Skip to main content
summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAnton Leherbauer2010-11-22 05:26:26 -0500
committerAnton Leherbauer2010-11-22 05:26:26 -0500
commit98a4695397da9572b9a8f989c55e950601ca01c7 (patch)
treefa1f354a1f9c0e344292d9fe4f75383e22b3e0ac /doc
parentef6bc84321bb262c5949832118622715adb636c7 (diff)
downloadorg.eclipse.cdt-98a4695397da9572b9a8f989c55e950601ca01c7.tar.gz
org.eclipse.cdt-98a4695397da9572b9a8f989c55e950601ca01c7.tar.xz
org.eclipse.cdt-98a4695397da9572b9a8f989c55e950601ca01c7.zip
Fix help context issues related to bugs 317992 and 310375
Diffstat (limited to 'doc')
-rw-r--r--doc/org.eclipse.cdt.doc.user/contexts_CDT.xml23
-rw-r--r--doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml15
-rw-r--r--doc/org.eclipse.cdt.doc.user/plugin.xml19
3 files changed, 30 insertions, 27 deletions
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 81b135e3b6..d088af9353 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -5,7 +5,6 @@
<!--
PLUGINS LINKED TO THESE HELP CONTEXT IDs
plugin="org.eclipse.cdt.ui"
- plugin="org.eclipse.ui"
-->
<context id ="projects_view">
@@ -370,6 +369,10 @@
<context id="toggle_mark_occurrences_action_context">
<description>Allows you to switch mark occurrences on and off.</description>
</context>
+<context id="format_all_action">
+ <description>This command formats selected C/C++ source files.</description>
+</context>
+
<context id="appearance_preference_page_context">
<description>Customize the appearance of C/C++ elements in viewers.</description>
<topic label="Appearance Preferences" href="reference/cdt_u_appearance_pref.htm"/>
@@ -546,17 +549,21 @@
<description>The Project Explorer displays project information.</description>
<topic href="reference/cdt_u_project_explorer_view.htm" label="Project Explorer view"/>
</context>
-<!-- this contributes to platform's outline view context, see bug 317992
<context id="content_outline_context" title="Outline">
<topic href="reference/cdt_u_outline_view.htm" label="Outline view"/>
</context>
--->
-<!-- USING ECLIPSE HELP CONTEXT IDs -->
-<context id="preference_dialog_context" title="Outline">
- <topic href="reference/cdt_u_console_pref.htm" label="C/C++ Console preferences"/>
+
+<context id="indexer_preference_page" title="Indexer">
+ <description>Configure the C/C++ Indexer.</description>
<topic href="reference/cdt_u_indexer_preference.html" label="C/C++ Indexer preferences"/>
+</context>
+<context id="language_mapping_preference_page" title="Language Mappings">
+ <description>Customize the use of C/C++ language associations for the workspace.</description>
<topic href="reference/cdt_u_language_mapping_pref.htm" label="C/C++ Language Mapping preferences"/>
- <topic href="reference/cdt_u_make_pref.htm" label="C/C++ Make Targets preferences"/>
- <topic href="reference/cdt_u_make_settings_pref.htm" label="C/C++ Make Settings preferences"/>
</context>
+<context id="build_console_preference_page" title="Build Console">
+ <description>Customize the appearance of messages that appear in the Build Console.</description>
+ <topic href="reference/cdt_u_console_pref.htm" label="C/C++ Console preferences"/>
+</context>
+
</contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
index ca40b2b6f3..3b0360b3bb 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
@@ -103,5 +103,20 @@
<topic href="reference/cdt_u_newproj_parser_binary.htm"
label="Binary Parser"/>
</context>
+<context id ="make_editor_pref">
+ <description>Click below to see help.</description>
+ <topic href="reference/cdt_u_makefile_settings_pref.htm"
+ label="Makefile Editor preferences"/>
+</context>
+<context id ="make_targets_pref">
+ <description>Click below to see help.</description>
+ <topic href="reference/cdt_u_make_pref.htm"
+ label="Make Targets preferences"/>
+</context>
+<context id ="make_settings_pref">
+ <description>Click below to see help.</description>
+ <topic href="reference/cdt_u_make_settings_pref.htm"
+ label="Make Settings preferences"/>
+</context>
</contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index b0e7a7ff08..52d47285a6 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -44,13 +44,6 @@
plugin="org.eclipse.cdt.ui">
</contexts>
<contexts
- file="contexts_CDT.xml"
- plugin="org.eclipse.ui">
- </contexts>
- </extension>
- <extension
- point="org.eclipse.help.contexts">
- <contexts
file="contexts_CDT_DEBUGGER.xml"
plugin="org.eclipse.cdt.debug.ui">
</contexts>
@@ -62,30 +55,18 @@
file="contexts_CDT_DEBUGGER.xml"
plugin="org.eclipse.ui.console">
</contexts>
- </extension>
- <extension
- point="org.eclipse.help.contexts">
<contexts
file="contexts_CDT_DEBUGGER_MI.xml"
plugin="org.eclipse.cdt.debug.mi.ui">
</contexts>
- </extension>
- <extension
- point="org.eclipse.help.contexts">
<contexts
file="contexts_CDT_make.xml"
plugin="org.eclipse.cdt.make.ui">
</contexts>
- </extension>
- <extension
- point="org.eclipse.help.contexts">
<contexts
file="contexts_CDT_LAUNCH.xml"
plugin="org.eclipse.cdt.launch">
</contexts>
- </extension>
- <extension
- point="org.eclipse.help.contexts">
<contexts
file="contexts_CDT_DEBUGGER_DSFGDB.xml"
plugin="org.eclipse.cdt.dsf.gdb.ui">

Back to the top