Merge branch '2.0' into 2.1.

6 files changed, 15 insertions, 15 deletions

diff --git a/docs/CODING b/docs/CODING
index 31fa4e847..6c56d0ddf 100644
--- a/docs/CODING
+++ b/docs/CODING
@@ -59,7 +59,7 @@ yet follows these. This will be rectified with time.
 4. Braces
 
    Always put braces opening and closing blocks on separate lines, see the
-   identation example. For example, place braces like this:
+   indentation example. For example, place braces like this:
      if (apples == "green")
      {
          cout << "Apples are green" << endl;
diff --git a/docs/Changes b/docs/Changes
index 67674e156..4d4f25b4f 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -83,7 +83,7 @@ Fix chankill to not add duplicate akills
 Allow nickserv/maxemail to disregard gmail style aliases when comparing emails
 Fix chanserv/mode when setting listmodes with CIDR ranges
 Fix reported expiry time when the time is divisible by 1 year
-Clearify botserv repeat kicker help and allow setting repeat times to 1
+Clarify botserv repeat kicker help and allow setting repeat times to 1
 Send vident/vhost with SASL login
 Add support for SASL reauth
 Fix log and database backup directories to be properly created by the installer
@@ -255,7 +255,7 @@ Anope Version 1.9.3
 A Added italics BotServ kicks support
 A Tell users when their nicks expire in /ns glist and /ns info
 A Added SSL support
-A Prevent negaitve mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
+A Prevent negative mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
 A Added nickserv/auxpex permission
 A Added nickserv ungroup command
 A Renamed the SGLINE to be SNLINE
@@ -267,15 +267,15 @@ A Added m_mysql which uses threads to execute queries
 A Added many subcommand modules for some commands, eg ns_set_autoop, ns_set_email, etc
 A Added a new logging system that is a bit more flexible
 A Added cs_set_misc and ns_set_misc to add miscellaneous set commands
-A Added os_modreload, which allows reloading some modules not normally unloable, like the protocol module
+A Added os_modreload, which allows reloading some modules not normally unloadable, like the protocol module
 A Added FOUNDER access level
 A Made OperServ, Global, MemoServ, and ChanServ optional
 F Shutting down if a config reload fails
 F Autoid to live through restarts on Unreal
 F Storing vhosts in MySQL
-F Not flushing the anope_extra table before rewriting databaes
+F Not flushing the anope_extra table before rewriting database
 F Anoperc start/stop to send the globaloncycle global, and fixed anoperc rehash to really rehash
-F Fixed a potential crash if HostServ or BotServ was disbled
+F Fixed a potential crash if HostServ or BotServ was disabled
 
 Anope Version 1.9.2
 -------------------
@@ -299,7 +299,7 @@ F Unban command to accept an optional nick arg
 F Some typos in services.conf
 F Crash when users change their host that are identified to a group, but not a nick
 F Host length checking in HS SET(ALL) and HS REQUEST
-F Only show if a user is online in NS INFO if they are really identiifed for the group of the nick they are on
+F Only show if a user is online in NS INFO if they are really identified for the group of the nick they are on
 F Crash when using BSSmartJoin
 F Converting access entries to access from xop when a users access is below voice
 F A bad pointer passed to the OnDelEvent which could cause some 3rd party modules to crash
diff --git a/docs/Changes.conf b/docs/Changes.conf
index 4f0077413..de3e0bf44 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -69,7 +69,7 @@ mail:restrict removed
 
 Anope Version 1.9.9
 -------------------
-There is not many config changes betewen 1.9.8 and 1.9.9, however many of the
+There is not many config changes between 1.9.8 and 1.9.9, however many of the
 options have been moved around to make more sense, too many to list here,
 so get a new config.
 
@@ -170,7 +170,7 @@ options:enablelogchannel added to auto turn on the logchannel on startup
 options:mlock added to configure the default mlock modes on new channels
 options:database added for the database modules
 options:botmodes added to configure modes BotServ bots should use
-options:userlen added to configure maxiumum ident length
+options:userlen added to configure maximum ident length
 options:hostlen added to configure maximum hostname length
 options:database added to configure what database modules to use
 options:passlen added to specify the maximum length of passwords
diff --git a/docs/INSTALL b/docs/INSTALL
index 5046c6912..ffbf04906 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -80,7 +80,7 @@ Note: You should also read the README and FAQ files!
 
     The configuration varies depending on the IRCd, but you will probably need
     a link block (also called connect block, or C line), a U line (also called
-    a shared block), and be sure that the IRCd is listneing on the given port
+    a shared block), and be sure that the IRCd is listening on the given port
     in the link block.
 
     Example link configurations can be found in anope.example.conf for some of the
diff --git a/docs/LANGUAGE b/docs/LANGUAGE
index bb76ca485..3aab36b45 100644
--- a/docs/LANGUAGE
+++ b/docs/LANGUAGE
@@ -1,4 +1,4 @@
-Anope Mutli Language Support
+Anope Multi Language Support
 ----------------------------
 
 1) Building Anope with gettext support
@@ -36,7 +36,7 @@ Anope Mutli Language Support
 
     NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.
 
-3) Using langages with modules
+3) Using languages with modules
 
     Module authors can easily add the ability to have their modules translated by adding _() around the strings they
     want translated (messages to the user, etc).
diff --git a/docs/REDIS b/docs/REDIS
index d18585979..8f7a076fd 100644
--- a/docs/REDIS
+++ b/docs/REDIS
@@ -32,7 +32,7 @@ Table of Contents
 
         hash -  The keys in hash are the actual objects, stored as hashes. For
                 example, if I had just looked up all BotInfo ids and wanted to iterate
-                over all of them, I woulld start by:
+                over all of them, I would start by:
 
                 redis 127.0.0.1:6379> HGETALL hash:BotInfo:1
 
@@ -73,7 +73,7 @@ Table of Contents
     (https://redis.io/topics/notifications). This allows Redis to notify Anope of
     any external changes to objects in the database. Once notified, Anope will
     immediately update the object. Otherwise, Anope keeps all objects in memory
-    and will not regularly read from the databaes once started.
+    and will not regularly read from the database once started.
 
     You can use this to modify objects in Redis and have them immediately reflected
     back into Anope. Additionally you can use this feature to run multiple Anope
@@ -93,7 +93,7 @@ Table of Contents
 
     The key space ids and value are managed entirely by Anope, you do
     not (and should not) modify them. Once you modify the object (hash), Anope will
-    update them for you to correctly refelect any changes made to the object.
+    update them for you to correctly reflect any changes made to the object.
 
     Finally, always use atomic operations. If you are inserting a new object with
     multiple commands, or inserting multiple objects at once, specifically if the