diff options
author | Matt LaPlante <kernel1@cyberdogtech.com> | 2006-10-03 16:53:09 -0400 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-10-03 16:53:09 -0400 |
commit | 84eb8d0608af1576175307ed8fb3c8fde329e579 (patch) | |
tree | 13f3223e6907ebe309328d460fe51ce7ac346ae1 /Documentation | |
parent | 992caacf1141b31e94540eb31e0540e3da3a5e25 (diff) |
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 <kernel1@cyberdogtech.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DMA-mapping.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/proc.txt | 2 | ||||
-rw-r--r-- | Documentation/highuid.txt | 2 | ||||
-rw-r--r-- | Documentation/ioctl/hdio.txt | 2 | ||||
-rw-r--r-- | Documentation/java.txt | 2 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 4 | ||||
-rw-r--r-- | Documentation/mono.txt | 2 | ||||
-rw-r--r-- | Documentation/networking/arcnet-hardware.txt | 2 | ||||
-rw-r--r-- | Documentation/networking/cs89x0.txt | 2 | ||||
-rw-r--r-- | Documentation/networking/netconsole.txt | 2 | ||||
-rw-r--r-- | Documentation/networking/sk98lin.txt | 4 | ||||
-rw-r--r-- | Documentation/networking/skfp.txt | 4 | ||||
-rw-r--r-- | Documentation/networking/tcp.txt | 2 | ||||
-rw-r--r-- | Documentation/pm.txt | 6 | ||||
-rw-r--r-- | Documentation/pnp.txt | 2 | ||||
-rw-r--r-- | Documentation/s390/cds.txt | 2 | ||||
-rw-r--r-- | Documentation/scsi/aic7xxx_old.txt | 2 | ||||
-rw-r--r-- | Documentation/stable_kernel_rules.txt | 4 | ||||
-rw-r--r-- | Documentation/uml/UserModeLinux-HOWTO.txt | 2 | ||||
-rw-r--r-- | Documentation/video4linux/et61x251.txt | 2 | ||||
-rw-r--r-- | Documentation/watchdog/watchdog-api.txt | 4 |
21 files changed, 28 insertions, 28 deletions
diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt index 63392c9132b4..1d8dccf04e79 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 | |||
117 | device supports. It returns zero if your card can perform DMA | 117 | device supports. It returns zero if your card can perform DMA |
118 | properly on the machine given the address mask you provided. | 118 | properly on the machine given the address mask you provided. |
119 | 119 | ||
120 | If it returns non-zero, your device can not perform DMA properly on | 120 | If it returns non-zero, your device cannot perform DMA properly on |
121 | this platform, and attempting to do so will result in undefined | 121 | this platform, and attempting to do so will result in undefined |
122 | behavior. You must either use a different mask, or not use DMA. | 122 | behavior. You must either use a different mask, or not use DMA. |
123 | 123 | ||
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 8d6590d5f35d..59763d695b14 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -1733,7 +1733,7 @@ error_burst and error_cost | |||
1733 | 1733 | ||
1734 | These parameters are used to limit how many ICMP destination unreachable to | 1734 | These parameters are used to limit how many ICMP destination unreachable to |
1735 | send from the host in question. ICMP destination unreachable messages are | 1735 | send from the host in question. ICMP destination unreachable messages are |
1736 | sent when we can not reach the next hop, while trying to transmit a packet. | 1736 | sent when we cannot reach the next hop while trying to transmit a packet. |
1737 | It will also print some error messages to kernel logs if someone is ignoring | 1737 | It will also print some error messages to kernel logs if someone is ignoring |
1738 | our ICMP redirects. The higher the error_cost factor is, the fewer | 1738 | our ICMP redirects. The higher the error_cost factor is, the fewer |
1739 | destination unreachable and error messages will be let through. Error_burst | 1739 | destination unreachable and error messages will be let through. Error_burst |
diff --git a/Documentation/highuid.txt b/Documentation/highuid.txt index 2c33926b9099..76034d9dbfc0 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: | |||
57 | 57 | ||
58 | Other filesystems have not been checked yet. | 58 | Other filesystems have not been checked yet. |
59 | 59 | ||
60 | - The ncpfs and smpfs filesystems can not presently use 32-bit UIDs in | 60 | - The ncpfs and smpfs filesystems cannot presently use 32-bit UIDs in |
61 | all ioctl()s. Some new ioctl()s have been added with 32-bit UIDs, but | 61 | all ioctl()s. Some new ioctl()s have been added with 32-bit UIDs, but |
62 | more are needed. (as well as new user<->kernel data structures) | 62 | more are needed. (as well as new user<->kernel data structures) |
63 | 63 | ||
diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt index 11c9be49f37c..c19efdeace2c 100644 --- a/Documentation/ioctl/hdio.txt +++ b/Documentation/ioctl/hdio.txt | |||
@@ -203,7 +203,7 @@ HDIO_SET_MULTCOUNT change IDE blockmode | |||
203 | 203 | ||
204 | Source code comments read: | 204 | Source code comments read: |
205 | 205 | ||
206 | This is tightly woven into the driver->do_special can not | 206 | This is tightly woven into the driver->do_special cannot |
207 | touch. DON'T do it again until a total personality rewrite | 207 | touch. DON'T do it again until a total personality rewrite |
208 | is committed. | 208 | is committed. |
209 | 209 | ||
diff --git a/Documentation/java.txt b/Documentation/java.txt index e4814c213301..c768dc63b34e 100644 --- a/Documentation/java.txt +++ b/Documentation/java.txt | |||
@@ -22,7 +22,7 @@ other program after you have done the following: | |||
22 | the kernel (CONFIG_BINFMT_MISC) and set it up properly. | 22 | the kernel (CONFIG_BINFMT_MISC) and set it up properly. |
23 | If you choose to compile it as a module, you will have | 23 | If you choose to compile it as a module, you will have |
24 | to insert it manually with modprobe/insmod, as kmod | 24 | to insert it manually with modprobe/insmod, as kmod |
25 | can not easily be supported with binfmt_misc. | 25 | cannot easily be supported with binfmt_misc. |
26 | Read the file 'binfmt_misc.txt' in this directory to know | 26 | Read the file 'binfmt_misc.txt' in this directory to know |
27 | more about the configuration process. | 27 | more about the configuration process. |
28 | 28 | ||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index aa21c66fbff0..456d18b25223 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 | |||
611 | noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing | 611 | noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing |
612 | 612 | ||
613 | i8042.direct [HW] Put keyboard port into non-translated mode | 613 | i8042.direct [HW] Put keyboard port into non-translated mode |
614 | i8042.dumbkbd [HW] Pretend that controlled can only read data from | 614 | i8042.dumbkbd [HW] Pretend that controller can only read data from |
615 | keyboard and can not control its state | 615 | keyboard and cannot control its state |
616 | (Don't attempt to blink the leds) | 616 | (Don't attempt to blink the leds) |
617 | i8042.noaux [HW] Don't check for auxiliary (== mouse) port | 617 | i8042.noaux [HW] Don't check for auxiliary (== mouse) port |
618 | i8042.nokbd [HW] Don't check/create keyboard port | 618 | i8042.nokbd [HW] Don't check/create keyboard port |
diff --git a/Documentation/mono.txt b/Documentation/mono.txt index 807a0c7b4737..e8e1758e87da 100644 --- a/Documentation/mono.txt +++ b/Documentation/mono.txt | |||
@@ -26,7 +26,7 @@ other program after you have done the following: | |||
26 | the kernel (CONFIG_BINFMT_MISC) and set it up properly. | 26 | the kernel (CONFIG_BINFMT_MISC) and set it up properly. |
27 | If you choose to compile it as a module, you will have | 27 | If you choose to compile it as a module, you will have |
28 | to insert it manually with modprobe/insmod, as kmod | 28 | to insert it manually with modprobe/insmod, as kmod |
29 | can not be easily supported with binfmt_misc. | 29 | cannot be easily supported with binfmt_misc. |
30 | Read the file 'binfmt_misc.txt' in this directory to know | 30 | Read the file 'binfmt_misc.txt' in this directory to know |
31 | more about the configuration process. | 31 | more about the configuration process. |
32 | 32 | ||
diff --git a/Documentation/networking/arcnet-hardware.txt b/Documentation/networking/arcnet-hardware.txt index 30a5f01403d3..731de411513c 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: | |||
139 | 139 | ||
140 | 5. An active hub to passive hub. | 140 | 5. An active hub to passive hub. |
141 | 141 | ||
142 | Remember, that you can not connect two passive hubs together. The power loss | 142 | Remember that you cannot connect two passive hubs together. The power loss |
143 | implied by such a connection is too high for the net to operate reliably. | 143 | implied by such a connection is too high for the net to operate reliably. |
144 | 144 | ||
145 | An example of a typical ARCnet network: | 145 | An example of a typical ARCnet network: |
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt index 0371ced334c2..f1f9e8afe1eb 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: | |||
584 | 584 | ||
585 | 1.) The system does not boot properly (or at all). | 585 | 1.) The system does not boot properly (or at all). |
586 | 586 | ||
587 | 2.) The driver can not communicate with the adapter, reporting an "Adapter | 587 | 2.) The driver cannot communicate with the adapter, reporting an "Adapter |
588 | not found" error message. | 588 | not found" error message. |
589 | 589 | ||
590 | 3.) You cannot connect to the network or the driver will not load. | 590 | 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 53618fb1a717..1caa6c734691 100644 --- a/Documentation/networking/netconsole.txt +++ b/Documentation/networking/netconsole.txt | |||
@@ -52,6 +52,6 @@ messages is high, but should have no other impact. | |||
52 | Netconsole was designed to be as instantaneous as possible, to | 52 | Netconsole was designed to be as instantaneous as possible, to |
53 | enable the logging of even the most critical kernel bugs. It works | 53 | enable the logging of even the most critical kernel bugs. It works |
54 | from IRQ contexts as well, and does not enable interrupts while | 54 | from IRQ contexts as well, and does not enable interrupts while |
55 | sending packets. Due to these unique needs, configuration can not | 55 | sending packets. Due to these unique needs, configuration cannot |
56 | be more automatic, and some fundamental limitations will remain: | 56 | be more automatic, and some fundamental limitations will remain: |
57 | only IP networks, UDP packets and ethernet devices are supported. | 57 | only IP networks, UDP packets and ethernet devices are supported. |
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt index 817fc113d93b..82ce5547db47 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 | |||
484 | following list: | 484 | following list: |
485 | 485 | ||
486 | 486 | ||
487 | Problem: The SK-98xx adapter can not be found by the driver. | 487 | Problem: The SK-98xx adapter cannot be found by the driver. |
488 | Solution: In /proc/pci search for the following entry: | 488 | Solution: In /proc/pci search for the following entry: |
489 | 'Ethernet controller: SysKonnect SK-98xx ...' | 489 | 'Ethernet controller: SysKonnect SK-98xx ...' |
490 | If this entry exists, the SK-98xx or SK-98xx V2.0 adapter has | 490 | 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: | |||
502 | web, e.g. at 'www.linux.org'). | 502 | web, e.g. at 'www.linux.org'). |
503 | 503 | ||
504 | 504 | ||
505 | Problem: Programs such as 'ifconfig' or 'route' can not be found or the | 505 | Problem: Programs such as 'ifconfig' or 'route' cannot be found or the |
506 | error message 'Operation not permitted' is displayed. | 506 | error message 'Operation not permitted' is displayed. |
507 | Reason: You are not logged in as user 'root'. | 507 | Reason: You are not logged in as user 'root'. |
508 | Solution: Logout and login as 'root' or change to 'root' via 'su'. | 508 | 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 3a419ed42f81..abfddf81e34a 100644 --- a/Documentation/networking/skfp.txt +++ b/Documentation/networking/skfp.txt | |||
@@ -81,7 +81,7 @@ Makes my life much easier :-) | |||
81 | 81 | ||
82 | If you run into problems during installation, check those items: | 82 | If you run into problems during installation, check those items: |
83 | 83 | ||
84 | Problem: The FDDI adapter can not be found by the driver. | 84 | Problem: The FDDI adapter cannot be found by the driver. |
85 | Reason: Look in /proc/pci for the following entry: | 85 | Reason: Look in /proc/pci for the following entry: |
86 | 'FDDI network controller: SysKonnect SK-FDDI-PCI ...' | 86 | 'FDDI network controller: SysKonnect SK-FDDI-PCI ...' |
87 | If this entry exists, then the FDDI adapter has been | 87 | If this entry exists, then the FDDI adapter has been |
@@ -99,7 +99,7 @@ Reason: Look in /proc/pci for the following entry: | |||
99 | 99 | ||
100 | Problem: You want to use your computer as a router between | 100 | Problem: You want to use your computer as a router between |
101 | multiple IP subnetworks (using multiple adapters), but | 101 | multiple IP subnetworks (using multiple adapters), but |
102 | you can not reach computers in other subnetworks. | 102 | you cannot reach computers in other subnetworks. |
103 | Reason: Either the router's kernel is not configured for IP | 103 | Reason: Either the router's kernel is not configured for IP |
104 | forwarding or there is a problem with the routing table | 104 | forwarding or there is a problem with the routing table |
105 | and gateway configuration in at least one of the | 105 | and gateway configuration in at least one of the |
diff --git a/Documentation/networking/tcp.txt b/Documentation/networking/tcp.txt index 0fa300425575..0121edc3ba06 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 | |||
62 | unknown congestion method, then the sysctl attempt will fail. | 62 | unknown congestion method, then the sysctl attempt will fail. |
63 | 63 | ||
64 | If you remove a tcp congestion control module, then you will get the next | 64 | If you remove a tcp congestion control module, then you will get the next |
65 | available one. Since reno can not be built as a module, and can not be | 65 | available one. Since reno cannot be built as a module, and cannot be |
66 | deleted, it will always be available. | 66 | deleted, it will always be available. |
67 | 67 | ||
68 | How the new TCP output machine [nyi] works. | 68 | How the new TCP output machine [nyi] works. |
diff --git a/Documentation/pm.txt b/Documentation/pm.txt index 79c0f32a760e..da8589a0e07d 100644 --- a/Documentation/pm.txt +++ b/Documentation/pm.txt | |||
@@ -18,10 +18,10 @@ enabled by default). If a working ACPI implementation is found, the | |||
18 | ACPI driver will override and disable APM, otherwise the APM driver | 18 | ACPI driver will override and disable APM, otherwise the APM driver |
19 | will be used. | 19 | will be used. |
20 | 20 | ||
21 | No sorry, you can not have both ACPI and APM enabled and running at | 21 | No, sorry, you cannot have both ACPI and APM enabled and running at |
22 | once. Some people with broken ACPI or broken APM implementations | 22 | once. Some people with broken ACPI or broken APM implementations |
23 | would like to use both to get a full set of working features, but you | 23 | would like to use both to get a full set of working features, but you |
24 | simply can not mix and match the two. Only one power management | 24 | simply cannot mix and match the two. Only one power management |
25 | interface can be in control of the machine at once. Think about it.. | 25 | interface can be in control of the machine at once. Think about it.. |
26 | 26 | ||
27 | User-space Daemons | 27 | User-space Daemons |
@@ -106,7 +106,7 @@ void pm_unregister_all(pm_callback cback); | |||
106 | * | 106 | * |
107 | * Returns: 0 if the request is successful | 107 | * Returns: 0 if the request is successful |
108 | * EINVAL if the request is not supported | 108 | * EINVAL if the request is not supported |
109 | * EBUSY if the device is now busy and can not handle the request | 109 | * EBUSY if the device is now busy and cannot handle the request |
110 | * ENOMEM if the device was unable to handle the request due to memory | 110 | * ENOMEM if the device was unable to handle the request due to memory |
111 | * | 111 | * |
112 | * Details: The device request callback will be called before the | 112 | * Details: The device request callback will be called before the |
diff --git a/Documentation/pnp.txt b/Documentation/pnp.txt index 9529c9c9fd59..9ff966bf76e6 100644 --- a/Documentation/pnp.txt +++ b/Documentation/pnp.txt | |||
@@ -222,7 +222,7 @@ static struct pnp_driver serial_pnp_driver = { | |||
222 | .remove = serial_pnp_remove, | 222 | .remove = serial_pnp_remove, |
223 | }; | 223 | }; |
224 | 224 | ||
225 | * name and id_table can not be NULL. | 225 | * name and id_table cannot be NULL. |
226 | 226 | ||
227 | 4.) register the driver | 227 | 4.) register the driver |
228 | ex: | 228 | ex: |
diff --git a/Documentation/s390/cds.txt b/Documentation/s390/cds.txt index b2acf4b6434f..265a313456ee 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 | |||
143 | of those devices is uniquely defined by a so called subchannel by the ESA/390 | 143 | of those devices is uniquely defined by a so called subchannel by the ESA/390 |
144 | channel subsystem. While the subchannel numbers are system generated, each | 144 | channel subsystem. While the subchannel numbers are system generated, each |
145 | subchannel also takes a user defined attribute, the so called device number. | 145 | subchannel also takes a user defined attribute, the so called device number. |
146 | Both subchannel number and device number can not exceed 65535. During driverfs | 146 | Both subchannel number and device number cannot exceed 65535. During driverfs |
147 | initialisation, the information about control unit type and device types that | 147 | initialisation, the information about control unit type and device types that |
148 | imply specific I/O commands (channel command words - CCWs) in order to operate | 148 | imply specific I/O commands (channel command words - CCWs) in order to operate |
149 | the device are gathered. Device drivers can retrieve this set of hardware | 149 | 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 433e942a24ec..1c8c69b8c465 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 | |||
102 | The hardware RAID devices sold by Adaptec are *NOT* supported by this | 102 | The hardware RAID devices sold by Adaptec are *NOT* supported by this |
103 | driver (and will people please stop emailing me about them, they are | 103 | driver (and will people please stop emailing me about them, they are |
104 | a totally separate beast from the bare SCSI controllers and this driver | 104 | a totally separate beast from the bare SCSI controllers and this driver |
105 | can not be retrofitted in any sane manner to support the hardware RAID | 105 | cannot be retrofitted in any sane manner to support the hardware RAID |
106 | features on those cards - Doug Ledford). | 106 | features on those cards - Doug Ledford). |
107 | 107 | ||
108 | 108 | ||
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index e409e5d07486..02a481225b0d 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 | |||
4 | "-stable" tree: | 4 | "-stable" tree: |
5 | 5 | ||
6 | - It must be obviously correct and tested. | 6 | - It must be obviously correct and tested. |
7 | - It can not be bigger than 100 lines, with context. | 7 | - It cannot be bigger than 100 lines, with context. |
8 | - It must fix only one thing. | 8 | - It must fix only one thing. |
9 | - It must fix a real bug that bothers people (not a, "This could be a | 9 | - It must fix a real bug that bothers people (not a, "This could be a |
10 | problem..." type thing). | 10 | problem..." type thing). |
@@ -14,7 +14,7 @@ Rules on what kind of patches are accepted, and which ones are not, into the | |||
14 | critical. | 14 | critical. |
15 | - No "theoretical race condition" issues, unless an explanation of how the | 15 | - No "theoretical race condition" issues, unless an explanation of how the |
16 | race can be exploited is also provided. | 16 | race can be exploited is also provided. |
17 | - It can not contain any "trivial" fixes in it (spelling changes, | 17 | - It cannot contain any "trivial" fixes in it (spelling changes, |
18 | whitespace cleanups, etc). | 18 | whitespace cleanups, etc). |
19 | - It must be accepted by the relevant subsystem maintainer. | 19 | - It must be accepted by the relevant subsystem maintainer. |
20 | - It must follow the Documentation/SubmittingPatches rules. | 20 | - It must follow the Documentation/SubmittingPatches rules. |
diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt index dc9440170119..d9c8c11e4710 100644 --- a/Documentation/uml/UserModeLinux-HOWTO.txt +++ b/Documentation/uml/UserModeLinux-HOWTO.txt | |||
@@ -3972,7 +3972,7 @@ | |||
3972 | nneett | 3972 | nneett |
3973 | 3973 | ||
3974 | If you can connect to the host, and the host can connect to UML, but | 3974 | If you can connect to the host, and the host can connect to UML, but |
3975 | you can not connect to any other machines, then you may need to enable | 3975 | you cannot connect to any other machines, then you may need to enable |
3976 | IP Masquerading on the host. Usually this is only experienced when | 3976 | IP Masquerading on the host. Usually this is only experienced when |
3977 | using private IP addresses (192.168.x.x or 10.x.x.x) for host/UML | 3977 | using private IP addresses (192.168.x.x or 10.x.x.x) for host/UML |
3978 | networking, rather than the public address space that your host is | 3978 | networking, rather than the public address space that your host is |
diff --git a/Documentation/video4linux/et61x251.txt b/Documentation/video4linux/et61x251.txt index b65aa0fa1848..1bdee8f85b9a 100644 --- a/Documentation/video4linux/et61x251.txt +++ b/Documentation/video4linux/et61x251.txt | |||
@@ -222,7 +222,7 @@ identifier - of the camera registered as "/dev/video0": | |||
222 | [root@localhost #] echo 1 > i2c_reg | 222 | [root@localhost #] echo 1 > i2c_reg |
223 | [root@localhost #] cat i2c_val | 223 | [root@localhost #] cat i2c_val |
224 | 224 | ||
225 | Note that if the sensor registers can not be read, "cat" will fail. | 225 | Note that if the sensor registers cannot be read, "cat" will fail. |
226 | To avoid race conditions, all the I/O accesses to the files are serialized. | 226 | To avoid race conditions, all the I/O accesses to the files are serialized. |
227 | 227 | ||
228 | 228 | ||
diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt index b705a0244d88..7e8ae83e9847 100644 --- a/Documentation/watchdog/watchdog-api.txt +++ b/Documentation/watchdog/watchdog-api.txt | |||
@@ -258,13 +258,13 @@ booke_wdt.c -- PowerPC BookE Watchdog Timer | |||
258 | Timeout default varies according to frequency, supports | 258 | Timeout default varies according to frequency, supports |
259 | SETTIMEOUT | 259 | SETTIMEOUT |
260 | 260 | ||
261 | Watchdog can not be turned off, CONFIG_WATCHDOG_NOWAYOUT | 261 | Watchdog cannot be turned off, CONFIG_WATCHDOG_NOWAYOUT |
262 | does not make sense | 262 | does not make sense |
263 | 263 | ||
264 | GETSUPPORT returns the watchdog_info struct, and | 264 | GETSUPPORT returns the watchdog_info struct, and |
265 | GETSTATUS returns the supported options. GETBOOTSTATUS | 265 | GETSTATUS returns the supported options. GETBOOTSTATUS |
266 | returns a 1 if the last reset was caused by the | 266 | returns a 1 if the last reset was caused by the |
267 | watchdog and a 0 otherwise. This watchdog can not be | 267 | watchdog and a 0 otherwise. This watchdog cannot be |
268 | disabled once it has been started. The wdt_period kernel | 268 | disabled once it has been started. The wdt_period kernel |
269 | parameter selects which bit of the time base changing | 269 | parameter selects which bit of the time base changing |
270 | from 0->1 will trigger the watchdog exception. Changing | 270 | from 0->1 will trigger the watchdog exception. Changing |