Be explicit when we exit

[nbd.git] / nbd-server.1.sgml

diff --git a/nbd-server.1.sgml b/nbd-server.1.sgml
index 069fb53..a492875 100644 (file)
--- a/nbd-server.1.sgml
+++ b/nbd-server.1.sgml
@@ -63,8 +63,7 @@ manpage.1: manpage.sgml
       <arg><option>-r</option></arg>
       <arg><option>-m</option></arg>
       <arg><option>-c</option></arg>
-      <arg><option>-a <replaceable>timeout</replaceable></option></arg>
-      <arg><option>-l <replaceable>host list</replaceable></option></arg>
+      <arg><option>-l <replaceable>host list filename</replaceable></option></arg>
       <arg><option>-o <replaceable>section name</replaceable></option></arg>
       <arg><option>-C <replaceable>config file</replaceable></option></arg>
     </cmdsynopsis>
@@ -184,19 +183,15 @@ manpage.1: manpage.sgml
            file entirely, either move it away or use the -C option to
            point <command>nbd-server</command>(1) to a non-existing or
            empty configuration file.</para>
+         <para>Also note that if an empty, incomplete, or invalid
+           configuration file is specified, nbd-server will produce a
+           warning about failure to parse the config file. If the
+           command line contains a fully specified configuration, this
+           warning is harmless and may be ignored.</para>
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><option>timeout</option></term>
-       <listitem>
-         <para>Maximum number of idle seconds. If a connection is
-           inactive for this amount of time, it is terminated; this is to
-           avoid stale nbd-server processes staying in memory. Use of
-           this option is strongly recommended.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><option>host list</option></term>
+       <term><option>host list filename</option></term>
        <listitem>
          <para>This argument should contain a list of IP-addresses
            for hosts that may connect to the server. Wildcards are