aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt2
-rw-r--r--Documentation/block/as-iosched.txt4
-rw-r--r--Documentation/block/barrier.txt2
-rw-r--r--Documentation/cpu-freq/governors.txt8
-rw-r--r--Documentation/dell_rbu.txt10
-rw-r--r--Documentation/devices.txt4
-rw-r--r--Documentation/dvb/avermedia.txt4
-rw-r--r--Documentation/dvb/faq.txt2
-rw-r--r--Documentation/eisa.txt2
-rw-r--r--Documentation/fb/sstfb.txt4
-rw-r--r--Documentation/filesystems/befs.txt4
-rw-r--r--Documentation/filesystems/ext2.txt2
-rw-r--r--Documentation/filesystems/spufs.txt2
-rw-r--r--Documentation/hrtimers.txt2
-rw-r--r--Documentation/input/joystick-parport.txt4
-rw-r--r--Documentation/lockdep-design.txt2
-rw-r--r--Documentation/md.txt4
-rw-r--r--Documentation/networking/gen_stats.txt4
-rw-r--r--Documentation/networking/packet_mmap.txt2
-rw-r--r--Documentation/networking/sk98lin.txt8
-rw-r--r--Documentation/networking/vortex.txt4
-rw-r--r--Documentation/networking/wan-router.txt8
-rw-r--r--Documentation/power/userland-swsusp.txt2
-rw-r--r--Documentation/power/video.txt2
-rw-r--r--Documentation/powerpc/booting-without-of.txt5
-rw-r--r--Documentation/s390/Debugging390.txt16
-rw-r--r--Documentation/s390/cds.txt4
-rw-r--r--Documentation/s390/crypto/crypto-API.txt4
-rw-r--r--Documentation/s390/s390dbf.txt4
-rw-r--r--Documentation/scsi/NinjaSCSI.txt4
-rw-r--r--Documentation/scsi/aic79xx.txt2
-rw-r--r--Documentation/scsi/dc395x.txt2
-rw-r--r--Documentation/scsi/ibmmca.txt2
-rw-r--r--Documentation/scsi/ncr53c8xx.txt6
-rw-r--r--Documentation/scsi/scsi-changer.txt2
-rw-r--r--Documentation/sound/alsa/CMIPCI.txt2
-rw-r--r--Documentation/sparc/sbus_drivers.txt4
-rw-r--r--Documentation/uml/UserModeLinux-HOWTO.txt2
-rw-r--r--Documentation/usb/usb-serial.txt2
-rw-r--r--Documentation/video4linux/cx2341x/fw-encoder-api.txt2
-rw-r--r--Documentation/video4linux/w9968cf.txt2
41 files changed, 78 insertions, 79 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt b/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt
index 000e3d7a78b2..26422f0f9080 100644
--- a/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt
+++ b/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt
@@ -38,7 +38,7 @@ MTD
38--- 38---
39 39
40 The NAND and NOR support has been merged from the linux-mtd project. 40 The NAND and NOR support has been merged from the linux-mtd project.
41 Any prolbems, see http://www.linux-mtd.infradead.org/ for more 41 Any problems, see http://www.linux-mtd.infradead.org/ for more
42 information or up-to-date versions of linux-mtd. 42 information or up-to-date versions of linux-mtd.
43 43
44 44
diff --git a/Documentation/block/as-iosched.txt b/Documentation/block/as-iosched.txt
index 6f47332c883d..e2a66f8143c5 100644
--- a/Documentation/block/as-iosched.txt
+++ b/Documentation/block/as-iosched.txt
@@ -99,8 +99,8 @@ contrast, many write requests may be dispatched to the disk controller
99at a time during a write batch. It is this characteristic that can make 99at a time during a write batch. It is this characteristic that can make
100the anticipatory scheduler perform anomalously with controllers supporting 100the anticipatory scheduler perform anomalously with controllers supporting
101TCQ, or with hardware striped RAID devices. Setting the antic_expire 101TCQ, or with hardware striped RAID devices. Setting the antic_expire
102queue paramter (see below) to zero disables this behavior, and the anticipatory 102queue parameter (see below) to zero disables this behavior, and the
103scheduler behaves essentially like the deadline scheduler. 103anticipatory scheduler behaves essentially like the deadline scheduler.
104 104
105When read anticipation is enabled (antic_expire is not zero), reads 105When read anticipation is enabled (antic_expire is not zero), reads
106are dispatched to the disk controller one at a time. 106are dispatched to the disk controller one at a time.
diff --git a/Documentation/block/barrier.txt b/Documentation/block/barrier.txt
index de3d88edb7f1..a272c3db8094 100644
--- a/Documentation/block/barrier.txt
+++ b/Documentation/block/barrier.txt
@@ -42,7 +42,7 @@ iii. Devices which have queue depth of 1. This is a degenerate case
42of ii. Just keeping issue order suffices. Ancient SCSI 42of ii. Just keeping issue order suffices. Ancient SCSI
43controllers/drives and IDE drives are in this category. 43controllers/drives and IDE drives are in this category.
44 44
452. Forced flushing to physcial medium 452. Forced flushing to physical medium
46 46
47Again, if you're not gonna do synchronization with disk drives (dang, 47Again, if you're not gonna do synchronization with disk drives (dang,
48it sounds even more appealing now!), the reason you use I/O barriers 48it sounds even more appealing now!), the reason you use I/O barriers
diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt
index e6d7010d30a4..6a9c55bd556b 100644
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
@@ -137,11 +137,11 @@ have to be made in a row before the CPU frequency is actually lower.
137If set to '1' then the frequency decreases as quickly as it increases, 137If set to '1' then the frequency decreases as quickly as it increases,
138if set to '2' it decreases at half the rate of the increase. 138if set to '2' it decreases at half the rate of the increase.
139 139
140ignore_nice_load: this parameter takes a value of '0' or '1', when set 140ignore_nice_load: this parameter takes a value of '0' or '1'. When
141to '0' (its default) then all processes are counted towards towards the 141set to '0' (its default), all processes are counted towards the
142'cpu utilisation' value. When set to '1' then processes that are 142'cpu utilisation' value. When set to '1', the processes that are
143run with a 'nice' value will not count (and thus be ignored) in the 143run with a 'nice' value will not count (and thus be ignored) in the
144overal usage calculation. This is useful if you are running a CPU 144overall usage calculation. This is useful if you are running a CPU
145intensive calculation on your laptop that you do not care how long it 145intensive calculation on your laptop that you do not care how long it
146takes to complete as you can 'nice' it and prevent it from taking part 146takes to complete as you can 'nice' it and prevent it from taking part
147in the deciding process of whether to increase your CPU frequency. 147in the deciding process of whether to increase your CPU frequency.
diff --git a/Documentation/dell_rbu.txt b/Documentation/dell_rbu.txt
index b95ee6f94703..2c0d631de0cf 100644
--- a/Documentation/dell_rbu.txt
+++ b/Documentation/dell_rbu.txt
@@ -52,7 +52,7 @@ echo packet > /sys/devices/platform/dell_rbu/image_type
52In packet update mode the packet size has to be given before any packets can 52In packet update mode the packet size has to be given before any packets can
53be downloaded. It is done as below 53be downloaded. It is done as below
54echo XXXX > /sys/devices/platform/dell_rbu/packet_size 54echo XXXX > /sys/devices/platform/dell_rbu/packet_size
55In the packet update mechanism, the user neesd to create a new file having 55In the packet update mechanism, the user needs to create a new file having
56packets of data arranged back to back. It can be done as follows 56packets of data arranged back to back. It can be done as follows
57The user creates packets header, gets the chunk of the BIOS image and 57The user creates packets header, gets the chunk of the BIOS image and
58places it next to the packetheader; now, the packetheader + BIOS image chunk 58places it next to the packetheader; now, the packetheader + BIOS image chunk
@@ -93,8 +93,8 @@ read back the image downloaded.
93NOTE: 93NOTE:
94This driver requires a patch for firmware_class.c which has the modified 94This driver requires a patch for firmware_class.c which has the modified
95request_firmware_nowait function. 95request_firmware_nowait function.
96Also after updating the BIOS image an user mdoe application neeeds to execute 96Also after updating the BIOS image a user mode application needs to execute
97code which message the BIOS update request to the BIOS. So on the next reboot 97code which sends the BIOS update request to the BIOS. So on the next reboot
98the BIOS knows about the new image downloaded and it updates it self. 98the BIOS knows about the new image downloaded and it updates itself.
99Also don't unload the rbu drive if the image has to be updated. 99Also don't unload the rbu driver if the image has to be updated.
100 100
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 682e1e7018f3..28c4f79662c2 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -2005,7 +2005,7 @@ Your cooperation is appreciated.
2005116 char Advanced Linux Sound Driver (ALSA) 2005116 char Advanced Linux Sound Driver (ALSA)
2006 2006
2007116 block MicroMemory battery backed RAM adapter (NVRAM) 2007116 block MicroMemory battery backed RAM adapter (NVRAM)
2008 Supports 16 boards, 15 paritions each. 2008 Supports 16 boards, 15 partitions each.
2009 Requested by neilb at cse.unsw.edu.au. 2009 Requested by neilb at cse.unsw.edu.au.
2010 2010
2011 0 = /dev/umem/d0 Whole of first board 2011 0 = /dev/umem/d0 Whole of first board
@@ -3094,7 +3094,7 @@ Your cooperation is appreciated.
3094 This major is reserved to assist the expansion to a 3094 This major is reserved to assist the expansion to a
3095 larger number space. No device nodes with this major 3095 larger number space. No device nodes with this major
3096 should ever be created on the filesystem. 3096 should ever be created on the filesystem.
3097 (This is probaly not true anymore, but I'll leave it 3097 (This is probably not true anymore, but I'll leave it
3098 for now /Torben) 3098 for now /Torben)
3099 3099
3100---LARGE MAJORS!!!!!--- 3100---LARGE MAJORS!!!!!---
diff --git a/Documentation/dvb/avermedia.txt b/Documentation/dvb/avermedia.txt
index 8bab8461a4af..e44c009ac6c5 100644
--- a/Documentation/dvb/avermedia.txt
+++ b/Documentation/dvb/avermedia.txt
@@ -45,9 +45,9 @@ Assumptions and Introduction
45 by circuitry on the card and is often presented uncompressed. 45 by circuitry on the card and is often presented uncompressed.
46 For a PAL TV signal encoded at a resolution of 768x576 24-bit 46 For a PAL TV signal encoded at a resolution of 768x576 24-bit
47 color pixels over 25 frames per second - a fair amount of data 47 color pixels over 25 frames per second - a fair amount of data
48 is generated and must be proceesed by the PC before it can be 48 is generated and must be processed by the PC before it can be
49 displayed on the video monitor screen. Some Analogue TV cards 49 displayed on the video monitor screen. Some Analogue TV cards
50 for PC's have onboard MPEG2 encoders which permit the raw 50 for PCs have onboard MPEG2 encoders which permit the raw
51 digital data stream to be presented to the PC in an encoded 51 digital data stream to be presented to the PC in an encoded
52 and compressed form - similar to the form that is used in 52 and compressed form - similar to the form that is used in
53 Digital TV. 53 Digital TV.
diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt
index 25fae0b4ce07..dbcedf5833ee 100644
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
@@ -5,7 +5,7 @@ Some very frequently asked questions about linuxtv-dvb
5 It's not a bug, it's a feature. Because the frontends have 5 It's not a bug, it's a feature. Because the frontends have
6 significant power requirements (and hence get very hot), they 6 significant power requirements (and hence get very hot), they
7 are powered down if they are unused (i.e. if the frontend device 7 are powered down if they are unused (i.e. if the frontend device
8 is closed). The dvb-core.o module paramter "dvb_shutdown_timeout" 8 is closed). The dvb-core.o module parameter "dvb_shutdown_timeout"
9 allow you to change the timeout (default 5 seconds). Setting the 9 allow you to change the timeout (default 5 seconds). Setting the
10 timeout to 0 disables the timeout feature. 10 timeout to 0 disables the timeout feature.
11 11
diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt
index e00fd0c5707f..6a099edadd62 100644
--- a/Documentation/eisa.txt
+++ b/Documentation/eisa.txt
@@ -84,7 +84,7 @@ struct eisa_driver {
84 84
85id_table : an array of NULL terminated EISA id strings, 85id_table : an array of NULL terminated EISA id strings,
86 followed by an empty string. Each string can 86 followed by an empty string. Each string can
87 optionnaly be paired with a driver-dependant value 87 optionally be paired with a driver-dependant value
88 (driver_data). 88 (driver_data).
89 89
90driver : a generic driver, such as described in 90driver : a generic driver, such as described in
diff --git a/Documentation/fb/sstfb.txt b/Documentation/fb/sstfb.txt
index 4b6c38089b8e..ccdcfec3c346 100644
--- a/Documentation/fb/sstfb.txt
+++ b/Documentation/fb/sstfb.txt
@@ -72,8 +72,8 @@ Module Usage
72 72
73Kernel/Modules Options 73Kernel/Modules Options
74 74
75 You can pass some otions to sstfb module, and via the kernel command 75 You can pass some options to the sstfb module, and via the kernel
76 line when the driver is compiled in : 76 command line when the driver is compiled in:
77 for module : insmod sstfb.o option1=value1 option2=value2 ... 77 for module : insmod sstfb.o option1=value1 option2=value2 ...
78 in kernel : video=sstfb:option1,option2:value2,option3 ... 78 in kernel : video=sstfb:option1,option2:value2,option3 ...
79 79
diff --git a/Documentation/filesystems/befs.txt b/Documentation/filesystems/befs.txt
index 8b7d732bfb68..e7aa177e5422 100644
--- a/Documentation/filesystems/befs.txt
+++ b/Documentation/filesystems/befs.txt
@@ -22,7 +22,7 @@ He has been working on the code since Aug 13, 2001. See the changelog for
22details. 22details.
23 23
24Original Author: Makoto Kato <m_kato@ga2.so-net.ne.jp> 24Original Author: Makoto Kato <m_kato@ga2.so-net.ne.jp>
25His orriginal code can still be found at: 25His original code can still be found at:
26<http://hp.vector.co.jp/authors/VA008030/bfs/> 26<http://hp.vector.co.jp/authors/VA008030/bfs/>
27Does anyone know of a more current email address for Makoto? He doesn't 27Does anyone know of a more current email address for Makoto? He doesn't
28respond to the address given above... 28respond to the address given above...
@@ -39,7 +39,7 @@ Which is it, BFS or BEFS?
39================ 39================
40Be, Inc said, "BeOS Filesystem is officially called BFS, not BeFS". 40Be, Inc said, "BeOS Filesystem is officially called BFS, not BeFS".
41But Unixware Boot Filesystem is called bfs, too. And they are already in 41But Unixware Boot Filesystem is called bfs, too. And they are already in
42the kernel. Because of this nameing conflict, on Linux the BeOS 42the kernel. Because of this naming conflict, on Linux the BeOS
43filesystem is called befs. 43filesystem is called befs.
44 44
45HOW TO INSTALL 45HOW TO INSTALL
diff --git a/Documentation/filesystems/ext2.txt b/Documentation/filesystems/ext2.txt
index 3dd2872416a1..4333e836c495 100644
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
@@ -205,7 +205,7 @@ Reserved Space
205 205
206In ext2, there is a mechanism for reserving a certain number of blocks 206In ext2, there is a mechanism for reserving a certain number of blocks
207for a particular user (normally the super-user). This is intended to 207for a particular user (normally the super-user). This is intended to
208allow for the system to continue functioning even if non-priveleged users 208allow for the system to continue functioning even if non-privileged users
209fill up all the space available to them (this is independent of filesystem 209fill up all the space available to them (this is independent of filesystem
210quotas). It also keeps the filesystem from filling up entirely which 210quotas). It also keeps the filesystem from filling up entirely which
211helps combat fragmentation. 211helps combat fragmentation.
diff --git a/Documentation/filesystems/spufs.txt b/Documentation/filesystems/spufs.txt
index 302df12b762f..3889a8066247 100644
--- a/Documentation/filesystems/spufs.txt
+++ b/Documentation/filesystems/spufs.txt
@@ -359,7 +359,7 @@ ERRORS
359 EFAULT npc is not a valid pointer or status is neither NULL nor a valid 359 EFAULT npc is not a valid pointer or status is neither NULL nor a valid
360 pointer. 360 pointer.
361 361
362 EINTR A signal occured while spu_run was in progress. The npc value 362 EINTR A signal occurred while spu_run was in progress. The npc value
363 has been updated to the new program counter value if necessary. 363 has been updated to the new program counter value if necessary.
364 364
365 EINVAL fd is not a file descriptor returned from spu_create(2). 365 EINVAL fd is not a file descriptor returned from spu_create(2).
diff --git a/Documentation/hrtimers.txt b/Documentation/hrtimers.txt
index acad3a9b16c9..1fbad1a7b809 100644
--- a/Documentation/hrtimers.txt
+++ b/Documentation/hrtimers.txt
@@ -27,7 +27,7 @@ several reasons why such integration is hard/impossible:
27 high-res timers. 27 high-res timers.
28 28
29- the unpredictable [O(N)] overhead of cascading leads to delays which 29- the unpredictable [O(N)] overhead of cascading leads to delays which
30 necessiate a more complex handling of high resolution timers, which 30 necessitate a more complex handling of high resolution timers, which
31 in turn decreases robustness. Such a design still led to rather large 31 in turn decreases robustness. Such a design still led to rather large
32 timing inaccuracies. Cascading is a fundamental property of the timer 32 timing inaccuracies. Cascading is a fundamental property of the timer
33 wheel concept, it cannot be 'designed out' without unevitably 33 wheel concept, it cannot be 'designed out' without unevitably
diff --git a/Documentation/input/joystick-parport.txt b/Documentation/input/joystick-parport.txt
index d537c48cc6d0..22f039d9da62 100644
--- a/Documentation/input/joystick-parport.txt
+++ b/Documentation/input/joystick-parport.txt
@@ -465,8 +465,8 @@ more parallel ports.
465 465
466 There are two options specific to PSX driver portion. gamecon.psx_delay sets 466 There are two options specific to PSX driver portion. gamecon.psx_delay sets
467the command delay when talking to the controllers. The default of 25 should 467the command delay when talking to the controllers. The default of 25 should
468work but you can try lowering it for better performace. If your pads don't 468work but you can try lowering it for better performance. If your pads don't
469respond try raising it untill they work. Setting the type to 8 allows the 469respond try raising it until they work. Setting the type to 8 allows the
470driver to be used with Dance Dance Revolution or similar games. Arrow keys are 470driver to be used with Dance Dance Revolution or similar games. Arrow keys are
471registered as key presses instead of X and Y axes. 471registered as key presses instead of X and Y axes.
472 472
diff --git a/Documentation/lockdep-design.txt b/Documentation/lockdep-design.txt
index 2a76a4af598c..dab123db5a4f 100644
--- a/Documentation/lockdep-design.txt
+++ b/Documentation/lockdep-design.txt
@@ -170,7 +170,7 @@ Proof of 100% correctness:
170 170
171The validator achieves perfect, mathematical 'closure' (proof of locking 171The validator achieves perfect, mathematical 'closure' (proof of locking
172correctness) in the sense that for every simple, standalone single-task 172correctness) in the sense that for every simple, standalone single-task
173locking sequence that occured at least once during the lifetime of the 173locking sequence that occurred at least once during the lifetime of the
174kernel, the validator proves it with a 100% certainty that no 174kernel, the validator proves it with a 100% certainty that no
175combination and timing of these locking sequences can cause any class of 175combination and timing of these locking sequences can cause any class of
176lock related deadlock. [*] 176lock related deadlock. [*]
diff --git a/Documentation/md.txt b/Documentation/md.txt
index 154b4ff9bb35..38589c9465f1 100644
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
@@ -330,7 +330,7 @@ Each directory contains:
330 This gives the role that the device has in the array. It will 330 This gives the role that the device has in the array. It will
331 either be 'none' if the device is not active in the array 331 either be 'none' if the device is not active in the array
332 (i.e. is a spare or has failed) or an integer less than the 332 (i.e. is a spare or has failed) or an integer less than the
333 'raid_disks' number for the array indicating which possition 333 'raid_disks' number for the array indicating which position
334 it currently fills. This can only be set while assembling an 334 it currently fills. This can only be set while assembling an
335 array. A device for which this is set is assumed to be working. 335 array. A device for which this is set is assumed to be working.
336 336
@@ -353,7 +353,7 @@ in the array. These are named
353 353
354 rdNN 354 rdNN
355 355
356where 'NN' is the possition in the array, starting from 0. 356where 'NN' is the position in the array, starting from 0.
357So for a 3 drive array there will be rd0, rd1, rd2. 357So for a 3 drive array there will be rd0, rd1, rd2.
358These are symbolic links to the appropriate 'dev-XXX' entry. 358These are symbolic links to the appropriate 'dev-XXX' entry.
359Thus, for example, 359Thus, for example,
diff --git a/Documentation/networking/gen_stats.txt b/Documentation/networking/gen_stats.txt
index ae54c828f4d6..70e6275b757a 100644
--- a/Documentation/networking/gen_stats.txt
+++ b/Documentation/networking/gen_stats.txt
@@ -79,8 +79,8 @@ Rate Estimator:
79 79
800) Prepare an estimator attribute. Most likely this would be in user 800) Prepare an estimator attribute. Most likely this would be in user
81 space. The value of this TLV should contain a tc_estimator structure. 81 space. The value of this TLV should contain a tc_estimator structure.
82 As usual, such a TLV nees to be 32 bit aligned and therefore the 82 As usual, such a TLV needs to be 32 bit aligned and therefore the
83 length needs to be appropriately set etc. The estimator interval 83 length needs to be appropriately set, etc. The estimator interval
84 and ewma log need to be converted to the appropriate values. 84 and ewma log need to be converted to the appropriate values.
85 tc_estimator.c::tc_setup_estimator() is advisable to be used as the 85 tc_estimator.c::tc_setup_estimator() is advisable to be used as the
86 conversion routine. It does a few clever things. It takes a time 86 conversion routine. It does a few clever things. It takes a time
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt
index a87d4a8b3954..12a008a5c221 100644
--- a/Documentation/networking/packet_mmap.txt
+++ b/Documentation/networking/packet_mmap.txt
@@ -278,7 +278,7 @@ an i386 kernel's memory size is limited to 1GiB.
278All memory allocations are not freed until the socket is closed. The memory 278All memory allocations are not freed until the socket is closed. The memory
279allocations are done with GFP_KERNEL priority, this basically means that 279allocations are done with GFP_KERNEL priority, this basically means that
280the allocation can wait and swap other process' memory in order to allocate 280the allocation can wait and swap other process' memory in order to allocate
281the nececessary memory, so normally limits can be reached. 281the necessary memory, so normally limits can be reached.
282 282
283 Other constraints 283 Other constraints
284------------------- 284-------------------
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt
index b8bc7dd3d282..817fc113d93b 100644
--- a/Documentation/networking/sk98lin.txt
+++ b/Documentation/networking/sk98lin.txt
@@ -180,7 +180,7 @@ To set the driver parameters in this file, proceed as follows:
1801. Insert a line of the form : 1801. Insert a line of the form :
181 options sk98lin ... 181 options sk98lin ...
182 For "...", the same syntax is required as described for the command 182 For "...", the same syntax is required as described for the command
183 line paramaters of modprobe below. 183 line parameters of modprobe below.
1842. To activate the new parameters, either reboot your computer 1842. To activate the new parameters, either reboot your computer
185 or 185 or
186 unload and reload the driver. 186 unload and reload the driver.
@@ -364,9 +364,9 @@ Parameter: IntsPerSec
364Values: 30...40000 (interrupts per second) 364Values: 30...40000 (interrupts per second)
365Default: 2000 365Default: 2000
366 366
367This parameter is only used, if either static or dynamic interrupt moderation 367This parameter is only used if either static or dynamic interrupt moderation
368is used on a network adapter card. Using this paramter if no moderation is 368is used on a network adapter card. Using this parameter if no moderation is
369applied, will lead to no action performed. 369applied will lead to no action performed.
370 370
371This parameter determines the length of any interrupt moderation interval. 371This parameter determines the length of any interrupt moderation interval.
372Assuming that static interrupt moderation is to be used, an 'IntsPerSec' 372Assuming that static interrupt moderation is to be used, an 'IntsPerSec'
diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt
index 6091e5f6794f..6356d3faed36 100644
--- a/Documentation/networking/vortex.txt
+++ b/Documentation/networking/vortex.txt
@@ -359,13 +359,13 @@ steps you should take:
359 359
360 Eliminate some variables: try different cards, different 360 Eliminate some variables: try different cards, different
361 computers, different cables, different ports on the switch/hub, 361 computers, different cables, different ports on the switch/hub,
362 different versions of the kernel or ofthe driver, etc. 362 different versions of the kernel or of the driver, etc.
363 363
364- OK, it's a driver problem. 364- OK, it's a driver problem.
365 365
366 You need to generate a report. Typically this is an email to the 366 You need to generate a report. Typically this is an email to the
367 maintainer and/or linux-net@vger.kernel.org. The maintainer's 367 maintainer and/or linux-net@vger.kernel.org. The maintainer's
368 email address will be inthe driver source or in the MAINTAINERS file. 368 email address will be in the driver source or in the MAINTAINERS file.
369 369
370- The contents of your report will vary a lot depending upon the 370- The contents of your report will vary a lot depending upon the
371 problem. If it's a kernel crash then you should refer to the 371 problem. If it's a kernel crash then you should refer to the
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index 37e42fed7485..0cf654147634 100644
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -214,7 +214,7 @@ PRODUCT COMPONENTS AND RELATED FILES
214/usr/local/wanrouter/patches/kdrivers: 214/usr/local/wanrouter/patches/kdrivers:
215 Sources of the latest WANPIPE device drivers. 215 Sources of the latest WANPIPE device drivers.
216 These are used to UPGRADE the linux kernel to the newest 216 These are used to UPGRADE the linux kernel to the newest
217 version if the kernel source has already been pathced with 217 version if the kernel source has already been patched with
218 WANPIPE drivers. 218 WANPIPE drivers.
219 219
220/usr/local/wanrouter/samples: 220/usr/local/wanrouter/samples:
@@ -438,7 +438,7 @@ beta1-2.1.5 Nov 15 2000
438 2.2.X kernels only 438 2.2.X kernels only
439 439
440 o Secured the driver UDP debugging calls 440 o Secured the driver UDP debugging calls
441 - All illegal netowrk debugging calls are reported to 441 - All illegal network debugging calls are reported to
442 the log. 442 the log.
443 - Defined a set of allowed commands, all other denied. 443 - Defined a set of allowed commands, all other denied.
444 444
@@ -451,7 +451,7 @@ beta1-2.1.5 Nov 15 2000
451 451
452 o Keyboard Led Monitor/Debugger 452 o Keyboard Led Monitor/Debugger
453 - A new utilty /usr/sbin/wpkbdmon uses keyboard leds 453 - A new utilty /usr/sbin/wpkbdmon uses keyboard leds
454 to convey operatinal statistic information of the 454 to convey operational statistic information of the
455 Sangoma WANPIPE cards. 455 Sangoma WANPIPE cards.
456 NUM_LOCK = Line State (On=connected, Off=disconnected) 456 NUM_LOCK = Line State (On=connected, Off=disconnected)
457 CAPS_LOCK = Tx data (On=transmitting, Off=no tx data) 457 CAPS_LOCK = Tx data (On=transmitting, Off=no tx data)
@@ -470,7 +470,7 @@ beta1-2.1.5 Nov 15 2000
470 o Fixed the Frame Relay and Chdlc network interfaces so they are 470 o Fixed the Frame Relay and Chdlc network interfaces so they are
471 compatible with libpcap libraries. Meaning, tcpdump, snort, 471 compatible with libpcap libraries. Meaning, tcpdump, snort,
472 ethereal, and all other packet sniffers and debuggers work on 472 ethereal, and all other packet sniffers and debuggers work on
473 all WANPIPE netowrk interfaces. 473 all WANPIPE network interfaces.
474 - Set the network interface encoding type to ARPHRD_PPP. 474 - Set the network interface encoding type to ARPHRD_PPP.
475 This tell the sniffers that data obtained from the 475 This tell the sniffers that data obtained from the
476 network interface is in pure IP format. 476 network interface is in pure IP format.
diff --git a/Documentation/power/userland-swsusp.txt b/Documentation/power/userland-swsusp.txt
index 94058220aaf0..64755e9285db 100644
--- a/Documentation/power/userland-swsusp.txt
+++ b/Documentation/power/userland-swsusp.txt
@@ -91,7 +91,7 @@ unfreeze user space processes frozen by SNAPSHOT_UNFREEZE if they are
91still frozen when the device is being closed). 91still frozen when the device is being closed).
92 92
93Currently it is assumed that the userland utilities reading/writing the 93Currently it is assumed that the userland utilities reading/writing the
94snapshot image from/to the kernel will use a swap parition, called the resume 94snapshot image from/to the kernel will use a swap partition, called the resume
95partition, as storage space. However, this is not really required, as they 95partition, as storage space. However, this is not really required, as they
96can use, for example, a special (blank) suspend partition or a file on a partition 96can use, for example, a special (blank) suspend partition or a file on a partition
97that is unmounted before SNAPSHOT_ATOMIC_SNAPSHOT and mounted afterwards. 97that is unmounted before SNAPSHOT_ATOMIC_SNAPSHOT and mounted afterwards.
diff --git a/Documentation/power/video.txt b/Documentation/power/video.txt
index d859faa3a463..2b358498d095 100644
--- a/Documentation/power/video.txt
+++ b/Documentation/power/video.txt
@@ -16,7 +16,7 @@ problem for S1 standby, because hardware should retain its state over
16that. 16that.
17 17
18We either have to run video BIOS during early resume, or interpret it 18We either have to run video BIOS during early resume, or interpret it
19using vbetool later, or maybe nothing is neccessary on particular 19using vbetool later, or maybe nothing is necessary on particular
20system because video state is preserved. Unfortunately different 20system because video state is preserved. Unfortunately different
21methods work on different systems, and no known method suits all of 21methods work on different systems, and no known method suits all of
22them. 22them.
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index 09a5d43a683c..ee272035f781 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -630,12 +630,11 @@ like address space bits, you'll have to add a bus translator to the
630prom_parse.c file of the recent kernels for your bus type. 630prom_parse.c file of the recent kernels for your bus type.
631 631
632The "reg" property only defines addresses and sizes (if #size-cells 632The "reg" property only defines addresses and sizes (if #size-cells
633is 633is non-0) within a given bus. In order to translate addresses upward
634non-0) within a given bus. In order to translate addresses upward
635(that is into parent bus addresses, and possibly into cpu physical 634(that is into parent bus addresses, and possibly into cpu physical
636addresses), all busses must contain a "ranges" property. If the 635addresses), all busses must contain a "ranges" property. If the
637"ranges" property is missing at a given level, it's assumed that 636"ranges" property is missing at a given level, it's assumed that
638translation isn't possible. The format of the "ranges" proprety for a 637translation isn't possible. The format of the "ranges" property for a
639bus is a list of: 638bus is a list of:
640 639
641 bus address, parent bus address, size 640 bus address, parent bus address, size
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt
index e506e8d333ed..2d826d84943f 100644
--- a/Documentation/s390/Debugging390.txt
+++ b/Documentation/s390/Debugging390.txt
@@ -366,8 +366,8 @@ Register Usage & Stackframes on Linux for s/390 & z/Architecture
366Overview: 366Overview:
367--------- 367---------
368This is the code that gcc produces at the top & the bottom of 368This is the code that gcc produces at the top & the bottom of
369each function, it usually is fairly consistent & similar from 369each function. It usually is fairly consistent & similar from
370function to function & if you know its layout you can probalby 370function to function & if you know its layout you can probably
371make some headway in finding the ultimate cause of a problem 371make some headway in finding the ultimate cause of a problem
372after a crash without a source level debugger. 372after a crash without a source level debugger.
373 373
@@ -1703,7 +1703,7 @@ concentrate on data processing.
1703IOP's can use one or more links ( known as channel paths ) to talk to each 1703IOP's can use one or more links ( known as channel paths ) to talk to each
1704IO device. It first checks for path availability & chooses an available one, 1704IO device. It first checks for path availability & chooses an available one,
1705then starts ( & sometimes terminates IO ). 1705then starts ( & sometimes terminates IO ).
1706There are two types of channel path ESCON & the Paralell IO interface. 1706There are two types of channel path: ESCON & the Parallel IO interface.
1707 1707
1708IO devices are attached to control units, control units provide the 1708IO devices are attached to control units, control units provide the
1709logic to interface the channel paths & channel path IO protocols to 1709logic to interface the channel paths & channel path IO protocols to
@@ -1742,11 +1742,11 @@ controllers or a control unit which connects to 1000 3270 terminals ).
1742 1742
1743The 390 IO systems come in 2 flavours the current 390 machines support both 1743The 390 IO systems come in 2 flavours the current 390 machines support both
1744 1744
1745The Older 360 & 370 Interface,sometimes called the paralell I/O interface, 1745The Older 360 & 370 Interface,sometimes called the Parallel I/O interface,
1746sometimes called Bus-and Tag & sometimes Original Equipment Manufacturers 1746sometimes called Bus-and Tag & sometimes Original Equipment Manufacturers
1747Interface (OEMI). 1747Interface (OEMI).
1748 1748
1749This byte wide paralell channel path/bus has parity & data on the "Bus" cable 1749This byte wide Parallel channel path/bus has parity & data on the "Bus" cable
1750& control lines on the "Tag" cable. These can operate in byte multiplex mode for 1750& control lines on the "Tag" cable. These can operate in byte multiplex mode for
1751sharing between several slow devices or burst mode & monopolize the channel for the 1751sharing between several slow devices or burst mode & monopolize the channel for the
1752whole burst. Upto 256 devices can be addressed on one of these cables. These cables are 1752whole burst. Upto 256 devices can be addressed on one of these cables. These cables are
@@ -1776,7 +1776,7 @@ Consoles 3270 & 3215 ( a teletype emulated under linux for a line mode console )
1776DASD's direct access storage devices ( otherwise known as hard disks ). 1776DASD's direct access storage devices ( otherwise known as hard disks ).
1777Tape Drives. 1777Tape Drives.
1778CTC ( Channel to Channel Adapters ), 1778CTC ( Channel to Channel Adapters ),
1779ESCON or Paralell Cables used as a very high speed serial link 1779ESCON or Parallel Cables used as a very high speed serial link
1780between 2 machines. We use 2 cables under linux to do a bi-directional serial link. 1780between 2 machines. We use 2 cables under linux to do a bi-directional serial link.
1781 1781
1782 1782
@@ -1802,8 +1802,8 @@ OSA 7C09 ON OSA 7C09 SUBCHANNEL = 0001
1802OSA 7C14 ON OSA 7C14 SUBCHANNEL = 0002 1802OSA 7C14 ON OSA 7C14 SUBCHANNEL = 0002
1803OSA 7C15 ON OSA 7C15 SUBCHANNEL = 0003 1803OSA 7C15 ON OSA 7C15 SUBCHANNEL = 0003
1804 1804
1805If you have a guest with certain priviliges you may be able to see devices 1805If you have a guest with certain privileges you may be able to see devices
1806which don't belong to you to avoid this do add the option V. 1806which don't belong to you. To avoid this, add the option V.
1807e.g. 1807e.g.
1808Q V OSA 1808Q V OSA
1809 1809
diff --git a/Documentation/s390/cds.txt b/Documentation/s390/cds.txt
index 59a5616ae33a..b2acf4b6434f 100644
--- a/Documentation/s390/cds.txt
+++ b/Documentation/s390/cds.txt
@@ -177,11 +177,11 @@ This routine returns the characteristics for the device specified.
177The function is meant to be called with an irq handler in place; that is, 177The function is meant to be called with an irq handler in place; that is,
178at earliest during set_online() processing. 178at earliest during set_online() processing.
179 179
180While the request is procesed synchronously, the device interrupt 180While the request is processed synchronously, the device interrupt
181handler is called for final ending status. In case of error situations the 181handler is called for final ending status. In case of error situations the
182interrupt handler may recover appropriately. The device irq handler can 182interrupt handler may recover appropriately. The device irq handler can
183recognize the corresponding interrupts by the interruption parameter be 183recognize the corresponding interrupts by the interruption parameter be
1840x00524443.The ccw_device must not be locked prior to calling read_dev_chars(). 1840x00524443. The ccw_device must not be locked prior to calling read_dev_chars().
185 185
186The function may be called enabled or disabled. 186The function may be called enabled or disabled.
187 187
diff --git a/Documentation/s390/crypto/crypto-API.txt b/Documentation/s390/crypto/crypto-API.txt
index 78a77624a716..29dee792c887 100644
--- a/Documentation/s390/crypto/crypto-API.txt
+++ b/Documentation/s390/crypto/crypto-API.txt
@@ -61,9 +61,9 @@ Example: z990 crypto instruction for SHA1 algorithm is available
61 -> when the sha1 algorithm is requested through the crypto API 61 -> when the sha1 algorithm is requested through the crypto API
62 (which has a module autoloader) the z990 module will be loaded. 62 (which has a module autoloader) the z990 module will be loaded.
63 63
64TBD: a userspace module probin mechanism 64TBD: a userspace module probing mechanism
65 something like 'probe sha1 sha1_z990 sha1' in modprobe.conf 65 something like 'probe sha1 sha1_z990 sha1' in modprobe.conf
66 -> try module sha1_z990, if it fails to load load standard module sha1 66 -> try module sha1_z990, if it fails to load standard module sha1
67 the 'probe' statement is currently not supported in modprobe.conf 67 the 'probe' statement is currently not supported in modprobe.conf
68 68
69 69
diff --git a/Documentation/s390/s390dbf.txt b/Documentation/s390/s390dbf.txt
index 2095a2704b8f..389e0e56e38d 100644
--- a/Documentation/s390/s390dbf.txt
+++ b/Documentation/s390/s390dbf.txt
@@ -83,8 +83,8 @@ Example:
83It is also possible to deactivate the debug feature globally for every 83It is also possible to deactivate the debug feature globally for every
84debug log. You can change the behavior using 2 sysctl parameters in 84debug log. You can change the behavior using 2 sysctl parameters in
85/proc/sys/s390dbf: 85/proc/sys/s390dbf:
86There are currently 2 possible triggers, which stop the debug feature 86There are currently 2 possible triggers, which stop the debug feature
87globally. The first possbility is to use the "debug_active" sysctl. If 87globally. The first possibility is to use the "debug_active" sysctl. If
88set to 1 the debug feature is running. If "debug_active" is set to 0 the 88set to 1 the debug feature is running. If "debug_active" is set to 0 the
89debug feature is turned off. 89debug feature is turned off.
90The second trigger which stops the debug feature is an kernel oops. 90The second trigger which stops the debug feature is an kernel oops.
diff --git a/Documentation/scsi/NinjaSCSI.txt b/Documentation/scsi/NinjaSCSI.txt
index 17dd54786d37..73cec1211d7b 100644
--- a/Documentation/scsi/NinjaSCSI.txt
+++ b/Documentation/scsi/NinjaSCSI.txt
@@ -59,10 +59,10 @@ $ emacs Makefile
59... 59...
60$ make 60$ make
61 61
62[5] Copy nsp_cs.o to suitable plase, like /lib/modules/<Kernel version>/pcmcia/ . 62[5] Copy nsp_cs.ko to suitable place, like /lib/modules/<Kernel version>/pcmcia/ .
63 63
64[6] Add these lines to /etc/pcmcia/config . 64[6] Add these lines to /etc/pcmcia/config .
65 If you yse pcmcia-cs-3.1.8 or later, we can use "nsp_cs.conf" file. 65 If you use pcmcia-cs-3.1.8 or later, we can use "nsp_cs.conf" file.
66 So, you don't need to edit file. Just copy to /etc/pcmcia/ . 66 So, you don't need to edit file. Just copy to /etc/pcmcia/ .
67 67
68------------------------------------- 68-------------------------------------
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt
index 382b439b439e..2084ad5efb94 100644
--- a/Documentation/scsi/aic79xx.txt
+++ b/Documentation/scsi/aic79xx.txt
@@ -94,7 +94,7 @@ The following information is available in this file:
94 - Add support for scsi_report_device_reset() found in 94 - Add support for scsi_report_device_reset() found in
95 2.5.X kernels. 95 2.5.X kernels.
96 - Add 7901B support. 96 - Add 7901B support.
97 - Simplify handling of the packtized lun Rev A workaround. 97 - Simplify handling of the packetized lun Rev A workaround.
98 - Correct and simplify handling of the ignore wide residue 98 - Correct and simplify handling of the ignore wide residue
99 message. The previous code would fail to report a residual 99 message. The previous code would fail to report a residual
100 if the transaction data length was even and we received 100 if the transaction data length was even and we received
diff --git a/Documentation/scsi/dc395x.txt b/Documentation/scsi/dc395x.txt
index ae3b79a2d275..88219f96633d 100644
--- a/Documentation/scsi/dc395x.txt
+++ b/Documentation/scsi/dc395x.txt
@@ -20,7 +20,7 @@ Parameters
20---------- 20----------
21The driver uses the settings from the EEPROM set in the SCSI BIOS 21The driver uses the settings from the EEPROM set in the SCSI BIOS
22setup. If there is no EEPROM, the driver uses default values. 22setup. If there is no EEPROM, the driver uses default values.
23Both can be overriden by command line parameters (module or kernel 23Both can be overridden by command line parameters (module or kernel
24parameters). 24parameters).
25 25
26The following parameters are available: 26The following parameters are available:
diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt
index a783635b9a8e..9b9516364ec1 100644
--- a/Documentation/scsi/ibmmca.txt
+++ b/Documentation/scsi/ibmmca.txt
@@ -1086,7 +1086,7 @@
1086 1086
1087 Q: "Reset SCSI-devices at boottime" halts the system at boottime, why? 1087 Q: "Reset SCSI-devices at boottime" halts the system at boottime, why?
1088 A: This is only tested with the IBM SCSI Adapter w/cache. It is not 1088 A: This is only tested with the IBM SCSI Adapter w/cache. It is not
1089 yet prooved to run on other adapters, however you may be lucky. 1089 yet proven to run on other adapters, however you may be lucky.
1090 In version 3.1d this has been hugely improved and should work better, 1090 In version 3.1d this has been hugely improved and should work better,
1091 now. Normally you really won't need to activate this flag in the 1091 now. Normally you really won't need to activate this flag in the
1092 kernel configuration, as all post 1989 SCSI-devices should accept 1092 kernel configuration, as all post 1989 SCSI-devices should accept
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt
index 29cbbb64e1ce..ea8e98fad2bb 100644
--- a/Documentation/scsi/ncr53c8xx.txt
+++ b/Documentation/scsi/ncr53c8xx.txt
@@ -631,8 +631,8 @@ string variable using 'insmod'.
631 631
632A boot setup command for the ncr53c8xx (sym53c8xx) driver begins with the 632A boot setup command for the ncr53c8xx (sym53c8xx) driver begins with the
633driver name "ncr53c8xx="(sym53c8xx). The kernel syntax parser then expects 633driver name "ncr53c8xx="(sym53c8xx). The kernel syntax parser then expects
634an optionnal list of integers separated with comma followed by an optional 634an optional list of integers separated with comma followed by an optional
635list of comma-separated strings. Example of boot setup command under lilo 635list of comma-separated strings. Example of boot setup command under lilo
636prompt: 636prompt:
637 637
638lilo: linux root=/dev/hda2 ncr53c8xx=tags:4,sync:10,debug:0x200 638lilo: linux root=/dev/hda2 ncr53c8xx=tags:4,sync:10,debug:0x200
@@ -899,7 +899,7 @@ boot setup can be:
899 ncr53c8xx=safe:y,mpar:y 899 ncr53c8xx=safe:y,mpar:y
900 ncr53c8xx=safe:y 900 ncr53c8xx=safe:y
901 901
902My personnal system works flawlessly with the following equivalent setup: 902My personal system works flawlessly with the following equivalent setup:
903 903
904 ncr53c8xx=mpar:y,spar:y,disc:y,specf:1,fsn:n,ultra:2,fsn:n,revprob:n,verb:1\ 904 ncr53c8xx=mpar:y,spar:y,disc:y,specf:1,fsn:n,ultra:2,fsn:n,revprob:n,verb:1\
905 tags:32,sync:12,debug:0,burst:7,led:1,wide:1,settle:2,diff:0,irqm:0 905 tags:32,sync:12,debug:0,burst:7,led:1,wide:1,settle:2,diff:0,irqm:0
diff --git a/Documentation/scsi/scsi-changer.txt b/Documentation/scsi/scsi-changer.txt
index c132687b017a..d74bbd29eb3a 100644
--- a/Documentation/scsi/scsi-changer.txt
+++ b/Documentation/scsi/scsi-changer.txt
@@ -31,7 +31,7 @@ changers. But it allows to handle nearly all possible cases. It knows
31 media transport - this one shuffles around the media, i.e. the 31 media transport - this one shuffles around the media, i.e. the
32 transport arm. Also known as "picker". 32 transport arm. Also known as "picker".
33 storage - a slot which can hold a media. 33 storage - a slot which can hold a media.
34 import/export - the same as above, but is accessable from outside, 34 import/export - the same as above, but is accessible from outside,
35 i.e. there the operator (you !) can use this to 35 i.e. there the operator (you !) can use this to
36 fill in and remove media from the changer. 36 fill in and remove media from the changer.
37 Sometimes named "mailslot". 37 Sometimes named "mailslot".
diff --git a/Documentation/sound/alsa/CMIPCI.txt b/Documentation/sound/alsa/CMIPCI.txt
index 1872e24442a4..4cae0474b104 100644
--- a/Documentation/sound/alsa/CMIPCI.txt
+++ b/Documentation/sound/alsa/CMIPCI.txt
@@ -76,7 +76,7 @@ in alsa-lib. For example, you can play a WAV file with 6 channels like
76 76
77 % aplay -Dsurround51 sixchannels.wav 77 % aplay -Dsurround51 sixchannels.wav
78 78
79For programmin the 4/6 channel playback, you need to specify the PCM 79For programming the 4/6 channel playback, you need to specify the PCM
80channels as you like and set the format S16LE. For example, for playback 80channels as you like and set the format S16LE. For example, for playback
81with 4 channels, 81with 4 channels,
82 82
diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt
index 4b9351624f13..7ac0695cba59 100644
--- a/Documentation/sparc/sbus_drivers.txt
+++ b/Documentation/sparc/sbus_drivers.txt
@@ -25,8 +25,8 @@ the bits necessary to run your device. The most commonly
25used members of this structure, and their typical usage, 25used members of this structure, and their typical usage,
26will be detailed below. 26will be detailed below.
27 27
28 Here is a piece of skeleton code for perofming a device 28 Here is a piece of skeleton code for performing a device
29probe in an SBUS driverunder Linux: 29probe in an SBUS driver under Linux:
30 30
31 static int __devinit mydevice_probe_one(struct sbus_dev *sdev) 31 static int __devinit mydevice_probe_one(struct sbus_dev *sdev)
32 { 32 {
diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt
index ecee1002ead4..dc9440170119 100644
--- a/Documentation/uml/UserModeLinux-HOWTO.txt
+++ b/Documentation/uml/UserModeLinux-HOWTO.txt
@@ -2031,7 +2031,7 @@
2031 there are multiple COWs associated with a backing file, a -d merge of 2031 there are multiple COWs associated with a backing file, a -d merge of
2032 one of them will invalidate all of the others. However, it is 2032 one of them will invalidate all of the others. However, it is
2033 convenient if you're short of disk space, and it should also be 2033 convenient if you're short of disk space, and it should also be
2034 noticably faster than a non-destructive merge. 2034 noticeably faster than a non-destructive merge.
2035 2035
2036 2036
2037 2037
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index eca85f373419..2899628f9daf 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -272,7 +272,7 @@ Digi AccelePort Driver
272 work under SMP with the uhci driver. 272 work under SMP with the uhci driver.
273 273
274 The driver is generally working, though we still have a few more ioctls 274 The driver is generally working, though we still have a few more ioctls
275 to implement and final testing and debugging to do. The paralled port 275 to implement and final testing and debugging to do. The parallel port
276 on the USB 2 is supported as a serial to parallel converter; in other 276 on the USB 2 is supported as a serial to parallel converter; in other
277 words, it appears as another USB serial port on Linux, even though 277 words, it appears as another USB serial port on Linux, even though
278 physically it is really a parallel port. The Digi Acceleport USB 8 278 physically it is really a parallel port. The Digi Acceleport USB 8
diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
index 001c68644b08..15df0df57ddd 100644
--- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -280,7 +280,7 @@ Param[0]
280Param[1] 280Param[1]
281 Unknown, but leaving this to 0 seems to work best. Indications are that 281 Unknown, but leaving this to 0 seems to work best. Indications are that
282 this might have to do with USB support, although passing anything but 0 282 this might have to do with USB support, although passing anything but 0
283 onl breaks things. 283 only breaks things.
284 284
285------------------------------------------------------------------------------- 285-------------------------------------------------------------------------------
286 286
diff --git a/Documentation/video4linux/w9968cf.txt b/Documentation/video4linux/w9968cf.txt
index 0d53ce774b01..e0bba8393c77 100644
--- a/Documentation/video4linux/w9968cf.txt
+++ b/Documentation/video4linux/w9968cf.txt
@@ -15,7 +15,7 @@ Index
155. Supported devices 155. Supported devices
166. Module dependencies 166. Module dependencies
177. Module loading 177. Module loading
188. Module paramaters 188. Module parameters
199. Contact information 199. Contact information
2010. Credits 2010. Credits
21 21