From: Ben Pfaff <blp@nicira.com>
Date: Wed, 23 Jun 2010 16:59:49 +0000 (-0700)
Subject: ovs-vsctl: Add details to documentation for "emer-reset" command.
X-Git-Tag: v1.1.0pre1~227
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=26b3154062489a3d3b87b28750f543e9ded43efa;p=sliver-openvswitch.git

ovs-vsctl: Add details to documentation for "emer-reset" command.

Someone asked me what emer-reset really does and I had to look in the
source code to find out.  It's kinder just to document it.
---

diff --git a/utilities/ovs-vsctl.8.in b/utilities/ovs-vsctl.8.in
index ab487ad41..cde912d7e 100644
--- a/utilities/ovs-vsctl.8.in
+++ b/utilities/ovs-vsctl.8.in
@@ -140,9 +140,12 @@ Open vSwitch database if it is empty.  This command is provided to
 initialize the database without executing any other command.
 .
 .IP "\fBemer\-reset\fR"
-Reset the configuration into a clean state.  This will clear the
-configuration of items likely to have been configured by a manager.
-The core networking configuration will be left as is.
+Reset the configuration into a clean state.  It deconfigures OpenFlow
+controllers, OVSDB servers, and SSL, and deletes port mirroring,
+NetFlow, and sFlow configuration.  This command also removes all
+\fBother\-config\fR keys from all database records, except that
+\fBother-config:hwaddr\fR is preserved if it is present in a Bridge
+record.  Other networking configuration is left as-is.
 .
 .SS "Bridge Commands"
 These commands examine and manipulate Open vSwitch bridges.