Bug 495324: [Documentation] Improve documentation layout

- Update layout according to bug proposal

Change-Id: I3d1901edb5b8388585afeee8f7cbda706d56abc6
Signed-off-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>

22 files changed, 90 insertions, 74 deletions

diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
index b21d14421c5..55ae0b11bed 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='utf-8' ?>

-<toc label="CDO Model Repository" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="target/generated-eclipse-help/start/cdo-start.html" label="Working with CDO Model Repositories">

-      <link toc="target/generated-eclipse-help/start/cdo-start-toc.xml"/>

-      <link toc="target/generated-eclipse-help/team/cdo-team-toc.xml"/>

-      <link toc="target/generated-eclipse-help/bugs/cdo-bugs-toc.xml"/>

-      <anchor id="cdo-additions"/>

-   </topic>

-	

-</toc>

+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="CDO Model Repository" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
+   <topic href="target/generated-eclipse-help/start/cdo-start.html" label="Working with CDO Model Repositories">
+      <link toc="target/generated-eclipse-help/start/cdo-start-toc.xml"/>
+      <link toc="target/generated-eclipse-help/team/cdo-team-toc.xml"/>
+      <link toc="target/generated-eclipse-help/bugs/cdo-bugs-toc.xml"/>
+      <anchor id="cdo-additions"/>
+   </topic>
+	
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
index 96b29f23bd4..fb644b691c9 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Copy Paste" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+<toc label="Copy Paste" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
    <topic href="target/generated-eclipse-help/copypaste.html" label="Using Copy paste">
       <link toc="target/generated-eclipse-help/copypaste-toc.xml"/>
       <anchor id="copypaste"/>
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
index fc4356fb58b..bcef6f52651 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8' ?>

-<toc label="Write and validate (OCL) constraints of a profile" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="target/generated-eclipse-help/dsml-validation.html" label="Validate (OCL) constraints of a profile">

-      <link toc="target/generated-eclipse-help/dsml-validation-toc.xml"/>

-      <anchor id="ValidateConstraints"/>

-   </topic>	

-</toc>

+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Writing and validating (OCL) constraints of a profile" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
+   <topic href="target/generated-eclipse-help/dsml-validation.html" label="Validate (OCL) constraints of a profile">
+      <link toc="target/generated-eclipse-help/dsml-validation-toc.xml"/>
+      <anchor id="ValidateConstraints"/>
+   </topic>	
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/toc.xml b/plugins/doc/org.eclipse.papyrus.infra.doc/toc.xml
index a3633c0dabe..1cbebdcebea 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/toc.xml
@@ -3,13 +3,29 @@
 
 <toc label="Papyrus Guide">
 	<topic label="User Guide">
-		<anchor id="PapyrusDocUser"/>
+		<anchor id="PapyrusStarterGuide"/>
+  		<topic label="Tasks">
+			<anchor id="PapyrusTasks"/>  
+  		</topic>
+  		<topic label="Tips and Tricks">
+			<anchor id="PapyrusTipsAndTricks"/>
+  		</topic>
+    <topic label="Tutorials">
+       <anchor id="PapyrusUserTutorials"/>
+    </topic>
+  		<anchor id="PapyrusDocUser"/>
+ 	</topic>
+ 	<topic label="Toolsmith Guide">
+		<anchor id="PapyrusDocCustom"/>
+  <topic label="Tutorials">
+     <anchor id="PapyrusCustomTutorials"/>
+  </topic>
  	</topic>
 	<topic href="http://wiki.eclipse.org/Papyrus_Developer_Guide" label="Developer Guide">
  		<anchor id="PapyrusDocDev"/>
- 	</topic>
- 	<topic label="Customization Guide">
-		<anchor id="PapyrusDocCustom"/>
+   <topic label="Tutorials">
+      <anchor id="PapryusDevTutorials"/>
+   </topic>
  	</topic>
 	<topic label="Online Help">
 		<topic href="http://wiki.eclipse.org/Papyrus-FAQ" label="FAQ"/>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
index 81d97da7438..4bb2a9d2c86 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/resource/tools-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Papyrus Modelling Tools" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-	<topic label="Using Papyrus modelling tools">
+<toc label="Papyrus Modeling Tools" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTipsAndTricks">
+	<topic label="Using Papyrus modeling tools">
     <anchor id="Tool"/>
     <link toc="target/generated-eclipse-help/marqueeSelectionTool-toc.xml"/>
     <link toc="target/generated-eclipse-help/alignmentTool-toc.xml"/>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-main-toc.xml
