14 files changed, 182 insertions, 121 deletions
diff --git a/docs/part-1/1_install-client.md b/docs/part-1/1_install-client.md
index 0d463d1..a1c2a4e 100644
--- a/docs/part-1/1_install-client.md
+++ b/docs/part-1/1_install-client.md
@@ -2,17 +2,30 @@
 
 [xds-agent](https://github.com/iotbzh/xds-agent) is a client tool that must run
 on your machine (user / developer host) to be able to use XDS.
+You should establish the following chain:
 
-Installation of other XDS client tools, such as `xds-exec` or `xds-gdb` is
+
+Client (eg. `xds-cli` or XDS Dashboard) and `xds-agent` is running on your machine
+and `xds-server` is running on a remote server and/or in a container.
+Exchanges between these 3 tools are done though HTTP and Websocket protocols
+and default url/port mentioned in schema below can be change using config files.
+
+![XDS blocks chain](./pictures/xds-block-chain.png)
+
+Installation of other XDS client tools, such as `xds-cli` or `xds-gdb` is
 optional and depends of what you want to do :
 
-- [xds-exec](https://github.com/iotbzh/xds-exec) : command line tool to interact with XDS (also used by IDE integration).
+- [xds-cli](https://github.com/iotbzh/xds-cli) : command line tool to used to interact with XDS (also used by IDE integration).
 - [xds-gdb](https://github.com/iotbzh/xds-gdb) : requested for debugging application.
 
+> [xds-exec](https://github.com/iotbzh/xds-exec) is another tool used to interact
+> with XDS before that `xds-cli` exists. `xds-exec` is deprecated and you should
+> now use `xds-cli exec` command instead.
+
 ## Install packages for debian distro type
 
 ```bash
-# 'DISTRO' can be set to { xUbuntu_16.04, xUbuntu_16.10, xUbuntu_17.04, Debian_8.0, Debian_9.0}
+# 'DISTRO' can be set to { xUbuntu_16.04, xUbuntu_16.10, xUbuntu_17.04, Debian_8.0, Debian_9.0 }
 seb@laptop ~$  export DISTRO="xUbuntu_16.04"
 
 seb@laptop ~$  wget -O - http://download.opensuse.org/repositories/isv:/LinuxAutomotive:/app-Development/${DISTRO}/Release.key | sudo apt-key add -
@@ -22,7 +35,7 @@ EOF"
 
 seb@laptop ~$  sudo apt-get update
 seb@laptop ~$  sudo apt-get install agl-xds-agent
-seb@laptop ~$  sudo apt-get install agl-xds-exec
+seb@laptop ~$  sudo apt-get install agl-xds-cli
 seb@laptop ~$  sudo apt-get install agl-xds-gdb
 ```
 
@@ -36,7 +49,7 @@ seb@laptop ~$  sudo zypper ar http://download.opensuse.org/repositories/isv:/Lin
 
 seb@laptop ~$  sudo zypper ref
 seb@laptop ~$  sudo zypper install agl-xds-agent
-seb@laptop ~$  sudo zypper install agl-xds-exec
+seb@laptop ~$  sudo zypper install agl-xds-cli
 seb@laptop ~$  sudo zypper install agl-xds-gdb
 ```
 
@@ -54,7 +67,7 @@ seb@laptop ~$  sudo zypper install agl-xds-gdb
     `setx path "C:\AGK\xds\xds-agent;%path%"`
 
 - repeat the previous steps to install other tools depending of your needs:
-  - `xds-exec` : requested for command line and IDE integration. ([released tarball link](https://github.com/iotbzh/xds-exec/releases)).
+  - `xds-cli` : requested for command line and IDE integration. ([released tarball link](https://github.com/iotbzh/xds-cli/releases)).
   - `xds-gdb` : requested for debugging application. ([released tarball link](https://github.com/iotbzh/xds-gdb/releases)).
 
 ## Start xds-agent
diff --git a/docs/part-1/2_install-xds-server.md b/docs/part-1/2_install-xds-server.md
index 5ac244c..143e028 100644
--- a/docs/part-1/2_install-xds-server.md
+++ b/docs/part-1/2_install-xds-server.md
@@ -13,11 +13,11 @@ Several installation types are supported :
 
 | Install type | Supported OS | Section to refer |
 |--------------|--------------|------------------|
-| Container | Linux or MacOS | [see Installation based on Docker container](#docker_container) |
-| Virtual Machine | Linux, MacOS or Windows | [see Installation based on VirtualBox appliance](#vbox_appliance) |
-| Native | Linux | [see Native installation](#native) |
+| Container | Linux or MacOS | [see Installation based on Docker container](#installation-based-on-docker-container) |
+| Virtual Machine | Linux, MacOS or Windows | [see Installation based on VirtualBox appliance](#installation-based-on-virtualbox-appliance) |
+| Native | Linux | [see Native installation](#native-installation) |
 
-## <a name="docker_container"></a> Installation based on Docker container
+## Installation based on Docker container
 
 ### Prerequisites
 
@@ -69,8 +69,8 @@ seb@laptop ~$ bash ./xds-docker-create-container.sh --volume /my-workspace:$HOME
 
 `xds-server` is automatically started as a service on container startup.
 
-To check if xds-server is correctly install and running, you can access the web
-interface, what we call the "Dashboard", using a web browser :
+To check if xds-server is correctly install and running, you can access the basic 
+web page that gives you some instructions:
 
 ```bash
 # if container is running on your local host
@@ -79,13 +79,13 @@ seb@laptop ~$ xdg-open http://localhost:8000
 ```
 
 `xds-server` is now up and running, you can now install AGL SDKs, please refer
-to chapter named "Installing AGL SDKs"
+to next chapter named [Installing AGL SDKs](3_install-sdks.md#installing-agl-sdks)
 
 ### Container settings
 
 This container (ID=0) exposes following ports:
 
-- 8000 : `xds-server` to serve XDS Dashboard
+- 8000 : `xds-server` to serve XDS basic web page
 - 69   : TFTP
 - 2222 : ssh
 
@@ -99,17 +99,18 @@ inside and outside docker):
 | $USER_VOLUME | $USER_VOLUME | user path, see `--volume` option of `xds-docker-create-container.sh` script |
 
 <!-- note -->
-Please refer to **part 2 - xds-server** documentation for additional info.
+Please refer to [part 2 - xds-server](../part-2/1_xds-server.md) documentation
+for additional info.
 <!-- endnote -->
 
-## <a name="vbox_appliance"></a> Installation based on VirtualBox appliance
+## Installation based on VirtualBox appliance
 
 _coming soon ..._
 
-## <a name="native"></a> Native installation
+## Native installation
 
 You can chose to install xds-server 'natively' instead of within a docker
-container but only Linux host OSes are supported and tested for native
+container but note that only Linux host OSes are supported and tested for native
 installation !
 
 ### Install packages for debian distro type
@@ -142,7 +143,7 @@ seb@laptop ~$  sudo zypper install agl-xds-server
 ### Configure xds-server
 
 <!-- note -->
->**Optional step**: nothing to do if you keep default settings
+**Optional step**: skip this chapter if you want to use keep default settings
 <!-- endnote -->
 
 When `xds-server` is started as a systemd service, default environment variables
@@ -152,15 +153,14 @@ are set into `/etc/default/xds-server` file.
 and default JSON config is `/etc/xds-server/config.json`.
 
 <!-- note -->
->**Note:** you can use your own JSON config by settings `APP_CONFIG` variable of
-`/etc/default/xds-server` file to your file, for example
-`/home/MYUSER/.xds/server/config.json`
+**Note:** you can use your own JSON config by settings `APP_CONFIG` variable of
+`/etc/default/xds-server` file to your file, for example `/home/MYUSER/.xds/server/config.json`
 <!-- endnote -->
 
 Supported fields in JSON configuration file are :
 
-- **httpPort** : HTTP port of client webapp / dashboard
-- **webAppDir** : location of client dashboard (default: webapp/dist)
+- **httpPort** : HTTP port of client webapp/REST API
+- **webAppDir** : location of client web application (default: webapp/dist)
 - **shareRootDir** : root directory where projects will be copied
 - **logsDir**  : directory to store logs (eg. syncthing output)
 - **sdkRootDir** : root directory where cross SDKs are installed
@@ -208,8 +208,14 @@ seb@laptop ~$ systemctl --user --unit=xds-server.service --output=cat
 ```
 
 To check if xds-server is correctly install and running, you can access the web
-interface, what we call the "Dashboard", using a web browser :
+interface, using a web browser :
 
 ```bash
 seb@laptop ~$ xdg-open http://localhost:8000
 ```
+
+or get the current version using the following curl command:
+
+```bash
+seb@laptop ~$ curl http://localhost:8000/api/v1/version
+```
diff --git a/docs/part-1/3_install-sdks.md b/docs/part-1/3_install-sdks.md
index 9c8b245..3ea342e 100644
--- a/docs/part-1/3_install-sdks.md
+++ b/docs/part-1/3_install-sdks.md
@@ -37,10 +37,10 @@ devel@docker ~$ sudo /opt/AGL/xds/server/xds-utils/install-agl-sdks.sh --arch co
 ```
 
 <!-- warning -->
->**Warning:** due to some limitation, you need for now to restart `xds-server` in
+**Warning:** due to some limitation, you need for now to restart `xds-server` in
 order to make new installed SDK visible/available.
-> ```bash
-> seb@laptop ~$  ssh -p 2222 devel@localhost
-> devel@docker ~$  systemctl --user restart xds-server.service
-> ```
+```bash
+seb@laptop ~$  ssh -p 2222 devel@localhost
+devel@docker ~$  systemctl --user restart xds-server.service
+```
 <!-- endwarning -->
diff --git a/docs/part-1/4_build-first-app.md b/docs/part-1/4_build-first-app.md
index 45b57b7..d473d77 100644
--- a/docs/part-1/4_build-first-app.md
+++ b/docs/part-1/4_build-first-app.md
@@ -2,17 +2,18 @@
 
 ## Prerequisites
 
-- `xds-agent` is running on your machine
-  (see **Installing XDS client tools**  previous chapter)
+- `xds-agent` is running locally on your machine
+  (see previous chapter: [Installing XDS client tools](./1_install-client.md) )
 - `xds-server` is running locally in a docker container or is accessible on your
-  network (see **Installing XDS server** previous chapter)
-- one or more SDK have been installed (see **Installing AGL SDKs** previous chapter)
-- XDS configuration is correct: in other words, all table lines are blue in
-  configuration page of XDS Dashboard.
+  network (see previous chapter: [Installing XDS server](./2_install-xds-server.md))
+- one or more SDK have been installed (see previous chapter: [Installing AGL SDKs](3_install-sdks.md))
+- XDS configuration is correct: in other words, connection is correctly
+  established between `xds-agent` and `xds-server` and no error message is
+  displayed when you open XDS Dashboard in a web browser.
 
 ## Setup
 
-Let's use for example helloworld-native-application, so you need first to clone
+Let's use _helloworld-native-application_ project as example, so you need first to clone
 this project into a directory that will be accessible by `xds-server`.
 Depending of the project sharing method:
 
@@ -20,7 +21,7 @@ Depending of the project sharing method:
 - Path mapping: you must clone project into `$HOME/xds-workspace` directory.
 
 <!-- note -->
-> **Note:** : [helloworld-native-application](https://github.com/iotbzh/helloworld-native-application) project is an AGL
+**Note:** : [helloworld-native-application](https://github.com/iotbzh/helloworld-native-application) project is an AGL
 project based on [app-templates](https://git.automotivelinux.org/apps/app-templates/)
 (included as a git submodule). This CMake templating, used to develop application
 with the AGL Application Framework, will automatically generate makefile rules
@@ -36,36 +37,59 @@ cd $HOME/xds-workspace
 git clone --recursive https://github.com/iotbzh/helloworld-native-application.git
 ```
 
-### Declare project into XDS
+### Declare project using XDS Dashboard
 
 Use XDS Dashboard to declare your project. Open a browser and connect to XDS
-Dashboard. URL depends of your config, for example `http://localhost:8000`
+Dashboard. URL depends of your config, for example `http://localhost:8800`
 
-Click cog icon ![](./pictures/xds-dashboard-icon-1.png){:: style="display:inline; padding:0;"}
-to open configuration panel and then create/declare a new project by with the
-plus icon
-![](./pictures/xds-dashboard-icon-2.png){:: style="display:inline; padding:0;"}
-of `Projects` bar.
+Open the right sidebar and select `Projects` entry to open project page and then
+create/declare a new project by with the plus icon:
 
-Set `Sharing Type` and paths according to your setup.
+![](./pictures/xds-dashboard-icon-2.png){:: style="margin:auto;"}
+
+<!-- pagebreak -->
+
+Set `Sharing Type` and paths according to your needs.
 
 ![](./pictures/xds-dashboard-prj-1.png){:: style="width:90%;"}
 
-Note that XDS creates a file name `xds-project.conf` (if not already exists)
-when you declare a new project using XDS Dashboard. This file may be very useful
-when you will use XDS client tools such as `xds-exec` (see next chapter).
+Note that XDS creates (if not already exists) a file named `xds-project.conf`
+when you declare a new project. This file may be very useful when you plan to
+use XDS client tools such as `xds-cli` or `xds-gdb`.
 
 <!-- note -->
->**Note:** when you select `Path mapping`, you must clone your project into
-`$HOME/xds-workspace` directory (named "Local Path" in modal window) and
-"Server Path" must be set to `/home/devel/xds-workspace/xxx` where xxx is your
-project directory name. If you select `Cloud Sync`, you can clone your project
-where you want on your local disk.
+**Note:** 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_install-xds-server.md#installation-based-on-docker-container) ),
+the **Server Path** must be set to `/home/devel/xds-workspace/xxx` where xxx is your
+project directory name.
+
+If you select `Cloud Sync`, you can clone your project wherever you want on
+your local disk.
 <!-- endnote -->
 
+### Declare project from command line
+
+Use XDS command line tool named [xds-cli](./part2/3_xds-cli.md) to declare your
+project from command line and more precisely the `projects add` command
+(short option: `prj add`).
+
+```bash
+xds-cli prj add --label="Project_helloworld-native-application" --type=pm --path=/home/seb/xds-workspace/helloworld-native-application --server-path=/home/devel/xds-workspace/helloworld-native-application
+```
+
+> **Note:** option `--url=http://localhost:1234` may be added to `xds-cli` in
+> order to set url of `xds-agent` in case of agent is not running on default
+> port (for example here, 1234)
+
+<!-- pagebreak -->
+
 ## Build from XDS dashboard
 
-Open the build page (icon ![](./pictures/xds-dashboard-icon-3.png){:: style="display:inline; padding:0;"}), then select your **Project** and the **Cross SDK** you want to use and click on
+Open the build page build entry of left sidebar ![](./pictures/xds-dashboard-icon-3.png){:: style="display:inline; padding:0;"},
+
+then select your **Project** and the **Cross SDK** you want to use and click on
 **Clean / Pre-Build / Build / Populate** buttons to execute various build actions.
 
 ![](./pictures/xds-dashboard-prj-2.png){:: style="width:90%;"}
@@ -74,24 +98,40 @@ Open the build page (icon ![](./pictures/xds-dashboard-icon-3.png){:: style="dis
 
 You need to determine which is the unique id of your project. You can find
 this ID in project page of XDS dashboard or you can get it from command line
-using the `--list` option. This option lists all existing projects ID:
+using `xds-cli` tool and `projects list` command (short: `prj ls`):
 
 ```bash
-xds-exec --list
-
-List of existing projects:
-  CKI7R47-UWNDQC3_myProject
-  CKI7R47-UWNDQC3_test2
-  CKI7R47-UWNDQC3_test3
+xds-cli prj ls
+ID                                       Label                                   LocalPath
+f9904f70-d441-11e7-8c59-3c970e49ad9b     Project_helloworld-service              /home/seb/xds-workspace/helloworld-service
+4021617e-ced0-11e7-acd2-3c970e49ad9b     Project_helloworld-native-application   /home/seb/xds-workspace/helloworld-native-application
 ```
 
-> **Note:** XDS tools, including `xds-exec` are installed by default in `/opt/AGL/bin`
-> directory and this path has been added into your PATH variable.
-> If it is not the case, just add it manually using `export PATH=${PATH}:/opt/AGL/bin` command line.
+XDS tools, including `xds-cli` are installed by default in `/opt/AGL/bin`
+directory and this path has been added into your PATH variable. If it is not the
+case, just add it manually using `export PATH=${PATH}:/opt/AGL/bin` command line.
 
 Now to refer your project, just use --id option or use `XDS_PROJECT_ID`
 environment variable.
 
+<!-- note -->
+**Note:** short id notation is also supported as soon as given id value is non ambiguous.
+For example, to refer to Project_helloworld-native-application project listed
+in above command, you can simply use --id 40 instead of --id 4021617e-ced0-11e7-acd2-3c970e49ad9b
+<!-- endnote -->
+
+You also need to determine the ID of the cross SDK you want to use to cross build
+you application. To list installed SDK, use the following command:
+
+```bash
+xds-cli sdks ls
+List of installed SDKs:
+  ID                                    NAME
+  7aa19224-b769-3463-98b1-4c029d721766  aarch64  (3.99.1+snapshot)
+  41a1efc4-8443-3fb0-afe5-8313e0c96efd  corei7-64  (3.99.2+snapshot)
+  c226821b-b5c0-386d-94fe-19f807946d03  aarch64  (3.99.3)
+```
+
 You are now ready to use XDS to for example cross build your project.
 Here is an example to build a project based on CMakefile:
 
@@ -101,18 +141,24 @@ cd $MY_PROJECT_DIR
 mkdir build
 
 # Generate build system using cmake
-xds-exec --id=CKI7R47-UWNDQC3_myProject --sdkid=poky-agl_aarch64_4.0.1 --url=http://localhost:8000 -- cd build && cmake ..
+xds-cli exec --id=4021617e --sdkid=c226821b -- "cd build && cmake .."
 
 # Build the project
-xds-exec --id=CKI7R47-UWNDQC3_myProject --sdkid=poky-agl_aarch64_4.0.1 --url=http://localhost:8000 -- cd build && make all
+xds-cli exec --id=4021617e --sdkid=c226821b -- "cd build && make all"
 ```
 
-To avoid to set project id, xds server url, ... at each command line, you can
-define these settings as environment variable within an env file and just set
-`--config` option or source file before executing xds-exec.
+<!-- note -->
+**Note:** If you use `&&`, `||` or `;` statement in the executed command line,
+you need to double quote the command, for example `"cd build && make`.
+<!-- endnote -->
+
+To avoid to set project id, sdks id, url, ... for each command line, you can
+define these settings as environment variables within an env file and just set
+`--config` option or source file before executing xds-cli command.
 
-XDS creates a file name `xds-project.conf` (only if not already exists) when you
-declare a new project using XDS Dashboard. Use this file with `--config` option.
+Note that XDS creates a file named `xds-project.conf` (only if not already exists)
+when you declare a new project using XDS Dashboard (or using `xds-cli prj add...`).
+Edit this file if needed and then refer it with `--config` option.
 
 For example, the equivalence of above command is:
 
@@ -122,30 +168,30 @@ cd $MY_PROJECT_DIR
 
 # Edit and potentially adapt xds-project.conf file that has been created
 # automatically on project declaration using XDS Dashboard
-vi xds-project.conf
+cat xds-project.conf
   # XDS project settings
-  export XDS_SERVER_URL=localhost:8000
-  export XDS_PROJECT_ID=cde3b382-9d3b-11e7_helloworld-native-application
-  export XDS_SDK_ID=poky-agl_aarch64_4.0.1
+  export XDS_AGENT_URL=localhost:8800
+  export XDS_PROJECT_ID=4021617e-ced0-11e7-acd2-3c970e49ad9b
+  export XDS_SDK_ID=c226821b-b5c0-386d-94fe-19f807946d03
 
 # Create build directory and invoke cmake and then build project
-xds-exec --config xds-project.conf -- "mkdir -p build && cd build && cmake .."
-cd build && xds-exec -- make all
+xds-cli exec --config=./xds-project.conf -- "mkdir -p build && cd build && cmake .."
+cd build && xds-cli exec --config=../xds-project.conf -- "make all"
 
 # Or equivalent by first sourcing conf file (avoid to set --config option)
 source xds-project.conf
-xds-exec -- "mkdir -p build && cd build && cmake .."
-cd build && xds-exec -- make all
+xds-cli exec "mkdir -p build && cd build && cmake .."
+cd build && xds-cli exec "make all"
 ```
 
 <!-- note -->
->**Note:** all parameters after a double dash (--) are considered as the command
-to execute on xds-server.
+**Note:** all parameters after a double dash (--) are considered as the command
+to execute.
 <!-- endnote -->
 
 ## Build from IDE
 
-First create an XDS config file or reuse the previous one, for example we use 
+First create an XDS config file or reuse the previous one, for example we use
 here aarch64 SDK to cross build application for a Renesas Gen3 board.
 
 ```bash
@@ -153,9 +199,9 @@ here aarch64 SDK to cross build application for a Renesas Gen3 board.
 # for example:
 # MY_PROJECT_DIR=/home/seb/xds-workspace/helloworld-native-application
 cat > $MY_PROJECT_DIR/xds-project.conf << EOF
- export XDS_SERVER_URL=localhost:8000
- export XDS_PROJECT_ID=cde3b382-9d3b-11e7_helloworld-native-application
- export XDS_SDK_ID=poky-agl_aarch64_3.99.3
+ export XDS_AGENT_URL=localhost:8800
+ export XDS_PROJECT_ID=4021617e-ced0-11e7-acd2-3c970e49ad9b
+ export XDS_SDK_ID=c226821b-b5c0-386d-94fe-19f807946d03
 EOF
 ```
 
@@ -211,13 +257,13 @@ __Netbeans 8.x :__
 
   - Select **Pre-Build** sub-category, and set:
     - Working Directory: `build_gen3`
-    - Command Line: `xds-exec -c ../xds-project.conf -- cmake -DRSYNC_TARGET=root@renesas-gen3 -DRSYNC_PREFIX=/opt ..`
+    - Command Line: `xds-cli exec -c ../xds-project.conf -- cmake -DRSYNC_TARGET=root@renesas-gen3 -DRSYNC_PREFIX=/opt ..`
     - Pre-build First: `ticked`
 
   - Select **Make** sub-category, and set:
     - Working Directory: `build_gen3`
-    - Build Command: `xds-exec -c ../xds-project.conf -- make remote-target-populate`
-    - Clean Command: `xds-exec -c ../xds-project.conf -- make clean`
+    - Build Command: `xds-cli exec -c ../xds-project.conf -- make remote-target-populate`
+    - Clean Command: `xds-cli exec -c ../xds-project.conf -- make clean`
 
     ![Select Make sub-category](./pictures/nb_new-project-4.png)
 
@@ -266,7 +312,7 @@ AGL helloworld application based on cmake template.
         {
             "taskName": "pre-build",
             "group": "build",
-            "command": "/opt/AGL/bin/xds-exec --rpath build --config xds-project.conf -- cmake -DRSYNC_TARGET=root@renesas-gen3 -DRSYNC_PREFIX=/opt ../",
+            "command": "/opt/AGL/bin/xds-cli exec --rpath build --config xds-project.conf -- cmake -DRSYNC_TARGET=root@renesas-gen3 -DRSYNC_PREFIX=/opt ../",
             "problemMatcher": [
                 "$gcc"
             ]
@@ -274,14 +320,14 @@ AGL helloworld application based on cmake template.
         {
             "taskName": "build",
             "group": "build",
-            "command": "/opt/AGL/bin/xds-exec --rpath build --config xds-project.conf -- make widget",
+            "command": "/opt/AGL/bin/xds-cli exec --rpath build --config xds-project.conf -- make widget",
             "problemMatcher": [
                 "$gcc"
             ]
         },
         {
             "taskName": "populate",
-            "command": "/opt/AGL/bin/xds-exec --rpath build --config xds-project.conf -- make widget-target-install",
+            "command": "/opt/AGL/bin/xds-cli exec --rpath build --config xds-project.conf -- make widget-target-install",
             "problemMatcher": []
         }
     ]
diff --git a/docs/part-1/5_debug-first-app.md b/docs/part-1/5_debug-first-app.md
index 15f58b9..69f004f 100644
--- a/docs/part-1/5_debug-first-app.md
+++ b/docs/part-1/5_debug-first-app.md
@@ -1,22 +1,18 @@
 # Debug your first AGL application
 
-Debug is based on gdb and you need to use `xds-gdb` as a wrapper on gdb to cross-debug your application.
-This tool allows you to debug an application built with an xds-server without the need to install gdb or any cross tool.
+Debug is based on gdb and you need to use `xds-gdb` as a wrapper on gdb to
+cross-debug your application. This tool allows you to debug an application built
+with XDS without the need to install gdb or any cross tools.
+
 Two debugging models are supported:
 
 1. native debugging
 
-1. XDS remote debugging requiring an XDS server and allowing cross debug your
-  application.
+1. XDS remote debugging requiring an XDS agent/server setup and that allows you to cross debug your application.
 
- By default XDS remote debug is used and you need to define `XDS_NATIVE_GDB`
+By default XDS debug model is used and you need to define `XDS_NATIVE_GDB`
 variable to use native gdb debug mode instead.
 
-> **SEE ALSO**: [xds-server](https://github.com/iotbzh/xds-server), a web server
-used to remotely cross build applications.
-> **SEE ALSO**: [xds-exec](https://github.com/iotbzh/xds-exec),
-wrappers on `exec` command that allows to cross build your application through `xds-server`.
-
 ## Configuration
 
  `xds-gdb` configuration is defined by variables (see listed below).
@@ -44,9 +40,9 @@ wrappers on `exec` command that allows to cross build your application through `
 # for example:
 # MY_PROJECT_DIR=/home/seb/xds-workspace/helloworld-native-application
 cat > $MY_PROJECT_DIR/xds-gen3.conf << EOF
-export XDS_SERVER_URL=http://docker:8000
-export XDS_PROJECT_ID=IW7B4EE-DBY4Z74_myProject
-export XDS_SDK_ID=poky-agl_aarch64_4.0.1
+export XDS_AGENT_URL=localhost:8800
+export XDS_PROJECT_ID=4021617e-ced0-11e7-acd2-3c970e49ad9b
+export XDS_SDK_ID=c226821b-b5c0-386d-94fe-19f807946d03
 EOF
 ```
 
@@ -60,9 +56,9 @@ Set logging file, default `/tmp/xds-gdb.log`.
 
 `XDS_NATIVE_GDB`
 
-Use native gdb mode instead of remote XDS server mode.
+Use native gdb mode instead of remote XDS mode.
 
-`XDS_PROJECT_ID`  *(mandatory with XDS server mode)*
+`XDS_PROJECT_ID`  *(mandatory in XDS mode)*
 
 Project ID you want to build
 
@@ -70,13 +66,13 @@ Project ID you want to build
 
 Relative path into project
 
-`XDS_SDK_ID`   *(mandatory with XDS server mode)*
+`XDS_SDK_ID`   *(mandatory in XDS mode)*
 
 Cross Sdk ID to use to build project
 
-`XDS_SERVER_URL`    *(mandatory with XDS server mode)*
+`XDS_AGENT_URL`
 
-Remote XDS server url
+Local XDS agent url (default `http://localhost:8800`)
 
 ### Configuration variables set within gdb init command file
 
@@ -87,8 +83,8 @@ You must respect the following syntax: commented line including `:XDS-ENV:` tag
 Example of gdb init file where we define project and sdk ID:
 
 ```bash
-     # :XDS-ENV: XDS_PROJECT_ID=IW7B4EE-DBY4Z74_myProject
-     # :XDS-ENV: XDS_SDK_ID=poky-agl_aarch64_4.0.1
+     # :XDS-ENV: XDS_PROJECT_ID=4021617e-ced0-11e7-acd2-3c970e49ad9b
+     # :XDS-ENV: XDS_SDK_ID=c226821b-b5c0-386d-94fe-19f807946d03
 ```
 
 ## Using xds-gdb from command line
@@ -96,16 +92,16 @@ Example of gdb init file where we define project and sdk ID:
 ### XDS remote debugging mode
 
 First the project you want to debug must be declared on an xds-server and this
-project may also has been built using this xds-server (see [xds-server](https://github.com/iotbzh/xds-server) for more details).
+project may also has been built using using XDS (see [Create your first AGL application](./4_build-first-app.md) for more details).
 
-So to debug it you need to know the xds-server url (eg. <http://docker:8000>),
+So to debug it you need to have the XDS agent - server chain in place and
 you also need the project and sdk unique id. You can find these IDs in project
 page of XDS dashboard or you can get them from command line using the `--list`
 option.
 This option lists all existing projects ID:
 
 ```bash
-XDS_SERVER_URL=http://docker:8000 xds-gdb --list
+xds-gdb --list
 ```
 
 Now to refer your project, just set `XDS_PROJECT_ID` and `XDS_SDK_ID` variables.
@@ -125,28 +121,28 @@ cd helloworld-service
 
 # Define XDS config
 cat <<EOF >./xds-config.env
-XDS_SERVER_URL=http://docker:8000
+#optional if not default value: XDS_AGENT_URL=http://localhost:8800
 XDS_PROJECT_ID=IW7B4EE-DBY4Z74_myProject
 XDS_SDK_ID=poky-agl_aarch64_4.0.1
 EOF
 
-# Tell to xds-exec and xds-gdb which is your config file
+# Tell to xds-cli and xds-gdb which is your config file
 export XDS_CONFIG=../xds-gen3.conf
 
 # Create a new build directory
 mkdir build && cd build
 
 # Start remote cross build
-xds-exec -- cmake -DRSYNC_TARGET=root@myTarget ..
-xds-exec -- make
-xds-exec -- make remote-target-populate
+xds-cli exec -- cmake -DRSYNC_TARGET=root@myTarget ..
+xds-cli exec -- make
+xds-cli exec -- make remote-target-populate
 
 # Start debugging
 xds-gdb -x target/gdb-on-root@myTarget.ini
 ```
 
 <!-- note -->
-> **Note:** : [helloworld-native-application](https://github.com/iotbzh/helloworld-native-application) project is an AGL
+**Note:** : [helloworld-native-application](https://github.com/iotbzh/helloworld-native-application) project is an AGL
 project based on [app-templates](https://git.automotivelinux.org/apps/app-templates/)
 (included as a git submodule). This CMake templating, used to develop application
 with the AGL Application Framework, will automatically generate makefile rules
diff --git a/docs/part-1/pictures/nb_new-project-4.png b/docs/part-1/pictures/nb_new-project-4.png
index ebd330a..bcb0716 100644
--- a/docs/part-1/pictures/nb_new-project-4.png
+++ b/docs/part-1/pictures/nb_new-project-4.png
diff --git a/docs/part-1/pictures/nb_xds_options.png b/docs/part-1/pictures/nb_xds_options.png
index 02bd3a9..fa82a94 100644
--- a/docs/part-1/pictures/nb_xds_options.png
+++ b/docs/part-1/pictures/nb_xds_options.png
diff --git a/docs/part-1/pictures/xds-block-chain.png b/docs/part-1/pictures/xds-block-chain.png
new file mode 100644
index 0000000..0ecceb0
--- /dev/null
+++ b/docs/part-1/pictures/xds-block-chain.png
diff --git a/docs/part-1/pictures/xds-block-diagram.png b/docs/part-1/pictures/xds-block-diagram.png
index cd11ad8..fae6df2 100644
--- a/docs/part-1/pictures/xds-block-diagram.png
+++ b/docs/part-1/pictures/xds-block-diagram.png
diff --git a/docs/part-1/pictures/xds-dashboard-icon-1.png b/docs/part-1/pictures/xds-dashboard-icon-1.png
index 9aea05e..8fdc20f 100644
--- a/docs/part-1/pictures/xds-dashboard-icon-1.png
+++ b/docs/part-1/pictures/xds-dashboard-icon-1.png
diff --git a/docs/part-1/pictures/xds-dashboard-icon-2.png b/docs/part-1/pictures/xds-dashboard-icon-2.png
index 5df47b6..e551d8c 100644
--- a/docs/part-1/pictures/xds-dashboard-icon-2.png
+++ b/docs/part-1/pictures/xds-dashboard-icon-2.png
diff --git a/docs/part-1/pictures/xds-dashboard-icon-3.png b/docs/part-1/pictures/xds-dashboard-icon-3.png
index 4a642e6..7b303ed 100644
--- a/docs/part-1/pictures/xds-dashboard-icon-3.png
+++ b/docs/part-1/pictures/xds-dashboard-icon-3.png
diff --git a/docs/part-1/pictures/xds-dashboard-prj-1.png b/docs/part-1/pictures/xds-dashboard-prj-1.png
index c675b90..d5b0621 100644
--- a/docs/part-1/pictures/xds-dashboard-prj-1.png
+++ b/docs/part-1/pictures/xds-dashboard-prj-1.png
diff --git a/docs/part-1/pictures/xds-dashboard-prj-2.png b/docs/part-1/pictures/xds-dashboard-prj-2.png
index 821b573..9429246 100644
--- a/docs/part-1/pictures/xds-dashboard-prj-2.png
+++ b/docs/part-1/pictures/xds-dashboard-prj-2.png