2 files changed, 113 insertions, 16 deletions
diff --git a/content/tocs/apis_services/fetched_files.yml b/content/tocs/apis_services/fetched_files.yml
index 24d3194..da0758b 100644
--- a/content/tocs/apis_services/fetched_files.yml
+++ b/content/tocs/apis_services/fetched_files.yml
@@ -23,7 +23,7 @@
 # ------------------------------------
 # url: "GERRIT_FETCH"
 # git_commit: "master"
-# repositories: 
+# repositories:
 # -
 #    git_name: src/foo
 #    src_prefix: docs
@@ -40,7 +40,7 @@
 url_fetch  : "GERRIT_FETCH"
 git_commit : "AGL_GERRIT_BRANCH"
 
-repositories:   
+repositories:
 -
     git_name : src/app-framework-main
     git_commit: master
@@ -99,6 +99,39 @@ repositories:
         - source: pictures/triskel_iot_bzh.svg
 
 -
+    git_name : apps/low-level-can-service
+    git_commit: master
+    src_prefix : docs
+    dst_prefix: signaling
+    documents:
+        - source: 1-Architecture.md
+          destination: low-can-architecture.md
+          label: Architecture presentation
+        - source: 2-Installation.md
+          destination: low-can-installation-guide.md
+          label: Installation Guide
+        - source: 3-Usage.md
+          destination: low-can-usage-guide.md
+          label: Usage Guide
+        - source: images/CAN_bindings_communication.png
+        - source: images/CAN_level_mapping.png
+        - source: images/OpenXC_to_AGL.png
+
+-
+    url_fetch: GITHUB_FETCH
+    git_name : iotbzh/high-level-viwi-service
+    git_commit: master
+    src_prefix : docs
+    dst_prefix: signaling
+    documents:
+        - source: 1-Architecture.md
+          destination: high-viwi-architecture.md
+          label: Architecture presentation
+        - source: 2-Install-Usage.md
+          destination: high-viwi-install-usage-guide.md
+          label: Installation and Usage Guide
+        - source: images/high-level-arch.png
+-
     url_fetch: AGL_GITHUB_FETCH
     url_edit: AGL_GITHUB_EDIT
     git_name: "%project_source%/docs-agl"
@@ -120,12 +153,6 @@ repositories:
         - source: architecture.md
           destination: architecture.md
           label: Signaling Architecture
-        - source: low-level-can-service-guide.md
-          destination: low-level-can-service-guide.md
-          label: Low level CAN service Guide
-        - source: high-level-viwi-service.md
-          destination: high-level-viwi-service.md
-          label: High level ViWi service Guide
         - source: index.md
           destination: resources.md
           label: Resources
@@ -136,10 +163,6 @@ repositories:
         - source: images/distributed-arch.svg
         - source: images/distributed-arch.png
         - source: images/signal-service-arch.svg
-        - source: images/OpenXC_to_AGL.png
-        - source: images/CAN_level_mapping.png
-        - source: images/CAN_bindings_communication.png
-        - source: images/high-level-arch.png
 -
     url_fetch: http://iot.bzh/download/public/2016/%source%
     dst_prefix: iotbzh2016
@@ -158,6 +181,62 @@ repositories:
           destination: resources.md
           label: Resources
 -