index 74e70784dd6..cf082ada4db 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-main-toc.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="CSS Stylesheets" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+<toc label="CSS Stylesheets" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
    <topic href="target/generated-eclipse-help/css.html" label="CSS Stylesheets">
       <anchor id="CSS"/>
       <link toc="target/generated-eclipse-help/css-toc.xml"/>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/nattable-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/nattable-main-toc.xml
index 5c386462125..864f1f78fd1 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/nattable-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/nattable-main-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Papyrus Nattable" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-  <topic label="Papyrus Nattable" >
+<toc label="Using tables" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
+  <topic label="Using tables" >
      <link toc="target/site/generated-eclipse-help/tablemetamodeldocumentation-toc.xml"/>
      <anchor id="tableMetamodel"/>
      <link toc="target/site/generated-eclipse-help/tableUserDoc-toc.xml"/>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-main-toc.xml
index f9d043cc461..73dc2aa1002 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/resource/newChild-main-toc.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Papyrus Guide" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+<toc label="Papyrus Guide" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
    <topic href="target/generated-eclipse-help/newChild.html" label="Menu new child">
       <anchor id="new Child"/>
       <link toc="target/generated-eclipse-help/newChild-toc.xml"/>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-main-toc.xml
index 8f246f8b86e..2999a6b843c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/resource/controlMode-main-toc.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8' ?>

-<toc label="Submodel Creation and Reintegration" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="target/generated-eclipse-help/controlMode.html" label="Submodel Creation and Reintegration">

-      <link toc="target/generated-eclipse-help/controlMode-toc.xml"/>

-      <anchor id="controlMode"/>

-   </topic>	

-</toc>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Creating and reintegrating submodels" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
+   <topic href="target/generated-eclipse-help/controlMode.html" label="Creating and reintegrating submodels">
+      <link toc="target/generated-eclipse-help/controlMode-toc.xml"/>
+      <anchor id="controlMode"/>
+   </topic>	
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.types.doc/resources/types-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.types.doc/resources/types-main-toc.xml
index 563c80ca8ec..9ef78ce5394 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.types.doc/resources/types-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.types.doc/resources/types-main-toc.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8' ?>

-<toc label="ElementTypeConfigurations" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocDev">

-   <topic href="target/generated-eclipse-help/types.html" label="ElementTypeConfigurations Framework">

-      <link toc="target/generated-eclipse-help/types-toc.xml"/>

-      <anchor id="TypesID"/>

-   </topic>

-</toc>

+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="ElementTypeConfigurations" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
+   <topic href="target/generated-eclipse-help/types.html" label="ElementTypeConfigurations Framework">
+      <link toc="target/generated-eclipse-help/types-toc.xml"/>
+      <anchor id="TypesID"/>
+   </topic>
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml
index 902c69ce29e..287f135aebe 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8' ?>

-<toc label="Viewpoints" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="target/generated-eclipse-help/viewpoints.html" label="Viewpoints in Papyrus">

-      <link toc="target/generated-eclipse-help/viewpoints-toc.xml"/>

-      <anchor id="ViewpointsID"/>

-   </topic>

-</toc>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Viewpoints" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
+   <topic href="target/generated-eclipse-help/viewpoints.html" label="Viewpoints in Papyrus">
+      <link toc="target/generated-eclipse-help/viewpoints-toc.xml"/>
+      <anchor id="ViewpointsID"/>
+   </topic>
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/index-toc.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/index-toc.xml
index 2de1876a0a8..76d2cea8fa1 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/index-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/resources/guides/index-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Layers" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-  <topic label="Layers" >
+<toc label="Using Layers" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
+  <topic label="Using Layers" >
      <link toc="target/generated-eclipse-help/guides/tutorials/layers-toc.xml"/>
      <anchor id="tutorials"/>
      <link toc="target/generated-eclipse-help/guides/users/index-toc.xml"/>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml
index a05843330f8..7eba771222a 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="ReqID Import Export" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+<toc label="ReqID Import Export" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
    <topic href="target/generated-eclipse-help/DeveloperDoc.html" label="ReqIF Import Export">
       <anchor id="ReqIF Import Export"/>
       <link toc="target/generated-eclipse-help/DeveloperDoc-toc.xml"/>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
