diff options
| -rw-r--r-- | data/chanserv.example.conf | 34 | ||||
| -rw-r--r-- | data/example.conf | 11 | ||||
| -rw-r--r-- | data/nickserv.example.conf | 10 | ||||
| -rw-r--r-- | modules/commands/cs_access.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/ms_set.cpp | 2 |
5 files changed, 28 insertions, 31 deletions
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf index 1f7cd0bea..95a5159b4 100644 --- a/data/chanserv.example.conf +++ b/data/chanserv.example.conf @@ -71,23 +71,23 @@ module * by spaces. * * The options are: - * - keeptopic: Retain topic when the channel is not in use - * - peace: Disallow users from kicking or removing modes from others who are of the same - * access level or superior - * - cs_private: Hide the channel from ChanServ's LIST command - * - restricted: Kick/ban users who are restricted from the channel - * - cs_secure: Enable channel security, requiring the user to be identified with NickServ in - * order to be considered for being on the access list of the channel - * - secureops: Only allow operator status to be given if the user is on the access list - * - securefounder: Only allow the real founder of the channel to drop the channel, change it's - * password, or change the founder or successor - * - signkick: Use of ChanServ's KICK command will cause the user's nick to be signed to the kick. - * - signkicklevel: Same as above, but the kick will not be signed if the user is at the same access - * level or superior to the target - * - topiclock: Disallow the topic to be changed except with ChanServ's TOPIC command - * - persist: Keep the channel open at all times - * - noautoop: Disables autoop on the channel - * - none: No defaults + * - keeptopic: Retain topic when the channel is not in use + * - peace: Disallow users from kicking or removing modes from others who are of the same + * access level or superior + * - cs_private: Hide the channel from ChanServ's LIST command + * - restricted: Kick/ban users who are restricted from the channel + * - cs_secure: Enable channel security, requiring the user to be identified with NickServ in + * order to be considered for being on the access list of the channel + * - secureops: Only allow operator status to be given if the user is on the access list + * - securefounder: Only allow the real founder of the channel to drop the channel, change it's + * password, or change the founder or successor + * - signkick: Use of ChanServ's KICK command will cause the user's nick to be signed to the kick. + * - signkick_level: Same as above, but the kick will not be signed if the user is at the same access + * level or superior to the target + * - topiclock: Disallow the topic to be changed except with ChanServ's TOPIC command + * - persist: Keep the channel open at all times + * - noautoop: Disables autoop on the channel + * - none: No defaults * * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder, * and signkick. If you really want no defaults, use "none" by itself as the option. diff --git a/data/example.conf b/data/example.conf index b6e0231ce..9ed55fee2 100644 --- a/data/example.conf +++ b/data/example.conf @@ -310,22 +310,19 @@ networkinfo /* * Set this to the maximum allowed nick length on your network. * Be sure to set this correctly, as setting this wrong can result in - * Services being disconnected from the network. This directive is optional, - * but recommended. + * Services being disconnected from the network. */ nicklen = 31 /* Set this to the maximum allowed ident length on your network. * Be sure to set this correctly, as setting this wrong can result in - * Services being disconnected from the network. This directive is optional, - * but recommended. + * Services being disconnected from the network. */ userlen = 10 /* Set this to the maximum allowed hostname length on your network. * Be sure to set this correctly, as setting this wrong can result in - * Services being disconnected from the network. This directive is optional, - * but recommended. + * Services being disconnected from the network. */ hostlen = 64 @@ -651,7 +648,7 @@ include /* * [OPTIONAL] NickServ * - * Includes memoserv.example.conf, which is necessary for NickServ functionality. + * Includes nickserv.example.conf, which is necessary for NickServ functionality. * * Remove this block to disable NickServ. */ diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index dab48996a..ce183743e 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -68,7 +68,7 @@ module /* * Force users to give an e-mail address when they register a nick. * - * This directive is recommended to be enabled, and required if e-mail registration is enabled. + * This directive defaults to "yes" and is recommended to be enabled. This is required if e-mail registration is enabled. */ forceemail = yes @@ -93,18 +93,18 @@ module * The options are: * - killprotect: Kill nick if not identified within 60 seconds * - kill_quick: Kill nick if not identified within 20 seconds, this one overrides the above - * option and the above must be specified with this one + * option and the above must be specified with this one * - ns_secure: Enable nickname security, requiring the nick's password before any operations - * can be done on it + * can be done on it * - ns_private: Hide the nick from NickServ's LIST command * - hide_email: Hide's the nick's e-mail address from NickServ's INFO command - * - hide_mask: Hide's the nick's last or current user@host from NickServ's INFO command + * - hide_mask: Hide's the nick's last or current user@host from NickServ's INFO command * - hide_quit: Hide's the nick's last quit message * - memo_signon: Notify user if they have a new memo when they sign into the nick * - memo_receive: Notify user if they have a new memo as soon as it's received * - autoop: User will be automatically opped in channels they enter and have access to * - msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires - * options:useprivmsg to be enabled as well + * options:useprivmsg to be enabled as well * * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and * memo_receive. If you really want no defaults, use "none" by itself as the option. diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 10606ca7e..5d361043d 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -572,7 +572,7 @@ class CommandCSAccess : public Command "already present on the list, its access level is changed to\n" "the level specified in the command. The \037level\037 specified\n" "may be a numerical level or the name of a privilege (eg AUTOOP).\n" - "When a user joins the channel the access they receive is from the" + "When a user joins the channel the access they receive is from the\n" "highest level entry in the access list.")); if (!Config->GetModule("chanserv")->Get<bool>("disallow_channel_access")) source.Reply(_("The given mask may also be a channel, which will use the\n" diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp index e6d48d08a..21f6d6a7d 100644 --- a/modules/commands/ms_set.cpp +++ b/modules/commands/ms_set.cpp @@ -299,7 +299,7 @@ class CommandMSSet : public Command class MSSet : public Module { CommandMSSet commandmsset; - PrimitiveExtensibleItem<bool> memo_signon, memo_receive, memo_mail, memo_hardmax; + SerializableExtensibleItem<bool> memo_signon, memo_receive, memo_mail, memo_hardmax; public: MSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), |