Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / Documentation / networking / nf_conntrack-sysctl.txt

diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt
index 497d668288f95f98d15c3f0057656fb5a5726c30..433b6724797ad7e9476f041c7f0e2dcd77ca8579 100644 (file)
--- a/Documentation/networking/nf_conntrack-sysctl.txt
+++ b/Documentation/networking/nf_conntrack-sysctl.txt
@@ -96,17 +96,6 @@ nf_conntrack_max - INTEGER
        Size of connection tracking table.  Default value is
        nf_conntrack_buckets value * 4.
 
-nf_conntrack_default_on - BOOLEAN
-       0 - don't register conntrack in new net namespaces
-       1 - register conntrack in new net namespaces (default)
-
-       This controls wheter newly created network namespaces have connection
-       tracking enabled by default.  It will be enabled automatically
-       regardless of this setting if the new net namespace requires
-       connection tracking, e.g. when NAT rules are created.
-       This setting is only visible in initial user namespace, it has no
-       effect on existing namespaces.
-
 nf_conntrack_tcp_be_liberal - BOOLEAN
        0 - disabled (default)
        not 0 - enabled