[dpdk-stable] patch 'fix dpdk.org URLs' has been queued to stable release 18.08.1

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From ae1e15791379ca36d269d972dc83473b172f00e2 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Mon, 26 Nov 2018 18:51:14 +0100
Subject: [PATCH] fix dpdk.org URLs

[ upstream commit 43d162bc168e5c66346acf9f464495a088a5a9f0 ]

The DPDK website has a new URL scheme since June 2018.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 app/test-eventdev/test_order_atq.c               |  2 +-
 app/test-eventdev/test_order_queue.c             |  2 +-
 app/test-eventdev/test_perf_atq.c                |  2 +-
 app/test-eventdev/test_perf_queue.c              |  2 +-
 app/test-eventdev/test_pipeline_atq.c            |  2 +-
 app/test-eventdev/test_pipeline_queue.c          |  2 +-
 doc/build-sdk-meson.txt                          |  2 +-
 doc/guides/contributing/documentation.rst        |  4 ++--
 doc/guides/contributing/patches.rst              | 14 +++++++-------
 doc/guides/contributing/stable.rst               |  6 +++---
 doc/guides/cryptodevs/qat.rst                    |  2 +-
 doc/guides/freebsd_gsg/install_from_ports.rst    |  2 +-
 doc/guides/howto/flow_bifurcation.rst            |  2 +-
 doc/guides/linux_gsg/nic_perf_intel_platform.rst |  2 +-
 doc/guides/nics/enic.rst                         |  2 +-
 doc/guides/prog_guide/cryptodev_lib.rst          |  2 +-
 doc/guides/prog_guide/event_timer_adapter.rst    |  4 ++--
 doc/guides/prog_guide/switch_representation.rst  |  4 ++--
 doc/guides/rel_notes/release_18_05.rst           | 10 +++++-----
 doc/guides/tools/testbbdev.rst                   |  3 ++-
 license/exceptions.txt                           |  2 +-
 21 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/app/test-eventdev/test_order_atq.c b/app/test-eventdev/test_order_atq.c
index 35debcfdc..4a8546e7f 100644
--- a/app/test-eventdev/test_order_atq.c
+++ b/app/test-eventdev/test_order_atq.c
@@ -8,5 +8,5 @@
 #include "test_order_common.h"
 
-/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
+/* See http://doc.dpdk.org/guides/tools/testeventdev.html for test details */
 
 static inline __attribute__((always_inline)) void
diff --git a/app/test-eventdev/test_order_queue.c b/app/test-eventdev/test_order_queue.c
index 17f7b9845..a272c7a57 100644
--- a/app/test-eventdev/test_order_queue.c
+++ b/app/test-eventdev/test_order_queue.c
@@ -8,5 +8,5 @@
 #include "test_order_common.h"
 
-/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
+/* See http://doc.dpdk.org/guides/tools/testeventdev.html for test details */
 
 static inline __attribute__((always_inline)) void
diff --git a/app/test-eventdev/test_perf_atq.c b/app/test-eventdev/test_perf_atq.c
index 9715a2ce8..b76ca605b 100644
--- a/app/test-eventdev/test_perf_atq.c
+++ b/app/test-eventdev/test_perf_atq.c
@@ -5,5 +5,5 @@
 #include "test_perf_common.h"
 
-/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
+/* See http://doc.dpdk.org/guides/tools/testeventdev.html for test details */
 
 static inline int
diff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_perf_queue.c
index 04ce94192..8efdec6f9 100644
--- a/app/test-eventdev/test_perf_queue.c
+++ b/app/test-eventdev/test_perf_queue.c
@@ -5,5 +5,5 @@
 #include "test_perf_common.h"
 
-/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
+/* See http://doc.dpdk.org/guides/tools/testeventdev.html for test details */
 
 static inline int
diff --git a/app/test-eventdev/test_pipeline_atq.c b/app/test-eventdev/test_pipeline_atq.c
index f0b2f9015..163b7bb8d 100644
--- a/app/test-eventdev/test_pipeline_atq.c
+++ b/app/test-eventdev/test_pipeline_atq.c
@@ -6,5 +6,5 @@
 #include "test_pipeline_common.h"
 
-/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
+/* See http://doc.dpdk.org/guides/tools/testeventdev.html for test details */
 
 static __rte_always_inline int
