From a8560affcee9ab72d7f9982c72eeea6f5d2d2868 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@atheme.org>
Date: Thu, 18 Feb 2010 07:34:40 -0600
Subject: [PATCH] Documentation updates for the ip_cloaking_4.0 transition.

---
 doc/example.conf   | 17 +++++++++++++++--
 doc/reference.conf |  6 ++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/doc/example.conf b/doc/example.conf
index 83016838..6a79129e 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -23,7 +23,6 @@
 #loadmodule "extensions/extb_server.so";
 #loadmodule "extensions/extb_ssl.so";
 #loadmodule "extensions/hurt.so";
-#loadmodule "extensions/ip_cloaking.so";
 #loadmodule "extensions/m_findforwards.so";
 #loadmodule "extensions/m_identify.so";
 #loadmodule "extensions/no_oper_invis.so";
@@ -32,6 +31,16 @@
 #loadmodule "extensions/sno_globaloper.so";
 #loadmodule "extensions/sno_whois.so";
 
+/*
+ * IP cloaking extensions: use ip_cloaking_4.0
+ * if you're linking 3.2 and later, otherwise use
+ * ip_cloaking.so, for compatibility with older 3.x
+ * releases.
+ */
+
+#loadmodule "extensions/ip_cloaking_4.0.so";
+#loadmodule "extensions/ip_cloaking.so";
+
 serverinfo {
 	name = "hades.arpa";
 	sid = "42X";
@@ -409,7 +418,11 @@ general {
 
 	/*
 	 * default_umodes: umodes to enable on connect.
-	 * If you have enabled the ip_cloaking module, and you want
+	 * If you have enabled the new ip_cloaking_4.0 module, and you want
+	 * to make use of it, add +x to this option, i.e.:
+	 *      default_umodes = "+ix";
+	 *
+	 * If you have enabled the old ip_cloaking module, and you want
 	 * to make use of it, add +h to this option, i.e.:
 	 *	default_umodes = "+ih";
 	 */
diff --git a/doc/reference.conf b/doc/reference.conf
index b9afb80d..10971d4d 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -60,7 +60,8 @@
  * Server bans (+b $s:mask)                          -- extb_server.so
  * SSL bans (+b $z)                                  -- extb_ssl.so
  * HURT system                                       -- hurt.so
- * Host mangling (umode +h)                          -- ip_cloaking.so
+ * New host mangling (umode +x)                      -- ip_cloaking_4.0.so
+ * Old host mangling (umode +h)                      -- ip_cloaking.so
  * Find channel forwards                             -- m_findforwards.so
  * /identify support                                 -- m_identify.so
  * Opers cannot be invisible (umode +i)              -- no_oper_invis.so
@@ -85,6 +86,7 @@
 #loadmodule "extensions/extb_server.so";
 #loadmodule "extensions/extb_ssl.so";
 #loadmodule "extensions/hurt.so";
+#loadmodule "extensions/ip_cloaking_4.0.so";
 #loadmodule "extensions/ip_cloaking.so";
 #loadmodule "extensions/m_findforwards.so";
 #loadmodule "extensions/m_identify.so";
@@ -884,7 +886,7 @@ general {
 
 	/* default umodes: umodes to set upon connection
 	 * If you have enabled the ip_cloaking extension, and you wish for
-	 * incoming clients to be set +h upon connection, add +h to the umode
+	 * incoming clients to be set +h or +x upon connection, add +h or +x to the umode
 	 * string below.
 	 */
 	default_umodes = "+i";