Merge remote-tracking branch 'origin/master' into flounder

Change-Id: Id6e2acbda560770d592e9c8ccddffcb142de7e84

5 files changed, 13 insertions, 13 deletions

diff --git a/docs/getting-started/app-workflow-build-app.md b/docs/getting-started/app-workflow-build-app.md
index 6ce3fdd..518d773 100644
--- a/docs/getting-started/app-workflow-build-app.md
+++ b/docs/getting-started/app-workflow-build-app.md
@@ -9,7 +9,7 @@ A simple application you can experiment with is the standard
 "hello world" application.
 For information on how to get set up and then clone the Git repository
 for the "Hello World" application, see the
-"[Setup](../../../../../docs/devguides/en/dev/reference/xds/part-1/4-1_build-first-app-setup.html)"
+"[Setup](../../../devguides/reference/xds/part-1/4-1_build-first-app-setup.html)"
 section.
 
 Key to developing an application suited for your target hardware is the
@@ -30,12 +30,12 @@ The following list describes several:
   * Use the XDS command line tool.
     For information on how to build the "Hello World" application using the XDS
     command line, see the
-    "[Build using command line tool](../../../../../docs/devguides/en/dev/reference/xds/part-1/4-2_build-first-app-cmd.html)"
+    "[Build using command line tool](../../../devguides/reference/xds/part-1/4-2_build-first-app-cmd.html)"
     section.
 
   * Use the XDS Dashboard.
     For information on how to build the application using the XDS Dashboard, see the
-    "[Build using XDS Dashboard](../../../../../docs/devguides/en/dev/reference/xds/part-1/4-3_build-first-app-dashboard.html)"
+    "[Build using XDS Dashboard](../../../devguides/reference/xds/part-1/4-3_build-first-app-dashboard.html)"
     section.
 
 * **Build the Application Using a Stand-Alone SDK:**
diff --git a/docs/getting-started/app-workflow-debug-app.md b/docs/getting-started/app-workflow-debug-app.md
index c0899de..63ec8cd 100644
--- a/docs/getting-started/app-workflow-debug-app.md
+++ b/docs/getting-started/app-workflow-debug-app.md
@@ -11,7 +11,7 @@ Or, is it better for you to use a remote user interface that is part of
 an Integrated Development Environment (IDE) such as Eclipse?
 
 For general information on debugging an application, see the
-"[Debug your first AGL application](../../../../../docs/devguides/en/dev/reference/xds/part-1/5_debug-first-app.html)"
+"[Debug your first AGL application](../../../devguides/reference/xds/part-1/5_debug-first-app.html)"
 section.
 
 Here are three methods:
