From c90bd5a7d2440cfdd0b8d111413a879567420822 Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@codefactory.se>
Date: Sun, 2 Feb 2003 17:36:46 +0000
Subject: 2003-02-02  Anders Carlsson  <andersca@codefactory.se>

	* doc/dbus-specification.sgml:
	Update address format section.
---
 ChangeLog                   |  5 +++++
 doc/dbus-specification.sgml | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 916ecc41..1a2427b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-02  Anders Carlsson  <andersca@codefactory.se>
+
+	* doc/dbus-specification.sgml:
+	Update address format section.
+	
 2003-02-02  Anders Carlsson  <andersca@codefactory.se>
 
 	* test/Makefile.am:
diff --git a/doc/dbus-specification.sgml b/doc/dbus-specification.sgml
index 8e862f1b..48d8af90 100644
--- a/doc/dbus-specification.sgml
+++ b/doc/dbus-specification.sgml
@@ -15,6 +15,16 @@
 	  </address>
 	</affiliation>
       </author>
+      <author>
+	<firstname>Anders</firstname>
+	<surname>Carlsson</surname>
+	<affiliation>
+	  <orgname>CodeFactory AB</orgname>
+	  <address>
+            <email>andersca@codefactory.se</email>
+          </address>
+	</affiliation>
+      </author>
     </authorgroup>
   </artheader>
 
@@ -410,8 +420,27 @@
   <sect1 id="addresses">
     <title>Server Addresses</title>
     <para>
-      [document the string format of an address, and how it maps 
-      to unix domain sockets, tcp, or whatever]
+      Server addresses consist of a transport name followed by a colon, and
+      then an optional, comma-separated list of keys and values in the form key=value.
+    </para>
+    <para>
+      For example: 
+      <programlisting>unix:path=/tmp/dbus-test</programlisting>
+      Which is the address to a unix socket with the path /tmp/dbus-test.
+    </para>
+    <para>
+      When connecting to a server, multiple server addresses can be
+      separated by a semi-colon. The library will then try to connect
+      to the first address and if that fails, it'll try to connect to
+      the next one specified, and so forth. For example
+      <programlisting>unix:path=/tmp/dbus-test;unix:path=/tmp/dbus-test2</programlisting>
+    </para>
+    <para>
+      Currently, a transport over local UNIX sockets exists, a debug
+      transport that only works in-process and therefore can be used
+      for for unit testing also exists. It is possible that other
+      transports are added, such as a TCP/IP transport, and a
+      transport that works over X11.
     </para>
   </sect1>
 
@@ -670,6 +699,7 @@
         interact with the message bus.
       </para>
       <para>
+        
         [document the messages here]
       </para>
     </sect2>
-- 
cgit