diff --git a/app/test-eventdev/test_pipeline_queue.c b/app/test-eventdev/test_pipeline_queue.c
index 2e0d93d99..7157ab520 100644
--- a/app/test-eventdev/test_pipeline_queue.c
+++ b/app/test-eventdev/test_pipeline_queue.c
@@ -6,5 +6,5 @@
 #include "test_pipeline_common.h"
 
-/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
+/* See http://doc.dpdk.org/guides/tools/testeventdev.html for test details */
 
 static __rte_always_inline int
diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index de43f8518..66af83334 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -5,5 +5,5 @@ NOTE: Compiling and installing DPDK using ``meson`` and ``ninja``, rather
 than using ``make`` (GNU make) is EXPERIMENTAL. Official builds of DPDK
 should always be done using ``make``, as described in the ``Getting Started
-Guide`` documentation, and at "http://dpdk.org/doc/quick-start".
+Guide`` documentation, and at "http://core.dpdk.org/doc/quick-start".
 
 Summary
diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
index 6a075553d..94bd96c42 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -84,5 +84,5 @@ added to by the developer.
 
   The API documentation explains how to use the public DPDK functions.
-  The `API index page <http://dpdk.org/doc/api/>`_ shows the generated API documentation with related groups of functions.
+  The `API index page <http://doc.dpdk.org/api/>`_ shows the generated API documentation with related groups of functions.
 
   The API documentation should be updated via Doxygen comments when new functions are added.
@@ -659,5 +659,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati
 
   In the API documentation the functions will be rendered as links, see the
-  `online section of the rte_ethdev.h docs <http://dpdk.org/doc/api/rte__ethdev_8h.html>`_ that contains the above text.
+  `online section of the rte_ethdev.h docs <http://doc.dpdk.org/api/rte__ethdev_8h.html>`_ that contains the above text.
 
 * The ``@see`` keyword can be used to create a *see also* link to another file or library.
diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index a3d788024..eb30e6911 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -29,7 +29,7 @@ The DPDK development process has the following features:
 * After the ``-rc2`` release all patches should target the main repository.
 
-The mailing list for DPDK development is `dev@dpdk.org <http://dpdk.org/ml/archives/dev/>`_.
-Contributors will need to `register for the mailing list <http://dpdk.org/ml/listinfo/dev>`_ in order to submit patches.
-It is also worth registering for the DPDK `Patchwork <http://dpdk.org/dev/patchwork/project/dpdk/list/>`_
+The mailing list for DPDK development is `dev@dpdk.org <http://mails.dpdk.org/archives/dev/>`_.
+Contributors will need to `register for the mailing list <http://mails.dpdk.org/listinfo/dev>`_ in order to submit patches.
+It is also worth registering for the DPDK `Patchwork <http://patches.dpdk.org/project/dpdk/list/>`_
 
 The development process requires some familiarity with the ``git`` version control system.
@@ -131,5 +131,5 @@ main repository::
     git clone http://dpdk.org/git/dpdk
 
-sub-repositories (`list <http://dpdk.org/browse/next>`_)::
+sub-repositories (`list <http://git.dpdk.org/next>`_)::
 
     git clone git://dpdk.org/next/dpdk-next-*
@@ -282,5 +282,5 @@ in the body of the commit message. For example::
 
 
-`Bugzilla <https://dpdk.org/tracker>`_
+`Bugzilla <https://bugs.dpdk.org>`_
 is a bug- or issue-tracking system.
 Bug-tracking systems allow individual or groups of developers
@@ -304,5 +304,5 @@ Patch for Stable Releases
 
 All fix patches to the master branch that are candidates for backporting
-should also be CCed to the `stable@dpdk.org <http://dpdk.org/ml/listinfo/stable>`_
+should also be CCed to the `stable@dpdk.org <http://mails.dpdk.org/listinfo/stable>`_
 mailing list.
 In the commit message body the Cc: stable@dpdk.org should be inserted as follows::
@@ -505,5 +505,5 @@ If the patch is in relation to a previous email thread you can add it to the sam
 
 The Message ID can be found in the raw text of emails or at the top of each Patchwork patch,
-`for example <http://dpdk.org/dev/patchwork/patch/7646/>`_.
+`for example <http://patches.dpdk.org/patch/7646/>`_.
 Shallow threading (``--thread --no-chain-reply-to``) is preferred for a patch series.
 
diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst
index 1746c0461..2ac4f0a88 100644
--- a/doc/guides/contributing/stable.rst
+++ b/doc/guides/contributing/stable.rst
@@ -97,5 +97,5 @@ list.
 
 All fix patches to the master branch that are candidates for backporting
