[PATCH 2/2] Revert "netfilter: fix nf_conntrack_helper documentation"

[Jiri Kosina]

From: Jiri Kosina <jkosina@xxxxxxx>

This reverts commit 486dcf43da7815baa615822f3e46883ccca5400f. The commit 
that flipped the default has been reverted as well.

Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

---
 Documentation/networking/nf_conntrack-sysctl.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt
index 497d668288f9..cdeb9d6a44c7 100644
--- a/Documentation/networking/nf_conntrack-sysctl.txt
+++ b/Documentation/networking/nf_conntrack-sysctl.txt
@@ -62,13 +62,10 @@ nf_conntrack_generic_timeout - INTEGER (seconds)
 	protocols.
 
 nf_conntrack_helper - BOOLEAN
-	0 - disabled (default)
-	not 0 - enabled
+	0 - disabled
+	not 0 - enabled (default)
 
 	Enable automatic conntrack helper assignment.
-	If disabled it is required to set up iptables rules to assign
-	helpers to connections.  See the CT target description in the
-	iptables-extensions(8) man page for further information.
 
 nf_conntrack_icmp_timeout - INTEGER (seconds)
 	default 30
-- 
2.11.0