From patchwork Fri Nov 9 05:39:00 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ben Pfaff
X-Patchwork-Id: 995314
Return-Path:
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
spf=pass (mailfrom) smtp.mailfrom=openvswitch.org
(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;
envelope-from=ovs-dev-bounces@openvswitch.org;
receiver=)
Authentication-Results: ozlabs.org;
dmarc=none (p=none dis=none) header.from=ovn.org
Received: from mail.linuxfoundation.org (mail.linuxfoundation.org
[140.211.169.12])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
bits)) (No client certificate requested)
by ozlabs.org (Postfix) with ESMTPS id 42rpqj4cjcz9s9J
for ;
Fri, 9 Nov 2018 16:39:13 +1100 (AEDT)
Received: from mail.linux-foundation.org (localhost [127.0.0.1])
by mail.linuxfoundation.org (Postfix) with ESMTP id 4706F49D;
Fri, 9 Nov 2018 05:39:10 +0000 (UTC)
X-Original-To: dev@openvswitch.org
Delivered-To: ovs-dev@mail.linuxfoundation.org
Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org
[172.17.192.35])
by mail.linuxfoundation.org (Postfix) with ESMTPS id D89312C
for ; Fri, 9 Nov 2018 05:39:08 +0000 (UTC)
X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6
Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net
[217.70.183.199])
by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 48DF975B
for ; Fri, 9 Nov 2018 05:39:07 +0000 (UTC)
X-Originating-IP: 75.54.222.30
Received: from sigabrt.attlocal.net
(75-54-222-30.lightspeed.rdcyca.sbcglobal.net [75.54.222.30])
(Authenticated sender: blp@ovn.org)
by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 7FF0EFF804;
Fri, 9 Nov 2018 05:39:04 +0000 (UTC)
From: Ben Pfaff
To: dev@openvswitch.org
Date: Thu, 8 Nov 2018 21:39:00 -0800
Message-Id: <20181109053900.28695-1-blp@ovn.org>
X-Mailer: git-send-email 2.16.1
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW
autolearn=ham version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
smtp1.linux-foundation.org
Cc: Ben Pfaff
Subject: [ovs-dev] [PATCH] docs: Fix cross-references that referred to
discussions that have moved.
X-BeenThere: ovs-dev@openvswitch.org
X-Mailman-Version: 2.1.12
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
MIME-Version: 1.0
Sender: ovs-dev-bounces@openvswitch.org
Errors-To: ovs-dev-bounces@openvswitch.org
Signed-off-by: Ben Pfaff
Reviewed-by: Yifeng Sun
---
include/openvswitch/meta-flow.h | 4 ++--
ovn/utilities/ovn-sbctl.8.in | 2 +-
ovn/utilities/ovn-trace.8.xml | 2 +-
vswitchd/vswitch.xml | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h
index 152f512db3e8..ffd89452c36c 100644
--- a/include/openvswitch/meta-flow.h
+++ b/include/openvswitch/meta-flow.h
@@ -136,7 +136,7 @@ struct ofputil_tlv_table_mod;
* tunnel flags: Any number of the strings "df", "csum", "key", or
* "oam" separated by "|".
*
- * TCP flags: See the description of tcp_flags in ovs-ofctl(8).
+ * TCP flags: See the description of tcp_flags in ovs-fields(7).
*
* packet type: A pair of packet type namespace NS and NS_TYPE within
* that namespace "(NS,NS_TYPE)". NS and NS_TYPE are formatted in
@@ -274,7 +274,7 @@ enum OVS_PACKED_ENUM mf_field_id {
/* "conj_id".
*
- * ID for "conjunction" actions. Please refer to ovs-ofctl(8)
+ * ID for "conjunction" actions. Please refer to ovs-fields(7)
* documentation of "conjunction" for details.
*
* Type: be32.
diff --git a/ovn/utilities/ovn-sbctl.8.in b/ovn/utilities/ovn-sbctl.8.in
index 659b44d70be4..2aaa457e826b 100644
--- a/ovn/utilities/ovn-sbctl.8.in
+++ b/ovn/utilities/ovn-sbctl.8.in
@@ -182,7 +182,7 @@ display the OpenFlow flows that correspond to each OVN logical flow.
To do so, \fBovn\-sbctl\fR connects to \fIremote\fR (by default,
\fBunix:@RUNDIR@/br-int.mgmt\fR) over OpenFlow and retrieves the
flows. If \fIremote\fR is specified, it must be an active OpenFlow
-connection method described in \fBovs\-ofctl\fR(8). Please see the
+connection method described in \fBovsdb\fR(7). Please see the
discussion of the similar \fB\-\-ovs\fR option in \fBovn-trace\fR(8)
for more information about the OpenFlow flow output.
.IP
diff --git a/ovn/utilities/ovn-trace.8.xml b/ovn/utilities/ovn-trace.8.xml
index d5e493e0eaed..01e74111901b 100644
--- a/ovn/utilities/ovn-trace.8.xml
+++ b/ovn/utilities/ovn-trace.8.xml
@@ -330,7 +330,7 @@
ovn-trace
connects to remote (by default,
unix:@RUNDIR@/br-int.mgmt
) over OpenFlow and retrieves the
flows. If remote is specified, it must be an active
- OpenFlow connection method described in ovs-ofctl
(8).
+ OpenFlow connection method described in ovsdb
(7).
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index efa1ef85e65e..170e843f1280 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -2519,9 +2519,9 @@
The word flow
. The tunnel accepts packets with any
key. The key will be placed in the tun_id
field for
- matching in the flow table. The ovs-ofctl
manual page
- contains additional information about matching fields in OpenFlow
- flows.
+ matching in the flow table. The ovs-fields
(7) manual
+ page contains additional information about matching fields in
+ OpenFlow flows.
@@ -2547,8 +2547,8 @@
The word flow
. Packets sent through the tunnel will
have the key set using the set_tunnel
Nicira OpenFlow
vendor extension (0 is used in the absence of an action). The
- ovs-ofctl
manual page contains additional information
- about the Nicira OpenFlow vendor extensions.
+ ovs-fields
(7) manual page contains additional
+ information about the Nicira OpenFlow vendor extensions.