diff options
-rw-r--r-- | arch/arm/mach-s3c2410/Kconfig | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/85xx/Kconfig | 14 | ||||
-rw-r--r-- | arch/xtensa/Kconfig | 4 | ||||
-rw-r--r-- | drivers/infiniband/ulp/ipoib/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/atm/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/Kconfig | 2 | ||||
-rw-r--r-- | fs/Kconfig | 2 | ||||
-rw-r--r-- | fs/cifs/README | 6 | ||||
-rw-r--r-- | net/ipv4/Kconfig | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/Kconfig | 2 | ||||
-rw-r--r-- | 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 | |||
13 | bool "Simtec Electronics ANUBIS" | 13 | bool "Simtec Electronics ANUBIS" |
14 | select CPU_S3C2440 | 14 | select CPU_S3C2440 |
15 | help | 15 | help |
16 | Say Y gere if you are using the Simtec Electronics ANUBIS | 16 | Say Y here if you are using the Simtec Electronics ANUBIS |
17 | development system | 17 | development system |
18 | 18 | ||
19 | config MACH_OSIRIS | 19 | 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 | |||
24 | config MPC8548_CDS | 24 | config MPC8548_CDS |
25 | bool "Freescale MPC8548 CDS" | 25 | bool "Freescale MPC8548 CDS" |
26 | help | 26 | help |
27 | This option enablese support for the MPC8548 CDS evaluation board. | 27 | This option enables support for the MPC8548 CDS evaluation board. |
28 | 28 | ||
29 | config MPC8555_CDS | 29 | config MPC8555_CDS |
30 | bool "Freescale MPC8555 CDS" | 30 | bool "Freescale MPC8555 CDS" |
31 | help | 31 | help |
32 | This option enablese support for the MPC8555 CDS evaluation board. | 32 | This option enables support for the MPC8555 CDS evaluation board. |
33 | 33 | ||
34 | config MPC8560_ADS | 34 | config MPC8560_ADS |
35 | bool "Freescale MPC8560 ADS" | 35 | bool "Freescale MPC8560 ADS" |
@@ -51,22 +51,22 @@ config STX_GP3 | |||
51 | config TQM8540 | 51 | config TQM8540 |
52 | bool "TQ Components TQM8540" | 52 | bool "TQ Components TQM8540" |
53 | help | 53 | help |
54 | This option enablese support for the TQ Components TQM8540 board. | 54 | This option enables support for the TQ Components TQM8540 board. |
55 | 55 | ||
56 | config TQM8541 | 56 | config TQM8541 |
57 | bool "TQ Components TQM8541" | 57 | bool "TQ Components TQM8541" |
58 | help | 58 | help |
59 | This option enablese support for the TQ Components TQM8541 board. | 59 | This option enables support for the TQ Components TQM8541 board. |
60 | 60 | ||
61 | config TQM8555 | 61 | config TQM8555 |
62 | bool "TQ Components TQM8555" | 62 | bool "TQ Components TQM8555" |
63 | help | 63 | help |
64 | This option enablese support for the TQ Components TQM8555 board. | 64 | This option enables support for the TQ Components TQM8555 board. |
65 | 65 | ||
66 | config TQM8560 | 66 | config TQM8560 |
67 | bool "TQ Components TQM8560" | 67 | bool "TQ Components TQM8560" |
68 | help | 68 | help |
69 | This option enablese support for the TQ Components TQM8560 board. | 69 | This option enables support for the TQ Components TQM8560 board. |
70 | 70 | ||
71 | endchoice | 71 | endchoice |
72 | 72 | ||
@@ -94,7 +94,7 @@ config MPC8560 | |||
94 | default y | 94 | default y |
95 | 95 | ||
96 | config 85xx_PCI2 | 96 | config 85xx_PCI2 |
97 | bool "Supprt for 2nd PCI host controller" | 97 | bool "Support for 2nd PCI host controller" |
98 | depends on MPC8555_CDS | 98 | depends on MPC8555_CDS |
99 | default y | 99 | default y |
100 | 100 | ||
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" | |||
206 | 206 | ||
207 | endmenu | 207 | endmenu |
208 | 208 | ||
209 | menu "Exectuable file formats" | 209 | menu "Executable file formats" |
210 | 210 | ||
211 | # only elf supported | 211 | # only elf supported |
212 | config KCORE_ELF | 212 | config KCORE_ELF |
@@ -241,7 +241,7 @@ menu "Xtensa initrd options" | |||
241 | bool "Embed root filesystem ramdisk into the kernel" | 241 | bool "Embed root filesystem ramdisk into the kernel" |
242 | 242 | ||
243 | config EMBEDDED_RAMDISK_IMAGE | 243 | config EMBEDDED_RAMDISK_IMAGE |
244 | string "Filename of gziped ramdisk image" | 244 | string "Filename of gzipped ramdisk image" |
245 | depends on EMBEDDED_RAMDISK | 245 | depends on EMBEDDED_RAMDISK |
246 | default "ramdisk.gz" | 246 | default "ramdisk.gz" |
247 | help | 247 | 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 | |||
26 | bool "IP-over-InfiniBand data path debugging" | 26 | bool "IP-over-InfiniBand data path debugging" |
27 | depends on INFINIBAND_IPOIB_DEBUG | 27 | depends on INFINIBAND_IPOIB_DEBUG |
28 | ---help--- | 28 | ---help--- |
29 | This option compiles debugging code into the the data path | 29 | This option compiles debugging code into the data path |
30 | of the IPoIB driver. The output can be turned on via the | 30 | of the IPoIB driver. The output can be turned on via the |
31 | data_debug_level module parameter; however, even with output | 31 | data_debug_level module parameter; however, even with output |
32 | turned off, this debugging code will have some performance | 32 | 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 | |||
69 | depends on VIDEO_CX88_DVB && DVB_MT352 | 69 | depends on VIDEO_CX88_DVB && DVB_MT352 |
70 | ---help--- | 70 | ---help--- |
71 | This adds DVB-T support for cards based on the | 71 | This adds DVB-T support for cards based on the |
72 | Connexant 2388x chip and the MT352 demodulator, | 72 | Conexant 2388x chip and the MT352 demodulator, |
73 | which also require support for the VP-3054 | 73 | which also require support for the VP-3054 |
74 | Secondary I2C bus, such at DNTV Live! DVB-T Pro. | 74 | 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 | |||
2115 | depends on PCI && EXPERIMENTAL | 2115 | depends on PCI && EXPERIMENTAL |
2116 | select CRC32 | 2116 | select CRC32 |
2117 | ---help--- | 2117 | ---help--- |
2118 | This driver supports Gigabit Ethernet adapters based on the the | 2118 | This driver supports Gigabit Ethernet adapters based on the |
2119 | Marvell Yukon 2 chipset: | 2119 | Marvell Yukon 2 chipset: |
2120 | Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ | 2120 | Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ |
2121 | 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 | 2121 | 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 | |||
157 | tristate "RPA PCI Hotplug driver" | 157 | tristate "RPA PCI Hotplug driver" |
158 | depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE | 158 | depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE |
159 | help | 159 | help |
160 | Say Y here if you have a a RPA system that supports PCI Hotplug. | 160 | Say Y here if you have a RPA system that supports PCI Hotplug. |
161 | 161 | ||
162 | To compile this driver as a module, choose M here: the | 162 | To compile this driver as a module, choose M here: the |
163 | module will be called rpaphp. | 163 | 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 | |||
64 | Say Y here if you have a DSL USB modem not explicitly supported by | 64 | Say Y here if you have a DSL USB modem not explicitly supported by |
65 | another USB DSL drivers. In order to use your modem you will need to | 65 | another USB DSL drivers. In order to use your modem you will need to |
66 | pass the vendor ID, product ID, and endpoint numbers for transmission | 66 | pass the vendor ID, product ID, and endpoint numbers for transmission |
67 | and reception as module parameters. You may need to initialize the | 67 | and reception as module parameters. You may need to initialize |
68 | the modem using a user space utility (a firmware loader for example). | 68 | the modem using a user space utility (a firmware loader for example). |
69 | 69 | ||
70 | To compile this driver as a module, choose M here: the | 70 | 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 @@ | |||
7 | # | 7 | # |
8 | # - Host systems (like PCs) need CONFIG_USB (with "A" jacks). | 8 | # - Host systems (like PCs) need CONFIG_USB (with "A" jacks). |
9 | # - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks). | 9 | # - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks). |
10 | # - Some systems have both kinds of of controller. | 10 | # - Some systems have both kinds of controllers. |
11 | # | 11 | # |
12 | # With help from a special transceiver and a "Mini-AB" jack, systems with | 12 | # With help from a special transceiver and a "Mini-AB" jack, systems with |
13 | # both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG). | 13 | # 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 | |||
188 | bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC" | 188 | bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC" |
189 | help | 189 | help |
190 | This is an implementation of the Sharp LQ035Q7DB02, a 3.5" | 190 | This is an implementation of the Sharp LQ035Q7DB02, a 3.5" |
191 | color QVGA, HRTFT panel. The LogicPD device includes an | 191 | color QVGA, HRTFT panel. The LogicPD device includes |
192 | an integrated HRTFT controller IC. | 192 | an integrated HRTFT controller IC. |
193 | The native resolution is 240x320. | 193 | The native resolution is 240x320. |
194 | 194 | ||
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 | |||
1365 | 1365 | ||
1366 | If you have floppies or hard disk partitions like that, it is likely | 1366 | If you have floppies or hard disk partitions like that, it is likely |
1367 | that they contain binaries from those other Unix systems; in order | 1367 | that they contain binaries from those other Unix systems; in order |
1368 | to run these binaries, you will want to install linux-abi which is a | 1368 | to run these binaries, you will want to install linux-abi which is |
1369 | a set of kernel modules that lets you run SCO, Xenix, Wyse, | 1369 | a set of kernel modules that lets you run SCO, Xenix, Wyse, |
1370 | UnixWare, Dell Unix and System V programs under Linux. It is | 1370 | UnixWare, Dell Unix and System V programs under Linux. It is |
1371 | available via FTP (user: ftp) from | 1371 | 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: | |||
269 | (gid) mount option is specified. For the uid (gid) of newly | 269 | (gid) mount option is specified. For the uid (gid) of newly |
270 | created files and directories, ie files created since | 270 | created files and directories, ie files created since |
271 | the last mount of the server share, the expected uid | 271 | the last mount of the server share, the expected uid |
272 | (gid) is cached as as long as the inode remains in | 272 | (gid) is cached as long as the inode remains in |
273 | memory on the client. Also note that permission | 273 | memory on the client. Also note that permission |
274 | checks (authorization checks) on accesses to a file occur | 274 | checks (authorization checks) on accesses to a file occur |
275 | at the server, but there are cases in which an administrator | 275 | at the server, but there are cases in which an administrator |
@@ -375,7 +375,7 @@ A partial list of the supported mount options follows: | |||
375 | the local process on newly created files, directories, and | 375 | the local process on newly created files, directories, and |
376 | devices (create, mkdir, mknod). If the CIFS Unix Extensions | 376 | devices (create, mkdir, mknod). If the CIFS Unix Extensions |
377 | are not negotiated, for newly created files and directories | 377 | are not negotiated, for newly created files and directories |
378 | instead of using the default uid and gid specified on the | 378 | instead of using the default uid and gid specified on |
379 | the mount, cache the new file's uid and gid locally which means | 379 | the mount, cache the new file's uid and gid locally which means |
380 | that the uid for the file can change when the inode is | 380 | that the uid for the file can change when the inode is |
381 | reloaded (or the user remounts the share). | 381 | reloaded (or the user remounts the share). |
@@ -440,7 +440,7 @@ A partial list of the supported mount options follows: | |||
440 | create device files and fifos in a format compatible with | 440 | create device files and fifos in a format compatible with |
441 | Services for Unix (SFU). In addition retrieve bits 10-12 | 441 | Services for Unix (SFU). In addition retrieve bits 10-12 |
442 | of the mode via the SETFILEBITS extended attribute (as | 442 | of the mode via the SETFILEBITS extended attribute (as |
443 | SFU does). In the future the bottom 9 bits of the mode | 443 | SFU does). In the future the bottom 9 bits of the |
444 | mode also will be emulated using queries of the security | 444 | mode also will be emulated using queries of the security |
445 | descriptor (ACL). | 445 | descriptor (ACL). |
446 | sign Must use packet signing (helps avoid unwanted data modification | 446 | 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 | |||
556 | default n | 556 | default n |
557 | ---help--- | 557 | ---help--- |
558 | TCP Low Priority (TCP-LP), a distributed algorithm whose goal is | 558 | TCP Low Priority (TCP-LP), a distributed algorithm whose goal is |
559 | to utiliza only the excess network bandwidth as compared to the | 559 | to utilize only the excess network bandwidth as compared to the |
560 | ``fair share`` of bandwidth as targeted by TCP. | 560 | ``fair share`` of bandwidth as targeted by TCP. |
561 | See http://www-ece.rice.edu/networks/TCP-LP/ | 561 | See http://www-ece.rice.edu/networks/TCP-LP/ |
562 | 562 | ||
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 | |||
204 | connections to the server with the shortest expected delay. The | 204 | connections to the server with the shortest expected delay. The |
205 | expected delay that the job will experience is (Ci + 1) / Ui if | 205 | expected delay that the job will experience is (Ci + 1) / Ui if |
206 | sent to the ith server, in which Ci is the number of connections | 206 | sent to the ith server, in which Ci is the number of connections |
207 | on the the ith server and Ui is the fixed service rate (weight) | 207 | on the ith server and Ui is the fixed service rate (weight) |
208 | of the ith server. | 208 | of the ith server. |
209 | 209 | ||
210 | If you want to compile it in kernel, say Y. To compile it as a | 210 | 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 | |||
122 | well as any conntrack helpers for protocols which you | 122 | well as any conntrack helpers for protocols which you |
123 | wish to control. | 123 | wish to control. |
124 | 124 | ||
125 | If you are unsure what do do here, select N. | 125 | If you are unsure what to do here, select N. |
126 | 126 | ||
127 | config SECURITY_SELINUX_POLICYDB_VERSION_MAX | 127 | config SECURITY_SELINUX_POLICYDB_VERSION_MAX |
128 | bool "NSA SELinux maximum supported policy format version" | 128 | bool "NSA SELinux maximum supported policy format version" |