1 files changed, 76 insertions, 78 deletions
diff --git a/content/tocs/apis_services/section_flounder.yml b/content/tocs/apis_services/section_flounder.yml
index ceb1912..c365671 100644
--- a/content/tocs/apis_services/section_flounder.yml
+++ b/content/tocs/apis_services/section_flounder.yml
@@ -1,108 +1,106 @@
 url_fetch  : "GERRIT_FETCH"
-git_commit : "flounder"
+git_commit : flounder
 
 name: APIs & Services
 template: generated_index.html
 books:
 -
-    id: app-framework-main-developer-guides-flounder
+    id: flounder-app-framework-main-developer-guides
     git_name: src/app-framework-main
     path: docs/api-services-book.yml
     dst_prefix: af-main
 -
-    id: app-framework-binder-developer-guides-flounder
+    id: flounder-app-framework-binder-developer-guides
     git_name: src/app-framework-binder
     path: docs/api-services-book.yml
     dst_prefix: af-binder
 -
-    id: agl-service-can-low-level-developer-guides-flounder
-    git_name: apps/agl-service-can-low-level
-    path: docs/api-services-book.yml
-    dst_prefix: signaling
--
-    id: app-afb-test-developer-guides-flounder
+    id: flounder-app-afb-test-developer-guides
     git_name: apps/app-afb-test
     path: docs/api-services-book.yml
     dst_prefix: afb-test
 -
-    id: high-level-developer-guides-flounder
-    url_fetch: GITHUB_FETCH
-    url_edit: GITHUB_EDIT
-    git_name: iotbzh/high-level-viwi-service
-    git_commit: master
-    path: docs/api-services-book.yml
-    dst_prefix: signaling
--
-    id: agl-service-signal-composer-developer-guides-flounder
-    git_name: apps/agl-service-signal-composer
-    path: docs/api-services-book.yml
--
-    id: candevstudio-developer-guides-flounder
-    url_fetch: GITHUB_FETCH
-    url_edit: GITHUB_EDIT
-    git_name: iotbzh/agl-documentation
-    git_commit: master
-    path: candevstudio/docs/api-services-book.yml
-    dst_prefix: candevstudio
--
-    id: app-framework-developer-guides-flounder
-    url_fetch: GITHUB_FETCH
-    url_edit: AGL_GITHUB_EDIT
-    git_name: automotive-grade-linux/docs-sources
-    git_commit: sandbox/benierc/newdocs
-    path: docs/app-framework-book.yml
-    dst_prefix: af-binder
--
-    id: signaling-developer-guides-flounder
-    url_fetch: GITHUB_FETCH
+    id: flounder-docs-source-signaling
+    url_fetch: AGL_GITHUB_FETCH
     url_edit: AGL_GITHUB_EDIT
     git_name: automotive-grade-linux/docs-sources
-    git_commit: sandbox/benierc/newdocs
     path: docs/signaling-book.yml
