From: Ben Pfaff <blp@nicira.com>
Date: Fri, 19 Mar 2010 00:00:02 +0000 (-0700)
Subject: docs: Fix ovsdb-server manpage.
X-Git-Tag: v1.0.0~242
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a976b2eca2bdbc69b9dabf9157b81a98c0e4a9e0;p=sliver-openvswitch.git

docs: Fix ovsdb-server manpage.

The description of --remote=db:table,column got accidentally dropped a
number of commits back, so restore it.  Also, document that ovsdb-server
supports SSL bootstrapping.
---

diff --git a/ovsdb/ovsdb-server.1.in b/ovsdb/ovsdb-server.1.in
index e301609d3..d315c8ae0 100644
--- a/ovsdb/ovsdb-server.1.in
+++ b/ovsdb/ovsdb-server.1.in
@@ -32,6 +32,14 @@ Adds \fIremote\fR as a connection method used by \fBovsdb\-server\fR.
 .RS
 .so ovsdb/remote-passive.man
 .so ovsdb/remote-active.man
+.
+.IP "\fBdb:\fItable\fB,\fIcolumn\fR"
+Reads additional connection methods from \fIcolumn\fR in all of the
+rows in \fItable\fR within the \fBovsdb\-server\fR database.  The
+\fIcolumn\fR must have type string or set of strings.  The connection
+methods in the column must have one of the forms described above.  As
+the contents of \fIcolumn\fR changes, \fBovsdb\-server\fR also adds
+and drops connection methods accordingly.
 .RE
 .
 .IP "\fB\-\-run=\fIcommand\fR]"
@@ -52,6 +60,7 @@ run a single command, e.g.:
 .so lib/vlog.man
 .SS "Public Key Infrastructure Options"
 .so lib/ssl.man
+.so lib/ssl-bootstrap.man
 .SS "Other Options"
 .so lib/common.man
 .SH "RUNTIME MANAGEMENT COMMANDS"