commit - 640367e88678b9ba778fb87492ea4eb206420b96
commit + 9021ea2070d50acc94783163be33625637040547
blob - 1821bf6743abcfe58100c31543164b21c624b143
blob + 478f331fe991143d0cb139d36db3561698620902
--- ChangeLog
+++ ChangeLog
@@ -14,11 +14,12 @@ ngIRCd HEAD
 
   - Fixed code that prevented GCC 2.95 to compile ngIRCd.
   - Adjust path names in manual pages according to "./configure" settings.
-  - Add new server config option to disable automatic connect. (Similar to -p
-    option to ngircd, but only for the specified server) (Tassilo Schweyer)
+  - Added new server configuration option "Passive" for "Server" blocks to
+    disable automatic outgoing connections (similar to -p option to ngircd,
+    but only for the specified server). (Tassilo Schweyer)
   - Don't connect to a server if a connection to another server within the
-    same group is in progress.
-  - Add support for the /WALLOPS command. Usage is restricted to irc
+    same group is already in progress.
+  - Added support for the WALLOPS command. Usage is restricted to IRC
     operators.
 
 ngIRCd 0.10.3 (2007-08-01)
@@ -705,4 +706,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.321 2007/08/02 10:16:28 fw Exp $
+$Id: ChangeLog,v 1.322 2007/10/04 10:14:52 alex Exp $
blob - 6bed77b253cb52c689f07fbc3b2ea80897d3ac71
blob + d99ad969beba99db91f5ad8607d61da3a1f49a66
--- doc/sample-ngircd.conf
+++ doc/sample-ngircd.conf
@@ -1,4 +1,4 @@
-# $Id: sample-ngircd.conf,v 1.39 2006/12/29 14:09:48 fw Exp $
+# $Id: sample-ngircd.conf,v 1.40 2007/10/04 10:14:52 alex Exp $
 
 #
 # This is a sample configuration file for the ngIRCd, which must be adepted
@@ -6,6 +6,10 @@
 #
 # Comments are started with "#" or ";".
 #
+# A lot of configuration options in this file start with a ";". You have
+# to remove the ";" in front of each variable to actually set a value!
+# The disabled variables are shown with example values for completeness.
+#
 # Use "ngircd --configtest" (see manual page ngircd(8)) to validate that the
 # server interprets the configuration file as expected!
 #
@@ -160,6 +164,13 @@
 	# Group of this server (optional)
 	;Group = 123
 
+	# Set the "Passive" option to "yes" if you don't want this ngIRCd to
+	# connect to the configured peer (same as leaving the "Port" variable
+	# empty). The advantage of this option is that you can actually configure
+	# a port an use the IRC command CONNECT more easily to manually connect
+	# this specific server later.
+	;Passive = no
+
 [Server]
 	# More [Server] sections, if you like ...