Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 0d65f4d394943ca6c9857d45b353b06a379f84e1..91efae88e8c2ac18a66cabd70dcdd7a318e6f5c9 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -20,7 +20,7 @@ config NETFILTER_FAMILY_ARP
        bool
 
 config NETFILTER_NETLINK_ACCT
        bool
 
 config NETFILTER_NETLINK_ACCT

-tristate "Netfilter NFACCT over NFNETLINK interface"
+       tristate "Netfilter NFACCT over NFNETLINK interface"

        depends on NETFILTER_ADVANCED
        select NETFILTER_NETLINK
        help
        depends on NETFILTER_ADVANCED
        select NETFILTER_NETLINK
        help


@@ -34,7 +34,7 @@ config NETFILTER_NETLINK_QUEUE
        help
          If this option is enabled, the kernel will include support
          for queueing packets via NFNETLINK.
        help
          If this option is enabled, the kernel will include support
          for queueing packets via NFNETLINK.

-         
+

 config NETFILTER_NETLINK_LOG
        tristate "Netfilter LOG over NFNETLINK interface"
        default m if NETFILTER_ADVANCED=n
 config NETFILTER_NETLINK_LOG
        tristate "Netfilter LOG over NFNETLINK interface"
        default m if NETFILTER_ADVANCED=n


@@ -697,7 +697,7 @@ config NF_FLOW_TABLE_INET
        tristate "Netfilter flow table mixed IPv4/IPv6 module"
        depends on NF_FLOW_TABLE
        help
        tristate "Netfilter flow table mixed IPv4/IPv6 module"
        depends on NF_FLOW_TABLE
        help

-          This option adds the flow table mixed IPv4/IPv6 support.
+         This option adds the flow table mixed IPv4/IPv6 support.

 
          To compile it as a module, choose M here.
 
 
          To compile it as a module, choose M here.
 


@@ -1502,7 +1502,7 @@ config NETFILTER_XT_MATCH_REALM
          This option adds a `realm' match, which allows you to use the realm
          key from the routing subsystem inside iptables.
 
          This option adds a `realm' match, which allows you to use the realm
          key from the routing subsystem inside iptables.
 

-         This match pretty much resembles the CONFIG_NET_CLS_ROUTE4 option 
+         This match pretty much resembles the CONFIG_NET_CLS_ROUTE4 option

          in tc world.
 
          If you want to compile it as a module, say M here and read
          in tc world.
 
          If you want to compile it as a module, say M here and read


@@ -1523,7 +1523,7 @@ config NETFILTER_XT_MATCH_SCTP
        depends on NETFILTER_ADVANCED
        default IP_SCTP
        help
        depends on NETFILTER_ADVANCED
        default IP_SCTP
        help

-         With this option enabled, you will be able to use the 
+         With this option enabled, you will be able to use the

          `sctp' match in order to match on SCTP source/destination ports
          and SCTP chunk types.
 
          `sctp' match in order to match on SCTP source/destination ports
          and SCTP chunk types.