From 0a8fe0d756fba2953462cec6db09c81dd732d0b5 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 3 Oct 2006 22:11:20 +0200 Subject: input: remove obsolete contact information This patch removes some obsolete contact information from Documentation/input/input.txt Signed-off-by: Adrian Bunk --- Documentation/input/input.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt index 47137e75fdb8..550ef9add4b6 100644 --- a/Documentation/input/input.txt +++ b/Documentation/input/input.txt @@ -289,24 +289,3 @@ list is in include/linux/input.h. EV_REL, absolute new value for EV_ABS (joysticks ...), or 0 for EV_KEY for release, 1 for keypress and 2 for autorepeat. -6. Contacts -~~~~~~~~~~~ - This effort has its home page at: - - http://www.suse.cz/development/input/ - -You'll find both the latest HID driver and the complete Input driver -there as well as information how to access the CVS repository for -latest revisions of the drivers. - - There is also a mailing list for this: - - majordomo@atrey.karlin.mff.cuni.cz - -Send "subscribe linux-input" to subscribe to it. - -The input changes are also being worked on as part of the LinuxConsole -project, see: - - http://sourceforge.net/projects/linuxconsole/ - -- cgit v1.2.2 From bf6ee0ae494596aaf311e8430684db85d1d2f25c Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 3 Oct 2006 22:17:48 +0200 Subject: remove mentionings of devfs in documentation Now that devfs is removed, there's no longer any need to document how to do this or that with devfs. This patch includes some improvements by Joe Perches. Signed-off-by: Adrian Bunk --- Documentation/DocBook/usb.tmpl | 3 +- Documentation/DocBook/writing_usb_driver.tmpl | 7 +-- Documentation/arm/SA1100/serial_UART | 4 +- Documentation/computone.txt | 70 +------------------------ Documentation/filesystems/00-INDEX | 2 - Documentation/filesystems/tmpfs.txt | 2 +- Documentation/input/input.txt | 4 +- Documentation/input/joystick.txt | 2 +- Documentation/kernel-docs.txt | 11 ---- Documentation/s390/3270.txt | 4 +- Documentation/scsi/osst.txt | 3 +- Documentation/sound/alsa/ALSA-Configuration.txt | 20 ------- Documentation/uml/UserModeLinux-HOWTO.txt | 54 +------------------ Documentation/usb/acm.txt | 14 ----- Documentation/usb/usb-serial.txt | 5 -- drivers/block/Kconfig | 3 +- drivers/char/mwave/README | 5 +- drivers/media/radio/Kconfig | 3 +- drivers/media/video/pwc/philips.txt | 4 +- drivers/sbus/char/cpwatchdog.c | 2 - 20 files changed, 19 insertions(+), 203 deletions(-) diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl index 3608472d7b74..fbc72d4dbc25 100644 --- a/Documentation/DocBook/usb.tmpl +++ b/Documentation/DocBook/usb.tmpl @@ -314,8 +314,7 @@ usbdevfs although it wasn't solving what devfs was. Every USB device will appear in usbfs, regardless of whether or - not it has a kernel driver; but only devices with kernel drivers - show up in devfs. + not it has a kernel driver. diff --git a/Documentation/DocBook/writing_usb_driver.tmpl b/Documentation/DocBook/writing_usb_driver.tmpl index 008a341234d0..07cd34c1940b 100644 --- a/Documentation/DocBook/writing_usb_driver.tmpl +++ b/Documentation/DocBook/writing_usb_driver.tmpl @@ -224,13 +224,8 @@ static int skel_probe(struct usb_interface *interface, Conversely, when the device is removed from the USB bus, the disconnect function is called with the device pointer. The driver needs to clean any private data that has been allocated at this time and to shut down any - pending urbs that are in the USB system. The driver also unregisters - itself from the devfs subsystem with the call: + pending urbs that are in the USB system. - -/* remove our devfs node */ -devfs_unregister(skel->devfs); - Now that the device is plugged into the system and the driver is bound to the device, any of the functions in the file_operations structure that diff --git a/Documentation/arm/SA1100/serial_UART b/Documentation/arm/SA1100/serial_UART index aea2e91ca0ef..a63966f1d083 100644 --- a/Documentation/arm/SA1100/serial_UART +++ b/Documentation/arm/SA1100/serial_UART @@ -24,8 +24,8 @@ The SA1100 serial port had its major/minor numbers officially assigned: > 7 = /dev/cusa2 Callout device for ttySA2 > -If you're not using devfs, you must create those inodes in /dev -on the root filesystem used by your SA1100-based device: +You must create those inodes in /dev on the root filesystem used +by your SA1100-based device: mknod ttySA0 c 204 5 mknod ttySA1 c 204 6 diff --git a/Documentation/computone.txt b/Documentation/computone.txt index b1cf59b84d97..5e2a0c76bfa0 100644 --- a/Documentation/computone.txt +++ b/Documentation/computone.txt @@ -199,30 +199,6 @@ boxes this will leave gaps in the sequence of device names. ip2mkdev uses Linux tty naming conventions: ttyF0 - ttyF255 for normal devices, and cuf0 - cuf255 for callout devices. -If you are using devfs, existing devices are automatically created within -the devfs name space. Normal devices will be tts/F0 - tts/F255 and callout -devices will be cua/F0 - cua/F255. With devfs installed, ip2mkdev will -create symbolic links in /dev from the old conventional names to the newer -devfs names as follows: - - /dev/ip2ipl[n] -> /dev/ip2/ipl[n] n = 0 - 3 - /dev/ip2stat[n] -> /dev/ip2/stat[n] n = 0 - 3 - /dev/ttyF[n] -> /dev/tts/F[n] n = 0 - 255 - /dev/cuf[n] -> /dev/cua/F[n] n = 0 - 255 - -Only devices for existing ports and boards will be created. - -IMPORTANT NOTE: The naming convention used for devfs by this driver -was changed from 1.2.12 to 1.2.13. The old naming convention was to -use ttf/%d for the tty device and cuf/%d for the cua device. That -has been changed to conform to an agreed-upon standard of placing -all the tty devices under tts. The device names are now tts/F%d for -the tty device and cua/F%d for the cua devices. If you were using -the older devfs names, you must update for the newer convention. - -You do not need to run ip2mkdev if you are using devfs and only want to -use the devfs native device names. - 4. USING THE DRIVERS @@ -256,57 +232,15 @@ cut out and run as "ip2mkdev" to create the necessary device files. To use the ip2mkdev script, you must have procfs enabled and the proc file system mounted on /proc. -You do not need to run ip2mkdev if you are using devfs and only want to -use the devfs native device names. - - -6. DEVFS - -DEVFS is the DEVice File System available as an add on package for the -2.2.x kernels and available as a configuration option in 2.3.46 and higher. -Devfs allows for the automatic creation and management of device names -under control of the device drivers themselves. The Devfs namespace is -hierarchical and reduces the clutter present in the normal flat /dev -namespace. Devfs names and conventional device names may be intermixed. -A userspace daemon, devfsd, exists to allow for automatic creation and -management of symbolic links from the devfs name space to the conventional -names. More details on devfs can be found on the DEVFS home site at - or in the file kernel -documentation files, .../linux/Documentation/filesystems/devfs/README. - -If you are using devfs, existing devices are automatically created within -the devfs name space. Normal devices will be tts/F0 - tts/F255 and callout -devices will be cua/F0 - cua/F255. With devfs installed, ip2mkdev will -create symbolic links in /dev from the old conventional names to the newer -devfs names as follows: - - /dev/ip2ipl[n] -> /dev/ip2/ipl[n] n = 0 - 3 - /dev/ip2stat[n] -> /dev/ip2/stat[n] n = 0 - 3 - /dev/ttyF[n] -> /dev/tts/F[n] n = 0 - 255 - /dev/cuf[n] -> /dev/cua/F[n] n = 0 - 255 - -Only devices for existing ports and boards will be created. - -IMPORTANT NOTE: The naming convention used for devfs by this driver -was changed from 1.2.12 to 1.2.13. The old naming convention was to -use ttf/%d for the tty device and cuf/%d for the cua device. That -has been changed to conform to an agreed-upon standard of placing -all the tty devices under tts. The device names are now tts/F%d for -the tty device and cua/F%d for the cua devices. If you were using -the older devfs names, you must update for the newer convention. - -You do not need to run ip2mkdev if you are using devfs and only want to -use the devfs native device names. - -7. NOTES +6. NOTES This is a release version of the driver, but it is impossible to test it in all configurations of Linux. If there is any anomalous behaviour that does not match the standard serial port's behaviour please let us know. -8. ip2mkdev shell script +7. ip2mkdev shell script Previously, this script was simply attached here. It is now attached as a shar archive to make it easier to extract the script from the documentation. diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index 16dec61d7671..3c384c0cf86e 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX @@ -26,8 +26,6 @@ cramfs.txt - info on the cram filesystem for small storage (ROMs etc). dentry-locking.txt - info on the RCU-based dcache locking model. -devfs/ - - directory containing devfs documentation. directory-locking - info about the locking scheme used for directory operations. dlmfs.txt diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt index 1773106976a2..f9bcf9f4934a 100644 --- a/Documentation/filesystems/tmpfs.txt +++ b/Documentation/filesystems/tmpfs.txt @@ -39,7 +39,7 @@ tmpfs has the following uses: tmpfs /dev/shm tmpfs defaults 0 0 Remember to create the directory that you intend to mount tmpfs on - if necessary (/dev/shm is automagically created if you use devfs). + if necessary. This mount is _not_ needed for SYSV shared memory. The internal mount is used for that. (In the 2.3 kernel versions it was diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt index 550ef9add4b6..ac22f636e4c2 100644 --- a/Documentation/input/input.txt +++ b/Documentation/input/input.txt @@ -68,8 +68,8 @@ will be available as a character device on major 13, minor 63: crw-r--r-- 1 root root 13, 63 Mar 28 22:45 mice - This device has to be created, unless you use devfs, in which case it's -created automatically. The commands to do create it by hand are: + This device has to be created. + The commands to create it by hand are: cd /dev mkdir input diff --git a/Documentation/input/joystick.txt b/Documentation/input/joystick.txt index 841c353297e6..389de9bd9878 100644 --- a/Documentation/input/joystick.txt +++ b/Documentation/input/joystick.txt @@ -60,7 +60,7 @@ and install it before going on. 2.2 Device nodes ~~~~~~~~~~~~~~~~ -For applications to be able to use the joysticks, in you don't use devfs, +For applications to be able to use the joysticks, you'll have to manually create these nodes in /dev: cd /dev diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt index 99d24f2943ee..b53bccbd9727 100644 --- a/Documentation/kernel-docs.txt +++ b/Documentation/kernel-docs.txt @@ -290,17 +290,6 @@ Description: Very nice 92 pages GPL book on the topic of modules programming. Lots of examples. - * Title: "Device File System (devfs) Overview" - Author: Richard Gooch. - URL: http://www.atnf.csiro.au/people/rgooch/linux/docs/devfs.html - Keywords: filesystem, /dev, devfs, dynamic devices, major/minor - allocation, device management. - Description: Document describing Richard Gooch's controversial - devfs, which allows for dynamic devices, only shows present - devices in /dev, gets rid of major/minor numbers allocation - problems, and allows for hundreds of identical devices (which some - USB systems might demand soon). - * Title: "I/O Event Handling Under Linux" Author: Richard Gooch. URL: http://www.atnf.csiro.au/~rgooch/linux/docs/io-events.html diff --git a/Documentation/s390/3270.txt b/Documentation/s390/3270.txt index 0a044e647d2d..7a5c73a7ed7f 100644 --- a/Documentation/s390/3270.txt +++ b/Documentation/s390/3270.txt @@ -111,9 +111,7 @@ Here are the installation steps in detail: config3270.sh. Inspect the output script it produces, /tmp/mkdev3270, and then run that script. This will create the necessary character special device files and make the necessary - changes to /etc/inittab. If you have selected DEVFS, the driver - itself creates the device files, and /tmp/mkdev3270 only changes - /etc/inittab. + changes to /etc/inittab. Then notify /sbin/init that /etc/inittab has changed, by issuing the telinit command with the q operand: diff --git a/Documentation/scsi/osst.txt b/Documentation/scsi/osst.txt index ce574e7791ab..f536907e241d 100644 --- a/Documentation/scsi/osst.txt +++ b/Documentation/scsi/osst.txt @@ -56,8 +56,7 @@ Compile your kernel and install the modules. Now, your osst driver is inside the kernel or available as a module, depending on your choice during kernel config. You may still need to create -the device nodes by calling the Makedevs.sh script (see below) manually, -unless you use a devfs kernel, where this won't be needed. +the device nodes by calling the Makedevs.sh script (see below) manually. To load your module, you may use the command modprobe osst diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index e6b57dd46a4f..958ccf3aa2ea 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -57,11 +57,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. - Default: 1 - For auto-loading more than one card, specify this option together with snd-card-X aliases. - device_mode - - permission mask for dynamic sound device filesystem - - This is available only when DEVFS is enabled - - Default: 0666 - - E.g.: device_mode=0660 Module snd-pcm-oss @@ -1915,21 +1910,6 @@ Please note that the device mapping above may be varied via the module options of snd-pcm-oss module. -DEVFS support -============= - -The ALSA driver fully supports the devfs extension. -You should add lines below to your devfsd.conf file: - -LOOKUP snd MODLOAD ACTION snd -REGISTER ^sound/.* PERMISSIONS root.audio 660 -REGISTER ^snd/.* PERMISSIONS root.audio 660 - -Warning: These lines assume that you have the audio group in your system. - Otherwise replace audio word with another group name (root for - example). - - Proc interfaces (/proc/asound) ============================== diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt index 544430e39980..b7390000bf28 100644 --- a/Documentation/uml/UserModeLinux-HOWTO.txt +++ b/Documentation/uml/UserModeLinux-HOWTO.txt @@ -157,7 +157,7 @@ 13. What to do when UML doesn't work 13.1 Strange compilation errors when you build from source - 13.2 UML hangs on boot after mounting devfs + 13.2 (obsolete) 13.3 A variety of panics and hangs with /tmp on a reiserfs filesystem 13.4 The compile fails with errors about conflicting types for 'open', 'dup', and 'waitpid' 13.5 UML doesn't work when /tmp is an NFS filesystem @@ -379,31 +379,6 @@ bug fixes and enhancements that have gone into subsequent releases. - If you build your own kernel, and want to boot it from one of the - filesystems distributed from this site, then, in nearly all cases, - devfs must be compiled into the kernel and mounted at boot time. The - exception is the SuSE filesystem. For this, devfs must either not be - in the kernel at all, or "devfs=nomount" must be on the kernel command - line. Any disagreement between the kernel and the filesystem being - booted about whether devfs is being used will result in the boot - getting no further than single-user mode. - - - If you don't want to use devfs, you can remove the need for it from a - filesystem by copying /dev from someplace, making a bunch of /dev/ubd - devices: - - - UML# for i in 0 1 2 3 4 5 6 7; do mknod ubd$i b 98 $i; done - - - - - and changing /etc/fstab and /etc/inittab to refer to the non-devfs - devices. - - - 22..22.. CCoommppiilliinngg aanndd iinnssttaalllliinngg kkeerrnneell mmoodduulleess UML modules are built in the same way as the native kernel (with the @@ -839,9 +814,7 @@ +o None - device=none - This causes the device to disappear. If you are using devfs, the - device will not appear in /dev. If not, then attempts to open it - will return -ENODEV. + This causes the device to disappear. @@ -3898,29 +3871,6 @@ - 1133..22.. UUMMLL hhaannggss oonn bboooott aafftteerr mmoouunnttiinngg ddeevvffss - - The boot looks like this: - - - VFS: Mounted root (ext2 filesystem) readonly. - Mounted devfs on /dev - - - - - You're probably running a recent distribution on an old machine. I - saw this with the RH7.1 filesystem running on a Pentium. The shared - library loader, ld.so, was executing an instruction (cmove) which the - Pentium didn't support. That instruction was apparently added later. - If you run UML under the debugger, you'll see the hang caused by one - instruction causing an infinite SIGILL stream. - - - The fix is to boot UML on an older filesystem. - - - 1133..33.. AA vvaarriieettyy ooff ppaanniiccss aanndd hhaannggss wwiitthh //ttmmpp oonn aa rreeiisseerrffss ffiilleessyyss-- tteemm diff --git a/Documentation/usb/acm.txt b/Documentation/usb/acm.txt index 8ef45ea8f691..737d6104c3f3 100644 --- a/Documentation/usb/acm.txt +++ b/Documentation/usb/acm.txt @@ -49,20 +49,6 @@ Abstract Control Model (USB CDC ACM) specification. Unfortunately many modems and most ISDN TAs use proprietary interfaces and thus won't work with this drivers. Check for ACM compliance before buying. - The driver (with devfs) creates these devices in /dev/usb/acm: - - crw-r--r-- 1 root root 166, 0 Apr 1 10:49 0 - crw-r--r-- 1 root root 166, 1 Apr 1 10:49 1 - crw-r--r-- 1 root root 166, 2 Apr 1 10:49 2 - - And so on, up to 31, with the limit being possible to change in acm.c to up -to 256, so you can use up to 256 USB modems with one computer (you'll need -three USB cards for that, though). - - If you don't use devfs, then you can create device nodes with the same -minor/major numbers anywhere you want, but either the above location or -/dev/usb/ttyACM0 is preferred. - To use the modems you need these modules loaded: usbcore.ko diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt index a2dee6e6190d..eca85f373419 100644 --- a/Documentation/usb/usb-serial.txt +++ b/Documentation/usb/usb-serial.txt @@ -13,7 +13,6 @@ CONFIGURATION Currently the driver can handle up to 256 different serial interfaces at one time. - If you are not using devfs: The major number that the driver uses is 188 so to use the driver, create the following nodes: mknod /dev/ttyUSB0 c 188 0 @@ -26,10 +25,6 @@ CONFIGURATION mknod /dev/ttyUSB254 c 188 254 mknod /dev/ttyUSB255 c 188 255 - If you are using devfs: - The devices supported by this driver will show up as - /dev/usb/tts/{0,1,...} - When the device is connected and recognized by the driver, the driver will print to the system log, which node(s) the device has been bound to. diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 422e31d5f8e5..24ebd1ce6644 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -207,8 +207,7 @@ config BLK_DEV_UMEM module will be called umem. The umem driver has not yet been allocated a MAJOR number, so - one is chosen dynamically. Use "devfs" or look in /proc/devices - for the device number + one is chosen dynamically. config BLK_DEV_UBD bool "Virtual block device" diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README index 70f8d19fb79f..480251fc78e2 100644 --- a/drivers/char/mwave/README +++ b/drivers/char/mwave/README @@ -41,10 +41,7 @@ Example to enable the 3780i DSP using ttyS1 resources: Accessing the driver -------------------- -You must also create a node for the driver. Without devfs: +You must also create a node for the driver: mkdir -p /dev/modems mknod --mode=660 /dev/modems/mwave c 10 219 -With devfs: - mkdir -p /dev/modems - ln -s ../misc/mwave /dev/modems/mwave diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 7015517e2c1b..6d96b17a7f81 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -195,8 +195,7 @@ config RADIO_MIROPCM20_RDS ---help--- Choose Y here if you want to see RDS/RBDS information like RadioText, Programme Service name, Clock Time and date, Programme - TYpe and Traffic Announcement/Programme identification. You also - need to say Y to "miroSOUND PCM20 radio" and devfs! + Type and Traffic Announcement/Programme identification. It's not possible to read the raw RDS packets from the device, so the driver cant provide an V4L interface for this. But the diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt index 11f751a6bda5..f5e848410311 100644 --- a/drivers/media/video/pwc/philips.txt +++ b/drivers/media/video/pwc/philips.txt @@ -175,8 +175,8 @@ dev_hint - If a device node is already occupied, registration will fail and the webcam is not available. - You can have up to 64 video devices; be sure to make enough device - nodes in /dev if you want to spread the numbers (this does not apply - to devfs). After /dev/video9 comes /dev/video10 (not /dev/videoA). + nodes in /dev if you want to spread the numbers. + After /dev/video9 comes /dev/video10 (not /dev/videoA). - If a camera does not match any dev_hint, it will simply get assigned the first available device node, just as it used to be. diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c index 836a58bb0305..40b6fc86f6a8 100644 --- a/drivers/sbus/char/cpwatchdog.c +++ b/drivers/sbus/char/cpwatchdog.c @@ -10,8 +10,6 @@ * timer interrupts. We use a timer to periodically * reset 'stopped' watchdogs on affected platforms. * - * TODO: DevFS support (/dev/watchdogs/0 ... /dev/watchdogs/2) - * * Copyright (c) 2000 Eric Brower (ebrower@usa.net) */ -- cgit v1.2.2 From 4b3f686d4aa8ad815dc68a4e8fabd05b1ebb9f2c Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:21:02 +0200 Subject: Attack of "the the"s in arch The patch below corrects multiple occurances of "the the" typos across several files, both in source comments and KConfig files. There is no actual code changed, only text. Note this only affects the /arch directory, and I believe I could find many more elsewhere. :) Signed-off-by: Adrian Bunk --- arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 2 +- arch/i386/Kconfig | 2 +- arch/i386/pci/fixup.c | 2 +- arch/ia64/sn/kernel/xpnet.c | 2 +- arch/m68knommu/Kconfig | 2 +- arch/mips/mm/tlbex.c | 2 +- arch/parisc/kernel/entry.S | 4 ++-- arch/powerpc/Kconfig | 4 ++-- arch/ppc/Kconfig | 4 ++-- arch/um/Makefile | 2 +- arch/um/drivers/line.c | 2 +- arch/um/include/sysdep-x86_64/ptrace_user.h | 2 +- arch/v850/kernel/entry.S | 2 +- arch/xtensa/lib/usercopy.S | 4 ++-- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c index a6910114b24c..a21b12f06c6b 100644 --- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c +++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c @@ -164,7 +164,7 @@ static void lh7a40x_ack_cpld_irq (u32 irq) /* CPLD doesn't have ack capability, but some devices may */ #if defined (CPLD_INTMASK_TOUCH) - /* The touch control *must* mask the the interrupt because the + /* The touch control *must* mask the interrupt because the * interrupt bit is read by the driver to determine if the pen * is still down. */ if (irq == IRQ_TOUCH) diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index af219e51734f..8ff1c6fb5aa1 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -682,7 +682,7 @@ config EFI depends on ACPI default n ---help--- - This enables the the kernel to boot on EFI platforms using + This enables the kernel to boot on EFI platforms using system configuration information passed to it from the firmware. This also enables the kernel to use any EFI runtime services that are available (such as the EFI variable services). diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c index 83c3645ccc43..b60d7e8689ed 100644 --- a/arch/i386/pci/fixup.c +++ b/arch/i386/pci/fixup.c @@ -393,7 +393,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video); * We pretend to bring them out of full D3 state, and restore the proper * IRQ, PCI cache line size, and BARs, otherwise the device won't function * properly. In some cases, the device will generate an interrupt on - * the wrong IRQ line, causing any devices sharing the the line it's + * the wrong IRQ line, causing any devices sharing the line it's * *supposed* to use to be disabled by the kernel's IRQ debug code. */ static u16 toshiba_line_size; diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c index 007703c494a4..c8173db0d84f 100644 --- a/arch/ia64/sn/kernel/xpnet.c +++ b/arch/ia64/sn/kernel/xpnet.c @@ -225,7 +225,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) skb_put(skb, (msg->size - msg->leadin_ignore - msg->tailout_ignore)); /* - * Move the data over from the the other side. + * Move the data over from the other side. */ if ((XPNET_VERSION_MINOR(msg->version) == 1) && (msg->embedded_bytes != 0)) { diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index e767f2ddae72..b7c942cf7741 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -495,7 +495,7 @@ config VECTORBASE hex "Address of the base of system vectors" default "0" help - Define the address of the the system vectors. Commonly this is + Define the address of the system vectors. Commonly this is put at the start of RAM, but it doesn't have to be. On ColdFire platforms this address is programmed into the VBR register, thus actually setting the address to use. diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 375e0991505d..6f8b25cfa6f0 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -1211,7 +1211,7 @@ static void __init build_r4000_tlb_refill_handler(void) * Overflow check: For the 64bit handler, we need at least one * free instruction slot for the wrap-around branch. In worst * case, if the intended insertion point is a delay slot, we - * need three, with the the second nop'ed and the third being + * need three, with the second nop'ed and the third being * unused. */ #ifdef CONFIG_32BIT diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 95c1b8ec4289..192357a3b9fe 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -941,8 +941,8 @@ syscall_exit_rfi: * to "proper" values now (otherwise we'll wind up restoring * whatever was last stored in the task structure, which might * be inconsistent if an interrupt occured while on the gateway - * page) Note that we may be "trashing" values the user put in - * them, but we don't support the the user changing them. + * page). Note that we may be "trashing" values the user put in + * them, but we don't support the user changing them. */ STREG %r0,PT_SR2(%r16) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 032e6ab5d3c4..96ef656e4669 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1002,7 +1002,7 @@ config CONSISTENT_START_BOOL depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help This option allows you to set the base virtual address - of the the consistent memory pool. This pool of virtual + of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. config CONSISTENT_START @@ -1013,7 +1013,7 @@ config CONSISTENT_SIZE_BOOL bool "Set custom consistent memory pool size" depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help - This option allows you to set the size of the the + This option allows you to set the size of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index fdd9e7b66244..077711e63104 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -1345,7 +1345,7 @@ config CONSISTENT_START_BOOL depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help This option allows you to set the base virtual address - of the the consistent memory pool. This pool of virtual + of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. config CONSISTENT_START @@ -1356,7 +1356,7 @@ config CONSISTENT_SIZE_BOOL bool "Set custom consistent memory pool size" depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help - This option allows you to set the size of the the + This option allows you to set the size of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. diff --git a/arch/um/Makefile b/arch/um/Makefile index f6ad832faf13..c8016a98483b 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -102,7 +102,7 @@ linux: vmlinux define archhelp echo '* linux - Binary kernel image (./linux) - for backward' echo ' compatibility only, this creates a hard link to the' - echo ' real kernel binary, the the "vmlinux" binary you' + echo ' real kernel binary, the "vmlinux" binary you' echo ' find in the kernel root.' endef diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 24747a413785..cfd9f01fd464 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -497,7 +497,7 @@ void close_lines(struct line *lines, int nlines) } /* Common setup code for both startup command line and mconsole initialization. - * @lines contains the the array (of size @num) to modify; + * @lines contains the array (of size @num) to modify; * @init is the setup string; */ diff --git a/arch/um/include/sysdep-x86_64/ptrace_user.h b/arch/um/include/sysdep-x86_64/ptrace_user.h index 128faf027364..4cd61a852fab 100644 --- a/arch/um/include/sysdep-x86_64/ptrace_user.h +++ b/arch/um/include/sysdep-x86_64/ptrace_user.h @@ -55,7 +55,7 @@ #define PTRACE_OLDSETOPTIONS 21 #endif -/* These are before the system call, so the the system call number is RAX +/* These are before the system call, so the system call number is RAX * rather than ORIG_RAX, and arg4 is R10 rather than RCX */ #define REGS_SYSCALL_NR PT_INDEX(RAX) diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S index d991e4547dbb..8bc521ca081f 100644 --- a/arch/v850/kernel/entry.S +++ b/arch/v850/kernel/entry.S @@ -195,7 +195,7 @@ sst.w lp, PTO+PT_GPR(GPR_LP)[ep]; \ type ## _STATE_SAVER /* Pop a register state pushed by PUSH_STATE, except for the stack pointer, - from the the stack. */ + from the stack. */ #define POP_STATE(type) \ mov sp, ep; \ type ## _STATE_RESTORER; \ diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S index 265db2693cbd..4641ef510f0e 100644 --- a/arch/xtensa/lib/usercopy.S +++ b/arch/xtensa/lib/usercopy.S @@ -5,10 +5,10 @@ * * DO NOT COMBINE this function with . * It needs to remain separate and distinct. The hal files are part - * of the the Xtensa link-time HAL, and those files may differ per + * of the Xtensa link-time HAL, and those files may differ per * processor configuration. Patching the kernel for another * processor configuration includes replacing the hal files, and we - * could loose the special functionality for accessing user-space + * could lose the special functionality for accessing user-space * memory during such a patch. We sacrifice a little code space here * in favor to simplify code maintenance. * -- cgit v1.2.2 From cc2e2767f172fb2f38ca72e22ac98e452550437f Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:22:29 +0200 Subject: Typos in fs/Kconfig Signed-off-by: Adrian Bunk --- fs/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index 1453d2d164f7..8d18497de629 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -74,11 +74,11 @@ config EXT3_FS tristate "Ext3 journalling file system support" select JBD help - This is the journaling version of the Second extended file system + This is the journalling version of the Second extended file system (often called ext3), the de facto standard Linux file system (method to organize files on a storage device) for hard disks. - The journaling code included in this driver means you do not have + The journalling code included in this driver means you do not have to run e2fsck (file system checker) on your file systems after a crash. The journal keeps track of any changes that were being made at the time the system crashed, and can ensure that your file system @@ -143,7 +143,7 @@ config EXT3_FS_SECURITY config JBD tristate help - This is a generic journaling layer for block devices. It is + This is a generic journalling layer for block devices. It is currently used by the ext3 and OCFS2 file systems, but it could also be used to add journal support to other file systems or block devices such as RAID or LVM. @@ -183,7 +183,7 @@ config REISERFS_FS tristate "Reiserfs support" help Stores not just filenames but the files themselves in a balanced - tree. Uses journaling. + tree. Uses journalling. Balanced trees are more efficient than traditional file system architectural foundations. @@ -1090,7 +1090,7 @@ config JFFS_FS tristate "Journalling Flash File System (JFFS) support" depends on MTD && BLOCK help - JFFS is the Journaling Flash File System developed by Axis + JFFS is the Journalling Flash File System developed by Axis Communications in Sweden, aimed at providing a crash/powerdown-safe file system for disk-less embedded devices. Further information is available at (). @@ -1260,7 +1260,7 @@ config JFFS2_CMODE_NONE config JFFS2_CMODE_PRIORITY bool "priority" help - Tries the compressors in a predefinied order and chooses the first + Tries the compressors in a predefined order and chooses the first successful one. config JFFS2_CMODE_SIZE @@ -1950,7 +1950,7 @@ config AFS_FS If you say Y here, you will get an experimental Andrew File System driver. It currently only supports unsecured read-only AFS access. - See for more intormation. + See for more information. If unsure, say N. -- cgit v1.2.2 From fc31e838162c60ed81659da677d7f72917576269 Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:23:47 +0200 Subject: fix an arch/alpha/Kconfig typo Signed-off-by: Adrian Bunk --- arch/alpha/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 2b36afd8e969..7e55ea66c6d4 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -534,7 +534,7 @@ config ARCH_DISCONTIGMEM_ENABLE bool "Discontiguous Memory Support (EXPERIMENTAL)" depends on EXPERIMENTAL help - Say Y to upport efficient handling of discontiguous physical memory, + Say Y to support efficient handling of discontiguous physical memory, for architectures which are either NUMA (Non-Uniform Memory Access) or have huge holes in the physical address space for other reasons. See for more. -- cgit v1.2.2 From c73a668c096fe3dd23c1062018e82eb85f5c7043 Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:24:43 +0200 Subject: fix drivers/acpi/Kconfig typos Signed-off-by: Adrian Bunk --- drivers/acpi/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 56c5ba874623..0f9d4be7ed75 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -253,7 +253,7 @@ config ACPI_CUSTOM_DSDT depends on !STANDALONE default n help - Thist option is to load a custom ACPI DSDT + This option is to load a custom ACPI DSDT If you don't know what that is, say N. config ACPI_CUSTOM_DSDT_FILE @@ -310,7 +310,7 @@ config X86_PM_TIMER The Power Management Timer is available on all ACPI-capable, in most cases even if ACPI is unusable or blacklisted. - This timing source is not affected by powermanagement features + This timing source is not affected by power management features like aggressive processor idling, throttling, frequency and/or voltage scaling, unlike the commonly used Time Stamp Counter (TSC) timing source. @@ -345,7 +345,7 @@ config ACPI_HOTPLUG_MEMORY Enabling this driver assumes that your platform hardware and firmware have support for hot-plugging physical memory. If your system does not support physically adding or ripping out - memory DIMMs at some platfrom defined granularity (individually + memory DIMMs at some platform defined granularity (individually or as a bank) at runtime, then you need not enable this driver. If one selects "m," this driver can be loaded using the following -- cgit v1.2.2 From 095096038d637c477ef3c1b674612bcbc4d60c2d Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:31:37 +0200 Subject: Fix several typos in drivers/ Signed-off-by: Adrian Bunk --- drivers/firmware/Kconfig | 2 +- drivers/i2c/busses/Kconfig | 4 ++-- drivers/ieee1394/Kconfig | 2 +- drivers/input/keyboard/Kconfig | 2 +- drivers/input/serio/Kconfig | 4 ++-- drivers/isdn/hardware/eicon/Kconfig | 2 +- drivers/isdn/hisax/Kconfig | 2 +- drivers/macintosh/Kconfig | 2 +- drivers/media/dvb/cinergyT2/Kconfig | 2 +- drivers/media/video/Kconfig | 2 +- drivers/mtd/chips/Kconfig | 2 +- drivers/mtd/nand/Kconfig | 2 +- drivers/mtd/onenand/Kconfig | 2 +- drivers/net/wireless/Kconfig | 2 +- drivers/rapidio/Kconfig | 2 +- drivers/scsi/Kconfig | 4 ++-- drivers/scsi/aic7xxx/Kconfig.aic79xx | 4 ++-- drivers/scsi/aic7xxx/Kconfig.aic7xxx | 4 ++-- drivers/serial/Kconfig | 6 +++--- drivers/usb/storage/Kconfig | 2 +- drivers/video/Kconfig | 8 ++++---- drivers/w1/Kconfig | 2 +- 22 files changed, 32 insertions(+), 32 deletions(-) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 731c3d5da0dc..88f462122a30 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -64,7 +64,7 @@ config DELL_RBU help Say m if you want to have the option of updating the BIOS for your DELL system. Note you need a Dell OpenManage or Dell Update package (DUP) - supporting application to comunicate with the BIOS regarding the new + supporting application to communicate with the BIOS regarding the new image for the image update to take effect. See for more details on the driver. diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 0d9667921f61..510816c16da3 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -333,10 +333,10 @@ config I2C_PARPORT_LIGHT This driver is a light version of i2c-parport. It doesn't depend on the parport driver, and uses direct I/O access instead. This - might be prefered on embedded systems where wasting memory for + might be preferred on embedded systems where wasting memory for the clean but heavy parport handling is not an option. The drawback is a reduced portability and the impossibility to - dasiy-chain other parallel port devices. + daisy-chain other parallel port devices. Don't say Y here if you said Y or M to i2c-parport. Saying M to both is possible but both modules should not be loaded at the same diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index 2769e505f051..672b92ef9f21 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig @@ -140,7 +140,7 @@ config IEEE1394_SBP2_PHYS_DMA help This builds sbp2 for use with non-OHCI host adapters which do not support physical DMA or for when ohci1394 is run with phys_dma=0. - Physical DMA is data movement without assistence of the drivers' + Physical DMA is data movement without assistance of the drivers' interrupt handlers. This option includes the interrupt handlers that are required in absence of this hardware feature. diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index c62e00c79dec..679bde34d247 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -177,7 +177,7 @@ config KEYBOARD_HIL_OLD However, it has been thoroughly tested and is stable. If you want full HIL support including support for multiple - keyboards, mices and tablets, you have to enable the + keyboards, mice, and tablets, you have to enable the "HP System Device Controller i8042 Support" in the input/serio submenu. diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 98acf170252c..8cdbfeca5903 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -115,9 +115,9 @@ config HP_SDC depends on GSC && SERIO default y ---help--- - This option enables supports for the the "System Device + This option enables support for the "System Device Controller", an i8042 carrying microcode to manage a - few miscellanous devices on some Hewlett Packard systems. + few miscellaneous devices on some Hewlett Packard systems. The SDC itself contains a 10ms resolution timer/clock capable of delivering interrupts on a periodic and one-shot basis. The SDC may also be connected to a battery-backed real-time diff --git a/drivers/isdn/hardware/eicon/Kconfig b/drivers/isdn/hardware/eicon/Kconfig index 51e66bc64208..01d4afd9d843 100644 --- a/drivers/isdn/hardware/eicon/Kconfig +++ b/drivers/isdn/hardware/eicon/Kconfig @@ -47,7 +47,7 @@ config ISDN_DIVAS_MAINT tristate "DIVA Maint driver support" depends on ISDN_DIVAS && m help - Enable Divas Maintainance driver. + Enable Divas Maintenance driver. endmenu diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 6dfc94122dd9..eb57a988e048 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -321,7 +321,7 @@ config HISAX_HFC_PCI help This enables HiSax support for the HFC-S PCI 2BDS0 based cards. - For more informations see under + For more information see under . config HISAX_W6692 diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index d5d649f5ccdb..7f8477d3a661 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig @@ -186,7 +186,7 @@ config THERM_ADT746X depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64 help This driver provides some thermostat and fan control for the - iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty + iBook G4, and the ATI based aluminium PowerBooks, allowing slightly better fan behaviour by default, and some manual control. config THERM_PM72 diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig index b5cdd57ec6f5..3d778c5aba68 100644 --- a/drivers/media/dvb/cinergyT2/Kconfig +++ b/drivers/media/dvb/cinergyT2/Kconfig @@ -56,7 +56,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL measurements. Please keep in mind that these updates cause traffic on the tuner - control bus and thus may or may not affect receiption sensitivity. + control bus and thus may or may not affect reception sensitivity. The default value should be a safe choice for common applications. diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index d1183c939221..f6779a422f1b 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -351,7 +351,7 @@ config VIDEO_SAA6588 help Support for Radio Data System (RDS) decoder. This allows seeing radio station identification transmitted using this standard. - Currentlly, it works only with bt8x8 chips. + Currently, it works only with bt8x8 chips. To compile this driver as a module, choose M here: the module will be called saa6588. diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig index 6d8f30deb868..72e6d73beb40 100644 --- a/drivers/mtd/chips/Kconfig +++ b/drivers/mtd/chips/Kconfig @@ -270,7 +270,7 @@ config MTD_JEDEC tristate "JEDEC device support" depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN help - Enable older older JEDEC flash interface devices for self + Enable older JEDEC flash interface devices for self programming flash. It is commonly used in older AMD chips. It is only called JEDEC because the JEDEC association distributes the identification codes for the diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index c99302ed3823..1831340e5f51 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -21,7 +21,7 @@ config MTD_NAND_VERIFY_WRITE NAND flash device internally checks only bits transitioning from 1 to 0. There is a rare possibility that even though the device thinks the write was successful, a bit could have been - flipped accidentaly due to device wear or something else. + flipped accidentally due to device wear or something else. config MTD_NAND_ECC_SMC bool "NAND ECC Smart Media byte order" diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig index 465961b8bcd1..373bddce8f1c 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/onenand/Kconfig @@ -21,7 +21,7 @@ config MTD_ONENAND_VERIFY_WRITE OneNAND flash device internally checks only bits transitioning from 1 to 0. There is a rare possibility that even though the device thinks the write was successful, a bit could have been - flipped accidentaly due to device wear or something else. + flipped accidentally due to device wear or something else. config MTD_ONENAND_GENERIC tristate "OneNAND Flash device via platform device driver" diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index bd4a68c85a47..ece3d9c2dc61 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -301,7 +301,7 @@ config HERMES tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)" depends on NET_RADIO && (PPC_PMAC || PCI || PCMCIA) ---help--- - A driver for 802.11b wireless cards based based on the "Hermes" or + A driver for 802.11b wireless cards based on the "Hermes" or Intersil HFA384x (Prism 2) MAC controller. This includes the vast majority of the PCMCIA 802.11b cards (which are nearly all rebadges) - except for the Cisco/Aironet cards. Cards supported include the diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig index 0b2d2c3579a7..4142115d298e 100644 --- a/drivers/rapidio/Kconfig +++ b/drivers/rapidio/Kconfig @@ -15,4 +15,4 @@ config RAPIDIO_DISC_TIMEOUT default "30" ---help--- Amount of time a discovery node waits for a host to complete - enumeration beforing giving up. + enumeration before giving up. diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index dab082002e6f..8ee2ca1fdab1 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -40,10 +40,10 @@ config SCSI_PROC_FS default y ---help--- This option enables support for the various files in - /proc/scsi. In Linux 2.6 this has been superceeded by + /proc/scsi. In Linux 2.6 this has been superseded by files in sysfs but many legacy applications rely on this. - If unusure say Y. + If unsure say Y. comment "SCSI support type (disk, tape, CD-ROM)" depends on SCSI diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx index 7955ebe8e1e8..911ea1756e55 100644 --- a/drivers/scsi/aic7xxx/Kconfig.aic79xx +++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx @@ -22,12 +22,12 @@ config AIC79XX_CMDS_PER_DEVICE to be used for any device. The aic7xxx driver will automatically vary this number based on device behavior. For devices with a fixed maximum, the driver will eventually lock to this maximum - and display a console message inidicating this value. + and display a console message indicating this value. Due to resource allocation issues in the Linux SCSI mid-layer, using a high number of commands per device may result in memory allocation failures when many devices are attached to the system. For this reason, - the default is set to 32. Higher values may result in higer performance + the default is set to 32. Higher values may result in higher performance on some devices. The upper bound is 253. 0 disables tagged queueing. Per device tag depth can be controlled via the kernel command line diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx index 5517da5855f0..cd93f9a8611f 100644 --- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx +++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx @@ -27,12 +27,12 @@ config AIC7XXX_CMDS_PER_DEVICE to be used for any device. The aic7xxx driver will automatically vary this number based on device behavior. For devices with a fixed maximum, the driver will eventually lock to this maximum - and display a console message inidicating this value. + and display a console message indicating this value. Due to resource allocation issues in the Linux SCSI mid-layer, using a high number of commands per device may result in memory allocation failures when many devices are attached to the system. For this reason, - the default is set to 32. Higher values may result in higer performance + the default is set to 32. Higher values may result in higher performance on some devices. The upper bound is 253. 0 disables tagged queueing. Per device tag depth can be controlled via the kernel command line diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index d926272a40db..653098bc2dd5 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -121,7 +121,7 @@ config SERIAL_8250_RUNTIME_UARTS default "4" help Set this to the maximum number of serial ports you want - the kernel to register at boot time. This can be overriden + the kernel to register at boot time. This can be overridden with the module parameter "nr_uarts", or boot-time parameter 8250.nr_uarts @@ -205,7 +205,7 @@ config SERIAL_8250_BOCA depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS help Say Y here if you have a Boca serial board. Please read the Boca - mini-HOWTO, avaialble from + mini-HOWTO, available from To compile this driver as a module, choose M here: the module will be called 8250_boca. @@ -667,7 +667,7 @@ config SERIAL_68328 depends on M68328 || M68EZ328 || M68VZ328 help This driver supports the built-in serial port of the Motorola 68328 - (standard, EZ and VZ varities). + (standard, EZ and VZ varieties). config SERIAL_68328_RTS_CTS bool "Support RTS/CTS on 68328 serial port" diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index 422a4b288e34..fe2c4cd53f5a 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig @@ -119,7 +119,7 @@ config USB_STORAGE_ALAUDA Say Y here to include additional code to support the Olympus MAUSB-10 and Fujifilm DPC-R1 USB Card reader/writer devices. - These devices are based on the Alauda chip and support support both + These devices are based on the Alauda chip and support both XD and SmartMedia cards. config USB_STORAGE_ONETOUCH diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index a1c8923b0bf5..4608a275955f 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -403,7 +403,7 @@ config FB_ARC is based on the KS-108 lcd controller and is typically a matrix of 2*n chips. This driver was tested with a 128x64 panel. This driver supports it for use with x86 SBCs through a 16 bit GPIO - interface (8 bit data, 8 bit control). If you anticpate using + interface (8 bit data, 8 bit control). If you anticipate using this driver, say Y or M; otherwise say N. You must specify the GPIO IO address to be used for setting control and data. @@ -771,7 +771,7 @@ config FB_RIVA_DEBUG default n help Say Y here if you want the Riva driver to output all sorts - of debugging informations to provide to the maintainer when + of debugging information to provide to the maintainer when something goes wrong. config FB_RIVA_BACKLIGHT @@ -865,7 +865,7 @@ config FB_INTEL_DEBUG depends on FB_INTEL ---help--- Say Y here if you want the Intel driver to output all sorts - of debugging informations to provide to the maintainer when + of debugging information to provide to the maintainer when something goes wrong. config FB_INTEL_I2C @@ -1062,7 +1062,7 @@ config FB_RADEON_DEBUG default n help Say Y here if you want the Radeon driver to output all sorts - of debugging informations to provide to the maintainer when + of debugging information to provide to the maintainer when something goes wrong. config FB_ATY128 diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig index 8b3d0f0c7bd5..27c9d05d03ef 100644 --- a/drivers/w1/Kconfig +++ b/drivers/w1/Kconfig @@ -21,7 +21,7 @@ config W1_CON There are three types of messages between w1 core and userspace: 1. Events. They are generated each time new master or slave device found either due to automatic or requested search. - 2. Userspace commands. Includes read/write and search/alarm search comamnds. + 2. Userspace commands. Includes read/write and search/alarm search commands. 3. Replies to userspace commands. source drivers/w1/masters/Kconfig -- cgit v1.2.2 From 44c09201a4178e08ed1c8cc37e7aea0683888f0a Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:34:14 +0200 Subject: more misc typo fixes Signed-off-by: Adrian Bunk --- arch/cris/arch-v10/drivers/Kconfig | 4 ++-- arch/cris/arch-v32/Kconfig | 2 +- arch/m68knommu/Kconfig | 4 ++-- arch/um/Kconfig | 2 +- arch/x86_64/Kconfig | 2 +- drivers/input/joystick/Kconfig | 2 +- fs/Kconfig | 2 +- mm/Kconfig | 2 +- net/ipv4/Kconfig | 4 ++-- net/ipv4/ipvs/Kconfig | 2 +- net/ipv4/netfilter/Kconfig | 2 +- security/selinux/Kconfig | 2 +- sound/oss/Kconfig | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 8b50e8402954..734d5f3a5304 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig @@ -550,7 +550,7 @@ config ETRAX_IDE select BLK_DEV_IDEDMA help Enable this to get support for ATA/IDE. - You can't use paralell ports or SCSI ports + You can't use parallel ports or SCSI ports at the same time. @@ -744,7 +744,7 @@ config ETRAX_PA_CHANGEABLE_BITS default "FF" help This is a bitmask with information of what bits in PA that a user - can change change the value on using ioctl's. + can change the value on using ioctl's. Bit set = changeable. You probably want 00 here. diff --git a/arch/cris/arch-v32/Kconfig b/arch/cris/arch-v32/Kconfig index 22f0ddc04c50..4f79d8ed3e1c 100644 --- a/arch/cris/arch-v32/Kconfig +++ b/arch/cris/arch-v32/Kconfig @@ -162,7 +162,7 @@ config ETRAX_SDRAM_GRP1_CONFIG depends on ETRAX_ARCH_V32 default "0" help - SDRAM configuration for group 1. The defult value is 0 + SDRAM configuration for group 1. The default value is 0 because group 1 is not used in the default configuration, described in the help for SDRAM_GRP0_CONFIG. diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index b7c942cf7741..6d920d4bdc3d 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -161,8 +161,8 @@ config CLOCK_FREQ frequency, it may or may not be the same as the external clock crystal fitted to your board. Some processors have an internal PLL and can have their frequency programmed at run time, others - use internal dividers. In gernal the kernel won't setup a PLL - if it is fitted (there are some expections). This value will be + use internal dividers. In general the kernel won't setup a PLL + if it is fitted (there are some exceptions). This value will be specific to the exact CPU that you are using. config CLOCK_DIV diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 76e85bbaea55..d75307589d74 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -257,7 +257,7 @@ config UML_REAL_TIME_CLOCK UML and spend long times with UML stopped at a breakpoint. In this case, when UML is restarted, it will call the timer enough times to make up for the time spent at the breakpoint. This could result in a - noticable lag. If this is a problem, then disable this option. + noticeable lag. If this is a problem, then disable this option. endmenu diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 0a5d8e659aa4..010d2265f1cf 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -310,7 +310,7 @@ config K8_NUMA help Enable K8 NUMA node topology detection. You should say Y here if you have a multi processor AMD K8 system. This uses an old - method to read the NUMA configurtion directly from the builtin + method to read the NUMA configuration directly from the builtin Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA instead, which also takes priority if both are compiled in. diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig index 67519ef0ef95..271263443c37 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -32,7 +32,7 @@ config JOYSTICK_ANALOG module will be called analog. config JOYSTICK_A3D - tristate "Assasin 3D and MadCatz Panther devices" + tristate "Assassin 3D and MadCatz Panther devices" select GAMEPORT help Say Y here if you have an FPGaming or MadCatz controller using the diff --git a/fs/Kconfig b/fs/Kconfig index 8d18497de629..deaad99ffadb 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1032,7 +1032,7 @@ config BEFS_FS on files and directories, and database-like indeces on selected attributes. (Also note that this driver doesn't make those features available at this time). It is a 64 bit filesystem, so it supports - extremly large volumes and files. + extremely large volumes and files. If you use this filesystem, you should also say Y to at least one of the NLS (native language support) options below. diff --git a/mm/Kconfig b/mm/Kconfig index 5d88489ef2de..f10fe51985a0 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -104,7 +104,7 @@ config SPARSEMEM_STATIC def_bool n # -# Architectecture platforms which require a two level mem_section in SPARSEMEM +# Architecture platforms which require a two level mem_section in SPARSEMEM # must select this option. This is usually for architecture platforms with # an extremely sparse physical address space. # diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 30af4a4dfcc8..0adfd88b7b0b 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -64,7 +64,7 @@ config ASK_IP_FIB_HASH config IP_FIB_TRIE bool "FIB_TRIE" ---help--- - Use new experimental LC-trie as FIB lookup algoritm. + Use new experimental LC-trie as FIB lookup algorithm. This improves lookup performance if you have a large number of routes. @@ -526,7 +526,7 @@ config TCP_CONG_HYBLA ---help--- TCP-Hybla is a sender-side only change that eliminates penalization of long-RTT, large-bandwidth connections, like when satellite legs are - involved, expecially when sharing a common bottleneck with normal + involved, especially when sharing a common bottleneck with normal terrestrial connections. config TCP_CONG_VEGAS diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig index c9820bfc493a..ad52c294d219 100644 --- a/net/ipv4/ipvs/Kconfig +++ b/net/ipv4/ipvs/Kconfig @@ -81,7 +81,7 @@ config IP_VS_PROTO_ESP bool "ESP load balancing support" depends on IP_VS ---help--- - This option enables support for load balancing ESP (Encapsultion + This option enables support for load balancing ESP (Encapsulation Security Payload) transport protocol. Say Y if unsure. config IP_VS_PROTO_AH diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index a55b8ff70ded..d88c292f118c 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -373,7 +373,7 @@ config IP_NF_TARGET_ULOG daemon using netlink multicast sockets; unlike the LOG target which can only be viewed through syslog. - The apropriate userspace logging daemon (ulogd) may be obtained from + The appropriate userspace logging daemon (ulogd) may be obtained from To compile it as a module, choose M here. If unsure, say N. diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig index 293dbd6246c1..d62b09843127 100644 --- a/security/selinux/Kconfig +++ b/security/selinux/Kconfig @@ -112,7 +112,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT your distribution will provide these and enable the new controls in the kernel they also distribute. - Note that this option can be overriden at boot with the + Note that this option can be overridden at boot with the selinux_compat_net parameter, and after boot via /selinux/compat_net. See Documentation/kernel-parameters.txt for details on this parameter. diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 97e38b665587..f08396c3f61a 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -647,7 +647,7 @@ config SOUND_PSS command line. config PSS_MIXER - bool "Enable PSS mixer (Beethoven ADSP-16 and other compatibile)" + bool "Enable PSS mixer (Beethoven ADSP-16 and other compatible)" depends on SOUND_PSS help Answer Y for Beethoven ADSP-16. You may try to say Y also for other -- cgit v1.2.2 From cab00891c5489cb6d0cde0a55d39bd5f2871fa70 Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:36:44 +0200 Subject: Still more typo fixes Signed-off-by: Adrian Bunk --- arch/arm/mach-s3c2410/Kconfig | 2 +- arch/ppc/platforms/85xx/Kconfig | 14 +++++++------- arch/xtensa/Kconfig | 4 ++-- drivers/infiniband/ulp/ipoib/Kconfig | 2 +- drivers/media/video/cx88/Kconfig | 2 +- drivers/net/Kconfig | 2 +- drivers/pci/hotplug/Kconfig | 2 +- drivers/usb/atm/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 2 +- drivers/video/Kconfig | 2 +- fs/Kconfig | 2 +- fs/cifs/README | 6 +++--- net/ipv4/Kconfig | 2 +- net/ipv4/ipvs/Kconfig | 2 +- security/selinux/Kconfig | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index df37594c30f8..63965c78de8c 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig @@ -13,7 +13,7 @@ config MACH_ANUBIS bool "Simtec Electronics ANUBIS" select CPU_S3C2440 help - Say Y gere if you are using the Simtec Electronics ANUBIS + Say Y here if you are using the Simtec Electronics ANUBIS development system config MACH_OSIRIS diff --git a/arch/ppc/platforms/85xx/Kconfig b/arch/ppc/platforms/85xx/Kconfig index 7ddd331a7145..6f2d0add7de6 100644 --- a/arch/ppc/platforms/85xx/Kconfig +++ b/arch/ppc/platforms/85xx/Kconfig @@ -24,12 +24,12 @@ config MPC8540_ADS config MPC8548_CDS bool "Freescale MPC8548 CDS" help - This option enablese support for the MPC8548 CDS evaluation board. + This option enables support for the MPC8548 CDS evaluation board. config MPC8555_CDS bool "Freescale MPC8555 CDS" help - This option enablese support for the MPC8555 CDS evaluation board. + This option enables support for the MPC8555 CDS evaluation board. config MPC8560_ADS bool "Freescale MPC8560 ADS" @@ -51,22 +51,22 @@ config STX_GP3 config TQM8540 bool "TQ Components TQM8540" help - This option enablese support for the TQ Components TQM8540 board. + This option enables support for the TQ Components TQM8540 board. config TQM8541 bool "TQ Components TQM8541" help - This option enablese support for the TQ Components TQM8541 board. + This option enables support for the TQ Components TQM8541 board. config TQM8555 bool "TQ Components TQM8555" help - This option enablese support for the TQ Components TQM8555 board. + This option enables support for the TQ Components TQM8555 board. config TQM8560 bool "TQ Components TQM8560" help - This option enablese support for the TQ Components TQM8560 board. + This option enables support for the TQ Components TQM8560 board. endchoice @@ -94,7 +94,7 @@ config MPC8560 default y config 85xx_PCI2 - bool "Supprt for 2nd PCI host controller" + bool "Support for 2nd PCI host controller" depends on MPC8555_CDS default y diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 848f173db257..c1e69a1f92a4 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -206,7 +206,7 @@ source "drivers/pci/hotplug/Kconfig" endmenu -menu "Exectuable file formats" +menu "Executable file formats" # only elf supported config KCORE_ELF @@ -241,7 +241,7 @@ menu "Xtensa initrd options" bool "Embed root filesystem ramdisk into the kernel" config EMBEDDED_RAMDISK_IMAGE - string "Filename of gziped ramdisk image" + string "Filename of gzipped ramdisk image" depends on EMBEDDED_RAMDISK default "ramdisk.gz" help diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig index d74653d7de1c..c75322d820d4 100644 --- a/drivers/infiniband/ulp/ipoib/Kconfig +++ b/drivers/infiniband/ulp/ipoib/Kconfig @@ -26,7 +26,7 @@ config INFINIBAND_IPOIB_DEBUG_DATA bool "IP-over-InfiniBand data path debugging" depends on INFINIBAND_IPOIB_DEBUG ---help--- - This option compiles debugging code into the the data path + This option compiles debugging code into the data path of the IPoIB driver. The output can be turned on via the data_debug_level module parameter; however, even with output turned off, this debugging code will have some performance diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index 51d68f32aa06..0f9d96963618 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig @@ -69,6 +69,6 @@ config VIDEO_CX88_VP3054 depends on VIDEO_CX88_DVB && DVB_MT352 ---help--- This adds DVB-T support for cards based on the - Connexant 2388x chip and the MT352 demodulator, + Conexant 2388x chip and the MT352 demodulator, which also require support for the VP-3054 Secondary I2C bus, such at DNTV Live! DVB-T Pro. diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ff8a8c0a26d5..ab92cc794c64 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2115,7 +2115,7 @@ config SKY2 depends on PCI && EXPERIMENTAL select CRC32 ---help--- - This driver supports Gigabit Ethernet adapters based on the the + This driver supports Gigabit Ethernet adapters based on the Marvell Yukon 2 chipset: Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 8a60f391ffcf..6e780db9454d 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -157,7 +157,7 @@ config HOTPLUG_PCI_RPA tristate "RPA PCI Hotplug driver" depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE help - Say Y here if you have a a RPA system that supports PCI Hotplug. + Say Y here if you have a RPA system that supports PCI Hotplug. To compile this driver as a module, choose M here: the module will be called rpaphp. diff --git a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig index 550ddfa71a43..b450cbaa3a0b 100644 --- a/drivers/usb/atm/Kconfig +++ b/drivers/usb/atm/Kconfig @@ -64,7 +64,7 @@ config USB_XUSBATM Say Y here if you have a DSL USB modem not explicitly supported by another USB DSL drivers. In order to use your modem you will need to pass the vendor ID, product ID, and endpoint numbers for transmission - and reception as module parameters. You may need to initialize the + and reception as module parameters. You may need to initialize the modem using a user space utility (a firmware loader for example). To compile this driver as a module, choose M here: the diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 8e5dd6f29d0b..bbbc82a8336a 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -7,7 +7,7 @@ # # - Host systems (like PCs) need CONFIG_USB (with "A" jacks). # - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks). -# - Some systems have both kinds of of controller. +# - Some systems have both kinds of controllers. # # With help from a special transceiver and a "Mini-AB" jack, systems with # both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG). diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 4608a275955f..daaa486159cf 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -188,7 +188,7 @@ config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC" help This is an implementation of the Sharp LQ035Q7DB02, a 3.5" - color QVGA, HRTFT panel. The LogicPD device includes an + color QVGA, HRTFT panel. The LogicPD device includes an integrated HRTFT controller IC. The native resolution is 240x320. diff --git a/fs/Kconfig b/fs/Kconfig index deaad99ffadb..68f4561423ff 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1365,7 +1365,7 @@ config SYSV_FS If you have floppies or hard disk partitions like that, it is likely that they contain binaries from those other Unix systems; in order - to run these binaries, you will want to install linux-abi which is a + to run these binaries, you will want to install linux-abi which is a set of kernel modules that lets you run SCO, Xenix, Wyse, UnixWare, Dell Unix and System V programs under Linux. It is available via FTP (user: ftp) from diff --git a/fs/cifs/README b/fs/cifs/README index 5f0e1bd64fee..432e515431c4 100644 --- a/fs/cifs/README +++ b/fs/cifs/README @@ -269,7 +269,7 @@ A partial list of the supported mount options follows: (gid) mount option is specified. For the uid (gid) of newly created files and directories, ie files created since the last mount of the server share, the expected uid - (gid) is cached as as long as the inode remains in + (gid) is cached as long as the inode remains in memory on the client. Also note that permission checks (authorization checks) on accesses to a file occur at the server, but there are cases in which an administrator @@ -375,7 +375,7 @@ A partial list of the supported mount options follows: the local process on newly created files, directories, and devices (create, mkdir, mknod). If the CIFS Unix Extensions are not negotiated, for newly created files and directories - instead of using the default uid and gid specified on the + instead of using the default uid and gid specified on the mount, cache the new file's uid and gid locally which means that the uid for the file can change when the inode is reloaded (or the user remounts the share). @@ -440,7 +440,7 @@ A partial list of the supported mount options follows: create device files and fifos in a format compatible with Services for Unix (SFU). In addition retrieve bits 10-12 of the mode via the SETFILEBITS extended attribute (as - SFU does). In the future the bottom 9 bits of the mode + SFU does). In the future the bottom 9 bits of the mode also will be emulated using queries of the security descriptor (ACL). sign Must use packet signing (helps avoid unwanted data modification diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 0adfd88b7b0b..d172a9804448 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -556,7 +556,7 @@ config TCP_CONG_LP default n ---help--- TCP Low Priority (TCP-LP), a distributed algorithm whose goal is - to utiliza only the excess network bandwidth as compared to the + to utilize only the excess network bandwidth as compared to the ``fair share`` of bandwidth as targeted by TCP. See http://www-ece.rice.edu/networks/TCP-LP/ diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig index ad52c294d219..891b9355cf96 100644 --- a/net/ipv4/ipvs/Kconfig +++ b/net/ipv4/ipvs/Kconfig @@ -204,7 +204,7 @@ config IP_VS_SED connections to the server with the shortest expected delay. The expected delay that the job will experience is (Ci + 1) / Ui if sent to the ith server, in which Ci is the number of connections - on the the ith server and Ui is the fixed service rate (weight) + on the ith server and Ui is the fixed service rate (weight) of the ith server. If you want to compile it in kernel, say Y. To compile it as a diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig index d62b09843127..23b51047494e 100644 --- a/security/selinux/Kconfig +++ b/security/selinux/Kconfig @@ -122,7 +122,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT well as any conntrack helpers for protocols which you wish to control. - If you are unsure what do do here, select N. + If you are unsure what to do here, select N. config SECURITY_SELINUX_POLICYDB_VERSION_MAX bool "NSA SELinux maximum supported policy format version" -- cgit v1.2.2 From 3f6dee9b2a22cc66050682287a77d5fccadb9733 Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:45:33 +0200 Subject: Fix some typos in Documentation/: 'A' This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letter 'A'. Signed-off-by: Matt LaPlante Acked-by: Randy Dunlap Acked-by: Alan Cox Signed-off-by: Adrian Bunk --- Documentation/IPMI.txt | 2 +- Documentation/arm/Samsung-S3C24XX/GPIO.txt | 2 +- Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 +- Documentation/dell_rbu.txt | 2 +- Documentation/eisa.txt | 2 +- Documentation/fb/sstfb.txt | 2 +- Documentation/filesystems/configfs/configfs.txt | 2 +- Documentation/filesystems/proc.txt | 2 +- Documentation/ia64/fsys.txt | 2 +- Documentation/input/atarikbd.txt | 2 +- Documentation/kernel-parameters.txt | 4 ++-- Documentation/keys.txt | 2 +- Documentation/laptop-mode.txt | 2 +- Documentation/mca.txt | 2 +- Documentation/md.txt | 2 +- Documentation/memory-barriers.txt | 2 +- Documentation/networking/3c509.txt | 2 +- Documentation/networking/cxgb.txt | 2 +- Documentation/networking/dl2k.txt | 2 +- Documentation/networking/dmfe.txt | 2 +- Documentation/networking/operstates.txt | 2 +- Documentation/networking/packet_mmap.txt | 2 +- Documentation/networking/pktgen.txt | 4 ++-- Documentation/s390/Debugging390.txt | 4 ++-- Documentation/s390/cds.txt | 2 +- Documentation/s390/driver-model.txt | 2 +- Documentation/scsi/ncr53c8xx.txt | 2 +- Documentation/scsi/ppa.txt | 2 +- Documentation/scsi/tmscsim.txt | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt index 9f08d73d90bf..e5b93510e358 100644 --- a/Documentation/IPMI.txt +++ b/Documentation/IPMI.txt @@ -473,7 +473,7 @@ on the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI message as a block write to the I2C bus and waits for a response. This action can be detrimental to some I2C devices. It is highly recommended that the known I2c address be given to the SMBus driver in the smb_addr -parameter. The default adrress range will not be used when a smb_addr +parameter. The default address range will not be used when a smb_addr parameter is provided. When compiled into the kernel, the addresses can be specified on the diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt index 0822764ec270..8caea8c237ee 100644 --- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt +++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt @@ -24,7 +24,7 @@ Headers header include/asm-arm/arch-s3c2410/hardware.h which can be included by #include - A useful ammount of documentation can be found in the hardware + A useful amount of documentation can be found in the hardware header on how the GPIO functions (and others) work. Whilst a number of these functions do make some checks on what diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt index 3e46d2a31158..dda7ecdde87b 100644 --- a/Documentation/arm/Samsung-S3C24XX/Overview.txt +++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt @@ -80,7 +80,7 @@ Machines Adding New Machines ------------------- - The archicture has been designed to support as many machines as can + The architecture has been designed to support as many machines as can be configured for it in one kernel build, and any future additions should keep this in mind before altering items outside of their own machine files. diff --git a/Documentation/dell_rbu.txt b/Documentation/dell_rbu.txt index 941343a7a265..fb18c5dc8ab4 100644 --- a/Documentation/dell_rbu.txt +++ b/Documentation/dell_rbu.txt @@ -4,7 +4,7 @@ for updating BIOS images on Dell servers and desktops. Scope: This document discusses the functionality of the rbu driver only. -It does not cover the support needed from aplications to enable the BIOS to +It does not cover the support needed from applications to enable the BIOS to update itself with the image downloaded in to the memory. Overview: diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt index 8c8388da868a..e00fd0c5707f 100644 --- a/Documentation/eisa.txt +++ b/Documentation/eisa.txt @@ -18,7 +18,7 @@ The EISA infrastructure is made up of three parts : - The bus code implements most of the generic code. It is shared among all the architectures that the EISA code runs on. It - implements bus probing (detecting EISA cards avaible on the bus), + implements bus probing (detecting EISA cards available on the bus), allocates I/O resources, allows fancy naming through sysfs, and offers interfaces for driver to register. diff --git a/Documentation/fb/sstfb.txt b/Documentation/fb/sstfb.txt index 628d7ffa8769..f21bec8c0a25 100644 --- a/Documentation/fb/sstfb.txt +++ b/Documentation/fb/sstfb.txt @@ -161,7 +161,7 @@ Todo - Buy more coffee. - test/port to other arch. - try to add panning using tweeks with front and back buffer . - - try to implement accel on voodoo2 , this board can actualy do a + - try to implement accel on voodoo2, this board can actually do a lot in 2D even if it was sold as a 3D only board ... ghoz. diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt index c4ff96b7c4e0..e6e7526619bf 100644 --- a/Documentation/filesystems/configfs/configfs.txt +++ b/Documentation/filesystems/configfs/configfs.txt @@ -406,7 +406,7 @@ that condition is met. Far better would be an explicit action notifying the subsystem that the config_item is ready to go. More importantly, an explicit action allows -the subsystem to provide feedback as to whether the attibutes are +the subsystem to provide feedback as to whether the attributes are initialized in a way that makes sense. configfs provides this as committable items. diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 7240ee7515de..841061829d25 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt @@ -410,7 +410,7 @@ VmallocChunk: 111088 kB this memory, making it slower to access than lowmem. LowTotal: LowFree: Lowmem is memory which can be used for everything that - highmem can be used for, but it is also availble for the + highmem can be used for, but it is also available for the kernel's use for its own data structures. Among many other things, it is where everything from the Slab is allocated. Bad things happen when you're out of lowmem. diff --git a/Documentation/ia64/fsys.txt b/Documentation/ia64/fsys.txt index 28da181f9966..59dd689d9b86 100644 --- a/Documentation/ia64/fsys.txt +++ b/Documentation/ia64/fsys.txt @@ -165,7 +165,7 @@ complicated cases. * Signal handling The delivery of (asynchronous) signals must be delayed until fsys-mode -is exited. This is acomplished with the help of the lower-privilege +is exited. This is accomplished with the help of the lower-privilege transfer trap: arch/ia64/kernel/process.c:do_notify_resume_user() checks whether the interrupted task was in fsys-mode and, if so, sets PSR.lp and returns immediately. When fsys-mode is exited via the diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt index 8fb896c74114..c16a5df2f1fa 100644 --- a/Documentation/input/atarikbd.txt +++ b/Documentation/input/atarikbd.txt @@ -10,7 +10,7 @@ provides a convenient connection point for a mouse and switch-type joysticks. The ikbd processor also maintains a time-of-day clock with one second resolution. The ikbd has been designed to be general enough that it can be used with a -ariety of new computer products. Product variations in a number of +variety of new computer products. Product variations in a number of keyswitches, mouse resolution, etc. can be accommodated. The ikbd communicates with the main processor over a high speed bi-directional serial interface. It can function in a variety of modes to facilitate diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 137e993f4329..aa21c66fbff0 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -355,9 +355,9 @@ and is between 256 and 4096 characters. It is defined in the file clock= [BUGS=IA-32, HW] gettimeofday clocksource override. [Deprecated] - Forces specified clocksource (if avaliable) to be used + Forces specified clocksource (if available) to be used when calculating gettimeofday(). If specified - clocksource is not avalible, it defaults to PIT. + clocksource is not available, it defaults to PIT. Format: { pit | tsc | cyclone | pmtmr } disable_8254_timer diff --git a/Documentation/keys.txt b/Documentation/keys.txt index e373f0212843..57450901fc30 100644 --- a/Documentation/keys.txt +++ b/Documentation/keys.txt @@ -708,7 +708,7 @@ The keyctl syscall functions are: If the specified key is 0, then any assumed authority will be divested. - The assumed authorititive key is inherited across fork and exec. + The assumed authoritative key is inherited across fork and exec. =============== diff --git a/Documentation/laptop-mode.txt b/Documentation/laptop-mode.txt index 5696e879449b..c487186eb2b9 100644 --- a/Documentation/laptop-mode.txt +++ b/Documentation/laptop-mode.txt @@ -152,7 +152,7 @@ loaded on demand while the application executes) and sequentially accessed data DO_REMOUNTS: The control script automatically remounts any mounted journaled filesystems -with approriate commit interval options. When this option is set to 0, this +with appropriate commit interval options. When this option is set to 0, this feature is disabled. DO_REMOUNT_NOATIME: diff --git a/Documentation/mca.txt b/Documentation/mca.txt index 60913354cb7d..aabce4ad90f9 100644 --- a/Documentation/mca.txt +++ b/Documentation/mca.txt @@ -177,7 +177,7 @@ Currently, there are a number of MCA-specific device drivers. with clones that have a different adapter id than the original NE/2. -6) Future Domain MCS-600/700, OEM'd IBM Fast SCSI Aapter/A and +6) Future Domain MCS-600/700, OEM'd IBM Fast SCSI Adapter/A and Reply Sound Blaster/SCSI (SCSI part) Better support for these cards than the driver for ISA. Supports multiple cards with IRQ sharing. diff --git a/Documentation/md.txt b/Documentation/md.txt index 9ae9e4078985..13aa401aed69 100644 --- a/Documentation/md.txt +++ b/Documentation/md.txt @@ -175,7 +175,7 @@ All md devices contain: raid levels that involve striping (1,4,5,6,10). The address space of the array is conceptually divided into chunks and consecutive chunks are striped onto neighbouring devices. - The size should be atleast PAGE_SIZE (4k) and should be a power + The size should be at least PAGE_SIZE (4k) and should be a power of 2. This can only be set while assembling an array component_size diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index 46b9b389df35..a60f3ce474e3 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt @@ -1915,7 +1915,7 @@ Whilst most CPUs do imply a data dependency barrier on the read when a memory access depends on a read, not all do, so it may not be relied on. Other CPUs may also have split caches, but must coordinate between the various -cachelets for normal memory accesss. The semantics of the Alpha removes the +cachelets for normal memory accesses. The semantics of the Alpha removes the need for coordination in absence of memory barriers. diff --git a/Documentation/networking/3c509.txt b/Documentation/networking/3c509.txt index 867a99f88c68..0643e3b7168c 100644 --- a/Documentation/networking/3c509.txt +++ b/Documentation/networking/3c509.txt @@ -126,7 +126,7 @@ packets faster than they can be removed from the card. This should be rare or impossible in normal operation. Possible causes of this error report are: - a "green" mode enabled that slows the processor down when there is no - keyboard activitiy. + keyboard activity. - some other device or device driver hogging the bus or disabling interrupts. Check /proc/interrupts for excessive interrupt counts. The timer tick diff --git a/Documentation/networking/cxgb.txt b/Documentation/networking/cxgb.txt index 76324638626b..7b231752f25b 100644 --- a/Documentation/networking/cxgb.txt +++ b/Documentation/networking/cxgb.txt @@ -56,7 +56,7 @@ FEATURES ethtool -C eth0 rx-usecs 100 - You may also provide a timer latency value while disabling adpative-rx: + You may also provide a timer latency value while disabling adaptive-rx: ethtool -C adaptive-rx off rx-usecs diff --git a/Documentation/networking/dl2k.txt b/Documentation/networking/dl2k.txt index d460492037ef..a3a3c6e08cee 100644 --- a/Documentation/networking/dl2k.txt +++ b/Documentation/networking/dl2k.txt @@ -173,7 +173,7 @@ Installing the Driver Parameter Description ===================== -You can install this driver without any addtional parameter. However, if you +You can install this driver without any additional parameter. However, if you are going to have extensive functions then it is necessary to set extra parameter. Below is a list of the command line parameters supported by the Linux device diff --git a/Documentation/networking/dmfe.txt b/Documentation/networking/dmfe.txt index 046363552d09..b1b7499dd9d3 100644 --- a/Documentation/networking/dmfe.txt +++ b/Documentation/networking/dmfe.txt @@ -34,7 +34,7 @@ Next you should configure your network interface with a command similar to : ifconfig eth0 172.22.3.18 ^^^^^^^^^^^ - Your IP Adress + Your IP Address Then you may have to modify the default routing table with command : diff --git a/Documentation/networking/operstates.txt b/Documentation/networking/operstates.txt index 4a21d9bb836b..c9074f9b78bb 100644 --- a/Documentation/networking/operstates.txt +++ b/Documentation/networking/operstates.txt @@ -2,7 +2,7 @@ 1. Introduction Linux distinguishes between administrative and operational state of an -interface. Admininstrative state is the result of "ip link set dev +interface. Administrative state is the result of "ip link set dev up or down" and reflects whether the administrator wants to use the device for traffic. diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index aaf99d5f0dad..781626261e35 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt @@ -296,7 +296,7 @@ the following (from include/linux/if_packet.h): - struct tpacket_hdr - pad to TPACKET_ALIGNMENT=16 - struct sockaddr_ll - - Gap, chosen so that packet data (Start+tp_net) alignes to + - Gap, chosen so that packet data (Start+tp_net) aligns to TPACKET_ALIGNMENT=16 - Start+tp_mac: [ Optional MAC header ] - Start+tp_net: Packet data, aligned to TPACKET_ALIGNMENT=16. diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt index 18d385c068fc..c2f859f7f2f0 100644 --- a/Documentation/networking/pktgen.txt +++ b/Documentation/networking/pktgen.txt @@ -7,7 +7,7 @@ Date: 041221 Enable CONFIG_NET_PKTGEN to compile and build pktgen.o either in kernel or as module. Module is preferred. insmod pktgen if needed. Once running -pktgen creates a thread on each CPU where each thread has affinty it's CPU. +pktgen creates a thread on each CPU where each thread has affinity to its CPU. Monitoring and controlling is done via /proc. Easiest to select a suitable a sample script and configure. @@ -32,7 +32,7 @@ Running: Stopped: eth1 Result: OK: max_before_softirq=10000 -Most important the devices assigend to thread. Note! A device can only belong +Most important the devices assigned to thread. Note! A device can only belong to one thread. diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt index 844c03fe7921..0bb4512e8a65 100644 --- a/Documentation/s390/Debugging390.txt +++ b/Documentation/s390/Debugging390.txt @@ -188,7 +188,7 @@ Bytes 0-512 ( 200 hex ) on s/390 & 0-512,4096-4544,4604-5119 currently on z/Arch are used by the processor itself for holding such information as exception indications & entry points for exceptions. Bytes after 0xc00 hex are used by linux for per processor globals on s/390 & z/Architecture -( there is a gap on z/Architecure too currently between 0xc00 & 1000 which linux uses ). +( there is a gap on z/Architecture too currently between 0xc00 & 1000 which linux uses ). The closest thing to this on traditional architectures is the interrupt vector table. This is a good thing & does simplify some of the kernel coding however it means that we now cannot catch stray NULL pointers in the @@ -861,7 +861,7 @@ Linux source tree. 6) rm /arch/s390/kernel/signal.o 7) make /arch/s390/kernel/signal.o 8) watch the gcc command line emitted -9) type it in again or alernatively cut & paste it on the console adding the -g option. +9) type it in again or alternatively cut & paste it on the console adding the -g option. 10) objdump --source arch/s390/kernel/signal.o > signal.lst This will output the source & the assembly intermixed, as the snippet below shows This will unfortunately output addresses which aren't the same diff --git a/Documentation/s390/cds.txt b/Documentation/s390/cds.txt index f0be389c7116..079d8868ae83 100644 --- a/Documentation/s390/cds.txt +++ b/Documentation/s390/cds.txt @@ -348,7 +348,7 @@ The ccw_device_start() function returns : not online. When the I/O request completes, the CDS first level interrupt handler will -accumalate the status in a struct irb and then call the device interrupt handler. +accumulate the status in a struct irb and then call the device interrupt handler. The intparm field will contain the value the device driver has associated with a particular I/O request. If a pending device status was recognized, intparm will be set to 0 (zero). This may happen during I/O initiation or delayed diff --git a/Documentation/s390/driver-model.txt b/Documentation/s390/driver-model.txt index efb674eda4d4..5295a835d55d 100644 --- a/Documentation/s390/driver-model.txt +++ b/Documentation/s390/driver-model.txt @@ -262,7 +262,7 @@ attribute 'online' which can be 0 or 1. ----------- The netiucv driver creates an attribute 'connection' under -bus/iucv/drivers/netiucv. Piping to this attibute creates a new netiucv +bus/iucv/drivers/netiucv. Piping to this attribute creates a new netiucv connection to the specified host. Netiucv connections show up under devices/iucv/ as "netiucv". The interface diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index 822d2aca3700..fb9281ae8faa 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt @@ -1151,7 +1151,7 @@ Driver files: New driver versions are made available separately in order to allow testing changes and new features prior to including them into the linux kernel -distribution. The following URL provides informations on latest avalaible +distribution. The following URL provides information on latest available patches: ftp://ftp.tux.org/pub/people/gerard-roudier/README diff --git a/Documentation/scsi/ppa.txt b/Documentation/scsi/ppa.txt index 5d9223bc1bd5..067ac394e0b2 100644 --- a/Documentation/scsi/ppa.txt +++ b/Documentation/scsi/ppa.txt @@ -3,7 +3,7 @@ General Iomega ZIP drive page for Linux: http://www.torque.net/~campbell/ -Driver achive for old drivers: +Driver archive for old drivers: http://www.torque.net/~campbell/ppa/ Linux Parport page (parallel port) diff --git a/Documentation/scsi/tmscsim.txt b/Documentation/scsi/tmscsim.txt index df7a02bfb5bf..2bf3cfa3a067 100644 --- a/Documentation/scsi/tmscsim.txt +++ b/Documentation/scsi/tmscsim.txt @@ -27,7 +27,7 @@ Tekram DC390(T) adapter. This is where the name comes from: tm = Tekram scsi = SCSI driver, m = AMD (?) as opposed to w for the DC390W/U/F (NCR53c8X5, X=2/7) driver. Yes, there was also a driver for the latter, tmscsiw, which supported DC390W/U/F adapters. It's not maintained any more, -as the ncr53c8xx is perfectly supporting these adpaters since some time. +as the ncr53c8xx is perfectly supporting these adapters since some time. The driver first appeared in April 1996, exclusively supported the DC390 and has been enhanced since then in various steps. In May 1998 support for -- cgit v1.2.2 From 6c28f2c0f2054865d82b5a6b2164eac956f15c94 Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:46:31 +0200 Subject: Fix typos in Documentation/: 'B'-'C' This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letters 'B'-'C'. There are also a few grammar fixes thrown in for Randy. ;) Signed-off-by: Matt LaPlante Signed-off-by: Adrian Bunk --- Documentation/IPMI.txt | 2 +- Documentation/block/barrier.txt | 2 +- Documentation/cciss.txt | 2 +- Documentation/dell_rbu.txt | 2 +- Documentation/dvb/faq.txt | 2 +- Documentation/filesystems/befs.txt | 2 +- Documentation/filesystems/configfs/configfs.txt | 2 +- Documentation/input/atarikbd.txt | 2 +- Documentation/input/yealink.txt | 2 +- Documentation/networking/dl2k.txt | 2 +- Documentation/networking/packet_mmap.txt | 16 ++++++++-------- Documentation/powerpc/booting-without-of.txt | 12 ++++++------ Documentation/s390/Debugging390.txt | 16 ++++++++-------- Documentation/scsi/aic7xxx.txt | 2 +- Documentation/scsi/dpti.txt | 2 +- Documentation/sound/alsa/MIXART.txt | 2 +- Documentation/uml/UserModeLinux-HOWTO.txt | 2 +- Documentation/video4linux/cx2341x/fw-decoder-api.txt | 2 +- Documentation/video4linux/sn9c102.txt | 2 +- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt index e5b93510e358..0e3924ecd76b 100644 --- a/Documentation/IPMI.txt +++ b/Documentation/IPMI.txt @@ -468,7 +468,7 @@ BMCs specified on the smb_addr line will be detected. Setting smb_dbg_probe to 1 will enable debugging of the probing and detection process for BMCs on the SMBusses. -Discovering the IPMI compilant BMC on the SMBus can cause devices +Discovering the IPMI compliant BMC on the SMBus can cause devices on the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI message as a block write to the I2C bus and waits for a response. This action can be detrimental to some I2C devices. It is highly recommended diff --git a/Documentation/block/barrier.txt b/Documentation/block/barrier.txt index 03971518b222..761073eae103 100644 --- a/Documentation/block/barrier.txt +++ b/Documentation/block/barrier.txt @@ -25,7 +25,7 @@ of the following three ways. i. For devices which have queue depth greater than 1 (TCQ devices) and support ordered tags, block layer can just issue the barrier as an ordered request and the lower level driver, controller and drive -itself are responsible for making sure that the ordering contraint is +itself are responsible for making sure that the ordering constraint is met. Most modern SCSI controllers/drives should support this. NOTE: SCSI ordered tag isn't currently used due to limitation in the diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt index 9c629ffa0e58..45a738b81501 100644 --- a/Documentation/cciss.txt +++ b/Documentation/cciss.txt @@ -152,7 +152,7 @@ side during the SCSI error recovery process, the cciss driver only implements the first two of these actions, aborting the command, and resetting the device. Additionally, most tape drives will not oblige in aborting commands, and sometimes it appears they will not even -obey a reset coommand, though in most circumstances they will. In +obey a reset command, though in most circumstances they will. In the case that the command cannot be aborted and the device cannot be reset, the device will be set offline. diff --git a/Documentation/dell_rbu.txt b/Documentation/dell_rbu.txt index fb18c5dc8ab4..8c93d8813791 100644 --- a/Documentation/dell_rbu.txt +++ b/Documentation/dell_rbu.txt @@ -41,7 +41,7 @@ The driver supports two types of update mechanism; monolithic and packetized. These update mechanism depends upon the BIOS currently running on the system. Most of the Dell systems support a monolithic update where the BIOS image is copied to a single contiguous block of physical memory. -In case of packet mechanism the single memory can be broken in smaller chuks +In case of packet mechanism the single memory can be broken in smaller chunks of contiguous memory and the BIOS image is scattered in these packets. By default the driver uses monolithic memory for the update type. This can be diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt index a42132d60dc8..0b2399e6b90d 100644 --- a/Documentation/dvb/faq.txt +++ b/Documentation/dvb/faq.txt @@ -138,7 +138,7 @@ Some very frequently asked questions about linuxtv-dvb - v4l2-common: common functions for Video4Linux-2 drivers - - v4l1-compat: backward compatiblity layer for Video4Linux-1 legacy + - v4l1-compat: backward compatibility layer for Video4Linux-1 legacy applications - dvb-core: DVB core module. This provides you with the diff --git a/Documentation/filesystems/befs.txt b/Documentation/filesystems/befs.txt index 877a7b1d46ec..8b7d732bfb68 100644 --- a/Documentation/filesystems/befs.txt +++ b/Documentation/filesystems/befs.txt @@ -57,7 +57,7 @@ if the patching step fails (i.e. there are rejected hunks), you can try to figure it out yourself (it shouldn't be hard), or mail the maintainer (Will Dyson ) for help. -step 2. Configuretion & make kernel +step 2. Configuration & make kernel The linux kernel has many compile-time options. Most of them are beyond the scope of this document. I suggest the Kernel-HOWTO document as a good general diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt index e6e7526619bf..1a6d45930ebc 100644 --- a/Documentation/filesystems/configfs/configfs.txt +++ b/Documentation/filesystems/configfs/configfs.txt @@ -1,5 +1,5 @@ -configfs - Userspace-driven kernel object configuation. +configfs - Userspace-driven kernel object configuration. Joel Becker diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt index c16a5df2f1fa..c8f99a0a9077 100644 --- a/Documentation/input/atarikbd.txt +++ b/Documentation/input/atarikbd.txt @@ -522,7 +522,7 @@ controller memory. The time between data bytes must be less than 20ms. 0x20 ; memory access { data } ; 6 data bytes starting at ADR -This comand permits the host to read from the ikbd controller memory. +This command permits the host to read from the ikbd controller memory. 9.26 CONTROLLER EXECUTE diff --git a/Documentation/input/yealink.txt b/Documentation/input/yealink.txt index 0962c5c948be..8bf2addadb4b 100644 --- a/Documentation/input/yealink.txt +++ b/Documentation/input/yealink.txt @@ -93,7 +93,7 @@ Format description: Format specifier '8' : Generic 7 segment digit with individual addressable segments - Reduced capabillity 7 segm digit, when segments are hard wired together. + Reduced capability 7 segm digit, when segments are hard wired together. '1' : 2 segments digit only able to produce a 1. 'e' : Most significant day of the month digit, able to produce at least 1 2 3. diff --git a/Documentation/networking/dl2k.txt b/Documentation/networking/dl2k.txt index a3a3c6e08cee..10e8490fa406 100644 --- a/Documentation/networking/dl2k.txt +++ b/Documentation/networking/dl2k.txt @@ -222,7 +222,7 @@ rx_timeout=n - Rx DMA wait time for an interrupt. reach timeout of n * 640 nano seconds. Set proper rx_coalesce and rx_timeout can reduce congestion collapse and overload which - has been a bottlenect for high speed network. + has been a bottleneck for high speed network. For example, rx_coalesce=10 rx_timeout=800. that is, hardware assert only 1 interrupt diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index 781626261e35..d1c5a4804bfc 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt @@ -66,7 +66,7 @@ the following process: [setup] socket() -------> creation of the capture socket setsockopt() ---> allocation of the circular buffer (ring) - mmap() ---------> maping of the allocated buffer to the + mmap() ---------> mapping of the allocated buffer to the user process [capture] poll() ---------> to wait for incoming packets @@ -93,7 +93,7 @@ The destruction of the socket and all associated resources is done by a simple call to close(fd). Next I will describe PACKET_MMAP settings and it's constraints, -also the maping of the circular buffer in the user process and +also the mapping of the circular buffer in the user process and the use of this buffer. -------------------------------------------------------------------------------- @@ -153,8 +153,8 @@ we will get the following buffer structure: A frame can be of any size with the only condition it can fit in a block. A block can only hold an integer number of frames, or in other words, a frame cannot -be spawn accross two blocks so there are some datails you have to take into -account when choosing the frame_size. See "Maping and use of the circular +be spawned accross two blocks, so there are some details you have to take into +account when choosing the frame_size. See "Mapping and use of the circular buffer (ring)". @@ -262,7 +262,7 @@ i386 architecture: = 4096 bytes = 11 -and a value for of 2048 byteas. These parameters will yield +and a value for of 2048 bytes. These parameters will yield = 131072/4 = 32768 blocks = 4096 << 11 = 8 MiB. @@ -311,14 +311,14 @@ the following (from include/linux/if_packet.h): tp_frame_size must be a multiple of TPACKET_ALIGNMENT tp_frame_nr must be exactly frames_per_block*tp_block_nr -Note that tp_block_size should be choosed to be a power of two or there will +Note that tp_block_size should be chosen to be a power of two or there will be a waste of memory. -------------------------------------------------------------------------------- -+ Maping and use of the circular buffer (ring) ++ Mapping and use of the circular buffer (ring) -------------------------------------------------------------------------------- -The maping of the buffer in the user process is done with the conventional +The mapping of the buffer in the user process is done with the conventional mmap function. Even the circular buffer is compound of several physically discontiguous blocks of memory, they are contiguous to the user space, hence just one call to mmap is needed: diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index 5c0ba235f5a5..e80e03637a67 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt @@ -732,12 +732,12 @@ address which can extend beyond that limit. that typically get driven by the same platform code in the kernel, you would use a different "model" property but put a value in "compatible". The kernel doesn't directly use that - value (see /chosen/linux,platform for how the kernel choses a + value (see /chosen/linux,platform for how the kernel chooses a platform type) but it is generally useful. The root node is also generally where you add additional properties specific to your board like the serial number if any, that sort of - thing. it is recommended that if you add any "custom" property whose + thing. It is recommended that if you add any "custom" property whose name may clash with standard defined ones, you prefix them with your vendor name and a comma. @@ -817,7 +817,7 @@ address which can extend beyond that limit. your board. It's a list of addresses/sizes concatenated together, with the number of cells of each defined by the #address-cells and #size-cells of the root node. For example, - with both of these properties beeing 2 like in the example given + with both of these properties being 2 like in the example given earlier, a 970 based machine with 6Gb of RAM could typically have a "reg" property here that looks like: @@ -970,7 +970,7 @@ device-tree in another format. The currently supported formats are: - "asm": assembly language file. This is a file that can be sourced by gas to generate a device-tree "blob". That file can then simply be added to your Makefile. Additionally, the - assembly file exports some symbols that can be use + assembly file exports some symbols that can be used. The syntax of the dtc tool is @@ -984,10 +984,10 @@ generated. Supported versions are 1,2,3 and 16. The default is currently version 3 but that may change in the future to version 16. Additionally, dtc performs various sanity checks on the tree, like the -uniqueness of linux,phandle properties, validity of strings, etc... +uniqueness of linux, phandle properties, validity of strings, etc... The format of the .dts "source" file is "C" like, supports C and C++ -style commments. +style comments. / { } diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt index 0bb4512e8a65..a6555dbfa081 100644 --- a/Documentation/s390/Debugging390.txt +++ b/Documentation/s390/Debugging390.txt @@ -163,7 +163,7 @@ s/390 z/Architecture 1 1 64 bit 32 1=31 bit addressing mode 0=24 bit addressing mode (for backward - compatibility ), linux always runs with this bit set to 1 + compatibility), linux always runs with this bit set to 1 33-64 Instruction address. 33-63 Reserved must be 0 @@ -239,7 +239,7 @@ they go to 64 Bit. On 390 our limitations & strengths make us slightly different. For backward compatibility we are only allowed use 31 bits (2GB) -of our 32 bit addresses,however, we use entirely separate address +of our 32 bit addresses, however, we use entirely separate address spaces for the user & kernel. This means we can support 2GB of non Extended RAM on s/390, & more @@ -1311,7 +1311,7 @@ for finding out when a particular variable changes. An alternative way of finding the STD of a currently running process is to do the following, ( this method is more complex but -could be quite convient if you aren't updating the kernel much & +could be quite convenient if you aren't updating the kernel much & so your kernel structures will stay constant for a reasonable period of time ). @@ -2045,13 +2045,13 @@ what gdb does when the victim receives certain signals. list: e.g. list lists current function source -list 1,10 list first 10 lines of curret file. +list 1,10 list first 10 lines of current file. list test.c:1,10 directory: Adds directories to be searched for source if gdb cannot find the source. -(note it is a bit sensititive about slashes ) +(note it is a bit sensititive about slashes) e.g. To add the root of the filesystem to the searchpath do directory // @@ -2123,9 +2123,9 @@ p/x (*(**$sp+56))&0x7fffffff Disassembling instructions without debug info --------------------------------------------- -gdb typically compains if there is a lack of debugging -symbols in the disassemble command with -"No function contains specified address." to get around +gdb typically complains if there is a lack of debugging +symbols in the disassemble command with +"No function contains specified address." To get around this do x/xi
e.g. diff --git a/Documentation/scsi/aic7xxx.txt b/Documentation/scsi/aic7xxx.txt index 3481fcded4c2..9b894f116d95 100644 --- a/Documentation/scsi/aic7xxx.txt +++ b/Documentation/scsi/aic7xxx.txt @@ -160,7 +160,7 @@ The following information is available in this file: 6.2.34 (May 5th, 2003) - Fix locking regression instroduced in 6.2.29 that - could cuase a lock order reversal between the io_request_lock + could cause a lock order reversal between the io_request_lock and our per-softc lock. This was only possible on RH9, SuSE, and kernel.org 2.4.X kernels. diff --git a/Documentation/scsi/dpti.txt b/Documentation/scsi/dpti.txt index 6e45e70243e5..f36dc0e7c8da 100644 --- a/Documentation/scsi/dpti.txt +++ b/Documentation/scsi/dpti.txt @@ -48,7 +48,7 @@ * Implemented suggestions from Alan Cox * Added calculation of resid for sg layer * Better error handling - * Added checking underflow condtions + * Added checking underflow conditions * Added DATAPROTECT checking * Changed error return codes * Fixed pointer bug in bus reset routine diff --git a/Documentation/sound/alsa/MIXART.txt b/Documentation/sound/alsa/MIXART.txt index 5cb970612870..0db6ca7db28a 100644 --- a/Documentation/sound/alsa/MIXART.txt +++ b/Documentation/sound/alsa/MIXART.txt @@ -31,7 +31,7 @@ With a miXart8AES/EBU there is in addition 1 stereo digital input Formats ------- U8, S16_LE, S16_BE, S24_3LE, S24_3BE, FLOAT_LE, FLOAT_BE -Sample rates : 8000 - 48000 Hz continously +Sample rates : 8000 - 48000 Hz continuously Playback -------- diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt index b7390000bf28..60e482bdf8fa 100644 --- a/Documentation/uml/UserModeLinux-HOWTO.txt +++ b/Documentation/uml/UserModeLinux-HOWTO.txt @@ -1020,7 +1020,7 @@ Note that the IP address you assign to the host end of the tap device must be different than the IP you assign to the eth device inside UML. - If you are short on IPs and don't want to comsume two per UML, then + If you are short on IPs and don't want to consume two per UML, then you can reuse the host's eth IP address for the host ends of the tap devices. Internally, the UMLs must still get unique IPs for their eth devices. You can also give the UMLs non-routable IPs (192.168.x.x or diff --git a/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/Documentation/video4linux/cx2341x/fw-decoder-api.txt index 9df4fb3ea0f2..78bf5f21e513 100644 --- a/Documentation/video4linux/cx2341x/fw-decoder-api.txt +++ b/Documentation/video4linux/cx2341x/fw-decoder-api.txt @@ -102,7 +102,7 @@ Param[0] Name CX2341X_DEC_GET_XFER_INFO Enum 9/0x09 Description - This API call may be used to detect an end of stream condtion. + This API call may be used to detect an end of stream condition. Result[0] Stream type Result[1] diff --git a/Documentation/video4linux/sn9c102.txt b/Documentation/video4linux/sn9c102.txt index 1d20895b4354..b737a865e86c 100644 --- a/Documentation/video4linux/sn9c102.txt +++ b/Documentation/video4linux/sn9c102.txt @@ -60,7 +60,7 @@ It's worth to note that SONiX has never collaborated with the author during the development of this project, despite several requests for enough detailed specifications of the register tables, compression engine and video data format of the above chips. Nevertheless, these informations are no longer necessary, -becouse all the aspects related to these chips are known and have been +because all the aspects related to these chips are known and have been described in detail in this documentation. The driver relies on the Video4Linux2 and USB core modules. It has been -- cgit v1.2.2 From fff9289b219f48cb2296714fea3d71f516991f9f Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:47:42 +0200 Subject: Fix typos in Documentation/: 'D'-'E' This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letters 'D'-'E'. Signed-off-by: Matt LaPlante Signed-off-by: Adrian Bunk --- Documentation/aoe/todo.txt | 2 +- Documentation/block/biodoc.txt | 2 +- Documentation/cciss.txt | 2 +- Documentation/cputopology.txt | 2 +- Documentation/devices.txt | 4 ++-- Documentation/fb/sstfb.txt | 10 ++++----- Documentation/filesystems/dlmfs.txt | 2 +- Documentation/filesystems/ntfs.txt | 2 +- Documentation/filesystems/sysfs.txt | 2 +- Documentation/hrtimers.txt | 2 +- Documentation/input/atarikbd.txt | 2 +- Documentation/input/cs461x.txt | 2 +- Documentation/input/ff.txt | 2 +- Documentation/input/input.txt | 2 +- Documentation/kobject.txt | 2 +- Documentation/md.txt | 6 +++--- Documentation/networking/NAPI_HOWTO.txt | 2 +- Documentation/networking/gen_stats.txt | 4 ++-- Documentation/networking/pktgen.txt | 2 +- Documentation/networking/wan-router.txt | 2 +- Documentation/nfsroot.txt | 2 +- Documentation/power/pci.txt | 2 +- Documentation/powerpc/booting-without-of.txt | 2 +- Documentation/rocket.txt | 4 ++-- Documentation/s390/Debugging390.txt | 27 ++++++++++++------------- Documentation/s390/cds.txt | 2 +- Documentation/s390/s390dbf.txt | 2 +- Documentation/scsi/ncr53c8xx.txt | 6 +++--- Documentation/scsi/scsi_eh.txt | 2 +- Documentation/scsi/tmscsim.txt | 2 +- Documentation/sound/alsa/ALSA-Configuration.txt | 4 ++-- Documentation/sound/alsa/Audiophile-Usb.txt | 2 +- Documentation/sound/alsa/MIXART.txt | 2 +- Documentation/sound/alsa/Procfile.txt | 2 +- Documentation/usb/error-codes.txt | 2 +- Documentation/usb/mtouchusb.txt | 2 +- Documentation/video4linux/meye.txt | 2 +- Documentation/video4linux/zr36120.txt | 4 ++-- 38 files changed, 63 insertions(+), 64 deletions(-) diff --git a/Documentation/aoe/todo.txt b/Documentation/aoe/todo.txt index 7fee1e1165bc..c09dfad4aed8 100644 --- a/Documentation/aoe/todo.txt +++ b/Documentation/aoe/todo.txt @@ -7,7 +7,7 @@ not been observed, but it would be nice to eliminate any potential for deadlock under memory pressure. Because ATA over Ethernet is not fragmented by the kernel's IP code, -the destructore member of the struct sk_buff is available to the aoe +the destructor member of the struct sk_buff is available to the aoe driver. By using a mempool for allocating all but the first few sk_buffs, and by registering a destructor, we should be able to efficiently allocate sk_buffs without introducing any potential for diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index f989a9e839b4..3646a0aaea82 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt @@ -1203,6 +1203,6 @@ temporarily map a bio into the virtual address space. and Linus' comments - Jan 2001) 9.2 Discussions about kiobuf and bh design on lkml between sct, linus, alan et al - Feb-March 2001 (many of the initial thoughts that led to bio were -brought up in this discusion thread) +brought up in this discussion thread) 9.3 Discussions on mempool on lkml - Dec 2001. diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt index 45a738b81501..f74affe5c829 100644 --- a/Documentation/cciss.txt +++ b/Documentation/cciss.txt @@ -80,7 +80,7 @@ the /proc filesystem entry which the "block" side of the driver creates as the SCSI core may not yet be initialized (because the driver is a block driver) and attempting to register it with the SCSI core in such a case would cause a hang. This is best done via an initialization script -(typically in /etc/init.d, but could vary depending on distibution). +(typically in /etc/init.d, but could vary depending on distribution). For example: for x in /proc/driver/cciss/cciss[0-9]* diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt index 2b28e9ec4e3a..b61cb9564023 100644 --- a/Documentation/cputopology.txt +++ b/Documentation/cputopology.txt @@ -26,7 +26,7 @@ The type of **_id is int. The type of siblings is cpumask_t. To be consistent on all architectures, the 4 attributes should have -deafult values if their values are unavailable. Below is the rule. +default values if their values are unavailable. Below is the rule. 1) physical_package_id: If cpu has no physical package id, -1 is the default value. 2) core_id: If cpu doesn't support multi-core, its core id is 0. diff --git a/Documentation/devices.txt b/Documentation/devices.txt index addc67b1d770..682e1e7018f3 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt @@ -3205,7 +3205,7 @@ for a session; this includes virtual consoles, serial ports, and pseudoterminals (PTYs). All terminal devices share a common set of capabilities known as line -diciplines; these include the common terminal line dicipline as well +disciplines; these include the common terminal line discipline as well as SLIP and PPP modes. All terminal devices are named similarly; this section explains the @@ -3285,7 +3285,7 @@ port TTY, for which no alternate device would exist. Pseudoterminals (PTYs) Pseudoterminals, or PTYs, are used to create login sessions or provide -other capabilities requiring a TTY line dicipline (including SLIP or +other capabilities requiring a TTY line discipline (including SLIP or PPP capability) to arbitrary data-generation processes. Each PTY has a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named /dev/tty[p-za-e][0-9a-f]. The kernel arbitrates the use of PTYs by diff --git a/Documentation/fb/sstfb.txt b/Documentation/fb/sstfb.txt index f21bec8c0a25..c7088c6d5df5 100644 --- a/Documentation/fb/sstfb.txt +++ b/Documentation/fb/sstfb.txt @@ -48,12 +48,12 @@ Module Usage Module insertion: # insmod sstfb.o - you should see some strange output frome the board: + you should see some strange output from the board: a big blue square, a green and a red small squares and a vertical - white rectangle. why ? the function's name is self explanatory : + white rectangle. why? the function's name is self-explanatory: "sstfb_test()"... (if you don't have a second monitor, you'll have to plug your monitor - directely to the 2D videocard to see what you're typing) + directly to the 2D videocard to see what you're typing) # con2fb /dev/fbx /dev/ttyx bind a tty to the new frame buffer. if you already have a frame buffer driver, the voodoo fb will likely be /dev/fb1. if not, @@ -95,11 +95,11 @@ inverse=1 inverse Supposed to enable inverse console. clipping=1 clipping Enable or disable clipping. clipping=0 noclipping With clipping enabled, all offscreen - reads and writes are disgarded. + reads and writes are discarded. Default: enable clipping. gfxclk=x gfxclk:x Force graphic clock frequency (in MHz). - Be carefull with this option, it may be + Be careful with this option, it may be DANGEROUS. Default: auto 50Mhz for Voodoo 1, diff --git a/Documentation/filesystems/dlmfs.txt b/Documentation/filesystems/dlmfs.txt index 9afab845a906..c50bbb2d52b4 100644 --- a/Documentation/filesystems/dlmfs.txt +++ b/Documentation/filesystems/dlmfs.txt @@ -68,7 +68,7 @@ request for an already acquired lock will not generate another DLM call. Userspace programs are assumed to handle their own local locking. -Two levels of locks are supported - Shared Read, and Exlcusive. +Two levels of locks are supported - Shared Read, and Exclusive. Also supported is a Trylock operation. For information on the libo2dlm interface, please see o2dlm.h, diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index 638cbd3d2b00..9175f44c9c64 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt @@ -390,7 +390,7 @@ stripes with parity, i.e. raid level 5, should not work, too. You have to use the "persistent-superblock 0" option for each raid-disk in the NTFS volume/stripe you are configuring in /etc/raidtab as the persistent -superblock used by the MD driver would damange the NTFS volume. +superblock used by the MD driver would damage the NTFS volume. Windows by default uses a stripe chunk size of 64k, so you probably want the "chunk-size 64k" option for each raid-disk, too. diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt index 89b1d196ca80..4b5ca26e5048 100644 --- a/Documentation/filesystems/sysfs.txt +++ b/Documentation/filesystems/sysfs.txt @@ -238,7 +238,7 @@ Top Level Directory Layout The sysfs directory arrangement exposes the relationship of kernel data structures. -The top level sysfs diretory looks like: +The top level sysfs directory looks like: block/ bus/ diff --git a/Documentation/hrtimers.txt b/Documentation/hrtimers.txt index 7620ff735faf..acad3a9b16c9 100644 --- a/Documentation/hrtimers.txt +++ b/Documentation/hrtimers.txt @@ -10,7 +10,7 @@ back and forth trying to integrate high-resolution and high-precision features into the existing timer framework, and after testing various such high-resolution timer implementations in practice, we came to the conclusion that the timer wheel code is fundamentally not suitable for -such an approach. We initially didnt believe this ('there must be a way +such an approach. We initially didn't believe this ('there must be a way to solve this'), and spent a considerable effort trying to integrate things into the timer wheel, but we failed. In hindsight, there are several reasons why such integration is hard/impossible: diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt index c8f99a0a9077..3feb9f2f3682 100644 --- a/Documentation/input/atarikbd.txt +++ b/Documentation/input/atarikbd.txt @@ -30,7 +30,7 @@ is obtained by ORing 0x80 with the make code. The special codes 0xF6 through 0xFF are reserved for use as follows: 0xF6 status report 0xF7 absolute mouse position record - 0xF8-0xFB relative mouse position records(lsbs determind by + 0xF8-0xFB relative mouse position records (lsbs determined by mouse button states) 0xFC time-of-day 0xFD joystick report (both sticks) diff --git a/Documentation/input/cs461x.txt b/Documentation/input/cs461x.txt index 6181747a14d8..afe0d6543e09 100644 --- a/Documentation/input/cs461x.txt +++ b/Documentation/input/cs461x.txt @@ -27,7 +27,7 @@ This driver have the basic support for PCI devices only; there is no ISA or PnP ISA cards supported. AFAIK the ns558 have support for Crystal ISA and PnP ISA series. -The driver works witn ALSA drivers simultaneously. For exmple, the xracer +The driver works with ALSA drivers simultaneously. For example, the xracer uses joystick as input device and PCM device as sound output in one time. There are no sound or input collisions detected. The source code have comments about them; but I've found the joystick can be initialized diff --git a/Documentation/input/ff.txt b/Documentation/input/ff.txt index c53b1c11aa40..085eb15b45b7 100644 --- a/Documentation/input/ff.txt +++ b/Documentation/input/ff.txt @@ -38,7 +38,7 @@ joystick.txt for details. There is an utility called fftest that will allow you to test the driver. % fftest /dev/input/eventXX -3. Instructions to the developper +3. Instructions to the developer ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ All interactions are done using the event API. That is, you can use ioctl() and write() on /dev/input/eventXX. diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt index ac22f636e4c2..a8aa848f8656 100644 --- a/Documentation/input/input.txt +++ b/Documentation/input/input.txt @@ -154,7 +154,7 @@ about it. 3.2 Event handlers ~~~~~~~~~~~~~~~~~~ - Event handlers distrubite the events from the devices to userland and + Event handlers distribute the events from the devices to userland and kernel, as needed. 3.2.1 keybdev diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index 949f7b5a2053..e44855513b3d 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt @@ -51,7 +51,7 @@ more complex object types. It provides a set of basic fields that almost all complex data types share. kobjects are intended to be embedded in larger data structures and replace fields they duplicate. -1.2 Defintion +1.2 Definition struct kobject { char name[KOBJ_NAME_LEN]; diff --git a/Documentation/md.txt b/Documentation/md.txt index 13aa401aed69..154b4ff9bb35 100644 --- a/Documentation/md.txt +++ b/Documentation/md.txt @@ -62,7 +62,7 @@ be reconstructed (due to no parity). For this reason, md will normally refuse to start such an array. This requires the sysadmin to take action to explicitly start the array -desipite possible corruption. This is normally done with +despite possible corruption. This is normally done with mdadm --assemble --force .... This option is not really available if the array has the root @@ -214,8 +214,8 @@ All md devices contain: safe_mode_delay When an md array has seen no write requests for a certain period of time, it will be marked as 'clean'. When another write - request arrive, the array is marked as 'dirty' before the write - commenses. This is known as 'safe_mode'. + request arrives, the array is marked as 'dirty' before the write + commences. This is known as 'safe_mode'. The 'certain period' is controlled by this file which stores the period as a number of seconds. The default is 200msec (0.200). Writing a value of 0 disables safemode. diff --git a/Documentation/networking/NAPI_HOWTO.txt b/Documentation/networking/NAPI_HOWTO.txt index 54376e8249c1..93af3e87c65b 100644 --- a/Documentation/networking/NAPI_HOWTO.txt +++ b/Documentation/networking/NAPI_HOWTO.txt @@ -35,7 +35,7 @@ Legend: packets out of the rx ring. Note from this that the lower the load the more we could clean up the rxring "Ndone" == is the converse of "Done". Note again, that the higher -the load the more times we couldnt clean up the rxring. +the load the more times we couldn't clean up the rxring. Observe that: when the NIC receives 890Kpackets/sec only 17 rx interrupts are generated. diff --git a/Documentation/networking/gen_stats.txt b/Documentation/networking/gen_stats.txt index c3297f79c137..ae54c828f4d6 100644 --- a/Documentation/networking/gen_stats.txt +++ b/Documentation/networking/gen_stats.txt @@ -103,8 +103,8 @@ In the kernel when setting up: else failed -From now on, everytime you dump my_rate_est_stats it will contain -uptodate info. +From now on, every time you dump my_rate_est_stats it will contain +up-to-date info. Once you are done, call gen_kill_estimator(my_basicstats, my_rate_est_stats) Make sure that my_basicstats and my_rate_est_stats diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt index c2f859f7f2f0..287b6227f1e9 100644 --- a/Documentation/networking/pktgen.txt +++ b/Documentation/networking/pktgen.txt @@ -147,7 +147,7 @@ Examples: Example scripts =============== -A collection of small tutorial scripts for pktgen is in expamples dir. +A collection of small tutorial scripts for pktgen is in examples dir. pktgen.conf-1-1 # 1 CPU 1 dev pktgen.conf-1-2 # 1 CPU 2 dev diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt index c96897aa08b6..3e549fc90f91 100644 --- a/Documentation/networking/wan-router.txt +++ b/Documentation/networking/wan-router.txt @@ -570,7 +570,7 @@ bata1-2.2.1 Feb 09 2001 Option to COMPILE WANPIPE modules against the currently running kernel, thus no need for manual kernel and module - re-compilatin. + re-compilation. o Updates and Bug Fixes to wancfg utility. diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt index 3cc953cb288f..719f9a9d60c0 100644 --- a/Documentation/nfsroot.txt +++ b/Documentation/nfsroot.txt @@ -11,7 +11,7 @@ Updated 2006 by Horms In order to use a diskless system, such as an X-terminal or printer server for example, it is necessary for the root filesystem to be present on a non-disk device. This may be an initramfs (see Documentation/filesystems/ -ramfs-rootfs-initramfs.txt), a ramdisk (see Documenation/initrd.txt) or a +ramfs-rootfs-initramfs.txt), a ramdisk (see Documentation/initrd.txt) or a filesystem mounted via NFS. The following text describes on how to use NFS for the root filesystem. For the rest of this text 'client' means the diskless system, and 'server' means the NFS server. diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt index 73fc87e5dc38..24edf25b3bb7 100644 --- a/Documentation/power/pci.txt +++ b/Documentation/power/pci.txt @@ -326,7 +326,7 @@ A reference implementation This is a typical implementation. Drivers can slightly change the order of the operations in the implementation, ignore some operations or add -more deriver specific operations in it, but drivers should do something like +more driver specific operations in it, but drivers should do something like this on the whole. 5. Resources diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index e80e03637a67..bfcd95dd3c36 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt @@ -335,7 +335,7 @@ struct boot_param_header { "compact" format for the tree itself that is however not backward compatible. You should always generate a structure of the highest version defined at the time of your implementation. Currently - that is version 16, unless you explicitely aim at being backward + that is version 16, unless you explicitly aim at being backward compatible. - last_comp_version diff --git a/Documentation/rocket.txt b/Documentation/rocket.txt index a10678004451..2d11ad6e525a 100644 --- a/Documentation/rocket.txt +++ b/Documentation/rocket.txt @@ -107,7 +107,7 @@ second, third, and fourth Rocketport cards (if present) are set via software control. The DIP switch settings for the I/O address must be set to the value of the first Rocketport cards. -In order to destinguish each of the card from the others, each card +In order to distinguish each of the card from the others, each card must have a unique board ID set on the dip switches. The first Rocketport board must be set with the DIP switches corresponding to the first board, the second board must be set with the DIP switches @@ -120,7 +120,7 @@ conflict with any other cards in the system, including other RocketPort cards. Below, you will find a list of commonly used I/O address ranges which may be in use by other devices in your system. On a Linux system, "cat /proc/ioports" will also be helpful in -identifying what I/O addresses are being used by devics on your +identifying what I/O addresses are being used by devices on your system. Remember, the FIRST RocketPort uses 68 I/O addresses. So, if you set it diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt index a6555dbfa081..ffb74a1656e6 100644 --- a/Documentation/s390/Debugging390.txt +++ b/Documentation/s390/Debugging390.txt @@ -8,8 +8,8 @@ Overview of Document: ===================== This document is intended to give an good overview of how to debug -Linux for s/390 & z/Architecture it isn't intended as a complete reference & not a -tutorial on the fundamentals of C & assembly, it dosen't go into +Linux for s/390 & z/Architecture. It isn't intended as a complete reference & not a +tutorial on the fundamentals of C & assembly. It doesn't go into 390 IO in any detail. It is intended to complement the documents in the reference section below & any other worthwhile references you get. @@ -354,7 +354,7 @@ static inline struct task_struct * get_current(void) } i.e. just anding the current kernel stack pointer with the mask -8192. -Thankfully because Linux dosen't have support for nested IO interrupts +Thankfully because Linux doesn't have support for nested IO interrupts & our devices have large buffers can survive interrupts being shut for short amounts of time we don't need a separate stack for interrupts. @@ -394,7 +394,7 @@ i.e they aren't in registers & they aren't static. back-chain: This is a pointer to the stack pointer before entering a framed functions ( see frameless function ) prologue got by -deferencing the address of the current stack pointer, +dereferencing the address of the current stack pointer, i.e. got by accessing the 32 bit value at the stack pointers current location. @@ -724,7 +724,7 @@ This is useful for debugging because 1) You can double check whether the files you expect to be included are the ones that are being included ( e.g. double check that you aren't going to the i386 asm directory ). 2) Check that macro definitions aren't clashing with typedefs, -3) Check that definitons aren't being used before they are being included. +3) Check that definitions aren't being used before they are being included. 4) Helps put the line emitting the error under the microscope if it contains macros. For convenience the Linux kernel's makefile will do preprocessing automatically for you @@ -840,12 +840,11 @@ using the strip command to make it a more reasonable size to boot it. A source/assembly mixed dump of the kernel can be done with the line objdump --source vmlinux > vmlinux.lst -Also if the file isn't compiled -g this will output as much debugging information -as it can ( e.g. function names ), however, this is very slow as it spends lots -of time searching for debugging info, the following self explanitory line should be used -instead if the code isn't compiled -g. +Also, if the file isn't compiled -g, this will output as much debugging information +as it can (e.g. function names). This is very slow as it spends lots +of time searching for debugging info. The following self explanatory line should be used +instead if the code isn't compiled -g, as it is much faster: objdump --disassemble-all --syms vmlinux > vmlinux.lst -as it is much faster As hard drive space is valuble most of us use the following approach. 1) Look at the emitted psw on the console to find the crash address in the kernel. @@ -1674,8 +1673,8 @@ channel is idle & the second for device end ( secondary status ) sometimes you g concurrently, you check how the IO went on by issuing a TEST SUBCHANNEL at each interrupt, from which you receive an Interruption response block (IRB). If you get channel & device end status in the IRB without channel checks etc. your IO probably went okay. If you didn't you -probably need a doctorto examine the IRB & extended status word etc. -If an error occurs more sophistocated control units have a facitity known as +probably need a doctor to examine the IRB & extended status word etc. +If an error occurs, more sophistocated control units have a facitity known as concurrent sense this means that if an error occurs Extended sense information will be presented in the Extended status word in the IRB if not you have to issue a subsequent SENSE CCW command after the test subchannel. @@ -1916,7 +1915,7 @@ Assembly -------- info registers: displays registers other than floating point. info all-registers: displays floating points as well. -disassemble: dissassembles +disassemble: disassembles e.g. disassemble without parameters will disassemble the current function disassemble $pc $pc+10 @@ -1935,7 +1934,7 @@ undisplay : undo's display's info breakpoints: shows all current breakpoints -info stack: shows stack back trace ( if this dosent work too well, I'll show you the +info stack: shows stack back trace ( if this doesn't work too well, I'll show you the stacktrace by hand below ). info locals: displays local variables. diff --git a/Documentation/s390/cds.txt b/Documentation/s390/cds.txt index 079d8868ae83..3746b6d7b4ba 100644 --- a/Documentation/s390/cds.txt +++ b/Documentation/s390/cds.txt @@ -433,7 +433,7 @@ puts the CPU into I/O disabled state by preserving the current PSW flags. The device driver is allowed to issue the next ccw_device_start() call from within its interrupt handler already. It is not required to schedule a -bottom-half, unless an non deterministicly long running error recovery procedure +bottom-half, unless an non deterministically long running error recovery procedure or similar needs to be scheduled. During I/O processing the Linux/390 generic I/O device driver support has already obtained the IRQ lock, i.e. the handler must not try to obtain it again when calling ccw_device_start() or we end in a diff --git a/Documentation/s390/s390dbf.txt b/Documentation/s390/s390dbf.txt index e321a8ed2a2d..5ff6fe551b93 100644 --- a/Documentation/s390/s390dbf.txt +++ b/Documentation/s390/s390dbf.txt @@ -468,7 +468,7 @@ The hex_ascii view shows the data field in hex and ascii representation The raw view returns a bytestream as the debug areas are stored in memory. The sprintf view formats the debug entries in the same way as the sprintf -function would do. The sprintf event/expection functions write to the +function would do. The sprintf event/exception functions write to the debug entry a pointer to the format string (size = sizeof(long)) and for each vararg a long value. So e.g. for a debug entry with a format string plus two varargs one would need to allocate a (3 * sizeof(long)) diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index fb9281ae8faa..e80a02cffb22 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt @@ -96,10 +96,10 @@ The original driver has been written for 386bsd and FreeBSD by: It is now available as a bundle of 2 drivers: - ncr53c8xx generic driver that supports all the SYM53C8XX family including - the ealiest 810 rev. 1, the latest 896 (2 channel LVD SCSI controller) and + the earliest 810 rev. 1, the latest 896 (2 channel LVD SCSI controller) and the new 895A (1 channel LVD SCSI controller). - sym53c8xx enhanced driver (a.k.a. 896 drivers) that drops support of oldest - chips in order to gain advantage of new features, as LOAD/STORE intructions + chips in order to gain advantage of new features, as LOAD/STORE instructions available since the 810A and hardware phase mismatch available with the 896 and the 895A. @@ -207,7 +207,7 @@ The 896 and the 895A allows handling of the phase mismatch context from SCRIPTS (avoids the phase mismatch interrupt that stops the SCSI processor until the C code has saved the context of the transfer). Implementing this without using LOAD/STORE instructions would be painfull -and I did'nt even want to try it. +and I didn't even want to try it. The 896 chip supports 64 bit PCI transactions and addressing, while the 895A supports 32 bit PCI transactions and 64 bit addressing. diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt index ce767b90bb0d..8d6253f9cb32 100644 --- a/Documentation/scsi/scsi_eh.txt +++ b/Documentation/scsi/scsi_eh.txt @@ -160,7 +160,7 @@ ways. - Fine-grained EH callbacks LLDD can implement fine-grained EH callbacks and let SCSI midlayer drive error handling and call appropriate callbacks. - This will be dicussed further in [2-1]. + This will be discussed further in [2-1]. - eh_strategy_handler() callback This is one big callback which should perform whole error diff --git a/Documentation/scsi/tmscsim.txt b/Documentation/scsi/tmscsim.txt index 2bf3cfa3a067..8b2168aa4fc7 100644 --- a/Documentation/scsi/tmscsim.txt +++ b/Documentation/scsi/tmscsim.txt @@ -381,7 +381,7 @@ Please see http://www.garloff.de/kurt/linux/dc390/problems.html replaced by the dev index of your scanner). You may try to reset your SCSI bus afterwards (echo "RESET" >/proc/scsi/tmscsim/?). The problem seems to be solved as of 2.0d18, thanks to Andreas Rick. -* If there is a valid partition table, the driver will use it for determing +* If there is a valid partition table, the driver will use it for determining the mapping. If there's none, a reasonable mapping (Symbios-like) will be assumed. Other operating systems may not like this mapping, though it's consistent with the BIOS' behaviour. Old DC390 drivers ignored the diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 958ccf3aa2ea..4fbf8d5d4e73 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1263,8 +1263,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Note: on some notebooks the buffer address cannot be detected automatically, or causes hang-up during initialization. - In such a case, specify the buffer top address explicity via - buffer_top option. + In such a case, specify the buffer top address explicitly via + the buffer_top option. For example, Sony F250: buffer_top=0x25a800 Sony F270: buffer_top=0x272800 diff --git a/Documentation/sound/alsa/Audiophile-Usb.txt b/Documentation/sound/alsa/Audiophile-Usb.txt index b535c2a198f8..e40cce83327c 100644 --- a/Documentation/sound/alsa/Audiophile-Usb.txt +++ b/Documentation/sound/alsa/Audiophile-Usb.txt @@ -126,7 +126,7 @@ Here is a list of supported device_setup values for this device: - Alsa driver default mode - maintains backward compatibility with setups that do not use this parameter by not introducing any change - - results sometimes in corrupted sound as decribed earlier + - results sometimes in corrupted sound as described earlier * device_setup=0x01 - 16bits 48kHz mode with Di disabled - Ai,Ao,Do can be used at the same time diff --git a/Documentation/sound/alsa/MIXART.txt b/Documentation/sound/alsa/MIXART.txt index 0db6ca7db28a..9fa5bbdbac82 100644 --- a/Documentation/sound/alsa/MIXART.txt +++ b/Documentation/sound/alsa/MIXART.txt @@ -97,4 +97,4 @@ COPYRIGHT ========= Copyright (c) 2003 Digigram SA -Distributalbe under GPL. +Distributable under GPL. diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt index 1fe48846d78f..b1386168f6a9 100644 --- a/Documentation/sound/alsa/Procfile.txt +++ b/Documentation/sound/alsa/Procfile.txt @@ -71,7 +71,7 @@ The status of MIDI I/O is found in midi* files. It shows the device name and the received/transmitted bytes through the MIDI device. When the card is equipped with AC97 codecs, there are codec97#* -subdirectories (desribed later). +subdirectories (described later). When the OSS mixer emulation is enabled (and the module is loaded), oss_mixer file appears here, too. This shows the current mapping of diff --git a/Documentation/usb/error-codes.txt b/Documentation/usb/error-codes.txt index 39c68f8c4e6c..671144193093 100644 --- a/Documentation/usb/error-codes.txt +++ b/Documentation/usb/error-codes.txt @@ -126,7 +126,7 @@ one or more packets could finish before an error stops further endpoint I/O. urb->transfer_flags. -ENODEV Device was removed. Often preceded by a burst of - other errors, since the hub driver does't detect + other errors, since the hub driver doesn't detect device removal events immediately. -EXDEV ISO transfer only partially completed diff --git a/Documentation/usb/mtouchusb.txt b/Documentation/usb/mtouchusb.txt index cd806bfc8b81..433208871fb4 100644 --- a/Documentation/usb/mtouchusb.txt +++ b/Documentation/usb/mtouchusb.txt @@ -63,7 +63,7 @@ TODO: Implement a control urb again to handle requests to and from the device such as calibration, etc once/if it becomes available. -DISCLAMER: +DISCLAIMER: I am not a MicroTouch/3M employee, nor have I ever been. 3M does not support this driver! If you want touch drivers only supported within X, please go to: diff --git a/Documentation/video4linux/meye.txt b/Documentation/video4linux/meye.txt index 2137da97552f..ecb34160e61d 100644 --- a/Documentation/video4linux/meye.txt +++ b/Documentation/video4linux/meye.txt @@ -29,7 +29,7 @@ driver (PCI vendor/device is 0x136b/0xff01) The third one, present in recent (more or less last year) Picturebooks (C1M* models), is not supported. The manufacturer has given the specs -to the developers under a NDA (which allows the develoment of a GPL +to the developers under a NDA (which allows the development of a GPL driver however), but things are not moving very fast (see http://r-engine.sourceforge.net/) (PCI vendor/device is 0x10cf/0x2011). diff --git a/Documentation/video4linux/zr36120.txt b/Documentation/video4linux/zr36120.txt index ac6d92d01944..1a1c2d03a5c8 100644 --- a/Documentation/video4linux/zr36120.txt +++ b/Documentation/video4linux/zr36120.txt @@ -118,9 +118,9 @@ card is not there, please try if any other card gives some response, and mail me if you got a working tvcard addition. PS. Date: Tue, 3 Oct 2006 22:49:15 +0200 Subject: Fix typos in Documentation/: 'F'-'G' This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'F'-'G'. Signed-off-by: Matt LaPlante Signed-off-by: Adrian Bunk --- Documentation/block/barrier.txt | 2 +- Documentation/block/deadline-iosched.txt | 2 +- Documentation/cpu-freq/cpufreq-stats.txt | 2 +- Documentation/cpu-freq/governors.txt | 2 +- Documentation/dell_rbu.txt | 4 ++-- Documentation/dvb/faq.txt | 2 +- Documentation/fb/sisfb.txt | 2 +- Documentation/fb/sstfb.txt | 2 +- Documentation/feature-removal-schedule.txt | 2 +- Documentation/filesystems/spufs.txt | 2 +- Documentation/lockdep-design.txt | 2 +- Documentation/networking/cxgb.txt | 2 +- Documentation/networking/fib_trie.txt | 2 +- Documentation/powerpc/booting-without-of.txt | 4 ++-- Documentation/powerpc/eeh-pci-error-recovery.txt | 2 +- Documentation/powerpc/hvcs.txt | 2 +- Documentation/s390/Debugging390.txt | 2 +- Documentation/s390/s390dbf.txt | 2 +- Documentation/scsi/aic7xxx_old.txt | 2 +- Documentation/uml/UserModeLinux-HOWTO.txt | 2 +- Documentation/watchdog/watchdog-api.txt | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Documentation/block/barrier.txt b/Documentation/block/barrier.txt index 761073eae103..de3d88edb7f1 100644 --- a/Documentation/block/barrier.txt +++ b/Documentation/block/barrier.txt @@ -56,7 +56,7 @@ There are four cases, i. No write-back cache. Keeping requests ordered is enough. ii. Write-back cache but no flush operation. There's no way to -gurantee physical-medium commit order. This kind of devices can't to +guarantee physical-medium commit order. This kind of devices can't to I/O barriers. iii. Write-back cache and flush operation but no FUA (forced unit diff --git a/Documentation/block/deadline-iosched.txt b/Documentation/block/deadline-iosched.txt index c918b3a6022d..672c06bcae8b 100644 --- a/Documentation/block/deadline-iosched.txt +++ b/Documentation/block/deadline-iosched.txt @@ -23,7 +23,7 @@ you can do so by typing: read_expire (in ms) ----------- -The goal of the deadline io scheduler is to attempt to guarentee a start +The goal of the deadline io scheduler is to attempt to guarantee a start service time for a request. As we focus mainly on read latencies, this is tunable. When a read request first enters the io scheduler, it is assigned a deadline that is the current time + the read_expire value in units of diff --git a/Documentation/cpu-freq/cpufreq-stats.txt b/Documentation/cpu-freq/cpufreq-stats.txt index 6a82948ff4bd..48bc2f1fff78 100644 --- a/Documentation/cpu-freq/cpufreq-stats.txt +++ b/Documentation/cpu-freq/cpufreq-stats.txt @@ -53,7 +53,7 @@ drwxr-xr-x 3 root root 0 May 14 15:58 .. This gives the amount of time spent in each of the frequencies supported by this CPU. The cat output will have "