X-Git-Url: http://git.alex.org.uk

diff --git a/nbd-server.1.sgml b/nbd-server.1.sgml
index a492875..c9190b0 100644
--- a/nbd-server.1.sgml
+++ b/nbd-server.1.sgml
@@ -57,7 +57,7 @@ manpage.1: manpage.sgml
     <cmdsynopsis>
       <command>&dhpackage; </command>
 
-      <arg choice=plain><replaceable>[ip:]port</replaceable</arg>
+      <arg choice=plain><replaceable>[ip@]port</replaceable</arg>
       <arg choice=plain><replaceable>filename</replaceable></arg>
       <arg><replaceable>size</replaceable></arg>
       <arg><option>-r</option></arg>
@@ -82,10 +82,17 @@ manpage.1: manpage.sgml
     were a local filesystem.</para>
 
     <para><command>&dhpackage;</command> implements some security
-    through a file called "nbd_server.allow" in the current directory (by default; a different file can be chosen with the '-l' option).
-    This file must list the IP-addresses of clients that are allowed
-    to connect. If it does not exist, all clients are able to connect.
-    If the file is empty, no clients can connect.</para>
+    through a file called "@sysconfdir@/nbd-server/allow" (by default; a
+    different file can be chosen with the '-l' option or through a
+    config file specification). This file must list the IP-addresses or
+    network masks of clients that are allowed to connect. If it does not
+    exist, all clients are able to connect. If the file is empty, no
+    clients can connect.</para>
+
+    <para>Note that while the command line allows for specifying an
+    export, the use of this option is deprecated. It is preferred to
+    make use of a configuration file instead, the format of which is
+    defined in nbd-server(5).</para>
   </refsect1>
   <refsect1>
     <title>OPTIONS</title>
@@ -94,19 +101,29 @@ manpage.1: manpage.sgml
       <varlistentry>
 	<term>ip</term>
 	<listitem>
-	  <para>The ip address the server should listen on. If
-	  omitted, 0.0.0.0 (aka "any address") is used.</para>
+	  <para>The ip address the server should listen on. This may
+	  be an IPv4 address, an IPv6 address, or a hostname. In the
+	  latter case, nbd-server will do a hostname lookup for the
+	  name specified, and will listen on the first address that is
+	  returned. For compatibility with past versions of
+	  nbd-server, if an IPv4 address is specified, the @ sign that
+	  serves as separator between the address and port may be
+	  replaced by a colon.</para>
+	  <para>If this parameter is not specified, nbd-server will
+	  listen on all local addresses on both IPv4 and IPv6. To
+	  limit to IPv4, specify the address as 0.0.0.0; to limit to
+	  IPv6, specify it as ::.</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>port</option>
-        </term>
-        <listitem>
-          <para>The port the server should listen to. A valid port is
+	<term><option>port</option>
+	</term>
+	<listitem>
+	  <para>The port the server should listen to. A valid port is
 	    any number between 1 and 65536; if 0 is used, nbd-server
 	    will listen on stdin (so that nbd-server can be ran from
 	    inetd)</para>
-        </listitem>
+	</listitem>
       </varlistentry>
       <varlistentry>
 	<term><option>filename</option></term>
@@ -122,7 +139,7 @@ manpage.1: manpage.sgml
 	<term><option>size</option></term>
 	<listitem>
 	  <para>The size of the block device at the client side. This
-	    is especially usefull in conjunction with the -m
+	    is especially useful in conjunction with the -m
 	    option</para>
 	  <para>Can optionally be followed by one of K,k,M or
 	    m, in which case the size will be multiplied by 1024 (K
@@ -172,7 +189,7 @@ manpage.1: manpage.sgml
 	</listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>-C</option></term>
+	<term><option>-C</option></term>
 	<listitem>
 	  <para>Specify configuration file. The default configuration
 	    file, if this parameter is not specified, is
@@ -205,7 +222,7 @@ manpage.1: manpage.sgml
 	</listitem>
       </varlistentry>
       <varlistentry>
-      	<term><option>section name</option></term>
+	<term><option>section name</option></term>
 	<listitem>
 	  <para>If the <option>-o</option> argument is given on the
 	  command line, then &dhpackage; will output a configuration
@@ -267,20 +284,3 @@ manpage.1: manpage.sgml
 
   </refsect1>
 </refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->