dbus/test/data/valid-config-files basic.conf, 1.6, 1.7 many-rules.conf, 1.3, 1.4

[Havoc Pennington]

Update of /cvs/dbus/dbus/test/data/valid-config-files
In directory gabe:/tmp/cvs-serv23786/test/data/valid-config-files

Modified Files:
	basic.conf many-rules.conf 
Log Message:
2005-01-18  Havoc Pennington  <hp@redhat.com>

        * Throughout, grand renaming to strip out the use of "service",
	just say "name" instead (or "bus name" when ambiguous).  Did not
	change the internal code of the message bus itself, only the
	programmer-facing API and messages.
	
	* doc/dbus-specification.xml: further update the message bus section
	
	* bus/config-parser.c (all_are_equiv): fix bug using freed string
	in error case



Index: basic.conf
===================================================================
RCS file: /cvs/dbus/dbus/test/data/valid-config-files/basic.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- basic.conf	30 Jul 2004 05:59:34 -0000	1.6
+++ basic.conf	18 Jan 2005 20:42:15 -0000	1.7
@@ -14,13 +14,13 @@
   <limit name="max_incoming_bytes">5000</limit>   
   <limit name="max_outgoing_bytes">5000</limit>
   <limit name="max_message_size">300</limit>
-  <limit name="activation_timeout">5000</limit>
+  <limit name="service_start_timeout">5000</limit>
   <limit name="auth_timeout">6000</limit>
   <limit name="max_completed_connections">50</limit>  
   <limit name="max_incomplete_connections">80</limit>
   <limit name="max_connections_per_user">64</limit>
-  <limit name="max_pending_activations">64</limit>
-  <limit name="max_services_per_connection">256</limit>
+  <limit name="max_pending_service_starts">64</limit>
+  <limit name="max_names_per_connection">256</limit>
 
   <selinux>
         <associate own="org.freedesktop.FrobationaryMeasures"

Index: many-rules.conf
===================================================================
RCS file: /cvs/dbus/dbus/test/data/valid-config-files/many-rules.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- many-rules.conf	25 Aug 2004 08:03:12 -0000	1.3
+++ many-rules.conf	18 Jan 2005 20:42:15 -0000	1.4
@@ -46,13 +46,13 @@
   <limit name="max_incoming_bytes">5000</limit>   
   <limit name="max_outgoing_bytes">5000</limit>
   <limit name="max_message_size">300</limit>
-  <limit name="activation_timeout">5000</limit>
+  <limit name="service_start_timeout">5000</limit>
   <limit name="auth_timeout">6000</limit>
   <limit name="max_completed_connections">50</limit>  
   <limit name="max_incomplete_connections">80</limit>
   <limit name="max_connections_per_user">64</limit>
-  <limit name="max_pending_activations">64</limit>
-  <limit name="max_services_per_connection">256</limit>
+  <limit name="max_pending_service_starts">64</limit>
+  <limit name="max_names_per_connection">256</limit>
   <limit name="max_match_rules_per_connection">512</limit>
                                    
 </busconfig>