@@ -33,11 +33,11 @@ Here are three methods:
    * Use XDS remotely, which is based on `gdb` and
      [`gdbserver`](https://en.wikipedia.org/wiki/Gdbserver).
      See the
-     "[XDS remote debugging mode](../../../../../docs/devguides/en/dev/reference/xds/part-1/5-2_debug-first-app-cmd.html#xds-remote-debugging-mode)"
+     "[XDS remote debugging mode](../../../devguides/reference/xds/part-1/5-2_debug-first-app-cmd.html#xds-remote-debugging-mode)"
      section for more information.
 
      For information on how to remotely debug the application using XDS from within an IDE, see the
-     "[Debug using `xds-gdb` within an IDE](../../../../../docs/devguides/en/dev/reference/xds/part-1/5-3_debug-first-app-ide.html)"
+     "[Debug using `xds-gdb` within an IDE](../../../devguides/reference/xds/part-1/5-3_debug-first-app-ide.html)"
      section.
 
    In order to use third-party debugging tools, you need to include the tools in the target image.
diff --git a/docs/getting-started/app-workflow-deploy-app.md b/docs/getting-started/app-workflow-deploy-app.md
index b79a06a..ef2b67b 100644
--- a/docs/getting-started/app-workflow-deploy-app.md
+++ b/docs/getting-started/app-workflow-deploy-app.md
@@ -23,7 +23,7 @@ Several general methods exist:
   * Use remote commands from a host over a network, such as `scp` (i.e. secure copy).
 
   * You can set up your build environment to leverage a procedure's
-    [application template](../../../../../docs/devguides/en/dev/reference/sdk-devkit/docs/part-2/2_4-Use-app-templates.html)
+    [application template](../../../devguides/reference/sdk-devkit/docs/part-2/2_4-Use-app-templates.html)
     (app-template).
     An app-template is an application framework that contains
     [CMake](https://cmake.org/) macros that abstract deploying the application.
diff --git a/docs/getting-started/app-workflow-prep-app.md b/docs/getting-started/app-workflow-prep-app.md
index 7768c76..31b1686 100644
--- a/docs/getting-started/app-workflow-prep-app.md
+++ b/docs/getting-started/app-workflow-prep-app.md
@@ -22,11 +22,11 @@ and then use XDS to install the SDK:
    Three install types exist: container, virtual machine, or native.
    Follow the steps from the appropriate section to install and start an XDS server:
 
-   * **Container:** [Installation based on Docker container](../../../../../docs/devguides/en/dev/reference/xds/part-1/1-1_install-xds-server-docker.html)
+   * **Container:** [Installation based on Docker container](../../../devguides/reference/xds/part-1/1-1_install-xds-server-docker.html)
 
-   * **Virtual Machine:** [Installation based on Virtual Machine appliance](../../../../../docs/devguides/en/dev/reference/xds/part-1/1-2_install-xds-server-vm.html)
+   * **Virtual Machine:** [Installation based on Virtual Machine appliance](../../../devguides/reference/xds/part-1/1-2_install-xds-server-vm.html)
 
-   * **Native:** [Native installation](../../../../../docs/devguides/en/dev/reference/xds/part-1/1-3_install-xds-server-native.html)
+   * **Native:** [Native installation](../../../devguides/reference/xds/part-1/1-3_install-xds-server-native.html)
 
 2. **Install the XDS Client Tools**  The XDS Agent (``xds-agent``) needs to run on your build host.
    The agent interfaces with a Command-line Interpretor (CLI) tool (``xds-cli``) and an
@@ -34,13 +34,13 @@ and then use XDS to install the SDK:
    Installation involves making sure you have the correct packages installed on the
    build host.
    Follow the steps in the
-   "[Installing XDS Client Tools](../../../../../docs/devguides/en/dev/reference/xds/part-1/2_install-client.html)"
+   "[Installing XDS Client Tools](../../../devguides/reference/xds/part-1/2_install-client.html)"
    section to install the XDS client tools and learn how to start the agent.
 
 3. **Install the SDK:** Once you have XDS up, you need to install the
    SDK using either the command line or the Dashboard.
    See the
-   "[Installing AGL SDKs](../../../../../docs/devguides/en/dev/reference/xds/part-1/3_install-sdks.html)"
+   "[Installing AGL SDKs](../../../devguides/reference/xds/part-1/3_install-sdks.html)"
    section for information on using both.
 
 ## Installing a Stand-Alone SDK ##
diff --git a/docs/getting-started/machines/renesas.md b/docs/getting-started/machines/renesas.md
index 895fe19..88bdc92 100644
--- a/docs/getting-started/machines/renesas.md
+++ b/docs/getting-started/machines/renesas.md
@@ -167,7 +167,7 @@ Follow these steps to download the drivers you need:
 ## 4. Making Sure Your Build Environment is Correct
 
    The
-   "[Initializing Your Build Environment](../image-workflow-initialize-build-environment.html/Initializing-your-build-environment)"
+   "[Initializing Your Build Environment](../image-workflow-initialize-build-environment.html#Initializing-your-build-environment)"
    section presented generic information for setting up your build environment
    using the `aglsetup.sh` script.
    If you are building an image for a supported Renesas board,