Fix some typos (documentation files, ngircd.conf manual page, ...)

Spotted by Étienne Mollier <etienne.mollier@mailoo.org> and Christoph
Biedl <debian.axhn@manchmal.in-ulm.de>, see Debian bug #932462
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932462). Thank you!

diff --git a/ChangeLog b/ChangeLog
index 17f92d87aa93711a8306c9d7091ca9df4a62ed5d..0ff0245b1d798492707035ce723422523e7337ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -201,7 +201,7 @@ ngIRCd 23 (2015-11-16)
     Idea and implementation by LucentW, Thanks! Closes #207.
   - Update ngircd.conf.5: "CloakUserToNick" hides user _and_ real name.
     This closes #208.
-  - Fix case insensitive pattern matching: Up to now, only the the input
+  - Fix case insensitive pattern matching: Up to now, only the input
     string became lowercased and was then compared to the pattern -- which
     failed when the pattern itself wasn't all lowercase!
   - Streamline the effect of "MorePrivacy" option: Update documentation
@@ -554,7 +554,7 @@ ngIRCd 20.3 (2013-08-23)
 ngIRCd 20.2 (2013-02-15)
 
   - Security: Fix a denial of service bug in the function handling KICK
-    commands that could be used by arbitrary users to to crash the daemon
+    commands that could be used by arbitrary users to crash the daemon
     (CVE-2013-1747).
   - WHO command: Use the currently "displayed hostname" (which can be cloaked!)
     for hostname matching, not the real one. In other words: don't display all

diff --git a/NEWS b/NEWS
index 1819ef6f2c551eb3108d015f2b9ff01bca22c01b..a81085a30ddde1dd0ca6a584ce58796b372fb9af 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -297,7 +297,7 @@ ngIRCd 20.2 (2013-02-15)
 
   - This release is a bugfix release only, without new features.
   - Security: Fix a denial of service bug in the function handling KICK
-    commands that could be used by arbitrary users to to crash the daemon
+    commands that could be used by arbitrary users to crash the daemon
     (CVE-2013-1747).
 
 ngIRCd 20.1 (2013-01-02)

diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl
index 7905da482c722ce2e39d2a342d4a886ea849cc48..cccc7e923b954f76a0c5704b4366412a5fc003d6 100644 (file)
--- a/doc/sample-ngircd.conf.tmpl
+++ b/doc/sample-ngircd.conf.tmpl
@@ -309,7 +309,7 @@
 [Server]
        # Other servers are configured in [Server] sections. If you
        # configure a port for the connection, then this ngircd tries to
-       # connect to to the other server on the given port; if not it waits
+       # connect to the other server on the given port; if not it waits
        # for the other server to connect.
        # There may be more than one server block, one for each server.
        #

diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl
index 1c5a6fa0e310241887248062f512c05db29c2619..33c737fea4ecb4157780132b739ffeb8f1481a4e 100644 (file)
--- a/man/ngircd.conf.5.tmpl
+++ b/man/ngircd.conf.5.tmpl
@@ -432,7 +432,7 @@ Example: nick!ident@*.example.com
 Other servers are configured in
 .I [Server]
 sections. If you configure a port for the connection, then this ngIRCd
-tries to connect to to the other server on the given port (active);
+tries to connect to the other server on the given port (active);
 if not, it waits for the other server to connect (passive).
 .PP
 ngIRCd supports "server groups": You can assign an "ID" to every server

diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index 4b73b547f8759e5eefc80e4a8e5de236ba3bcc9d..8029c0f77b3086d17512d8466ef04821402d1b15 100644 (file)
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -29,7 +29,7 @@
 
 /**
  * Configured IRC operator.
- * Please note the the name of the IRC operaor and his nick have nothing to
+ * Please note that the name of the IRC operaor and his nick have nothing to
  * do with each other! The IRC operator is only identified by the name and
  * password configured in this structure.
  */