[PATCH 2/8] Documentation: thinkpad-acpi grammo fixes

[PATCH 2/8] Documentation: thinkpad-acpi grammo fixes

[Randy Dunlap]

From: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>

This commit adds minor grammatical fixes to the description of the
keys in the thinkpad-acpi documentation.

Signed-off-by: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 Documentation/laptops/thinkpad-acpi.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- lnx1104.orig/Documentation/laptops/thinkpad-acpi.txt
+++ lnx1104/Documentation/laptops/thinkpad-acpi.txt
@@ -411,9 +411,9 @@ event	code	Key		Notes
 
 0x1004	0x03	FN+F4		Sleep button (ACPI sleep button
 				semantics, i.e. sleep-to-RAM).
-				It is always generate some kind
+				It always generates some kind
 				of event, either the hot key
-				event or a ACPI sleep button
+				event or an ACPI sleep button
 				event. The firmware may
 				refuse to generate further FN+F4
 				key presses until a S3 or S4 ACPI

[PATCH 3/8] Documentation: fix inotify source file paths

[Randy Dunlap]

From: Marcos Paulo de Souza <marcos.mage@gmail.com>

Fixes the path to find the source files of the inotify subsystem.

Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 Documentation/filesystems/inotify.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- lnx1104.orig/Documentation/filesystems/inotify.txt
+++ lnx1104/Documentation/filesystems/inotify.txt
@@ -194,7 +194,8 @@ associated with the inotify_handle, and
 Each watch is associated with an inotify_watch structure.  Watches are chained
 off of each associated inotify_handle and each associated inode.
 
-See fs/inotify.c and fs/inotify_user.c for the locking and lifetime rules.
+See fs/notify/inotify/inotify_fsnotify.c and fs/notify/inotify/inotify_user.c
+for the locking and lifetime rules.
 
 
 (vi) Rationale

[PATCH 4/8] Documentation: update CodingStyle use of braces

[Randy Dunlap]

From: Antonio Ospite <ospite@studenti.unina.it>

After commit 38829dc highlight that if _only_one_ branch of a
conditional statement is a single statement, then braces are to be used
on both branches.

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 Documentation/CodingStyle |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- lnx1104.orig/Documentation/CodingStyle
+++ lnx1104/Documentation/CodingStyle
@@ -166,8 +166,8 @@ if (condition)
 else
 	do_that();
 
-This does not apply if one branch of a conditional statement is a single
-statement. Use braces in both branches.
+This does not apply if only one branch of a conditional statement is a single
+statement; in the latter case use braces in both branches:
 
 if (condition) {
 	do_this();

[PATCH 5/8] Documentation: HFS is orphaned

[Randy Dunlap]

From: Marcos Paulo de Souza <marcos.mage@gmail.com>

Removed the reference of Roman Zippel, last maintainer, of orphaned
HFS filesystem.

Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 Documentation/filesystems/hfs.txt |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- lnx1104.orig/Documentation/filesystems/hfs.txt
+++ lnx1104/Documentation/filesystems/hfs.txt
@@ -1,3 +1,4 @@
+Note: This filesystem doesn't have a maintainer.
 
 Macintosh HFS Filesystem for Linux
 ==================================
@@ -76,8 +77,6 @@ hformat that can be used to create HFS f
 Credits
 =======
 
-The HFS drivers was written by Paul H. Hargrovea (hargrove@sccm.Stanford.EDU)
-and is now maintained by Roman Zippel (roman@ardistech.com) at Ardis
-Technologies.
-Roman rewrote large parts of the code and brought in btree routines derived
-from Brad Boyer's hfsplus driver (also maintained by Roman now).
+The HFS drivers was written by Paul H. Hargrovea (hargrove@sccm.Stanford.EDU).
+Roman Zippel (roman@ardistech.com) rewrote large parts of the code and brought
+in btree routines derived from Brad Boyer's hfsplus driver.

[PATCH 6/8] Documentation: Computone ip2 is orphaned

[Randy Dunlap]

From: Marcos Paulo Souza <marcos.mage@gmail.com>

Removed the email for support and fixes for orphaned ip2 driver.

Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 Documentation/serial/computone.txt |    2 --
 1 file changed, 2 deletions(-)

--- lnx1104.orig/Documentation/serial/computone.txt
+++ lnx1104/Documentation/serial/computone.txt
@@ -20,8 +20,6 @@ Version: 1.2.14
 Date: 11/01/2001
 Historical Author: Andrew Manison <amanison@america.net>
 Primary Author: Doug McNash
-Support: support@computone.com
-Fixes and Updates: Mike Warfield <mhw@wittsend.com>
 
 This file assumes that you are using the Computone drivers which are
 integrated into the kernel sources.  For updating the drivers or installing

[PATCH 7/8] Documentation: fix leds-class.txt duplicated word

[Randy Dunlap]

From: Bryan Wu <bryan.wu@canonical.com>

Fix a typo (duplicated word) in Documentation/leds/leds-class.txt

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Richard Purdie <rchard.purdie@linuxfoundation.org>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 Documentation/leds/leds-class.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- lnx1104.orig/Documentation/leds/leds-class.txt
+++ lnx1104/Documentation/leds/leds-class.txt
@@ -61,8 +61,8 @@ Hardware accelerated blink of LEDs
 Some LEDs can be programmed to blink without any CPU interaction. To
 support this feature, a LED driver can optionally implement the
 blink_set() function (see <linux/leds.h>). To set an LED to blinking,
-however, it is better to use use the API function led_blink_set(),
-as it will check and implement software fallback if necessary.
+however, it is better to use the API function led_blink_set(), as it
+will check and implement software fallback if necessary.
 
 To turn off blinking again, use the API function led_brightness_set()
 as that will not just set the LED brightness but also stop any software

[PATCH 8/8] Documentation: drop as block elevator reference in switching-sched.txt

[Randy Dunlap]

From: Wang Sheng-Hui <shhuiw@gmail.com>

Remove 'as' for as is no longer supported.



The patch is against 3.1-rc3.



as is no longer supported and we can not use 'elevator=as' any

more.



Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>

Cc: Jens Axboe <axboe@kernel.dk>

---

 Documentation/block/switching-sched.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


--- lnx1104.orig/Documentation/block/switching-sched.txt
+++ lnx1104/Documentation/block/switching-sched.txt
@@ -1,6 +1,6 @@
 To choose IO schedulers at boot time, use the argument 'elevator=deadline'.
-'noop', 'as' and 'cfq' (the default) are also available. IO schedulers are
-assigned globally at boot time only presently.
+'noop' and 'cfq' (the default) are also available. IO schedulers are assigned
+globally at boot time only presently.
 
 Each io queue has a set of io scheduler tunables associated with it. These
 tunables control how the io scheduler works. You can find these entries