From ee5869653156e21f4ce889479aa322aed39e0e4f Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Thu, 10 Oct 2013 09:56:52 +1100
Subject: [PATCH 1/3] DOC: try to encourage jail.local jail.d/*.local a lot
 more

---
 config/jail.conf | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/config/jail.conf b/config/jail.conf
index 177db4c4..17972353 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -1,16 +1,24 @@
-# Fail2Ban jail specifications file
+# Fail2Ban jail base specification file
 #
-# Comments: use '#' for comment lines and ';' (following a space) for inline comments
+# HOW TO ACTIVATE JAILS:
 #
-# Changes:  in most of the cases you should not modify this
-#           file, but provide customizations in jail.local file, e.g.:
+# YOU SHOULD NOT MODIFY THIS FILE.
+#
+# It will probably be overwitten or improved in a distribution update.
+#
+# Provide customizations in a jail.local file or a jail.d/customisation.local.
+# For example to change the default bantime for all jails and to enable the
+# ssh-iptables jail the following (uncommented) would appear in the .local file.
+# See man 5 jail.conf for details.
 #
 # [DEFAULT]
 # bantime = 3600
 #
 # [ssh-iptables]
 # enabled = true
-#
+
+
+
 
 # The DEFAULT allows a global definition of the options. They can be overridden
 # in each jail afterwards.
@@ -56,7 +64,7 @@ backend = auto
 usedns = warn
 
 
-# This jail corresponds to the standard configuration in Fail2ban 0.6.
+# This jail corresponds to the standard configuration in Fail2ban.
 # The mail-whois action send a notification e-mail with a whois request
 # in the body.
 

From 8fe542ca9f2d71e2243feb92a69335778342f759 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Fri, 11 Oct 2013 06:48:31 +1100
Subject: [PATCH 2/3] DOC: reintroduce comment on comments

---
 config/jail.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/jail.conf b/config/jail.conf
index 17972353..690466fc 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -19,6 +19,7 @@
 
 
 
+# Comments: use '#' for comment lines and ';' (following a space) for inline comments
 
 # The DEFAULT allows a global definition of the options. They can be overridden
 # in each jail afterwards.

From 09cae9f4f3114281d114dee5e9cdccfeb6d3fafb Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Fri, 11 Oct 2013 06:51:34 +1100
Subject: [PATCH 3/3] DOC: comment on comments in jail.conf.5

---
 man/jail.conf.5 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/man/jail.conf.5 b/man/jail.conf.5
index 8f281ce4..2de42d7c 100644
--- a/man/jail.conf.5
+++ b/man/jail.conf.5
@@ -45,6 +45,8 @@ identical entries, parsed alphabetically, e.g.
 .RE
 .RE
 
+Comments: use '#' for comment lines and ';' (following a space) for inline comments
+
 .SH DEFAULT
 The following options are applicable to all jails. Their meaning is described in the default \fIjail.conf\fR file.
 .TP