[dpdk-stable] patch 'doc: fix description of links to EAL options pages' has been queued to LTS release 18.11.6
Kevin Traynor
ktraynor at redhat.com
Tue Dec 10 15:59:21 CET 2019
Hi,
FYI, your patch has been queued to LTS release 18.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/16/19. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/a6aa809639cf072112d84750936fb5a698f923b4
Thanks.
Kevin.
---
>From a6aa809639cf072112d84750936fb5a698f923b4 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Thu, 24 Oct 2019 16:17:51 +0300
Subject: [PATCH] doc: fix description of links to EAL options pages
[ upstream commit c41c100b2278ed4d56fc548697c90e103cc523e2 ]
Documentation includes separate pages of EAL command-line options for
Linux and for FreeBSD.
Links to these pages use the same text 'EAL parameters', so it is not
clear which link to use for which environment.
This patch adds the text '(Linux)' and '(FreeBSD)' where relevant, to
clearly identify the links.
Fixes: 3ee567cfec37 ("doc: document all EAL parameters in one place")
Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
doc/guides/sample_app_ug/intro.rst | 6 +++---
doc/guides/testpmd_app_ug/run_app.rst | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/guides/sample_app_ug/intro.rst b/doc/guides/sample_app_ug/intro.rst
index 90704194a..71d99f981 100644
--- a/doc/guides/sample_app_ug/intro.rst
+++ b/doc/guides/sample_app_ug/intro.rst
@@ -16,7 +16,7 @@ Running Sample Applications
Some sample applications may have their own command-line parameters described in
their respective guides, however all of them also share the same EAL parameters.
-Please refer to :doc:`../linux_gsg/linux_eal_parameters` or
-:doc:`../freebsd_gsg/freebsd_eal_parameters` for a list of available EAL
-command-line options.
+Please refer to :doc:`EAL parameters (Linux) <../linux_gsg/linux_eal_parameters>`
+or :doc:`EAL parameters (FreeBSD) <../freebsd_gsg/freebsd_eal_parameters>` for
+a list of available EAL command-line options.
diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
index 89df03166..5a3ad411a 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -8,7 +8,7 @@ EAL Command-line Options
------------------------
-Please refer to :doc:`../linux_gsg/linux_eal_parameters` or
-:doc:`../freebsd_gsg/freebsd_eal_parameters` for a list of available EAL
-command-line options.
+Please refer to :doc:`EAL parameters (Linux) <../linux_gsg/linux_eal_parameters>`
+or :doc:`EAL parameters (FreeBSD) <../freebsd_gsg/freebsd_eal_parameters>` for
+a list of available EAL command-line options.
--
2.21.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-12-10 14:49:42.210494782 +0000
+++ 0047-doc-fix-description-of-links-to-EAL-options-pages.patch 2019-12-10 14:49:39.079457264 +0000
@@ -1 +1 @@
-From c41c100b2278ed4d56fc548697c90e103cc523e2 Mon Sep 17 00:00:00 2001
+From a6aa809639cf072112d84750936fb5a698f923b4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c41c100b2278ed4d56fc548697c90e103cc523e2 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 6a3b6722e..0b4ab1ba4 100644
+index 90704194a..71d99f981 100644
@@ -40 +41 @@
-index ef677ba2f..00e0c2ac5 100644
+index 89df03166..5a3ad411a 100644
More information about the stable
mailing list