-should also be CCed to the `stable@dpdk.org <http://dpdk.org/ml/listinfo/stable>`_
+should also be CCed to the `stable@dpdk.org <http://mails.dpdk.org/listinfo/stable>`_
 mailing list.
 
@@ -108,8 +108,8 @@ A Stable Release will be released by:
 * Tagging the release with YY.MM.n (year, month, number).
 * Uploading a tarball of the release to dpdk.org.
-* Sending an announcement to the `announce@dpdk.org <http://dpdk.org/ml/listinfo/announce>`_
+* Sending an announcement to the `announce@dpdk.org <http://mails.dpdk.org/listinfo/announce>`_
   list.
 
-Stable releases are available on the `dpdk.org download page <http://dpdk.org/download>`_.
+Stable releases are available on the `dpdk.org download page <http://core.dpdk.org/download/>`_.
 
 
diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index c2528bcaa..6fbaaedf7 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -93,5 +93,5 @@ Building the DPDK QAT cryptodev PMD
 
 To enable QAT crypto in DPDK, follow the instructions for modifying the compile-time
-configuration file as described `here <http://dpdk.org/doc/guides/linux_gsg/build_dpdk.html>`_.
+configuration file as described `here <http://doc.dpdk.org/guides/linux_gsg/build_dpdk.html>`_.
 
 
diff --git a/doc/guides/freebsd_gsg/install_from_ports.rst b/doc/guides/freebsd_gsg/install_from_ports.rst
index d6ce847f6..253328eb1 100644
--- a/doc/guides/freebsd_gsg/install_from_ports.rst
+++ b/doc/guides/freebsd_gsg/install_from_ports.rst
@@ -63,5 +63,5 @@ environmental variables should be set as below:
 
    To install a copy of the DPDK compiled using gcc, please download the
-   official DPDK package from http://dpdk.org/ and install manually using
+   official DPDK package from http://core.dpdk.org/download/ and install manually using
    the instructions given in the next chapter, :ref:`building_from_source`
 
diff --git a/doc/guides/howto/flow_bifurcation.rst b/doc/guides/howto/flow_bifurcation.rst
index bc9a0934d..eabf4d730 100644
--- a/doc/guides/howto/flow_bifurcation.rst
+++ b/doc/guides/howto/flow_bifurcation.rst
@@ -269,3 +269,3 @@ The typical procedure to achieve this is as follows:
 
    * For more details of the configuration, refer to the
-     `cloud filter test plan <http://dpdk.org/browse/tools/dts/tree/test_plans/cloud_filter_test_plan.rst>`_
+     `cloud filter test plan <http://git.dpdk.org/tools/dts/tree/test_plans/cloud_filter_test_plan.rst>`_
diff --git a/doc/guides/linux_gsg/nic_perf_intel_platform.rst b/doc/guides/linux_gsg/nic_perf_intel_platform.rst
index 987cd0a5a..cf5c9e0db 100644
--- a/doc/guides/linux_gsg/nic_perf_intel_platform.rst
+++ b/doc/guides/linux_gsg/nic_perf_intel_platform.rst
@@ -65,5 +65,5 @@ Network Interface Card Requirements
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Use a `DPDK supported <http://dpdk.org/doc/nics>`_ high end NIC such as the Intel XL710 40GbE.
+Use a `DPDK supported <http://core.dpdk.org/supported/>`_ high end NIC such as the Intel XL710 40GbE.
 
 Make sure each NIC has been flashed the latest version of NVM/firmware.
diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index 438a83d5f..08395097b 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -15,5 +15,5 @@ How to obtain ENIC PMD integrated DPDK
 
 ENIC PMD support is integrated into the DPDK suite. dpdk-<version>.tar.gz
-should be downloaded from http://dpdk.org
+should be downloaded from http://core.dpdk.org/download/
 
 
diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst
index 90d01e936..8ee33c875 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -1044,3 +1044,3 @@ Asymmetric Crypto Device API
 
 The cryptodev Library API is described in the
-`DPDK API Reference <http://dpdk.org/doc/api/>`_
+`DPDK API Reference <http://doc.dpdk.org/api/>`_
diff --git a/doc/guides/prog_guide/event_timer_adapter.rst b/doc/guides/prog_guide/event_timer_adapter.rst
index 7bbbdfe90..3b4446ee9 100644
--- a/doc/guides/prog_guide/event_timer_adapter.rst
+++ b/doc/guides/prog_guide/event_timer_adapter.rst
@@ -6,5 +6,5 @@ Event Timer Adapter Library
 
 The DPDK
