Bug 548719: [Documentation] The documentation plugin org.eclipse.papyrus.views.references.doc doesn't contribute properly to the Eclipse Help

	- Fix the documentation as expected

Change-Id: Ib0a25af90d20325e9fa9ec71bc1a94f64ae16316
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

4 files changed, 7 insertions, 8 deletions

diff --git a/plugins/doc/org.eclipse.papyrus.views.references.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.views.references.doc/META-INF/MANIFEST.MF
index 5ceae5bef6b..6752ec3bce2 100644
--- a/plugins/doc/org.eclipse.papyrus.views.references.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.views.references.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Version: 1.2.0.qualifier
-Bundle-Name: References view Documentation
+Bundle-Name: Papyrus References view Documentation
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.views.references.doc;singleton:=true
 Automatic-Module-Name: org.eclipse.papyrus.views.references.doc
diff --git a/plugins/doc/org.eclipse.papyrus.views.references.doc/build.properties b/plugins/doc/org.eclipse.papyrus.views.references.doc/build.properties
index 4f0c001142b..aab72d67580 100644
--- a/plugins/doc/org.eclipse.papyrus.views.references.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.views.references.doc/build.properties
@@ -1,6 +1,5 @@
 bin.includes = META-INF/,\
                about.html,\
                plugin.xml,\
-               target/generated-eclipse-help/** 
-src.includes = about.html,\
-				resource/
+               target/generated-eclipse-help/**
+src.includes = about.html
diff --git a/plugins/doc/org.eclipse.papyrus.views.references.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.views.references.doc/plugin.xml
index e5050ded24a..2a3e28b7e72 100644
--- a/plugins/doc/org.eclipse.papyrus.views.references.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.references.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension
          point="org.eclipse.help.toc">
       <toc
-            file="target/generated-eclipse-help/references-view-toc.xml"
+            file="target/generated-eclipse-help/references-view-main-toc.xml"
             primary="false">
       </toc>
       <toc
-            file="target/generated-eclipse-help/references-view.html"
+            file="target/generated-eclipse-help/references-view-toc.xml"
             primary="false">
       </toc>
    </extension>
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 04c4e2016cb..3a2dac74018 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="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">
+<toc label="Browsing references to/from an element" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusTasks">
+   <topic label="Browsing references to/from an element">
       <link toc="target/generated-eclipse-help/references-view-toc.xml"/>
       <anchor id="references-view"/>
    </topic>