=== modified file 'mandos-options.xml'
--- mandos-options.xml	2008-08-25 06:44:13 +0000
+++ mandos-options.xml	2008-08-25 10:41:16 +0000
@@ -25,8 +25,9 @@
     interface should be set, since a link-local address is only valid
     on a single interface.  By default, the server will listen to all
     available addresses.  If set, this must be an IPv6 address; an
-    IPv4 address can only be specified using the <quote><systemitem
-    class="ipaddress">::FFFF:192.0.2.3</systemitem ></quote> format.
+    IPv4 address can only be specified using IPv4-mapped IPv6 address
+    syntax: <quote><systemitem class="ipaddress"
+    >::FFFF:192.0.2.3</systemitem ></quote>.
   </para>
   
   <para id="port">

=== modified file 'mandos.conf.xml'
--- mandos.conf.xml	2008-08-25 06:44:13 +0000
+++ mandos.conf.xml	2008-08-25 10:41:16 +0000
@@ -216,7 +216,55 @@
 	<refentrytitle>mandos</refentrytitle>
 	<manvolnum>8</manvolnum></citerefentry>, <citerefentry>
 	<refentrytitle>mandos-clients.conf</refentrytitle>
-	<manvolnum>5</manvolnum></citerefentry>
+	<manvolnum>5</manvolnum></citerefentry>, <citerefentry>
+	<refentrytitle>gnutls_priority_init</refentrytitle>
+	<manvolnum>3</manvolnum></citerefentry>
     </para>
+
+    <variablelist>
+      <varlistentry>
+	<term>
+	  RFC 4291: <citetitle>IP Version 6 Addressing
+	  Architecture</citetitle>
+	</term>
+	<listitem>
+	  <variablelist>
+	    <varlistentry>
+	      <term>Section 2.2: <citetitle>Text Representation of
+	      Addresses</citetitle></term>
+	      <listitem><para/></listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term>Section 2.5.5.2: <citetitle>IPv4-Mapped IPv6
+	      Address</citetitle></term>
+	      <listitem><para/></listitem>
+	    </varlistentry>
+	    <varlistentry>
+	    <term>Section 2.5.6, <citetitle>Link-Local IPv6 Unicast
+	    Addresses</citetitle></term>
+	    <listitem>
+	      <para>
+		The clients use IPv6 link-local addresses, which are
+		immediately usable since a link-local addresses is
+		automatically assigned to a network interfaces when it
+		is brought up.
+	      </para>
+	    </listitem>
+	    </varlistentry>
+	  </variablelist>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>
+	  <ulink url="http://www.zeroconf.org/">Zeroconf</ulink>
+	</term>
+	<listitem>
+	  <para>
+	    Zeroconf is the network protocol standard used by clients
+	    for finding the Mandos server on the local network.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
   </refsect1>
 </refentry>

=== modified file 'mandos.xml'
--- mandos.xml	2008-08-25 06:44:13 +0000
+++ mandos.xml	2008-08-25 10:41:16 +0000
@@ -572,8 +572,8 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <ulink
-	      url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>
+	  <ulink url="http://www.gnu.org/software/gnutls/"
+	  >GnuTLS</ulink>
 	</term>
       <listitem>
 	<para>
@@ -585,23 +585,40 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <citation>RFC 4291: <citetitle>IP Version 6 Addressing
-	  Architecture</citetitle>, section 2.5.6, Link-Local IPv6
-	  Unicast Addresses</citation>
+	  RFC 4291: <citetitle>IP Version 6 Addressing
+	  Architecture</citetitle>
 	</term>
 	<listitem>
-	  <para>
-	    The clients use IPv6 link-local addresses, which are
-	    immediately usable since a link-local addresses is
-	    automatically assigned to a network interfaces when it is
-	    brought up.
-	  </para>
+	  <variablelist>
+	    <varlistentry>
+	      <term>Section 2.2: <citetitle>Text Representation of
+	      Addresses</citetitle></term>
+	      <listitem><para/></listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term>Section 2.5.5.2: <citetitle>IPv4-Mapped IPv6
+	      Address</citetitle></term>
+	      <listitem><para/></listitem>
+	    </varlistentry>
+	    <varlistentry>
+	    <term>Section 2.5.6, <citetitle>Link-Local IPv6 Unicast
+	    Addresses</citetitle></term>
+	    <listitem>
+	      <para>
+		The clients use IPv6 link-local addresses, which are
+		immediately usable since a link-local addresses is
+		automatically assigned to a network interfaces when it
+		is brought up.
+	      </para>
+	    </listitem>
+	    </varlistentry>
+	  </variablelist>
 	</listitem>
       </varlistentry>
       <varlistentry>
 	<term>
-	  <citation>RFC 4346: <citetitle>The Transport Layer Security
-	  (TLS) Protocol Version 1.1</citetitle></citation>
+	  RFC 4346: <citetitle>The Transport Layer Security (TLS)
+	  Protocol Version 1.1</citetitle>
 	</term>
       <listitem>
 	<para>
@@ -611,8 +628,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <citation>RFC 4880: <citetitle>OpenPGP Message
-	  Format</citetitle></citation>
+	  RFC 4880: <citetitle>OpenPGP Message Format</citetitle>
 	</term>
       <listitem>
 	<para>
@@ -622,8 +638,8 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <citation>RFC 5081: <citetitle>Using OpenPGP Keys for
-	  Transport Layer Security</citetitle></citation>
+	  RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
+	  Security</citetitle>
 	</term>
       <listitem>
 	<para>