index 1c3035af614..cd260b787e4 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <toc topic="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html" label="constraint-creation">
-	<topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html" label="Create and edit constraints">
+	<topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html" label="Creating and editing constraints">
 		<topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html#Define_a_constraint_and_its_context" label="Define a constraint and its context"></topic>
 		<topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html#Define_constraint_specification" label="Define constraint specification"></topic>
 	</topic>
-</toc>
\ No newline at end of file
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/stereotype-display-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/stereotype-display-toc.xml
index d64bf86c05a..6b776aceb90 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/stereotype-display-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/stereotype-display-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="stereotype-display" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-	<topic label="Display Stereotype">
+<toc label="stereotype-display" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
+	<topic label="Customizing stereotypes display">
 		<topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/DisplayStereotypes.html" label="Display Stereotypes"></topic>
 	</topic>
 </toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-main-toc.xml
index 4b9fd0124eb..3da6c9c4918 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/symbols-main-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Symbols" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="target/generated-eclipse-help/symbols.html" label="Symbols">
+<toc label="Symbols" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
+   <topic href="target/generated-eclipse-help/symbols.html" label="Customizing elements display">
       <link toc="target/generated-eclipse-help/symbols-toc.xml"/>
       <anchor id="UMLCommon"/>
    </topic>	
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml
index 5b05571958f..018e0230617 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/resource/users/profile-main-toc.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Papyrus Profiles" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+<toc label="Papyrus Profiles" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
    <topic label="Using UML Profiles">
       <anchor id="profiles-start"/>
         <link toc="target/generated-eclipse-help/users/whatIsAUmlProfile-toc.xml"/>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml
index cd4672bdb80..d062d0f448b 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Papyrus UML Starter Guide" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="target/generated-eclipse-help/PapyrusStarterGuide.html" label="Papyrus UML Starter Guide">
+<toc label="Starter Guide" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusStarterGuide">
+   <topic href="target/generated-eclipse-help/PapyrusStarterGuide.html" label="Starter Guide">
       <link toc="target/generated-eclipse-help/PapyrusStarterGuide-toc.xml"/>
       <anchor id="UMLStarterDoc"/>
    </topic>	
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
index ba4f15b99a1..00b3094bf5f 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='utf-8' ?>

-<toc label="Search" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

-   <topic href="target/generated-eclipse-help/search.html" label="Search in Models">

-      <link toc="target/generated-eclipse-help/search-toc.xml"/>

-      <anchor id="SearchID"/>

-   </topic>

-	

-</toc>

+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Search" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
+   <topic href="target/generated-eclipse-help/search.html" label="Searching in Models">
+      <link toc="target/generated-eclipse-help/search-toc.xml"/>
+      <anchor id="SearchID"/>
+   </topic>
+	
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-main-toc.xml b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-main-toc.xml
index 0add93e6d77..5c0c2a0ec0b 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/resource/properties-view-main-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="Search" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="target/generated-eclipse-help/properties-view.html" label="Properties view">
+<toc label="Properties View" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
+   <topic href="target/generated-eclipse-help/properties-view.html" label="Customizing properties view">
       <link toc="target/generated-eclipse-help/properties-view-toc.xml"/>
       <anchor id="properties-view"/>
    </topic>	
diff --git a/plugins/doc/org.eclipse.papyrus.views.references.doc/resource/references-view-main-toc.xml b/plugins/doc/org.eclipse.papyrus.views.references.doc/resource/references-view-main-toc.xml
index 6e47266f043..04c4e2016cb 100644
--- a/plugins/doc/org.eclipse.papyrus.views.references.doc/resource/references-view-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.references.doc/resource/references-view-main-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc label="References" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
-   <topic href="target/generated-eclipse-help/reference-view.html" label="References view">
+<toc label="Browsing references to/from an element" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocTasks">
+   <topic href="target/generated-eclipse-help/reference-view.html" label="Browsing references to/from an element">
       <link toc="target/generated-eclipse-help/references-view-toc.xml"/>
       <anchor id="references-view"/>
    </topic>	
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/maintoc-user.xml b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/maintoc-user.xml
index a0ae99d0259..a6da05ea76e 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/maintoc-user.xml
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/maintoc-user.xml
@@ -11,7 +11,7 @@ Contributors:
     Gregoire Dupe (Mia-Software) - Bug 337584 - Documentation set up
     Nicolas Bros (Mia-Software) - Bug 375789 - Documentation
 -->
-<toc label="Facet Documentation" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+<toc label="Facet Documentation" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
    <topic label="Facet">
       <anchor id="user.anchor.1"/>
       <anchor id="user.anchor.2"/>