3 files changed, 17 insertions, 8 deletions
diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions b/doc/org.eclipse.cdt.doc.isv/cdtOptions
index d81be2e52b2..5eb42484db1 100644
--- a/doc/org.eclipse.cdt.doc.isv/cdtOptions
+++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions
@@ -1,5 +1,5 @@
 -charset "iso-8859-1"
--sourcepath "../org.eclipse.cdt.core/parser:../org.eclipse.cdt.debug.core/cdi"
+-sourcepath "../org.eclipse.cdt.core/model:../org.eclipse.cdt.core/parser:../org.eclipse.cdt.debug.core/cdi"
 -d reference/api
 -classpath  ${bootclasspath}:../org.apache.ant/lib/ant.jar:../org.eclipse.debug.core/dtcore.jar:../org.eclipse.compare/compare.jar:../org.eclipse.help/help.jar:../org.eclipse.help.ui/helpworkbench.jar:../org.eclipse.core.resources/resources.jar:../org.eclipse.core.runtime/runtime.jar:../org.eclipse.core.filebuffers/filebuffers.jar:../org.eclipse.core.expressions/expressions.jar:../org.eclipse.swt.win32/ws/win32/swt.jar:../org.eclipse.swt.motif/ws/motif/swt.jar:../org.eclipse.ui/ui.jar:../org.eclipse.jdt.debug/jdi.jar:../org.eclipse.debug.ui/dtui.jar:../org.eclipse.search/search.jar:../org.eclipse.jface/jface.jar:../org.eclipse.jface.text/jfacetext.jar:../org.eclipse.text/text.jar:../org.eclipse.ui.editors/editors.jar:../org.eclipse.ui.views/views.jar:../org.eclipse.ui.workbench/workbench.jar:../org.eclipse.ui.workbench.texteditor/texteditor.jar:../org.eclipse.core.variables/variables.jar:../org.eclipse.ui.ide/ide.jar:../org.eclipse.jdt.junit/junitsupport.jar:../org.eclipse.osgi/osgi.jar:../org.eclipse.osgi/core.jar:../org.eclipse.osgi/eclipseAdaptor.jar:../org.eclipse.osgi.services/services.jar:../org.eclipse.osgi.util/util.jar
 -breakiterator
@@ -13,10 +13,13 @@
 -group "C/C++ Development Tools Debug Core Plug-in Packages" "org.eclipse.cdt.debug.core:org.eclipse.cdt.debug.core.*"
 -link http://java.sun.com/j2se/1.4/docs/api
 
+org.eclipse.cdt.core.model
 org.eclipse.cdt.core.dom.ast
 org.eclipse.cdt.core.dom.ast.c
-org.eclipse.cdt.core.dom.ast.c.gcc
 org.eclipse.cdt.core.dom.ast.cpp
+org.eclipse.cdt.core.dom.ast.gnu
+org.eclipse.cdt.core.dom.ast.gnu.c
+org.eclipse.cdt.core.dom.ast.gnu.cpp
 org.eclipse.cdt.debug.core.cdi
 org.eclipse.cdt.debug.core.cdi.event
 org.eclipse.cdt.debug.core.cdi.model
diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
index 33ff46f16c6..b5ec5e36927 100644
--- a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
+++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
@@ -1,5 +1,5 @@
 -charset "iso-8859-1"
--sourcepath "../org.eclipse.cdt.core/parser;../org.eclipse.cdt.debug.core/cdi"
+-sourcepath "../org.eclipse.cdt.core/model;../org.eclipse.cdt.core/parser;../org.eclipse.cdt.debug.core/cdi"
 -d reference/api
 -classpath  ${bootclasspath};../org.apache.ant/lib/ant.jar;../org.eclipse.debug.core/dtcore.jar;../org.eclipse.compare/compare.jar;../org.eclipse.help/help.jar;../org.eclipse.help.ui/helpworkbench.jar;../org.eclipse.core.resources/resources.jar;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.filebuffers/filebuffers.jar;../org.eclipse.core.expressions/expressions.jar;../org.eclipse.swt.win32/ws/win32/swt.jar;../org.eclipse.swt.motif/ws/motif/swt.jar;../org.eclipse.ui/ui.jar;../org.eclipse.jdt.debug/jdi.jar;../org.eclipse.debug.ui/dtui.jar;../org.eclipse.search/search.jar;../org.eclipse.jface/jface.jar;../org.eclipse.jface.text/jfacetext.jar;../org.eclipse.text/text.jar;../org.eclipse.ui.editors/editors.jar;../org.eclipse.ui.views/views.jar;../org.eclipse.ui.workbench/workbench.jar;../org.eclipse.ui.workbench.texteditor/texteditor.jar;../org.eclipse.core.variables/variables.jar;../org.eclipse.ui.ide/ide.jar;../org.eclipse.jdt.junit/junitsupport.jar;../org.eclipse.osgi/osgi.jar;../org.eclipse.osgi/core.jar;../org.eclipse.osgi/eclipseAdaptor.jar;../org.eclipse.osgi.services/services.jar;../org.eclipse.osgi.util/util.jar
 -breakiterator
