[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Nbd] [PATCH] doc: Kill references to unsupported old style



The man pages and top-level README should no longer advertise
the oldstyle configuration option, since it now just triggers
an error.

Signed-off-by: Eric Blake <eblake@...696...>
---

Some stale documentation caught my eye when browsing the new
forked repo and various doc branches.

 README.md                | 11 +----------
 man/nbd-client.8.in.sgml |  2 +-
 man/nbd-server.5.in.sgml | 15 ++-------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 013152e..14cfa1c 100644
--- a/README.md
+++ b/README.md
@@ -44,10 +44,6 @@ this:
         group = nbd
     [export1]
         exportname = /export/nbd/export1-file
-        # The following line will be ignored unless the 
-        # "oldstyle = true" line in the generic section above is
-        # enabled.
-        port = 12345
         authfile = /export/nbd/export1-authfile
         timeout = 30
         filesize = 10000000
@@ -58,9 +54,7 @@ this:
         postrun = rm -f %s
     [otherexport]
         exportname = /export/nbd/experiment
-        # The other options are all optional, except this one in case
-        # the oldstyle option is used in [generic]:
-        # port = 12346
+        # The other options are all optional

 The configuration file is parsed with GLib's GKeyFile, which parses key
 files as they are specified in the Freedesktop.org Desktop Entry
@@ -93,9 +87,6 @@ will use the second export in the above example (the one that exports
 `nbd-server` runs as; otherwise, you won't get a PID file, though the
 server will keep running).

-The old command-line port-only way of exporting something is still
-supported, but it is deprecated.
-
 There are packages (or similar) available for the following operating
 systems:

diff --git a/man/nbd-client.8.in.sgml b/man/nbd-client.8.in.sgml
index e15aa82..2bbf04b 100644
--- a/man/nbd-client.8.in.sgml
+++ b/man/nbd-client.8.in.sgml
@@ -158,7 +158,7 @@ manpage.1: manpage.sgml
           <para>Previous versions of the nbd tools supported an older
             version of the negotiation protocol known as "oldstyle".
             This protocol version is no longer supported as of version
-            3.11 of the nbd spport tools.</para>
+            3.11 of the nbd support tools.</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/man/nbd-server.5.in.sgml b/man/nbd-server.5.in.sgml
index 41235e0..8851708 100644
--- a/man/nbd-server.5.in.sgml
+++ b/man/nbd-server.5.in.sgml
@@ -424,10 +424,8 @@ manpage.1: manpage.sgml
 	    Optional; string
 	  </para>
 	  <para>
-	    If the 'oldstyle' global parameter is specified, works
-	    similarly to the global listenaddr parameter, but for the
-	    individual port of this particular export. If the 'oldstyle'
-	    parameter is not set, this parameter is ignored.
+	    Ignored, kept for compatibility with the obsolete
+	    'oldstyle' global parameter.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -887,15 +885,6 @@ manpage.1: manpage.sgml
       192.168.0.0/8
       192.168.1.1
     </programlisting>
-    <para>To be compatible with older nbd-client systems, one might wish
-    to enable the old-style, port-based, negotation:</para>
-    <programlisting>
-      [generic]
-          oldstyle = true
-      [export]
-          exportname = /export/blkdev
-	  port = 12345
-    </programlisting>
   </refsect1>
 </refentry>

-- 
2.5.5




Reply to: