From 84eb8d0608af1576175307ed8fb3c8fde329e579 Mon Sep 17 00:00:00 2001 From: Matt LaPlante Date: Tue, 3 Oct 2006 22:53:09 +0200 Subject: [PATCH] Fix "can not" in Documentation and Kconfig Randy brought it to my attention that in proper english "can not" should always be written "cannot". I donot see any reason to argue, even if I mightnot understand why this rule exists. This patch fixes "can not" in several Documentation files as well as three Kconfigs. Signed-off-by: Matt LaPlante Acked-by: Randy Dunlap Signed-off-by: Adrian Bunk --- Documentation/DMA-mapping.txt | 2 +- Documentation/filesystems/proc.txt | 2 +- Documentation/highuid.txt | 2 +- Documentation/ioctl/hdio.txt | 2 +- Documentation/java.txt | 2 +- Documentation/kernel-parameters.txt | 4 ++-- Documentation/mono.txt | 2 +- Documentation/networking/arcnet-hardware.txt | 2 +- Documentation/networking/cs89x0.txt | 2 +- Documentation/networking/netconsole.txt | 2 +- Documentation/networking/sk98lin.txt | 4 ++-- Documentation/networking/skfp.txt | 4 ++-- Documentation/networking/tcp.txt | 2 +- Documentation/pm.txt | 6 +++--- Documentation/pnp.txt | 2 +- Documentation/s390/cds.txt | 2 +- Documentation/scsi/aic7xxx_old.txt | 2 +- Documentation/stable_kernel_rules.txt | 4 ++-- Documentation/uml/UserModeLinux-HOWTO.txt | 2 +- Documentation/video4linux/et61x251.txt | 2 +- Documentation/watchdog/watchdog-api.txt | 4 ++-- arch/arm/Kconfig | 2 +- drivers/scsi/Kconfig | 2 +- mm/Kconfig | 2 +- 24 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt index 63392c9132b..1d8dccf04e7 100644 --- a/Documentation/DMA-mapping.txt +++ b/Documentation/DMA-mapping.txt @@ -117,7 +117,7 @@ device_mask is a bit mask describing which bits of a PCI address your device supports. It returns zero if your card can perform DMA properly on the machine given the address mask you provided. -If it returns non-zero, your device can not perform DMA properly on +If it returns non-zero, your device cannot perform DMA properly on this platform, and attempting to do so will result in undefined behavior. You must either use a different mask, or not use DMA. diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 8d6590d5f35..59763d695b1 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt @@ -1733,7 +1733,7 @@ error_burst and error_cost These parameters are used to limit how many ICMP destination unreachable to send from the host in question. ICMP destination unreachable messages are -sent when we can not reach the next hop, while trying to transmit a packet. +sent when we cannot reach the next hop while trying to transmit a packet. It will also print some error messages to kernel logs if someone is ignoring our ICMP redirects. The higher the error_cost factor is, the fewer destination unreachable and error messages will be let through. Error_burst diff --git a/Documentation/highuid.txt b/Documentation/highuid.txt index 2c33926b909..76034d9dbfc 100644 --- a/Documentation/highuid.txt +++ b/Documentation/highuid.txt @@ -57,7 +57,7 @@ What's left to be done for 32-bit UIDs on all Linux architectures: Other filesystems have not been checked yet. -- The ncpfs and smpfs filesystems can not presently use 32-bit UIDs in +- The ncpfs and smpfs filesystems cannot presently use 32-bit UIDs in all ioctl()s. Some new ioctl()s have been added with 32-bit UIDs, but more are needed. (as well as new user<->kernel data structures) diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt index 11c9be49f37..c19efdeace2 100644 --- a/Documentation/ioctl/hdio.txt +++ b/Documentation/ioctl/hdio.txt @@ -203,7 +203,7 @@ HDIO_SET_MULTCOUNT change IDE blockmode Source code comments read: - This is tightly woven into the driver->do_special can not + This is tightly woven into the driver->do_special cannot touch. DON'T do it again until a total personality rewrite is committed. diff --git a/Documentation/java.txt b/Documentation/java.txt index e4814c21330..c768dc63b34 100644 --- a/Documentation/java.txt +++ b/Documentation/java.txt @@ -22,7 +22,7 @@ other program after you have done the following: the kernel (CONFIG_BINFMT_MISC) and set it up properly. If you choose to compile it as a module, you will have to insert it manually with modprobe/insmod, as kmod - can not easily be supported with binfmt_misc. + cannot easily be supported with binfmt_misc. Read the file 'binfmt_misc.txt' in this directory to know more about the configuration process. diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index aa21c66fbff..456d18b2522 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -611,8 +611,8 @@ and is between 256 and 4096 characters. It is defined in the file noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing i8042.direct [HW] Put keyboard port into non-translated mode - i8042.dumbkbd [HW] Pretend that controlled can only read data from - keyboard and can not control its state + i8042.dumbkbd [HW] Pretend that controller can only read data from + keyboard and cannot control its state (Don't attempt to blink the leds) i8042.noaux [HW] Don't check for auxiliary (== mouse) port i8042.nokbd [HW] Don't check/create keyboard port diff --git a/Documentation/mono.txt b/Documentation/mono.txt index 807a0c7b473..e8e1758e87d 100644 --- a/Documentation/mono.txt +++ b/Documentation/mono.txt @@ -26,7 +26,7 @@ other program after you have done the following: the kernel (CONFIG_BINFMT_MISC) and set it up properly. If you choose to compile it as a module, you will have to insert it manually with modprobe/insmod, as kmod - can not be easily supported with binfmt_misc. + cannot be easily supported with binfmt_misc. Read the file 'binfmt_misc.txt' in this directory to know more about the configuration process. diff --git a/Documentation/networking/arcnet-hardware.txt b/Documentation/networking/arcnet-hardware.txt index 30a5f01403d..731de411513 100644 --- a/Documentation/networking/arcnet-hardware.txt +++ b/Documentation/networking/arcnet-hardware.txt @@ -139,7 +139,7 @@ And now to the cabling. What you can connect together: 5. An active hub to passive hub. -Remember, that you can not connect two passive hubs together. The power loss +Remember that you cannot connect two passive hubs together. The power loss implied by such a connection is too high for the net to operate reliably. An example of a typical ARCnet network: diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt index 0371ced334c..f1f9e8afe1e 100644 --- a/Documentation/networking/cs89x0.txt +++ b/Documentation/networking/cs89x0.txt @@ -584,7 +584,7 @@ of four ways after installing and or configuring the CS8900/20-based adapter: 1.) The system does not boot properly (or at all). - 2.) The driver can not communicate with the adapter, reporting an "Adapter + 2.) The driver cannot communicate with the adapter, reporting an "Adapter not found" error message. 3.) You cannot connect to the network or the driver will not load. diff --git a/Documentation/networking/netconsole.txt b/Documentation/networking/netconsole.txt index 53618fb1a71..1caa6c73469 100644 --- a/Documentation/networking/netconsole.txt +++ b/Documentation/networking/netconsole.txt @@ -52,6 +52,6 @@ messages is high, but should have no other impact. Netconsole was designed to be as instantaneous as possible, to enable the logging of even the most critical kernel bugs. It works from IRQ contexts as well, and does not enable interrupts while -sending packets. Due to these unique needs, configuration can not +sending packets. Due to these unique needs, configuration cannot be more automatic, and some fundamental limitations will remain: only IP networks, UDP packets and ethernet devices are supported. diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt index 817fc113d93..82ce5547db4 100644 --- a/Documentation/networking/sk98lin.txt +++ b/Documentation/networking/sk98lin.txt @@ -484,7 +484,7 @@ If any problems occur during the installation process, check the following list: -Problem: The SK-98xx adapter can not be found by the driver. +Problem: The SK-98xx adapter cannot be found by the driver. Solution: In /proc/pci search for the following entry: 'Ethernet controller: SysKonnect SK-98xx ...' If this entry exists, the SK-98xx or SK-98xx V2.0 adapter has @@ -502,7 +502,7 @@ Solution: In /proc/pci search for the following entry: web, e.g. at 'www.linux.org'). -Problem: Programs such as 'ifconfig' or 'route' can not be found or the +Problem: Programs such as 'ifconfig' or 'route' cannot be found or the error message 'Operation not permitted' is displayed. Reason: You are not logged in as user 'root'. Solution: Logout and login as 'root' or change to 'root' via 'su'. diff --git a/Documentation/networking/skfp.txt b/Documentation/networking/skfp.txt index 3a419ed42f8..abfddf81e34 100644 --- a/Documentation/networking/skfp.txt +++ b/Documentation/networking/skfp.txt @@ -81,7 +81,7 @@ Makes my life much easier :-) If you run into problems during installation, check those items: -Problem: The FDDI adapter can not be found by the driver. +Problem: The FDDI adapter cannot be found by the driver. Reason: Look in /proc/pci for the following entry: 'FDDI network controller: SysKonnect SK-FDDI-PCI ...' If this entry exists, then the FDDI adapter has been @@ -99,7 +99,7 @@ Reason: Look in /proc/pci for the following entry: Problem: You want to use your computer as a router between multiple IP subnetworks (using multiple adapters), but - you can not reach computers in other subnetworks. + you cannot reach computers in other subnetworks. Reason: Either the router's kernel is not configured for IP forwarding or there is a problem with the routing table and gateway configuration in at least one of the diff --git a/Documentation/networking/tcp.txt b/Documentation/networking/tcp.txt index 0fa30042557..0121edc3ba0 100644 --- a/Documentation/networking/tcp.txt +++ b/Documentation/networking/tcp.txt @@ -62,7 +62,7 @@ if needed and you will get the expected protocol. If you ask for an unknown congestion method, then the sysctl attempt will fail. If you remove a tcp congestion control module, then you will get the next -available one. Since reno can not be built as a module, and can not be +available one. Since reno cannot be built as a module, and cannot be deleted, it will always be available. How the new TCP output machine [nyi] works. diff --git a/Documentation/pm.txt b/Documentation/pm.txt index 79c0f32a760..da8589a0e07 100644 --- a/Documentation/pm.txt +++ b/Documentation/pm.txt @@ -18,10 +18,10 @@ enabled by default). If a working ACPI implementation is found, the ACPI driver will override and disable APM, otherwise the APM driver will be used. -No sorry, you can not have both ACPI and APM enabled and running at +No, sorry, you cannot have both ACPI and APM enabled and running at once. Some people with broken ACPI or broken APM implementations would like to use both to get a full set of working features, but you -simply can not mix and match the two. Only one power management +simply cannot mix and match the two. Only one power management interface can be in control of the machine at once. Think about it.. User-space Daemons @@ -106,7 +106,7 @@ void pm_unregister_all(pm_callback cback); * * Returns: 0 if the request is successful * EINVAL if the request is not supported - * EBUSY if the device is now busy and can not handle the request + * EBUSY if the device is now busy and cannot handle the request * ENOMEM if the device was unable to handle the request due to memory * * Details: The device request callback will be called before the diff --git a/Documentation/pnp.txt b/Documentation/pnp.txt index 9529c9c9fd5..9ff966bf76e 100644 --- a/Documentation/pnp.txt +++ b/Documentation/pnp.txt @@ -222,7 +222,7 @@ static struct pnp_driver serial_pnp_driver = { .remove = serial_pnp_remove, }; -* name and id_table can not be NULL. +* name and id_table cannot be NULL. 4.) register the driver ex: diff --git a/Documentation/s390/cds.txt b/Documentation/s390/cds.txt index b2acf4b6434..265a313456e 100644 --- a/Documentation/s390/cds.txt +++ b/Documentation/s390/cds.txt @@ -143,7 +143,7 @@ During its startup the Linux/390 system checks for peripheral devices. Each of those devices is uniquely defined by a so called subchannel by the ESA/390 channel subsystem. While the subchannel numbers are system generated, each subchannel also takes a user defined attribute, the so called device number. -Both subchannel number and device number can not exceed 65535. During driverfs +Both subchannel number and device number cannot exceed 65535. During driverfs initialisation, the information about control unit type and device types that imply specific I/O commands (channel command words - CCWs) in order to operate the device are gathered. Device drivers can retrieve this set of hardware diff --git a/Documentation/scsi/aic7xxx_old.txt b/Documentation/scsi/aic7xxx_old.txt index 433e942a24e..1c8c69b8c46 100644 --- a/Documentation/scsi/aic7xxx_old.txt +++ b/Documentation/scsi/aic7xxx_old.txt @@ -102,7 +102,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD The hardware RAID devices sold by Adaptec are *NOT* supported by this driver (and will people please stop emailing me about them, they are a totally separate beast from the bare SCSI controllers and this driver - can not be retrofitted in any sane manner to support the hardware RAID + cannot be retrofitted in any sane manner to support the hardware RAID features on those cards - Doug Ledford). diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index e409e5d0748..02a481225b0 100644 --- a/Documentation/stable_kernel_rules.txt +++ b/Documentation/stable_kernel_rules.txt @@ -4,7 +4,7 @@ Rules on what kind of patches are accepted, and which ones are not, into the "-stable" tree: - It must be obviously correct and tested. - - It can not be bigger than 100 lines, with context. + - It cannot be bigger than 100 lines, with context. - It must fix only one thing. - It must fix a real bug that bothers people (not a, "This could be a problem..." type thing). @@ -14,7 +14,7 @@ Rules on what kind of patches are accepted, and which ones are not, into the critical. - No "theoretical race condition" issues, unless an explanation of how the race can be exploited is also provided. - - It can not contain any "trivial" fixes in it (spelling changes, + - It cannot contain any "trivial" fixes in it (spelling changes, whitespace cleanups, etc). - It must be accepted by the relevant subsystem maintainer. - It must follow the Documentation/SubmittingPatches rules. diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt index dc944017011..d9c8c11e471 100644 --- a/Documentation/uml/UserModeLinux-HOWTO.txt +++ b/Documentation/uml/UserModeLinux-HOWTO.txt @@ -3972,7 +3972,7 @@ nneett If you can connect to the host, and the host can connect to UML, but - you can not connect to any other machines, then you may need to enable + you cannot connect to any other machines, then you may need to enable IP Masquerading on the host. Usually this is only experienced when using private IP addresses (192.168.x.x or 10.x.x.x) for host/UML networking, rather than the public address space that your host is diff --git a/Documentation/video4linux/et61x251.txt b/Documentation/video4linux/et61x251.txt index b65aa0fa184..1bdee8f85b9 100644 --- a/Documentation/video4linux/et61x251.txt +++ b/Documentation/video4linux/et61x251.txt @@ -222,7 +222,7 @@ identifier - of the camera registered as "/dev/video0": [root@localhost #] echo 1 > i2c_reg [root@localhost #] cat i2c_val -Note that if the sensor registers can not be read, "cat" will fail. +Note that if the sensor registers cannot be read, "cat" will fail. To avoid race conditions, all the I/O accesses to the files are serialized. diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt index b705a0244d8..7e8ae83e984 100644 --- a/Documentation/watchdog/watchdog-api.txt +++ b/Documentation/watchdog/watchdog-api.txt @@ -258,13 +258,13 @@ booke_wdt.c -- PowerPC BookE Watchdog Timer Timeout default varies according to frequency, supports SETTIMEOUT - Watchdog can not be turned off, CONFIG_WATCHDOG_NOWAYOUT + Watchdog cannot be turned off, CONFIG_WATCHDOG_NOWAYOUT does not make sense GETSUPPORT returns the watchdog_info struct, and GETSTATUS returns the supported options. GETBOOTSTATUS returns a 1 if the last reset was caused by the - watchdog and a 0 otherwise. This watchdog can not be + watchdog and a 0 otherwise. This watchdog cannot be disabled once it has been started. The wdt_period kernel parameter selects which bit of the time base changing from 0->1 will trigger the watchdog exception. Changing diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f9362ee9955..adb05de40e2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -629,7 +629,7 @@ config ALIGNMENT_TRAP depends on CPU_CP15_MMU default y if !ARCH_EBSA110 help - ARM processors can not fetch/store information which is not + ARM processors cannot fetch/store information which is not naturally aligned on the bus, i.e., a 4 byte fetch must start at an address divisible by 4. On 32-bit ARM processors, these non-aligned fetch/store instructions will be emulated in software if you say diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 8ee2ca1fdab..c6dfb6fa13b 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -85,7 +85,7 @@ config CHR_DEV_OSST tristate "SCSI OnStream SC-x0 tape support" depends on SCSI ---help--- - The OnStream SC-x0 SCSI tape drives can not be driven by the + The OnStream SC-x0 SCSI tape drives cannot be driven by the standard st driver, but instead need this special osst driver and use the /dev/osstX char device nodes (major 206). Via usb-storage and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives diff --git a/mm/Kconfig b/mm/Kconfig index f10fe51985a..db7c55de92c 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -92,7 +92,7 @@ config HAVE_MEMORY_PRESENT # # SPARSEMEM_EXTREME (which is the default) does some bootmem -# allocations when memory_present() is called. If this can not +# allocations when memory_present() is called. If this cannot # be done on your architecture, select this option. However, # statically allocating the mem_section[] array can potentially # consume vast quantities of .bss, so be careful.