dbus/test/data/equiv-config-files/basic basic-1.conf,1.1,1.2

[Havoc Pennington]

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

Modified Files:
	basic-1.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-1.conf
===================================================================
RCS file: /cvs/dbus/dbus/test/data/equiv-config-files/basic/basic-1.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- basic-1.conf	9 Apr 2004 19:50:29 -0000	1.1
+++ basic-1.conf	18 Jan 2005 20:42:15 -0000	1.2
@@ -14,12 +14,12 @@
   <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>
                                    
 </busconfig>