-    src_prefix: docs/signaling
-# FIXME
-# -
-#     id: devel-guidelines-2016-flounder
-#     url_fetch: https://iot.bzh/download/public/2016/%source%
-#     dst_prefix: iotbzh2016
-#     documents:
-#         - source: signaling/AGL-AppFW-CAN-Signaling-Benchmark.pdf
-#         - source: signaling/AGL-Message-Signaling-Developer-Guidelines.pdf
--
-    id: audio-developer-guides-flounder
+    dst_prefix: signaling
+    books:
+        - id: flounder-agl-service-can-low-level-developer-guides
+          git_name: apps/agl-service-can-low-level
+          path: docs/api-services-book.yml
+          dst_prefix: signaling
+        - id: flounder-high-level-developer-guides
+          url_fetch: GITHUB_FETCH
+          url_edit: GITHUB_EDIT
+          git_commit: master
+          git_name: iotbzh/high-level-viwi-service
+          path: docs/api-services-book.yml
+          dst_prefix: signaling
+        - id: flounder-agl-service-signal-composer-developer-guides
+          git_name: apps/agl-service-signal-composer
+          path: docs/api-services-book.yml
+        - id: flounder-devel-appfw-guidelines-2016
+          path: https://iot.bzh/download/public/2016/signaling/AGL-AppFW-CAN-Signaling-Benchmark.pdf
+          dst_prefix: iotbzh2016
+          name: Developer Guidelines
+        - id: flounder-devel-message-guidelines-2016
+          path: https://iot.bzh/download/public/2016/signaling/AGL-Message-Signaling-Developer-Guidelines.pdf
+          dst_prefix: iotbzh2016
+          name: CAN Signaling Benchmark
+        - id: flounder-candevstudio-developer-guides
+          url_fetch: GITHUB_FETCH
+          url_edit: GITHUB_EDIT
+          git_commit: master
+          git_name: iotbzh/agl-documentation
+          path: candevstudio/docs/api-services-book.yml
+          dst_prefix: candevstudio
+        - id: flounder-app-framework-developer-guides
+          url_fetch: GITHUB_FETCH
+          url_edit: AGL_GITHUB_EDIT
+          git_name: automotive-grade-linux/docs-sources
+          path: docs/app-framework-book.yml
+          dst_prefix: af-binder
+-
+    id: flounder-audio-developer-guides
     url_fetch: GITHUB_FETCH
     url_edit: AGL_GITHUB_EDIT
     git_name: automotive-grade-linux/docs-sources
-    git_commit: sandbox/benierc/newdocs
     path: docs/audio-book.yml
     dst_prefix: audio
--
-    id: agl-service-audio-4a-developer-guides-flounder
-    git_name: apps/agl-service-audio-4a
-    path: docs/api-services-book.yml
-    dst_prefix: audio
--
-    id: pulseaudio-module-4a-developer-guides-flounder
-    git_name: src/pulseaudio-module-4a
-    path: api-services-book.yml
-    dst_prefix: audio
--
-    id: agl-service-homescreen-developer-guides-flounder
-    git_name: apps/agl-service-homescreen
-    path: doc/api-services-book.yml
-    dst_prefix: hmi-framework
--
-    id: agl-service-windowmanager-developer-guides-flounder
-    git_name: apps/agl-service-windowmanager
-    path: doc/api-services-book.yml
-    dst_prefix: hmi-framework
--
-    id: agl-service-soundmanager-developer-guides-flounder
-    git_name: apps/agl-service-soundmanager
-    path: doc/api-services-book.yml
+    books:
+        - id: flounder-pulseaudio-module-4a-developer-guides
+          git_name: src/pulseaudio-module-4a
+          path: api-services-book.yml
+          dst_prefix: audio
+        - id: flounder-agl-service-audio-4a-developer-guides
+          git_name: apps/agl-service-audio-4a
+          path: docs/api-services-book.yml
+          dst_prefix: audio
+-
+    id: flounder-hmi-framework
+    url_fetch: GITHUB_FETCH
+    url_edit: AGL_GITHUB_EDIT
+    git_name: automotive-grade-linux/docs-sources
+    path: docs/hmi-framework-book.yml
     dst_prefix: hmi-framework
--
-    id: homescreen-developer-guides-flounder
+    books:
+        - id: flounder-agl-service-homescreen-developer-guides
+          name: HMI Framework
+          git_name: apps/agl-service-homescreen
+          path: doc/api-services-book.yml
+          dst_prefix: hmi-framework
+        - id: flounder-agl-service-windowmanager-developer-guides
+          git_name: apps/agl-service-windowmanager
+          path: doc/api-services-book.yml
+          dst_prefix: hmi-framework
+        - id: flounder-agl-service-soundmanager-developer-guides
+          git_name: apps/agl-service-soundmanager
+          path: doc/api-services-book.yml
+          dst_prefix: hmi-framework
+-
+    id: flounder-homescreen-developer-guides
     git_name: apps/homescreen
     path: homescreen/docs/api-services-book.yml
     dst_prefix: hmi-framework