docs: Make it clear that ovs-openflowd is an alternative to ovs-vswitchd.

Suggested-by: Vishal Swarankar <vishal.swarnkar@gmail.com>

diff --git a/AUTHORS b/AUTHORS
index 3364fa2b828067a8b1f1be26843fba8d5a7e42f2..9adaa6d3df42442bc763f480ac1d574078f91999 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -59,6 +59,7 @@ Srini Seetharaman       seethara@stanford.edu
 Stephen Hemminger       shemminger@vyatta.com
 Takayuki HAMA           t-hama@cb.jp.nec.com
 Teemu Koponen           koponen@nicira.com
+Vishal Swarankar        vishal.swarnkar@gmail.com
 kk yap                  yapkke@stanford.edu
 
 Thanks to all Open vSwitch contributors.  If you are not listed above

diff --git a/README b/README
index 55e9d9c9b9b2eee0def667ecc5417701a959ce80..16f2ee676e11c20e82254da174aceb1ddc31fc96 100644 (file)
--- a/README
+++ b/README
@@ -73,9 +73,9 @@ The main components of this distribution are:
 Open vSwitch also provides an OpenFlow implementation and tools for
 those interested in OpenFlow but not additional Open vSwitch features:
 
-    * ovs-openflowd, a program that implements a simple OpenFlow
-      switch (without the special features provided by ovs-vswitchd)
-      using the same kernel module as ovs-vswitchd.
+    * ovs-openflowd, an alternative to ovs-vswitchd that implements a
+      simple OpenFlow switch, without the special features provided by
+      ovs-vswitchd.
 
     * ovs-controller, a simple OpenFlow controller.
 

diff --git a/utilities/ovs-openflowd.8.in b/utilities/ovs-openflowd.8.in
index 4c10d8d65aab8c78c437095c9cb88a6f8afdce93..30b3705a17f463261fcf64b5be21611664521ded 100644 (file)
--- a/utilities/ovs-openflowd.8.in
+++ b/utilities/ovs-openflowd.8.in
@@ -16,6 +16,9 @@ The \fBovs\-openflowd\fR program implements an OpenFlow switch using a
 flow-based datapath.  \fBovs\-openflowd\fR connects to one or more
 OpenFlow controllers over TCP or SSL.
 .PP
+For a more powerful alternative to \fBovs\-openflowd\fR, see
+\fBovs\-vswitchd\fR(8).  Do not run both daemons at the same time.
+.PP
 The mandatory \fIdatapath\fR argument argument specifies the local datapath
 to relay.  It takes one of the following forms:
 .

diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in
index 42282c16cd9b1ec6777049b55daaf77156764982..e59893ff4e36d944f80ba837023cb51eec4122eb 100644 (file)
--- a/vswitchd/ovs-vswitchd.8.in
+++ b/vswitchd/ovs-vswitchd.8.in
@@ -67,6 +67,9 @@ Only a single instance of \fBovs\-vswitchd\fR is intended to run at a time.
 A single \fBovs\-vswitchd\fR can manage any number of switch instances, up
 to the maximum number of supported Open vSwitch datapaths.
 .PP
+\fBovs\-vswitchd\fR provides all the features of \fBovs-openflowd\fR,
+and more.  Do not run both daemons at the same time.
+.PP
 \fBovs\-vswitchd\fR does all the necessary management of Open vSwitch datapaths
 itself.  Thus, external tools, such \fBovs\-dpctl\fR(8), are not needed for
 managing datapaths in conjunction with \fBovs\-vswitchd\fR, and their use