Date:	Thursday May 10, 2001 @ 5:37
Author:	quisar

Update of /home/netrek/cvsroot/Vanilla/docs
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv8235/docs

Modified Files:
	CUSTOMIZATION sample_sysdef.in 
Log Message:
 Here's the Changelog entry:

        * docs/CUSTOMIZATION, docs/sample_sysdef.in, include/config.h.in,
        include/data.h, include/sysdefaults.h, ntserv/data.c,
        ntserv/interface.c: remove RESTRICT_BOMB and NO_UNWARRING_BOMBING 
        from config.h.in and put it in .sysdef.

        * tools/xtkill.c: Correct 'S' option to do what it should (put
        damages and etemp back to 0.

        * Makefile.in: Correct a syntax error.

 PS: gum has to be upgraded, but having not the right version of glade, I
send the patch to James Cameron so that he does the checkin.



****************************************

Index: Vanilla/docs/CUSTOMIZATION
diff -u Vanilla/docs/CUSTOMIZATION:1.1 Vanilla/docs/CUSTOMIZATION:1.2
--- Vanilla/docs/CUSTOMIZATION:1.1	Wed Nov 11 20:44:50 1998
+++ Vanilla/docs/CUSTOMIZATION	Thu May 10 05:37:10 2001
@@ -33,8 +33,6 @@
 	NO_PLANET_PLAGUE - Don't allow planet plagueing. Don't use this with
 		ERIKPLAGUE.
 
-	NO_UNWARRING_BOMBING - Don't allow 3rd space bombing at any time.
-
 	PING - Allow ping stats support. This may increase the network load a
 		little.
 
@@ -46,8 +44,6 @@
 
 	RESETGALAXY - Everytime a conquer occurs reset the galaxy.
 
-	RESTRICT_BOMB - Disable bombing out of t-mode.
-
 	SELF_RESET - galaxy will reset if daemon dies.
 
 	SHORT_PACKETS - Use short packets code. This may increase the load on
@@ -147,6 +143,10 @@
 
 	SBRANK - ( 0 - 7 ) Rank needed to get a starbase.
 		0 = Ensign , 7 = Admiral
+
+	RESTRICT_BOMB (0 or 1) - Disable bombing out of t-mode.
+
+	NO_UNWARRING_BOMBING - Don't allow 3rd space bombing at any time.
 
 	CHAOS - (0 or 1) Turn on chaos mode. Ships are more powerful and
 		re-generate faster.
Index: Vanilla/docs/sample_sysdef.in
diff -u Vanilla/docs/sample_sysdef.in:1.1 Vanilla/docs/sample_sysdef.in:1.2
--- Vanilla/docs/sample_sysdef.in:1.1	Fri Apr 27 21:42:34 2001
+++ Vanilla/docs/sample_sysdef.in	Thu May 10 05:37:11 2001
@@ -1,4 +1,4 @@
-#	$Id: sample_sysdef.in,v 1.1 2001/04/28 02:42:34 cameron Exp $	
+#	$Id: sample_sysdef.in,v 1.2 2001/05/10 10:37:11 quisar Exp $	
 #
 #	The sample sysdef file shipped with the server.
 #
@@ -78,6 +78,12 @@
 #
 #  Maximum number of Starbases allowed in Chaos mode
 MAX_CHAOS_BASES=2
+#
+#  Disallow bombing out of t-mode (1 = no bombing)
+RESTRICT_BOMB=1
+#
+#  Disallow 3rd space bombing (1 = no bombing)
+NO_UNWARRING_BOMBING=1
 #
 # 	Use topgun mode (0 = no, 1 = yes)
 TOPGUN=0