Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2006-06-30 01:52:34 +0000
committermkersten2006-06-30 01:52:34 +0000
commitc00cfc6a478fa9ee0c5fa6d3f39b1297fd4531df (patch)
treed0412ac3514da5928269d1113ca079344d6c0a60
parentede8a6e2a970dc68d0550377dd45da2d163eaa3e (diff)
downloadorg.eclipse.mylyn.tasks-c00cfc6a478fa9ee0c5fa6d3f39b1297fd4531df.tar.gz
org.eclipse.mylyn.tasks-c00cfc6a478fa9ee0c5fa6d3f39b1297fd4531df.tar.xz
org.eclipse.mylyn.tasks-c00cfc6a478fa9ee0c5fa6d3f39b1297fd4531df.zip
3.1 merge
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/doc/toc.xml10
-rw-r--r--org.eclipse.mylyn.tasks.ui/doc/toc.xml2
2 files changed, 9 insertions, 3 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/doc/toc.xml b/org.eclipse.mylyn.bugzilla.ui/doc/toc.xml
index ae0bccbeb..f29dd8d33 100644
--- a/org.eclipse.mylyn.bugzilla.ui/doc/toc.xml
+++ b/org.eclipse.mylyn.bugzilla.ui/doc/toc.xml
@@ -1,17 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<?NLS TYPE="org.eclipse.help.toc"?>
-<!--<toc label="Bugzilla Client" topic="docs/html/book.html"> -->
+<!--<toc label="Bugzilla Connector" topic="docs/html/book.html"> -->
<toc link_to="../org.eclipse.mylar.doc/doc/toc.xml#bugzilla" label="Bugzilla Client">
<topic label="Bugzilla Client" href="doc/html/book.html">
+ <!--
<topic label="Server Configuration" href="doc/html/start/setup.html"/>
+ -->
<topic label="New Bug Wizard" href="doc/html/start/bugWizard.html"/>
<topic label="Searching Reports" href="doc/html/start/bugzillaSearch.html"/>
+ <!--
<topic label="Saving Favorites" href="doc/html/start/bugzillaFavorites.html"/>
<topic label="Saving Queries" href="doc/html/start/saveQuery.html"/>
+ <topic label="Offline Reports" href="doc/html/start/offlineReports.html"/>
+ <topic label="Known Limitations" href="doc/html/start/limitations.html"/>
+ -->
<topic label="Editing Reports" href="doc/html/start/bugEditor.html"/>
- <topic label="Offline Reports" href="doc/html/start/offlineReports.html"/>
- <topic label="Known Limitations" href="doc/html/start/limitations.html"/>
</topic>
</toc>
diff --git a/org.eclipse.mylyn.tasks.ui/doc/toc.xml b/org.eclipse.mylyn.tasks.ui/doc/toc.xml
index 1bacafd3c..e32d7821b 100644
--- a/org.eclipse.mylyn.tasks.ui/doc/toc.xml
+++ b/org.eclipse.mylyn.tasks.ui/doc/toc.xml
@@ -3,8 +3,10 @@
<toc link_to="../org.eclipse.mylar.doc/doc/toc.xml#tasklist" label="Task List">
<topic label="Task List" href="doc/tasklist.html">
+ <!--
<topic label="Task Planning" href="doc/planning.html"/>
<topic label="Bugzilla Integration" href="doc/bugzilla.html"/>
+ -->
</topic>
</toc>

Back to the top