Rename "services.conf" to "anope.conf".

19 files changed, 35 insertions, 35 deletions

diff --git a/data/example.conf b/data/example.conf
index 6d661cb57..a09ce2378 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -2,7 +2,7 @@
  * Example configuration file for Services. After making the appropriate
  * changes to this file, place it in the Services conf directory (as
  * specified in the "configure" script, default /home/username/anope/conf)
- * under the name "services.conf".
+ * under the name "anope.conf".
  *
  * The format of this file is fairly simple: three types of comments are supported:
  *  - All text after a '#' on a line is ignored, as in shell scripting
@@ -110,7 +110,7 @@ define
 #include
 {
 	type = "executable"
-	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/services.conf"
+	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/anope.conf"
 }
 
 /*
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 7048e5e43..10c6255f9 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -695,7 +695,7 @@ module { name = "help" }
 
 	/* Query to execute to determine if a user should have operator privileges.
 	 * A field named opertype must be returned in order to link the user to their oper type.
-	 * The oper types must be configured earlier in services.conf.
+	 * The oper types must be configured earlier in anope.conf.
 	 *
 	 * If a field named modes is returned from this query then those modes are set on the user.
 	 * Without this, only a simple +o is sent.
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index 1c83bede1..9b5c166ff 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -523,7 +523,7 @@ command { service = "OperServ"; name = "OPER"; command = "operserv/oper"; permis
  *
  * Provides the command operserv/reload.
  *
- * Used to reload the services.conf configuration file.
+ * Used to reload the anope.conf configuration file.
  */
 module { name = "operserv/reload" }
 command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; permission = "operserv/reload"; }
diff --git a/docs/INSTALL b/docs/INSTALL
index 2717bc2c2..3601de1de 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -53,7 +53,7 @@ Note: You should also read the README and FAQ files!
     the memos of any user.
 
     Now go into the conf directory (by default, ~/anope/conf). Copy the example
-    configuration file (example.conf) to services.conf, and open the latter
+    configuration file (example.conf) to anope.conf, and open the latter
     with your favorite text editor. It contains all the configuration
     directives Anope will use at startup. Read the instructions contained in
     the file carefully. Using the default values is NOT a good idea, and will
diff --git a/docs/INSTALL.fr b/docs/INSTALL.fr
index 447cc4bb2..b99397120 100644
--- a/docs/INSTALL.fr
+++ b/docs/INSTALL.fr
@@ -57,7 +57,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
 
     Allez maintenant dans le répertoire conf (par défaut, ~/anope/conf).
     Copiez l'exemple de fichier de configuration (example.conf) en
-    services.conf et ouvrez ce dernier avec votre éditeur de texte favori.
+    anope.conf et ouvrez ce dernier avec votre éditeur de texte favori.
     Il contient toutes les directives de configuration qu'Anope va utiliser
     en démarrant. Lisez attentivement les instructions contenues dans le
     fichier. L'utilisation des valeurs par défaut n'est pas toujours
