aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-10-04 11:57:13 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-10-04 18:04:02 +0200
commitf260390246214949fbedde723c4349283189823d (patch)
treeec0eb0f9536bb2b0a5ec1d8b26dc3d356eeeb516
parentaf184b48d00d7b764583518576ddc96fd79511ed (diff)
Invert order of installation chapters
To make install process more understandable, document first installation of xds-server part and then installation of xds tools. Change-Id: I5733c5d6885f45ff98cc9fee0d04362f76a86a4c Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--docs/SUMMARY.md10
-rw-r--r--docs/part-1/1-1_install-xds-server-docker.md (renamed from docs/part-1/2-1_install-xds-server-docker.md)0
-rw-r--r--docs/part-1/1-2_install-xds-server-vm.md (renamed from docs/part-1/2-2_install-xds-server-vm.md)0
-rw-r--r--docs/part-1/1-3_install-xds-server-native.md (renamed from docs/part-1/2-3_install-xds-server-native.md)0
-rw-r--r--docs/part-1/1_install-xds-server.md (renamed from docs/part-1/2_install-xds-server.md)6
-rw-r--r--docs/part-1/2_install-client.md (renamed from docs/part-1/1_install-client.md)0
-rw-r--r--docs/part-1/4-3_build-first-app-dashboard.md2
-rw-r--r--docs/part-2/1_xds-server/2_how-to-run.md8
8 files changed, 13 insertions, 13 deletions
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index ffa286f..670e293 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -3,11 +3,11 @@
* [Document revisions](0-Doc-Revisions.md)
* [Part 1 - Getting Started for Users](part-1/0_Abstract.md)
- * [Installing xds client tools](part-1/1_install-client.md)
- * [Installing xds-server](part-1/2_install-xds-server.md)
- * [Based on Docker container](part-1/2-1_install-xds-server-docker.md)
- * [Based on Virtual Machine appliance](part-1/2-2_install-xds-server-vm.md)
- * [Native installation](part-1/2-3_install-xds-server-native.md)
+ * [Installing xds-server](part-1/1_install-xds-server.md)
+ * [Based on Docker container](part-1/1-1_install-xds-server-docker.md)
+ * [Based on Virtual Machine appliance](part-1/1-2_install-xds-server-vm.md)
+ * [Native installation](part-1/1-3_install-xds-server-native.md)
+ * [Installing xds client tools](part-1/2_install-client.md)
* [Installing AGL SDKs](part-1/3_install-sdks.md)
* [Create your first AGL application](part-1/4_build-first-app.md)
* [Setup](part-1/4-1_build-first-app-setup.md)
diff --git a/docs/part-1/2-1_install-xds-server-docker.md b/docs/part-1/1-1_install-xds-server-docker.md
index 37e1fba..37e1fba 100644
--- a/docs/part-1/2-1_install-xds-server-docker.md
+++ b/docs/part-1/1-1_install-xds-server-docker.md
diff --git a/docs/part-1/2-2_install-xds-server-vm.md b/docs/part-1/1-2_install-xds-server-vm.md
index 32a8c20..32a8c20 100644
--- a/docs/part-1/2-2_install-xds-server-vm.md
+++ b/docs/part-1/1-2_install-xds-server-vm.md
diff --git a/docs/part-1/2-3_install-xds-server-native.md b/docs/part-1/1-3_install-xds-server-native.md
index 77ef9f8..77ef9f8 100644
--- a/docs/part-1/2-3_install-xds-server-native.md
+++ b/docs/part-1/1-3_install-xds-server-native.md
diff --git a/docs/part-1/2_install-xds-server.md b/docs/part-1/1_install-xds-server.md
index 76afee3..5b9f776 100644
--- a/docs/part-1/2_install-xds-server.md
+++ b/docs/part-1/1_install-xds-server.md
@@ -13,6 +13,6 @@ Several installation types are supported:
| Install type | Supported OS | Section to refer |
|--------------|--------------|------------------|
-| Container | Linux or MacOS | [see Installation based on Docker container](./2-1_install-xds-server-docker.html) |
-| Virtual Machine | Linux, MacOS or Windows | [see Installation based on VirtualBox appliance](./2-2_install-xds-server-vm.html) |
-| Native | Linux | [see Native installation](./2-3_install-xds-server-native.html) |
+| Container | Linux or MacOS | [see Installation based on Docker container](./1-1_install-xds-server-docker.html) |
+| Virtual Machine | Linux, MacOS or Windows | [see Installation based on VirtualBox appliance](./1-2_install-xds-server-vm.html) |
+| Native | Linux | [see Native installation](./1-3_install-xds-server-native.html) |
diff --git a/docs/part-1/1_install-client.md b/docs/part-1/2_install-client.md
index 44906c0..44906c0 100644
--- a/docs/part-1/1_install-client.md
+++ b/docs/part-1/2_install-client.md
diff --git a/docs/part-1/4-3_build-first-app-dashboard.md b/docs/part-1/4-3_build-first-app-dashboard.md
index 468d9c0..1f43715 100644
--- a/docs/part-1/4-3_build-first-app-dashboard.md
+++ b/docs/part-1/4-3_build-first-app-dashboard.md
@@ -29,7 +29,7 @@ This file may be very useful when you plan to use XDS client tools such as `xds-
When `Path mapping` type is selected, you must clone your project into
`$HOME/xds-workspace` directory (named **Local Path** in modal window).
-If XDS server is running in the XDS docker container (see [Installation based on Docker container](./2-1_install-xds-server-docker.html) ),
+If XDS server is running in the XDS docker container (see [Installation based on Docker container](./1-1_install-xds-server-docker.html) ),
the **Server Path** must be set to `/home/devel/xds-workspace/xxx` where xxx is your
project directory name.
diff --git a/docs/part-2/1_xds-server/2_how-to-run.md b/docs/part-2/1_xds-server/2_how-to-run.md
index 04c14cf..79d44b0 100644
--- a/docs/part-2/1_xds-server/2_how-to-run.md
+++ b/docs/part-2/1_xds-server/2_how-to-run.md
@@ -13,10 +13,10 @@ There are several way to install xds-server and start-up depend of installation
| Installation type | Supported<br> host OS | Start-up | Install instructions |
|-------------------|-------------------------|---------------------------------------------------|----------------------|
-| Docker container | Linux or MacOS | Automatic based on systemd user service | [see Installation based on Docker container](../../part-1/2-1_install-xds-server-docker.html) |
-| Virtual Machine | Linux, MacOS or Windows | Automatic based on systemd user service | [see Installation based on VirtualBox appliance](../../part-1/2-2_install-xds-server-vm.html) |
-| Native | Linux | Automatic based on systemd user service or manual | [see Native installation](../../part-1/2-3_install-xds-server-native.html) |
-| Native | MacOS or Windows | Manually | [see Native installation](../../part-1/2-3_install-xds-server-native.html) |
+| Docker container | Linux or MacOS | Automatic based on systemd user service | [see Installation based on Docker container](../../part-1/1-1_install-xds-server-docker.html) |
+| Virtual Machine | Linux, MacOS or Windows | Automatic based on systemd user service | [see Installation based on VirtualBox appliance](../../part-1/1-2_install-xds-server-vm.html) |
+| Native | Linux | Automatic based on systemd user service or manual | [see Native installation](../../part-1/1-3_install-xds-server-native.html) |
+| Native | MacOS or Windows | Manually | [see Native installation](../../part-1/1-3_install-xds-server-native.html) |
### Automatic start-up based on systemd user service