-`Event Device library <http://dpdk.org/doc/guides/prog_guide/eventdev.html>`_
+`Event Device library <http://doc.dpdk.org/guides/prog_guide/eventdev.html>`_
 introduces an event driven programming model which presents applications with
 an alternative to the polling model traditionally used in DPDK
@@ -22,5 +22,5 @@ software implementations of the timer mechanism; it will query an eventdev PMD
 to determine which implementation should be used.  The default software
 implementation manages timers using the DPDK
-`Timer library <http://dpdk.org/doc/guides/prog_guide/timer_lib.html>`_.
+`Timer library <http://doc.dpdk.org/guides/prog_guide/timer_lib.html>`_.
 
 Examples of using the API are presented in the `API Overview`_ and
diff --git a/doc/guides/prog_guide/switch_representation.rst b/doc/guides/prog_guide/switch_representation.rst
index f5ee516f6..e5c78c234 100644
--- a/doc/guides/prog_guide/switch_representation.rst
+++ b/doc/guides/prog_guide/switch_representation.rst
@@ -350,5 +350,5 @@ implement them. This is described in `flow API (rte_flow)`_.
 
 .. [6] `Generic flow API (rte_flow)
-       <http://dpdk.org/doc/guides/prog_guide/rte_flow.html>`_
+       <http://doc.dpdk.org/guides/prog_guide/rte_flow.html>`_
 
 Flow API (rte_flow)
@@ -738,5 +738,5 @@ are based on port representors **A**, **B** and **C**.
 
 .. [2] `Flow syntax
-    <http://dpdk.org/doc/guides/testpmd_app_ug/testpmd_funcs.html#flow-syntax>`_
+    <http://doc.dpdk.org/guides/testpmd_app_ug/testpmd_funcs.html#flow-syntax>`_
 
 Associating VF 1 with Physical Port 0
diff --git a/doc/guides/rel_notes/release_18_05.rst b/doc/guides/rel_notes/release_18_05.rst
index 8dc22b011..3413d8de1 100644
--- a/doc/guides/rel_notes/release_18_05.rst
+++ b/doc/guides/rel_notes/release_18_05.rst
@@ -595,5 +595,5 @@ Known Issues
   in the Bugzilla entry referenced below.
 
-  Bugzilla entry: https://dpdk.org/tracker/show_bug.cgi?id=50
+  Bugzilla entry: https://bugs.dpdk.org/show_bug.cgi?id=50
 
 * **pdump is not compatible with old applications.**
@@ -620,5 +620,5 @@ Known Issues
   can also be made persistent by adding ``kern.coredump=0`` to ``/etc/sysctl.conf``.
 
-  Bugzilla entry: https://dpdk.org/tracker/show_bug.cgi?id=53
+  Bugzilla entry: https://bugs.dpdk.org/show_bug.cgi?id=53
 
 * **ixgbe PMD crash on hotplug detach when no VF created.**
@@ -627,5 +627,5 @@ Known Issues
   cleanup when number of VF is zero.
 
-  Bugzilla entry: https://dpdk.org/tracker/show_bug.cgi?id=57
+  Bugzilla entry: https://bugs.dpdk.org/show_bug.cgi?id=57
 
 * **Bonding PMD may fail to accept new slave ports in certain conditions.**
@@ -634,5 +634,5 @@ Known Issues
   bonding may fail to register new slave ports.
 
-  Bugzilla entry: https://dpdk.org/tracker/show_bug.cgi?id=52.
+  Bugzilla entry: https://bugs.dpdk.org/show_bug.cgi?id=52.
 
 * **Unexpected performance regression in Vhost library.**
@@ -642,5 +642,5 @@ Known Issues
   when running micro-benchmarks.
 
-  Bugzilla entry: https://dpdk.org/tracker/show_bug.cgi?id=48
+  Bugzilla entry: https://bugs.dpdk.org/show_bug.cgi?id=48
 
 
diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst
index 234a64f53..5caa90239 100644
--- a/doc/guides/tools/testbbdev.rst
+++ b/doc/guides/tools/testbbdev.rst
@@ -63,5 +63,6 @@ The following are the command-line options:
 ``-e EAL_PARAMS, --eal_params EAL_PARAMS``
  Specifies EAL arguments which are passed to the test app. For more details,