diff --git a/docs/LANGUAGE b/docs/LANGUAGE
index 33fa240fd..24c47124f 100644
--- a/docs/LANGUAGE
+++ b/docs/LANGUAGE
@@ -25,7 +25,7 @@ Anope Mutli Language Support
     Anope uses gettext (http://www.gnu.org/software/gettext/) to translate messages for users. To add a new language
     install gettext and run `msginit -l language -o anope.language.po -i anope.pot`. For example if I was translating to
     Spanish I could run `msginit -l es_ES -o anope.es_ES.po -i anope.pot`. Open the newly generating .po file and start
-    translating. Once you are done simply rerun ./Config; make && make install and add the language to your services.conf.
+    translating. Once you are done simply rerun ./Config; make && make install and add the language to your anope.conf.
     Note that on Windows it is not quite this simple, windows.cpp must be edited and Anope recompiled and restarted.
 
     Poedit (http://www.poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
diff --git a/docs/TOOLS b/docs/TOOLS
index 2ef279261..26fe9e9ed 100644
--- a/docs/TOOLS
+++ b/docs/TOOLS
@@ -8,7 +8,7 @@ Anope Bundled Tools
 
     The SMTP client can be used instead of sendmail for use with Anope's mail
     options. To use the SMTP client instead of sendmail, find the line in your
-    services configuration file (services.conf) that defines sendmailpath. On
+    services configuration file (anope.conf) that defines sendmailpath. On
     that line, change the path to your services installation directory, then
     followed by "bin/anopesmtp" and the IP address of a valid SMTP server. It
     should look like this:
diff --git a/docs/WIN32.txt b/docs/WIN32.txt
index 071831995..d0a2a7dd7 100644
--- a/docs/WIN32.txt
+++ b/docs/WIN32.txt
@@ -103,7 +103,7 @@ Anope for Windows
        INSTALL within the Solution Explorer. Right-click on INSTALL and choose Build.

 

        When you have done this, all the files will be installed to where they belong.

-       The only thing you need to do is rename "data/example.conf" to be "data/services.conf",

+       The only thing you need to do is rename "data/example.conf" to be "data/anope.conf",

        and then follow the steps to set up Anope.

 

     You have now completed the building phase of Anope for Windows. You can

@@ -120,7 +120,7 @@ Anope for Windows
     Notepad will cause strange characters to appear, and you may not be able to

     edit the file correctly.

 

-    Open services.conf, and read through it carefully and adjust the settings

+    Open anope.conf, and read through it carefully and adjust the settings

     you think you need to adjust.

 

     If you are unsure of the settings, you can go to the dos command prompt

diff --git a/include/language.h b/include/language.h
index c7bb6d689..6201a5cb5 100644
--- a/include/language.h
+++ b/include/language.h
@@ -12,7 +12,7 @@
 namespace Language
 {
 
-	/* Languages we support as configured in services.conf. They are
+	/* Languages we support as configured in anope.conf. They are
 	 * added to this list if we detect a language exists in the correct
 	 * location for each language.
 	 */
diff --git a/language/anope.ca_ES.po b/language/anope.ca_ES.po
index 87daa1e2b..33fa5bffd 100644
--- a/language/anope.ca_ES.po
+++ b/language/anope.ca_ES.po
@@ -4841,7 +4841,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4863,7 +4863,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -9067,7 +9067,7 @@ msgstr "Sucessor de %s desabilitat."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.de_DE.po b/language/anope.de_DE.po
index af6a0102c..288a37eef 100644
--- a/language/anope.de_DE.po
+++ b/language/anope.de_DE.po
@@ -4526,7 +4526,7 @@ msgstr ""
 "angezeigt. (Es werden jedoch nur max. %d angezeigt, um ein\n"
 "Flooding des Users zu verhindern. Wenn mehr News\n"
 "existieren, werden nur die neuesten angezeigt.)\n"
-"NewsCount kann in der services.conf eingestellt werden.\n"
+"NewsCount kann in der anope.conf eingestellt werden.\n"
 "\n"
 "Diese Funktion ist beschränkt auf Services Operatoren."
 
@@ -4545,7 +4545,7 @@ msgstr ""
 "(Es werden jedoch nur max. %d Nachrichten angezeigt, um ein\n"
 "Flooding des Users zu verhindern. Wenn mehr News\n"
 "existieren, werden nur die neüsten angezeigt.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "Diese Funktion ist beschränkt auf Services Operatoren."
 
@@ -8708,7 +8708,7 @@ msgstr "Der Eintrag des Vertreters für %s wurde entfernt."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin muss in der services.conf eingeschaltet werden."
+msgstr "SuperAdmin muss in der anope.conf eingeschaltet werden."
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.el_GR.po b/language/anope.el_GR.po
index d1b1aea73..1afa99c9b 100644
--- a/language/anope.el_GR.po
+++ b/language/anope.el_GR.po
@@ -4761,7 +4761,7 @@ msgstr ""
 "(Παρόλα αυτά, δεν θα του στέλνονται παραπάνω από #%d# μηνύματα\n"
 "για να αποφευχθεί το flood του χρήστη. Αν υπάρχουν\n"
 "περισσότερα μηνύματα, θα φαίνονται τα πιο πρόσφατα.)\n"
-"Το NewsCount μπορεί να ρυθμιστεί στο services.conf.\n"
+"Το NewsCount μπορεί να ρυθμιστεί στο anope.conf.\n"
 "\n"
 "Η εντολή LOGONNEWS μπορεί να χρησιμοποιηθεί μόνο από IRC Operators."
 
@@ -4784,7 +4784,7 @@ msgstr ""
 "μηνύματα\n"
 "για να αποφευχθεί flood στον χρήστη. Αν υπάρχουν \n"
 "περισσότερα μηνύματα, θα φαίνονται τα πιο πρόσφατα.)\n"
-"Το NewsCount μπορεί να ρυθμιστεί στο services.conf.\n"
+"Το NewsCount μπορεί να ρυθμιστεί στο anope.conf.\n"
 " \n"
 "Το OPERNEWS μπορεί να χρησιμοποιηθεί μόνο από Services Operators."
 
@@ -8975,7 +8975,7 @@ msgstr "Ο Successor του #%s# δεν έχει οριστεί."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "H ρύθμιση SuperAdmin δεν έχει ενεργοποιηθεί στο services.conf"
+msgstr "H ρύθμιση SuperAdmin δεν έχει ενεργοποιηθεί στο anope.conf"
 
 #
 #: modules/commands/ns_suspend.cpp:60
diff --git a/language/anope.hu_HU.po b/language/anope.hu_HU.po
index 1b6e3bf66..5e4dd3f7f 100644
--- a/language/anope.hu_HU.po
+++ b/language/anope.hu_HU.po
@@ -4803,7 +4803,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4825,7 +4825,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -8982,7 +8982,7 @@ msgstr "A megadott csatorna %s successora törölve."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.it_IT.po b/language/anope.it_IT.po
index 4bed7ac42..c338191a0 100644
--- a/language/anope.it_IT.po
+++ b/language/anope.it_IT.po
@@ -8365,7 +8365,7 @@ msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
 msgstr ""
 "L'impostazione SuperAdmin non può essere attivata perchè non è abilitata in "
-"services.conf"
+"anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 msgid "Suspend a given nick"
diff --git a/language/anope.pt_PT.po b/language/anope.pt_PT.po
index fe246a031..b9fef464d 100644
--- a/language/anope.pt_PT.po
+++ b/language/anope.pt_PT.po
@@ -4766,7 +4766,7 @@ msgstr ""
 "to them.  (However, no more than %s messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4788,7 +4788,7 @@ msgstr ""
 "be sent to them.  (However, no more than %s messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -8938,7 +8938,7 @@ msgstr "Successor do canal %s removido."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "Opção SuperAdmin não habilitada no arquivo services.conf"
+msgstr "Opção SuperAdmin não habilitada no arquivo anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.ru_RU.po b/language/anope.ru_RU.po
index 0890a9613..0b3d4ddb5 100644
--- a/language/anope.ru_RU.po
+++ b/language/anope.ru_RU.po
@@ -3775,7 +3775,7 @@ msgid ""
 msgstr ""
 "Синтаксис: RELOAD\n"
 "\n"
-"Заставляет сервисы перечитать конфигурационный файл services.conf.\n"
+"Заставляет сервисы перечитать конфигурационный файл anope.conf.\n"
 "Примечание: активация некоторых новых/измененных директив конфига\n"
 "требует  полного  перезапуска  сервисов  (например: изменение ников\n"
 "сервисов, активация лимитирования сессий, и т.д.)"
@@ -4881,7 +4881,7 @@ msgstr ""
 "Стоит заметить, что во избежание  флуда пользователь получит только\n"
 "%d новость(и), так что если у  вас в списке их  больше - показаны\n"
 "будут только  последние из них. Значение  NewsCount,  отвечающее за\n"
-"одновременно посылаемое кол-во новостей, указывается в services.conf\n"
+"одновременно посылаемое кол-во новостей, указывается в anope.conf\n"
 "\n"
 "Команда LOGONNEWS ADD позволяет добавить новость в список.\n"
 "\n"
@@ -4910,7 +4910,7 @@ msgstr ""
 "Стоит заметить, что во избежание  флуда пользователь получит только\n"
 "%d новость(и), так что если у  вас в списке их  больше - показаны\n"
 "будут только  последние из них. Значение  NewsCount,  отвечающее за\n"
-"одновременно посылаемое кол-во новостей, указывается в services.conf\n"
+"одновременно посылаемое кол-во новостей, указывается в anope.conf\n"
 "\n"
 "Команда OPERNEWS ADD позволяет добавить новость в список.\n"
 "\n"
diff --git a/language/anope.tr_TR.po b/language/anope.tr_TR.po
index fc8dbe1ca..2a41b4f34 100644
--- a/language/anope.tr_TR.po
+++ b/language/anope.tr_TR.po
@@ -4756,7 +4756,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4778,7 +4778,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -8929,7 +8929,7 @@ msgstr "%s için successor kaldırıldı."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/src/config.cpp b/src/config.cpp
index 2fe8dd74f..5042f1a47 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -24,7 +24,7 @@
 
 using namespace Configuration;
 
-File ServicesConf("services.conf", false); // Services configuration file name
+File ServicesConf("anope.conf", false); // Services configuration file name
 Conf *Config = NULL;
 
 Block::Block(const Anope::string &n) : name(n), linenum(-1)
diff --git a/src/init.cpp b/src/init.cpp
index 124181d2b..e64bf0eff 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -493,7 +493,7 @@ void Anope::Init(int ac, char **av)
 	catch (const ConfigException &ex)
 	{
 		Log(LOG_TERMINAL) << ex.GetReason();
-		Log(LOG_TERMINAL) << "*** Support resources: Read through the services.conf self-contained";
+		Log(LOG_TERMINAL) << "*** Support resources: Read through the anope.conf self-contained";
 		Log(LOG_TERMINAL) << "*** documentation. Read the documentation files found in the 'docs'";
 		Log(LOG_TERMINAL) << "*** folder. Visit our portal located at http://www.anope.org/. Join";
 		Log(LOG_TERMINAL) << "*** our support channel on /server irc.anope.org channel #anope.";