@@ -13,10 +13,13 @@
 -group "C/C++ Development Tools Debug Core Plug-in Packages" "org.eclipse.cdt.debug.core;org.eclipse.cdt.debug.core.*"
 -link http://java.sun.com/j2se/1.4/docs/api
 
+org.eclipse.cdt.core.model
 org.eclipse.cdt.core.dom.ast
 org.eclipse.cdt.core.dom.ast.c
-org.eclipse.cdt.core.dom.ast.c.gcc
 org.eclipse.cdt.core.dom.ast.cpp
+org.eclipse.cdt.core.dom.ast.gnu
+org.eclipse.cdt.core.dom.ast.gnu.c
+org.eclipse.cdt.core.dom.ast.gnu.cpp
 org.eclipse.cdt.debug.core.cdi
 org.eclipse.cdt.debug.core.cdi.event
 org.eclipse.cdt.debug.core.cdi.model
diff --git a/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml b/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
index d1572755dc9..fe11159e294 100644
--- a/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
@@ -5,10 +5,13 @@
 <!-- ============================================================================= -->
 <toc label="Reference">
 	<topic label="API Reference" href="reference/api/overview-summary.html">
-       <topic label="org.eclipse.cdt.core.dom" href="reference/api/org/eclipse/cdt/core/dom/ast/package-summary.html"/>
-       <topic label="org.eclipse.cdt.core.dom.c" href="reference/api/org/eclipse/cdt/core/dom/ast/c/package-summary.html"/>
-       <topic label="org.eclipse.cdt.core.dom.c.gcc" href="reference/api/org/eclipse/cdt/core/dom/ast/c/gcc/package-summary.html"/>
-       <topic label="org.eclipse.cdt.core.dom.cpp" href="reference/api/org/eclipse/cdt/core/dom/ast/cpp/package-summary.html"/>
+       <topic label="org.eclipse.cdt.core.model" href="reference/api/org/eclipse/cdt/core/model/package-summary.html"/>
+       <topic label="org.eclipse.cdt.core.dom.ast" href="reference/api/org/eclipse/cdt/core/dom/ast/package-summary.html"/>
+       <topic label="org.eclipse.cdt.core.dom.ast.c" href="reference/api/org/eclipse/cdt/core/dom/ast/c/package-summary.html"/>
+       <topic label="org.eclipse.cdt.core.dom.ast.cpp" href="reference/api/org/eclipse/cdt/core/dom/ast/cpp/package-summary.html"/>
+       <topic label="org.eclipse.cdt.core.dom.ast.gnu" href="reference/api/org/eclipse/cdt/core/dom/ast/gnu/package-summary.html"/>
+       <topic label="org.eclipse.cdt.core.dom.ast.gnu.c" href="reference/api/org/eclipse/cdt/core/dom/ast/gnu/c/package-summary.html"/>
+       <topic label="org.eclipse.cdt.core.dom.ast.gnu.cpp" href="reference/api/org/eclipse/cdt/core/dom/ast/gnu/cpp/package-summary.html"/>
        <topic label="org.eclipse.cdt.debug.core.cdi" href="reference/api/org/eclipse/cdt/debug/core/cdi/package-summary.html"/>
        <topic label="org.eclipse.cdt.debug.core.cdi.event" href="reference/api/org/eclipse/cdt/debug/core/cdi/event/package-summary.html"/>
        <topic label="org.eclipse.cdt.debug.core.cdi.model" href="reference/api/org/eclipse/cdt/debug/core/cdi/model/package-summary.html"/>