improve docs

Author: Alexandru Scvortov

Makefile

@@ -34,7 +34,7 @@ ensure-deliverables: rabbit-vsn
 	file ${RELEASE_DIR}/${NAME_VSN}.msm
 
 ensure-prerequisites: rabbit-vsn
-	dpkg -L htmldoc plotutils transfig graphviz docbook-utils > /dev/null
+	[ -f "/etc/debian_version" ] && dpkg -L htmldoc plotutils transfig graphviz docbook-utils || true > /dev/null
 
 ensure-release-dir: rabbit-vsn
 	touch ${RELEASE_DIR}/

docs/wikipages/data.ApiOverview.txt

@@ -117,7 +117,7 @@ of the shell environment variable scanned.)
 
 ** Connecting to a broker
 
-The following code connects to an AMQP broker:
+The following two code snippets connect to an AMQP broker:
 
 @code java
  ConnectionFactory factory = new ConnectionFactory();
@@ -129,6 +129,11 @@ The following code connects to an AMQP broker:
  factory.Port = AmqpTcpEndpoint.UseDefaultPort;
  IConnection conn = factory.CreateConnection();
 
+@code java
+ ConnectionFactory factory = new ConnectionFactory();
+ factory.Uri = "amqp://user:pass@hostName:port/vhost";
+ IConnection conn = factory.CreateConnection();
+
 All factory properties have default values. The default value for a property will be used if the property remains unassigned prior to creating a connection:
  - username: [code "guest"]
  - password: [code "guest"]

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

@@ -76,17 +76,23 @@ namespace RabbitMQ.Client
     ///     conn.Close(Constants.ReplySuccess, "Closing the connection");
     ///</code></example>
     ///<para>
-    /// Please see also the API overview and tutorial in the User Guide.
+    ///The same example, written more compactly with AMQP URIs:
     ///</para>
+    ///<example><code>
+    ///     ConnectionFactory factory = new ConnectionFactory();
+    ///     factory.Uri = "amqp://guest:guest@localhost:5672/";
+    ///     IConnection conn = factory.CreateConnection();
+    ///     ...
+    ///</code></example>
     ///<para>
-    /// Some of the static methods described below take, as a
-    /// convenience, a System.Uri instance representing an AMQP server
-    /// address. The use of Uri here is not standardised - Uri is
-    /// simply a convenient container for internet-address-like
-    /// components. In particular, the Uri "Scheme" property is
-    /// ignored: only the "Host" and "Port" properties are extracted.
+    /// Please see also the API overview and tutorial in the User Guide.
     ///</para>
-    ///</remarks>
+    ///<para>
+    ///Note that the Uri property takes a string representation of an
+    ///AMQP URI.  Omitted URI parts will take default values.  The
+    ///only deviation from the spec is that URIs of the form
+    ///"amqp://foo/" (note the trailling slash) are used to represent
+    ///the default virtual host.</para></remarks>
     public class ConnectionFactory
     {
         /// <summary>Default user name (value: "guest")</summary>