+    url_fetch: "GERRIT_FETCH"
+    git_name: apps/agl-service-homescreen-2017
+    git_commit: "master"
+    src_prefix: doc/
+    dst_prefix: hmi-framework/
+    documents:
+        - source: ApplicationGuide.md
+          destination: 3_1-HomeScreen-Guide.md
+          label: Home Screen Developper Guide
+        - source: parts/initialize.svg
+        - source: parts/initialize-registercallback.svg
+        - source: parts/initialize-set-event-handler.svg
+        - source: parts/on_screen_message.svg
+        - source: parts/software-stack.png
+        - source: parts/tap_shortcut.svg
+-
+    url_fetch: "GERRIT_FETCH"
+    git_name: apps/agl-service-windowmanager-2017
+    git_commit: "master"
+    src_prefix: doc/
+    dst_prefix: hmi-framework/
+    documents:
+        - source: ApplicationGuide.md
+          destination: 3_2-WindowManager-Guide.md
+          label: Window Manager Developper Guide
+-
+    url_fetch: "GERRIT_FETCH"
+    git_name: apps/agl-service-soundmanager-2017
+    git_commit: "master"
+    src_prefix: doc/
+    dst_prefix: hmi-framework/
+    documents:
+        - source: ApplicationGuide.md
+          destination: 3_3-SoundManager-Guide.md
+          label: Sound Manager Developper Guide
+        - source: Display_Audio_Transition1.md
+          destination: Display_Audio_Transition1.md
+          label: Sound Manager Developper Guide 2
+        - source: Display_Audio_Transition2.md
+          destination: Display_Audio_Transition2.md
+          label: Sound Manager Developper Guide 3
+        - source: parts/seq_startup.svg
+        - source: parts/am-component.png
+        - source: parts/seq_registration.svg
+        - source: parts/seq_connectsoundroute.svg
+        - source: parts/seq_startsoundstreaming.svg
+        - source: parts/seq_requestsoundmode.svg
+        - source: parts/seq_setmutestate.svg
+        - source: parts/seq_changevolume.svg
+        - source: parts/seq_stopsoundstreaming.svg
+        - source: parts/seq_disconnectsoundroute.svg
+        - source: parts/software-stack.png
+        - source: parts/seq_releasesoundmode.svg
+        - source: parts/typical-usecase.png
+        - source: parts/am-component.png
+-
     url_fetch  : GERRIT_FETCH
     git_commit : master
     git_name   : apps/homescreen
@@ -184,4 +263,3 @@ repositories:
           destination: pictures/api_requestSurfaceIdToFullScreen.png
         - source: pictures/api_surfaceVisibilityChanged.png
           destination: pictures/api_surfaceVisibilityChanged.png
-
diff --git a/content/tocs/apis_services/toc_dev_en.yml b/content/tocs/apis_services/toc_dev_en.yml
index 083a9a7..3c3e4a9 100644
--- a/content/tocs/apis_services/toc_dev_en.yml
+++ b/content/tocs/apis_services/toc_dev_en.yml
@@ -65,8 +65,15 @@ children:
     name: Message Signaling
     children:
         - url: reference/signaling/architecture.html
-        - url: reference/signaling/low-level-can-service-guide.html
-        - url: reference/signaling/high-level-viwi-service.html
+        - name: Low level CAN service Guide
+          children:
+                - url: reference/signaling/low-can-architecture.html
+                - url: reference/signaling/low-can-installation-guide.html
+                - url: reference/signaling/low-can-usage-guide.html
+        - name: High level ViWi service Guide
+          children:
+                - url: reference/signaling/high-viwi-architecture.html
+                - url: reference/signaling/high-viwi-install-usage-guide.html
         - name: Developer Guidelines
           url: reference/iotbzh2016/signaling/AGL-Message-Signaling-Developer-Guidelines.pdf
         - name: CAN Signaling Benchmark
@@ -77,7 +84,19 @@ children:
     children:
         - url: reference/audio/resources.html
 -
-    name: HomeScreen
+    name: HMI Framework
+    children:
+        -
+            name: Home Screen Developper Guide
+            url: reference/hmi-framework/3_1-HomeScreen-Guide.html
+        -
+            name: Window Manager Developper Guide
+            url: reference/hmi-framework/3_2-WindowManager-Guide.html
+        -
+            name: Sound Manager Developper Guide
+            url: reference/hmi-framework/3_3-SoundManager-Guide.html
+-
+    name: HomeScreen (old)
     children:
         - url: reference/homescreen/homescreen_api.html