Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

2 files changed, 29 insertions, 0 deletions

diff --git a/data/example.conf b/data/example.conf
index 73c6627a3..a746051c0 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -498,6 +498,13 @@ options
 	 * If set, Services do not allow ownership of nick names, only ownership of accounts.
 	 */
 	nonicknameownership = no
+
+	/* The regex engine to use, as provided by the regex modules.
+	 * Leave commented to disable regex matching.
+	 *
+	 * Note for this to work the regex module providing the regex engine must be loaded.
+	 */
+	regexengine = "regex/pcre"
 }
 
 /*
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 715be1898..101437d04 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -311,6 +311,28 @@ sqlite
 }
 
 /*
+ * m_regex_pcre
+ *
+ * Provides the regex engine regex/pcre, which uses the Perl Compatible Regular Expressions library.
+ */
+module { name = "m_regex_pcre" }
+
+/*
+ * m_regex_posix
+ *
+ * Provides the regex engine regex/posix, which uses the POSIX compliant regular expressions.
+ * This is likely the only regex module you will not need extra libraries for.
+ */
+#module { name = "m_regex_posix" }
+
+/*
+ * m_regex_tre
+ *
+ * Provides the regex engine regex/tre, which uses the TRE regex library.
+ */
+#module { name = "m_regex_tre" }
+
+/*
  * m_rewrite
  *
  * Allows rewriting commands sent to clients.