Remove ambiguity in descriptions +u

[solanum.git] / doc / ircd.conf.example

diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example
index 159ddf744c1bdcca1affd489c4d13c5251d5c2d9..9cd18fa1bacdba9625729de51647574c37a42228 100644 (file)
--- a/doc/ircd.conf.example
+++ b/doc/ircd.conf.example
@@ -29,7 +29,6 @@
 #loadmodule "extensions/m_locops";
 #loadmodule "extensions/no_oper_invis";
 #loadmodule "extensions/sno_farconnect";
-#loadmodule "extensions/sno_globalkline";
 #loadmodule "extensions/sno_globalnickchange";
 #loadmodule "extensions/sno_globaloper";
 #loadmodule "extensions/override";
@@ -48,7 +47,7 @@
 serverinfo {
        name = "hades.arpa";
        sid = "42X";
-       description = "charybdis test server";
+       description = "solanum test server";
        network_name = "StaticBox";
 
        /* On multi-homed hosts you may need the following. These define
@@ -232,8 +231,8 @@ auth {
  * means they must be defined before operator {}.
  */
 privset "local_op" {
-       privs = oper:general, oper:privs, oper:testline, oper:kill, oper:operwall, usermode:servnotice,
-               auspex:oper, auspex:hostname, auspex:umodes, auspex:cmodes;
+       privs = oper:general, oper:privs, oper:testline, oper:kill, oper:operwall, oper:message,
+               usermode:servnotice, auspex:oper, auspex:hostname, auspex:umodes, auspex:cmodes;
 };
 
 privset "server_bot" {
@@ -244,7 +243,8 @@ privset "server_bot" {
 privset "global_op" {
        extends = "local_op";
        privs = oper:routing, oper:kline, oper:unkline, oper:xline,
-               oper:resv, oper:cmodes, oper:mass_notice, oper:remoteban;
+               oper:resv, oper:cmodes, oper:mass_notice, oper:wallops,
+               oper:remoteban;
 };
 
 privset "admin" {
@@ -306,14 +306,15 @@ operator "god" {
        privset = "admin";
 };
 
+// See connecting-servers.rst for an introduction to using these files.
+
 connect "irc.uplink.com" {
        host = "203.0.113.3";
        send_password = "password";
        accept_password = "anotherpassword";
        port = 6666;
-       hub_mask = "*";
        class = "server";
-       flags = compressed, topicburst;
+       flags = topicburst;
 
        #fingerprint = "c77106576abf7f9f90cca0f63874a60f2e40a64b";
 };
@@ -323,7 +324,6 @@ connect "ssl.uplink.com" {
        send_password = "password";
        accept_password = "anotherpassword";
        port = 9999;
-       hub_mask = "*";
        class = "server";
        flags = ssl, topicburst;
 };
@@ -579,6 +579,16 @@ general {
        kline_with_reason = yes;
        hide_tkdline_duration = no;
        kline_reason = "K-Lined";
+       sasl_only_client_message = "You need to identify via SASL to use this server.";
+       identd_only_client_message = "You need to install identd to use this server.";
+       sctp_forbidden_client_message = "You are not allowed to use SCTP on this server.";
+       ssltls_only_client_message = "You need to use SSL/TLS to use this server.";
+       not_authorised_client_message = "You are not authorised to access this server.";
+       illegal_hostname_client_message = "You have an illegal character in your hostname.";
+       server_full_client_message = "Sorry, server is full - try later";
+       illegal_name_long_client_message = "Your username is invalid. Please make sure that your username contains "
+                                                                          "only alphanumeric characters.";
+       illegal_name_short_client_message = "Invalid username";
        identify_service = "NickServ@services.int";
        identify_command = "IDENTIFY";
        non_redundant_klines = yes;
@@ -586,7 +596,6 @@ general {
        use_propagated_bans = yes;
        stats_e_disabled = no;
        stats_c_oper_only = no;
-       stats_h_oper_only = no;
        stats_y_oper_only = no;
        stats_o_oper_only = yes;
        stats_P_oper_only = no;