patch 'doc: remove repeated repeated words' has been queued to stable release 20.11.4

Xueming Li xuemingl at nvidia.com
Sun Nov 28 15:54:07 CET 2021


Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/30/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/d748677d8b45feb014da9175e314ca02b96704c2

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From d748677d8b45feb014da9175e314ca02b96704c2 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Fri, 5 Nov 2021 22:10:30 +0100
Subject: [PATCH] doc: remove repeated repeated words
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 4f823975f45218c674b15ad1e9b84255eeabe08c ]

Some duplicate words were detected with a script.

Fixes: fdec9301f52d ("doc: add flow classify guides")
Fixes: 4dc6d8e63c16 ("doc: add graph library guide")
Fixes: 30d3aa861db5 ("doc: rework VM power manager user guide")
Fixes: 0d547ed03717 ("examples/ipsec-secgw: support configuration file")
Fixes: e64833f2273a ("examples/l2fwd-keepalive: add sample application")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 doc/guides/prog_guide/flow_classify_lib.rst      | 2 +-
 doc/guides/prog_guide/graph_lib.rst              | 2 +-
 doc/guides/sample_app_ug/ipsec_secgw.rst         | 2 +-
 doc/guides/sample_app_ug/keep_alive.rst          | 2 +-
 doc/guides/sample_app_ug/vm_power_management.rst | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/guides/prog_guide/flow_classify_lib.rst b/doc/guides/prog_guide/flow_classify_lib.rst
index f0ed5a1a04..7dae0bc8c6 100644
--- a/doc/guides/prog_guide/flow_classify_lib.rst
+++ b/doc/guides/prog_guide/flow_classify_lib.rst
@@ -366,7 +366,7 @@ Packet Matching
 ~~~~~~~~~~~~~~~
 
 The ``rte_flow_classifier_query`` API is used to find packets which match a
-given flow Flow rule in the table.
+given flow rule in the table.
 This API calls the flow_classify_run internal function which calls the
 ``table.ops.f_lookup`` API to see if any packets in a burst match any
 of the Flow rules in the table.
diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst
index fcff9c4286..1cfdc86433 100644
--- a/doc/guides/prog_guide/graph_lib.rst
+++ b/doc/guides/prog_guide/graph_lib.rst
@@ -220,7 +220,7 @@ the user needs to update the context of the node hence access to
 ``struct rte_node *`` memory.
 
 ``rte_graph_foreach_node()``, ``rte_graph_node_get()``,
-``rte_graph_node_get_by_name()`` APIs can be used to to get the
+``rte_graph_node_get_by_name()`` APIs can be used to get the
 ``struct rte_node*``. ``rte_graph_foreach_node()`` iterator function works on
 ``struct rte_graph *`` fast-path graph object while others works on graph ID or name.
 
diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst
index c07275e581..b2f94963d5 100644
--- a/doc/guides/sample_app_ug/ipsec_secgw.rst
+++ b/doc/guides/sample_app_ug/ipsec_secgw.rst
@@ -421,7 +421,7 @@ where each options means:
 
    * *protect <SA_idx>*: the specified traffic is protected by SA rule
      with id SA_idx
-   * *bypass*: the specified traffic traffic is bypassed
+   * *bypass*: the specified traffic is bypassed
    * *discard*: the specified traffic is discarded
 
 ``<priority>``
diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst
index c9392c9951..2ecfe3cfce 100644
--- a/doc/guides/sample_app_ug/keep_alive.rst
+++ b/doc/guides/sample_app_ug/keep_alive.rst
@@ -78,7 +78,7 @@ options.
 Explanation
 -----------
 
-The following sections provide some explanation of the The
+The following sections provide some explanation of the
 Keep-Alive/'Liveliness' conceptual scheme. As mentioned in the
 overview section, the initialization and run-time paths are very
 similar to those of the :doc:`l2_forward_real_virtual`.
diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst
index 35afdac63f..7160b6a63a 100644
--- a/doc/guides/sample_app_ug/vm_power_management.rst
+++ b/doc/guides/sample_app_ug/vm_power_management.rst
@@ -236,7 +236,7 @@ Compiling and Running the Host Application
 Compiling the Host Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For information on compiling the DPDK and sample applications, see
+For information on compiling the DPDK and sample applications,
 see :doc:`compiling`.
 
 The application is located in the ``vm_power_manager`` subdirectory.
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:06.471956943 +0800
+++ 0063-doc-remove-repeated-repeated-words.patch	2021-11-28 22:41:03.403539471 +0800
@@ -1 +1 @@
-From 4f823975f45218c674b15ad1e9b84255eeabe08c Mon Sep 17 00:00:00 2001
+From d748677d8b45feb014da9175e314ca02b96704c2 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 4f823975f45218c674b15ad1e9b84255eeabe08c ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -52 +54 @@
-index 2304141ce8..c53ee7c386 100644
+index c07275e581..b2f94963d5 100644
@@ -55 +57 @@
-@@ -443,7 +443,7 @@ where each options means:
+@@ -421,7 +421,7 @@ where each options means:
@@ -65 +67 @@
-index b6d75c8a80..a907ff36a1 100644
+index c9392c9951..2ecfe3cfce 100644


More information about the stable mailing list