- refer to DPDK documentation at http://dpdk.org/doc.
+ refer to DPDK documentation at
+ http://doc.dpdk.org/guides/linux_gsg/linux_eal_parameters.html.
 
 ``-t TIMEOUT, --timeout TIMEOUT``
diff --git a/license/exceptions.txt b/license/exceptions.txt
index f2ef03706..f1cfa462f 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -2,5 +2,5 @@ This file will record any exceptions in DPDK Project with respect to DPDK
 IP License policy as defined in DPDK Charter available at:
 
-	http://dpdk.org/about/charter#ip
+	https://www.dpdk.org/charter/
 
 Note that following licenses are not exceptions:-
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:37.179526108 +0000
+++ 0086-fix-dpdk.org-URLs.patch	2018-11-29 13:11:35.000000000 +0000
@@ -1,11 +1,11 @@
-From 43d162bc168e5c66346acf9f464495a088a5a9f0 Mon Sep 17 00:00:00 2001
+From ae1e15791379ca36d269d972dc83473b172f00e2 Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas@monjalon.net>
 Date: Mon, 26 Nov 2018 18:51:14 +0100
 Subject: [PATCH] fix dpdk.org URLs
 
-The DPDK website has a new URL scheme since June 2018.
+[ upstream commit 43d162bc168e5c66346acf9f464495a088a5a9f0 ]
 
-Cc: stable@dpdk.org
+The DPDK website has a new URL scheme since June 2018.
 
 Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
 Acked-by: John McNamara <john.mcnamara@intel.com>
@@ -20,7 +20,7 @@
  doc/guides/contributing/documentation.rst        |  4 ++--
  doc/guides/contributing/patches.rst              | 14 +++++++-------
  doc/guides/contributing/stable.rst               |  6 +++---
- doc/guides/cryptodevs/qat.rst                    |  4 ++--
+ doc/guides/cryptodevs/qat.rst                    |  2 +-
  doc/guides/freebsd_gsg/install_from_ports.rst    |  2 +-
  doc/guides/howto/flow_bifurcation.rst            |  2 +-
  doc/guides/linux_gsg/nic_perf_intel_platform.rst |  2 +-
@@ -31,7 +31,7 @@
  doc/guides/rel_notes/release_18_05.rst           | 10 +++++-----
  doc/guides/tools/testbbdev.rst                   |  3 ++-
  license/exceptions.txt                           |  2 +-
- 21 files changed, 38 insertions(+), 37 deletions(-)
+ 21 files changed, 37 insertions(+), 36 deletions(-)
 
 diff --git a/app/test-eventdev/test_order_atq.c b/app/test-eventdev/test_order_atq.c
 index 35debcfdc..4a8546e7f 100644
@@ -78,7 +78,7 @@
  
  static inline int
 diff --git a/app/test-eventdev/test_pipeline_atq.c b/app/test-eventdev/test_pipeline_atq.c
-index c60635bf6..fc4cb3bb7 100644
+index f0b2f9015..163b7bb8d 100644
 --- a/app/test-eventdev/test_pipeline_atq.c
 +++ b/app/test-eventdev/test_pipeline_atq.c
 @@ -6,5 +6,5 @@
@@ -89,7 +89,7 @@
  
  static __rte_always_inline int
 diff --git a/app/test-eventdev/test_pipeline_queue.c b/app/test-eventdev/test_pipeline_queue.c
-index 25217008c..e35e9eb4c 100644
+index 2e0d93d99..7157ab520 100644
 --- a/app/test-eventdev/test_pipeline_queue.c
 +++ b/app/test-eventdev/test_pipeline_queue.c
 @@ -6,5 +6,5 @@
@@ -100,7 +100,7 @@
  
  static __rte_always_inline int
 diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
-index a4dd09194..29a8bd387 100644
+index de43f8518..66af83334 100644
 --- a/doc/build-sdk-meson.txt
 +++ b/doc/build-sdk-meson.txt
 @@ -5,5 +5,5 @@ NOTE: Compiling and installing DPDK using ``meson`` and ``ninja``, rather
@@ -111,7 +111,7 @@
  
  Summary
 diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
-index 0165990ed..c28a95c34 100644
+index 6a075553d..94bd96c42 100644
 --- a/doc/guides/contributing/documentation.rst
 +++ b/doc/guides/contributing/documentation.rst
 @@ -84,5 +84,5 @@ added to by the developer.
