Browse Source

Fix a typo in documentation. Closes: #932462

Christoph Biedl 1 year ago
parent
commit
6c9932b676

+ 1 - 1
debian/ngircd.conf

@@ -299,7 +299,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.
 	#

+ 73 - 0
debian/patches/cherry-pick.rel-25-10-ge954b59d.fix-some-typos-documentation-files-ngircd-conf-manual-page.patch

@@ -0,0 +1,73 @@
+Subject: Fix some typos (documentation files, ngircd.conf manual page, ...)
+Origin: rel-25-10-ge954b59d
+Upstream-Author: Alexander Barton <alex@barton.de>
+Date: Sun Jul 21 16:23:07 2019 +0200
+
+    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!
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -201,7 +201,7 @@
+     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.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
+--- a/NEWS
++++ b/NEWS
+@@ -297,7 +297,7 @@
+ 
+   - 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)
+--- 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.
+ 	#
+--- a/man/ngircd.conf.5.tmpl
++++ b/man/ngircd.conf.5.tmpl
+@@ -432,7 +432,7 @@
+ 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
+--- 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.
+  */

+ 1 - 0
debian/patches/series

@@ -1,2 +1,3 @@
 # cherry-picked from upstream. Keep in chronological order
 cherry-pick.rel-25-1-gaec86aa8.ngircd-conf-5-fix-wording-as-suggested-by-lintian.patch
+cherry-pick.rel-25-10-ge954b59d.fix-some-typos-documentation-files-ngircd-conf-manual-page.patch