diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/Kconfig | 2 | ||||
-rw-r--r-- | net/ipv6/Kconfig | 18 | ||||
-rw-r--r-- | net/mac80211/Kconfig | 2 | ||||
-rw-r--r-- | net/netfilter/Kconfig | 2 | ||||
-rw-r--r-- | net/phonet/Kconfig | 2 | ||||
-rw-r--r-- | net/sunrpc/Kconfig | 2 | ||||
-rw-r--r-- | net/wimax/Kconfig | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/net/Kconfig b/net/Kconfig index ec93e7e38b38..ce77db4fcec8 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -140,7 +140,7 @@ config NETFILTER_ADVANCED | |||
140 | default y | 140 | default y |
141 | help | 141 | help |
142 | If you say Y here you can select between all the netfilter modules. | 142 | If you say Y here you can select between all the netfilter modules. |
143 | If you say N the more ununsual ones will not be shown and the | 143 | If you say N the more unusual ones will not be shown and the |
144 | basic ones needed by most people will default to 'M'. | 144 | basic ones needed by most people will default to 'M'. |
145 | 145 | ||
146 | If unsure, say Y. | 146 | If unsure, say Y. |
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index ec992159b5f8..ca8cb326d1d2 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
@@ -22,17 +22,17 @@ menuconfig IPV6 | |||
22 | if IPV6 | 22 | if IPV6 |
23 | 23 | ||
24 | config IPV6_PRIVACY | 24 | config IPV6_PRIVACY |
25 | bool "IPv6: Privacy Extensions support" | 25 | bool "IPv6: Privacy Extensions (RFC 3041) support" |
26 | ---help--- | 26 | ---help--- |
27 | Privacy Extensions for Stateless Address Autoconfiguration in IPv6 | 27 | Privacy Extensions for Stateless Address Autoconfiguration in IPv6 |
28 | support. With this option, additional periodically-alter | 28 | support. With this option, additional periodically-altered |
29 | pseudo-random global-scope unicast address(es) will assigned to | 29 | pseudo-random global-scope unicast address(es) will be assigned to |
30 | your interface(s). | 30 | your interface(s). |
31 | 31 | ||
32 | We use our standard pseudo random algorithm to generate randomized | 32 | We use our standard pseudo-random algorithm to generate the |
33 | interface identifier, instead of one described in RFC 3041. | 33 | randomized interface identifier, instead of one described in RFC 3041. |
34 | 34 | ||
35 | By default, kernel do not generate temporary addresses. | 35 | By default the kernel does not generate temporary addresses. |
36 | To use temporary addresses, do | 36 | To use temporary addresses, do |
37 | 37 | ||
38 | echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr | 38 | echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr |
@@ -43,9 +43,9 @@ config IPV6_ROUTER_PREF | |||
43 | bool "IPv6: Router Preference (RFC 4191) support" | 43 | bool "IPv6: Router Preference (RFC 4191) support" |
44 | ---help--- | 44 | ---help--- |
45 | Router Preference is an optional extension to the Router | 45 | Router Preference is an optional extension to the Router |
46 | Advertisement message to improve the ability of hosts | 46 | Advertisement message which improves the ability of hosts |
47 | to pick more appropriate router, especially when the hosts | 47 | to pick an appropriate router, especially when the hosts |
48 | is placed in a multi-homed network. | 48 | are placed in a multi-homed network. |
49 | 49 | ||
50 | If unsure, say N. | 50 | If unsure, say N. |
51 | 51 | ||
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index 60c16162474c..f3d9ae350fb6 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig | |||
@@ -33,7 +33,7 @@ choice | |||
33 | ---help--- | 33 | ---help--- |
34 | This option selects the default rate control algorithm | 34 | This option selects the default rate control algorithm |
35 | mac80211 will use. Note that this default can still be | 35 | mac80211 will use. Note that this default can still be |
36 | overriden through the ieee80211_default_rc_algo module | 36 | overridden through the ieee80211_default_rc_algo module |
37 | parameter if different algorithms are available. | 37 | parameter if different algorithms are available. |
38 | 38 | ||
39 | config MAC80211_RC_DEFAULT_PID | 39 | config MAC80211_RC_DEFAULT_PID |
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 2c967e4f706c..bb279bf59a1b 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
@@ -52,7 +52,7 @@ config NF_CT_ACCT | |||
52 | 52 | ||
53 | Please note that currently this option only sets a default state. | 53 | Please note that currently this option only sets a default state. |
54 | You may change it at boot time with nf_conntrack.acct=0/1 kernel | 54 | You may change it at boot time with nf_conntrack.acct=0/1 kernel |
55 | paramater or by loading the nf_conntrack module with acct=0/1. | 55 | parameter or by loading the nf_conntrack module with acct=0/1. |
56 | 56 | ||
57 | You may also disable/enable it on a running system with: | 57 | You may also disable/enable it on a running system with: |
58 | sysctl net.netfilter.nf_conntrack_acct=0/1 | 58 | sysctl net.netfilter.nf_conntrack_acct=0/1 |
diff --git a/net/phonet/Kconfig b/net/phonet/Kconfig index 51a5669573f2..6ec7d55b1769 100644 --- a/net/phonet/Kconfig +++ b/net/phonet/Kconfig | |||
@@ -6,7 +6,7 @@ config PHONET | |||
6 | tristate "Phonet protocols family" | 6 | tristate "Phonet protocols family" |
7 | help | 7 | help |
8 | The Phone Network protocol (PhoNet) is a packet-oriented | 8 | The Phone Network protocol (PhoNet) is a packet-oriented |
9 | communication protocol developped by Nokia for use with its modems. | 9 | communication protocol developed by Nokia for use with its modems. |
10 | 10 | ||
11 | This is required for Maemo to use cellular data connectivity (if | 11 | This is required for Maemo to use cellular data connectivity (if |
12 | supported). It can also be used to control Nokia phones | 12 | supported). It can also be used to control Nokia phones |
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig index 5592883e1e4a..3f7faa9688ae 100644 --- a/net/sunrpc/Kconfig +++ b/net/sunrpc/Kconfig | |||
@@ -69,7 +69,7 @@ config RPCSEC_GSS_SPKM3 | |||
69 | select CRYPTO_CBC | 69 | select CRYPTO_CBC |
70 | help | 70 | help |
71 | Choose Y here to enable Secure RPC using the SPKM3 public key | 71 | Choose Y here to enable Secure RPC using the SPKM3 public key |
72 | GSS-API mechansim (RFC 2025). | 72 | GSS-API mechanism (RFC 2025). |
73 | 73 | ||
74 | Secure RPC calls with SPKM3 require an auxiliary userspace | 74 | Secure RPC calls with SPKM3 require an auxiliary userspace |
75 | daemon which may be found in the Linux nfs-utils package | 75 | daemon which may be found in the Linux nfs-utils package |
diff --git a/net/wimax/Kconfig b/net/wimax/Kconfig index 18495cdcd10d..1b46747a5f5a 100644 --- a/net/wimax/Kconfig +++ b/net/wimax/Kconfig | |||
@@ -8,7 +8,7 @@ | |||
8 | # | 8 | # |
9 | # As well, enablement of the RFKILL code means we need the INPUT layer | 9 | # As well, enablement of the RFKILL code means we need the INPUT layer |
10 | # support to inject events coming from hw rfkill switches. That | 10 | # support to inject events coming from hw rfkill switches. That |
11 | # dependency could be killed if input.h provided appropiate means to | 11 | # dependency could be killed if input.h provided appropriate means to |
12 | # work when input is disabled. | 12 | # work when input is disabled. |
13 | 13 | ||
14 | comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled" | 14 | comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled" |