summaryrefslogtreecommitdiff
path: root/docs/conf
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2013-04-06 11:46:56 +0100
committerPeter Powell <petpow@saberuk.com>2013-04-06 11:47:56 +0100
commit2ae42bbb1fbd661f6078fdbeb65e1d430e38c805 (patch)
treeb4fa47fbfb51f4b9ced9e893e72ca11c493d9a58 /docs/conf
parentbc148f5227b6a4e6ac2d69587998836412d51193 (diff)
Default to the XML config format.
Diffstat (limited to 'docs/conf')
-rw-r--r--docs/conf/inspircd.conf.example14
-rw-r--r--docs/conf/modules.conf.example2
2 files changed, 10 insertions, 6 deletions
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index 631db7376..2988ccc0b 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -38,6 +38,15 @@
# #
########################################################################
+#-#-#-#-#-#-#-#-#-# CONFIGURATION FORMAT #-#-#-#-#-#-#-#-#-#-#-#-#-#-
+# #
+# In order to maintain compatibility with older configuration files, #
+# you can change the configuration parser to parse as it did in #
+# previous releases. When using the "compat" format, you need to use #
+# C++ escape sequences (e.g. \n) instead of XML ones (e.g. &nl;) and #
+# can not use <define> to create macros. #
+#<config format="compat">
+
#-#-#-#-#-#-#-#-#-# INCLUDE CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-#-#-#
# #
# This optional tag allows you to include another config file #
@@ -69,11 +78,6 @@
# #
# Variables may be redefined and may reference other variables. #
# Value expansion happens at the time the tag is read. #
-# #
-# Using variable definitions REQUIRES that the config format be #
-# changed to "xml" from the default "compat" that uses escape #
-# sequences such as "\"" and "\n", and does not support <define> #
-<config format="xml">
<define name="bindip" value="1.2.2.3">
<define name="localips" value="&bindip;/24">
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index bd64f69f5..6d0c2cbdb 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -592,7 +592,7 @@
# ranktoset The numeric rank required to set/unset this mode. Defaults to rank.
# depriv Can you remove the mode from yourself? Defaults to yes.
#<customprefix name="founder" letter="q" prefix="~" rank="50000" ranktoset="50000">
-#<customprefix name="admin" letter="a" prefix="&" rank="40000" ranktoset="50000">
+#<customprefix name="admin" letter="a" prefix="&amp;" rank="40000" ranktoset="50000">
#<customprefix name="halfop" letter="h" prefix="%" rank="20000" ranktoset="30000">
#<customprefix name="halfvoice" letter="V" prefix="-" rank="1" ranktoset="20000">