@@ -121,7 +121,7 @@
 +  The `API index page <http://doc.dpdk.org/api/>`_ shows the generated API documentation with related groups of functions.
  
    The API documentation should be updated via Doxygen comments when new functions are added.
-@@ -654,5 +654,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati
+@@ -659,5 +659,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati
  
    In the API documentation the functions will be rendered as links, see the
 -  `online section of the rte_ethdev.h docs <http://dpdk.org/doc/api/rte__ethdev_8h.html>`_ that contains the above text.
@@ -129,7 +129,7 @@
  
  * The ``@see`` keyword can be used to create a *see also* link to another file or library.
 diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
-index ffeb50436..a64bb0368 100644
+index a3d788024..eb30e6911 100644
 --- a/doc/guides/contributing/patches.rst
 +++ b/doc/guides/contributing/patches.rst
 @@ -29,7 +29,7 @@ The DPDK development process has the following features:
@@ -150,21 +150,21 @@
 +sub-repositories (`list <http://git.dpdk.org/next>`_)::
  
      git clone git://dpdk.org/next/dpdk-next-*
-@@ -287,5 +287,5 @@ in the body of the commit message. For example::
+@@ -282,5 +282,5 @@ in the body of the commit message. For example::
  
  
 -`Bugzilla <https://dpdk.org/tracker>`_
 +`Bugzilla <https://bugs.dpdk.org>`_
  is a bug- or issue-tracking system.
  Bug-tracking systems allow individual or groups of developers
-@@ -309,5 +309,5 @@ Patch for Stable Releases
+@@ -304,5 +304,5 @@ Patch for Stable Releases
  
  All fix patches to the master branch that are candidates for backporting
 -should also be CCed to the `stable@dpdk.org <http://dpdk.org/ml/listinfo/stable>`_
 +should also be CCed to the `stable@dpdk.org <http://mails.dpdk.org/listinfo/stable>`_
  mailing list.
  In the commit message body the Cc: stable@dpdk.org should be inserted as follows::
-@@ -510,5 +510,5 @@ If the patch is in relation to a previous email thread you can add it to the sam
+@@ -505,5 +505,5 @@ If the patch is in relation to a previous email thread you can add it to the sam
  
  The Message ID can be found in the raw text of emails or at the top of each Patchwork patch,
 -`for example <http://dpdk.org/dev/patchwork/patch/7646/>`_.
@@ -194,21 +194,14 @@
  
  
 diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
-index 1db98685a..9fb9f01d1 100644
+index c2528bcaa..6fbaaedf7 100644
 --- a/doc/guides/cryptodevs/qat.rst
 +++ b/doc/guides/cryptodevs/qat.rst
-@@ -8,5 +8,5 @@ QAT documentation consists of three parts:
+@@ -93,5 +93,5 @@ Building the DPDK QAT cryptodev PMD
  
- * Details of the symmetric crypto service below.
--* Details of the `compression service <http://dpdk.org/doc/guides/compressdevs/qat_comp.html>`_
-+* Details of the `compression service <http://doc.dpdk.org/guides/compressdevs/qat_comp.html>`_
-   in the compressdev drivers section.
- * Details of building the common QAT infrastructure and the PMDs to support the
-@@ -125,5 +125,5 @@ Configuring and Building the DPDK QAT PMDs
- 
- Further information on configuring, building and installing DPDK is described
--`here <http://dpdk.org/doc/guides/linux_gsg/build_dpdk.html>`_.
-+`here <http://doc.dpdk.org/guides/linux_gsg/build_dpdk.html>`_.
+ To enable QAT crypto in DPDK, follow the instructions for modifying the compile-time
+-configuration file as described `here <http://dpdk.org/doc/guides/linux_gsg/build_dpdk.html>`_.
++configuration file as described `here <http://doc.dpdk.org/guides/linux_gsg/build_dpdk.html>`_.
  
  
 diff --git a/doc/guides/freebsd_gsg/install_from_ports.rst b/doc/guides/freebsd_gsg/install_from_ports.rst
@@ -243,7 +236,7 @@
  
  Make sure each NIC has been flashed the latest version of NVM/firmware.
 diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
-index 746d89123..bc38f51aa 100644
+index 438a83d5f..08395097b 100644
 --- a/doc/guides/nics/enic.rst
 +++ b/doc/guides/nics/enic.rst
 @@ -15,5 +15,5 @@ How to obtain ENIC PMD integrated DPDK