Merge branch 'mimir' into 4.7

Conflicts:
	doc/src/declarative/qdeclarativemodels.qdoc
	doc/src/index.qdoc
	doc/src/template/style/style.css
	tools/qdoc3/atom.h
	tools/qdoc3/doc.cpp
	tools/qdoc3/doc/qdoc-manual.qdoc
	tools/qdoc3/doc/qdoc-manual.qdocconf

1 files changed, 3509 insertions, 3983 deletions

diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index 7290c0e..a613177 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -27,727 +27,836 @@
 
 /*!
     \page index.html
-    \nextpage QDoc Manual
+    \nextpage Introduction to QDoc
 
-    \title QDoc Manual - Table of Contents
+    \title Table of Contents
 
     \list
-    \o \l{QDoc Manual}
-    \o \l{QDoc Commands}
-       \list
-       \o \l{Markup Commands}
-       \o \l{Text Formatting Commands}
-       \o \l{Document Structuring Commands}
-       \o \l{Verbatim Code Commands}
-       \o \l{Quoting External Code Commands}
-          \list
-          \o \l{Example File}
-          \endlist
-       \o \l{Linking Commands}
-       \o \l{Graphic Commands}
-       \o \l{Container Commands}
-       \o \l{Document Contents Commands}
-       \o \l{Miscellaneous Commands}
-          \list
-          \o \l{signalandslots.qdocinc}
-          \o \l{objectmodel.qdocinc}
-          \o \l{layoutmanagement.qdocinc}
-          \endlist
-       \o \l{Topical Commands}
-       \o \l{Contextual Commands}
-       \o \l{Navigation Commands}
-       \o \l{Status Commands}
-       \o \l{Thread Support Commands}
-       \o \l{Relating Commands}
-       \o \l{Grouping Commands}
-       \o \l{Title Commands}
-       \endlist
-    \o \l{QDoc Configuration}
-       \list
-       \o \l{General Configuration Variables}
-       \o \l{Creating Help Project Files}
-       \o \l{C++ Specific Configuration Variables}
-       \o \l{HTML Specific Configuration Variables}
-       \o \l{Supporting Derived Projects}
-       \o \l{QDoc Compatibility}
-       \o \l{qt.qdocconf}
-       \o \l{minimum.qdocconf}
-       \endlist
-    \o \l{QDoc Commands - Alphabetical List}
+      \o \l {Introduction to QDoc}
+      \o \l {The QDoc Commands}
+        \list
+          \o \l {Topic Commands}
+          \o \l {Context Commands}
+            \list
+              \o \l {Navigating}
+              \o \l {Reporting Status}
+              \o \l {Thread Support}
+              \o \l {Relating Things}
+              \o \l {Grouping Things}
+              \o \l {Naming Things}
+            \endlist
+          \o \l{Markup Commands}
+            \list
+              \o \l {Text Markup} \span {class="newStuff"} {(new: div & span)}
+              \o \l {Document Structure}
+              \o \l {Including Code Inline}
+              \o \l {Including External Code}
+              \o \l {Creating Links}
+              \o \l {Including Images}
+              \o \l {Tables and Lists}
+              \o \l {Special Content}
+              \o \l {Miscellaneous}
+            \endlist
+        \endlist 
+      \o \l {The QDoc Configuration File}
+        \list
+          \o \l {General Configuration Variables}
+          \o \l {Creating Help Project Files}
+          \o \l {C++ Specific Configuration Variables}
+          \o \l {HTML Specific Configuration Variables}
+          \o \l {Supporting Derived Projects}
+          \o \l {Compatibility Issues}
+          \o \l {qt.qdocconf}
+          \o \l {minimum.qdocconf}
+        \endlist
     \endlist
+
 */
 
 /*!
     \page 01-qdoc-manual.html
-    \contentspage QDoc Manual - Table of Contents
-    \previouspage QDoc Manual - Table of Contents
-    \nextpage QDoc Commands
-
-    \title QDoc Manual
+    \contentspage Table of Contents
+    \previouspage Table of Contents
+    \nextpage The QDoc Commands
 
-    QDoc is the internal tool used by Qt Development Frameworks for generating
-    documentation. This document is a reference for QDoc command syntax and
-    configuration.
+    \title Introduction to QDoc
 
-    \section1 Overview
+    QDoc is a tool used by Qt Developers to extract \e {qdoc comments}
+    from a set of source files and format them for output as HTML
+    pages or as DITA XML files.. This manual explains how to use the
+    QDoc commands and how to create a QDoc configuration file.
 
-    \list I
-    \o \section2 \l {QDoc Commands}
+    \section1 Running QDoc
 
-       \l {QDoc Commands - Alphabetical List}{A complete alphabetical
-       list}.
+    QDoc is currently called \c {qdoc3}. To run qdoc3, use the command
+    line:
 
-       There are two main categories of commands for QDoc: markup
-       commands and meta-commands.
+    \quotation
+        \bold {/currentdirectory$ qdoc3 config.qdocconf}
+    \endquotation
 
-       The markup commands indicate the generated documentation's
-       appearance and logical structure. The meta-commands provide
-       information about the document as well as the documented
-       item. The meta-commands can be further categorized as topical
-       commands and contextual commands.
+    ...where config.qdocconf is your \l{The QDoc Configuration File}
+    {QDoc configuration file}. The main purpose of the configuration
+    file is to tell qdoc3 where to find the source files from which to
+    extract qdoc comments, what kind of output to generate (HTML, DITA
+    XML,...}, and where to put the output. The configuration file also
+    contains other information for qdoc3.
 
-       \list
-       \o \l {Markup Commands}
-           \list
-           \o \l {Text Formatting Commands}{Text Formatting}
-           \o \l {Document Structuring Commands}{Document Structuring}
-           \o \l {Verbatim Code Commands}{Verbatim Code}
-           \o \l {Quoting External Code Commands}{Quoting External Code}
-           \o \l {Linking Commands}{Linking}
-           \o \l {Graphic Commands}{Graphic}
-           \o \l {Container Commands}{Container}
-           \o \l {Document Contents Commands}{Document Contents}
-           \o \l {Miscellaneous Commands}{Miscellaneous}
-           \endlist
-       \o \l {Topical Commands}
-       \o \l {Contextual Commands}
-           \list
-           \o \l {Navigation Commands}{Navigation}
-           \o \l {Status Commands}{Status}
-           \o \l {Thread Support Commands}{Thread Support}
-           \o \l {Relating Commands}{Relating}
-           \o \l {Grouping Commands}{Grouping}
-           \o \l {Title Commands}{Title}
-           \endlist
-       \endlist
-    \endlist
+    \section1 Command Types
 
-    \list II
-    \o \section2 \l {QDoc Configuration}
+    QDoc interprets three types of commands: 
 
-       When running QDoc to generate the documentation, you must
-       specify a configuration file on the command line. The
-       configuration file is a list of entries of entries of the form
-       "variable = value".
+    \list
+    \o \l {Topic Commands} 
+    \o \l {Context Commands}
+    \o \l {Markup Commands}
+    \endlist
 
-       \list
-       \o \l {Configuration Variables}
-       \o \l {Configuration File Examples}
-       \endlist
+    Topic commands identify the entity you are documenting, e.g. a C++
+    class, function, or type, an example, or an extra page of text
+    that doesn't map to any C++ entity.
+
+    Context commands tell QDoc how the entity being documented relates
+    to other documented entities, e.g. next and previous page links or
+    inclusion in page groups or library modules. They can also provide
+    information about the documented entity that QDoc can't get from
+    the source files, e.g. whether the entitity is thread-safe, an
+    overloaded or reimplemented function, or that it has been
+    deprecated.
+
+    Markup commands tell QDoc how text and image elements in the
+    document should be rendered or about the document's outline
+    structure.  
+*/
 
-       Some particular configuration variables allow you to use QDoc
-       to support Qt-based projects; i.e to make projects, such as Qt
-       Solutions, contain references to the online Qt documentation.
+/*!
+    \page 03-qdoc-commands-markup.html
+    \contentspage Table of Contents
+    \previouspage Naming Things
+    \nextpage Text Markup
 
-       \list
-       \o \l {Supporting Derived Projects}
-       \endlist
+    \title Markup Commands
 
-       QDoc is a tool that constantly evolves to suit our needs, for
-       that reason there are some compatibility issues between old and
-       new practices.
+    The markup commands indicate the generated documentation's visual
+    appearance and logical structure.
 
-       \list
-       \o \l {QDoc Compatibility}
-       \endlist
+    \list
+    \o \l {04-qdoc-commands-textmarkup.html#backslash-command} {\\\\}
+    \o \l {04-qdoc-commands-textmarkup.html#a-command} {\\a}
+    \o \l {11-qdoc-commands-specialcontent.html#abstract-command} {\\abstract}
+    \o \l {06-qdoc-commands-includecodeinline.html#badcode-command} {\\badcode}
+    \o \l {04-qdoc-commands-textmarkup.html#bold-command} {\\bold}
+    \o \l {11-qdoc-commands-specialcontent.html#brief-command} {\\brief}
+    \o \l {04-qdoc-commands-textmarkup.html#c-command} {\\c}
+    \o \l {09-qdoc-commands-includingimages.html#caption-command} {\\caption}
+    \o \l {05-qdoc-commands-documentstructure.html#chapter-command} {\\chapter}
+    \o \l {06-qdoc-commands-includecodeinline.html#code-command} {\\code}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#codeline-command} {\\codeline}
+    \o \l {04-qdoc-commands-textmarkup.html#div-command} {\\div} \span {class="newStuff"} {(new)}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#dots-command} {\\dots}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#else-command} {\\else}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#endif-command} {\\endif}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#expire-command} {\\expire}
+    \o \l {11-qdoc-commands-specialcontent.html#footnote-command} {\\footnote}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#generatelist-command} {\\generatelist}
+    \o \l {10-qdoc-commands-tablesandlists.html#header-command} {\\header}
+    \o \l {04-qdoc-commands-textmarkup.html#i-command} {\\i}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#if-command} {\\if}
+    \o \l {09-qdoc-commands-includingimages.html#image-command} {\\image}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#include-command} {\\include}
+    \o \l {09-qdoc-commands-includingimages.html#inlineimage-command} {\\inlineimage}
+    \o \l {08-qdoc-commands-creatinglinks.html#keyword-command} {\\keyword}
+    \o \l {08-qdoc-commands-creatinglinks.html#l-command} {\\l}
+    \o \l {11-qdoc-commands-specialcontent.html#legalese-command} {\\legalese}
+    \o \l {10-qdoc-commands-tablesandlists.html#list-command} {\\list}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#meta-command} {\\meta}
+    \o \l {06-qdoc-commands-includecodeinline.html#newcode-command} {\\newcode}
+    \o \l {10-qdoc-commands-tablesandlists.html#o-command} {\\o}
+    \o \l {06-qdoc-commands-includecodeinline.html#oldcode-command} {\\oldcode}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#omit-command} {\\omit}
+    \o \l {05-qdoc-commands-documentstructure.html#part-command} {\\part}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printline-command} {\\printline}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printto-command} {\\printto}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printuntil-command} {\\printuntil}
+    \o \l {11-qdoc-commands-specialcontent.html#quotation-command} {\\quotation}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#quotefile-command} {\\quotefile}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#quotefromfile-command} {\\quotefromfile}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#raw-command} {\\raw} \span {class="newStuff"} {(avoid)}
+    \o \l {10-qdoc-commands-tablesandlists.html#row-command} {\\row}
+    \o \l {08-qdoc-commands-creatinglinks.html#sa-command} {\\sa}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionOne-command} {\\section1}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionTwo-command} {\\section2}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionThree-command} {\\section3}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionFour-command} {\\section4}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipline-command} {\\skipline}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipto-command} {\\skipto}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipuntil-command} {\\skipuntil}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#snippet-command} {\\snippet}
+    \o \l {04-qdoc-commands-textmarkup.html#span-command} {\\span} \span {class="newStuff"} {(new)}
+    \o \l {04-qdoc-commands-textmarkup.html#sub-command} {\\sub}
+    \o \l {04-qdoc-commands-textmarkup.html#sup-command} {\\sup}
+    \o \l {10-qdoc-commands-tablesandlists.html#table-command} {\\table}
+    \o \l {11-qdoc-commands-specialcontent.html#tableofcontents-command} {\\tableofcontents}
+    \o \l {08-qdoc-commands-creatinglinks.html#target-command} {\\target}
+    \o \l {04-qdoc-commands-textmarkup.html#tt-command} {\\tt}
+    \o \l {04-qdoc-commands-textmarkup.html#underline-command} {\\underline}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#raw-command} {\\unicode}
+    \o \l {11-qdoc-commands-specialcontent.html#warning-command} {\\warning}
     \endlist
+
 */
 
 /*!
-    \page 02-qdoc-commands.html
-    \previouspage QDoc Manual
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Markup Commands
+    \page 04-qdoc-commands-textmarkup.html
+    \contentspage Table of Contents
+    \previouspage Markup Commands
+    \nextpage Document Structure
 
-    \title QDoc Commands
+    \title Text Markup
 
-    There are two main categories of commands for QDoc: markup
-    commands and meta-commands.
+    The text formatting commands indicate how text is to be rendered.
 
-    The markup commands indicate the generated documentation's visual
-    appearance and logical structure. The meta-commands provide
-    information about the documentation unit as well as the documented
-    item. The meta-commands can be further categorized as topical
-    commands and contextual commands.
+    \target a-command
+    \section1 \\a (parameter marker)
 
-    \section1 Alphabetical List
+    The \\a command tells QDoc the next word is a formal parameter name.
 
-    A complete \l{QDoc Commands - Alphabetical List }
-    {alphabetical list of the QDoc commands}.
+    A warning is emitted when a formal parameter is not documented or
+    is misspelled, so when you document a function you should mention
+    each formal parameter by name in the function description,
+    preceded by the \\a command. The parameter name is then rendered
+    in italics. For example:
 
-    \section1 Categories
+    \code
+      / *!
+         Constructs a line edit containing the text
+         \a contents. The \a parent parameter is sent 
+         to the QWidget constructor.
+      * /
 
-    \list
-    \o \l {Markup Commands}
-    \o \l {Topical Commands}
-    \o \l {Contextual Commands}
-    \endlist
-*/
+      QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)
+      {
+         ...
+      }
 
-/*!
-    \page 03-qdoc-commands-markup.html
-    \contentspage QDoc Manual - Table of Contents
-    \previouspage QDoc Commands
-    \nextpage Text Formatting Commands
+    \endcode
 
-    \title Markup Commands
+    QDoc renders this as:
 
-    The markup commands indicate the generated documentation's visual
-    appearance and logical structure.
+    \quotation
+        \bold {QLineEdit::QLineEdit ( const QString &
+        contents, QWidget *parent )}
 
-    \section1 Alphabetical List
-
-    \l {04-qdoc-commands-textformatting.html#backslash}{\\\\},
-    \l {04-qdoc-commands-textformatting.html#a}{\\a},
-    \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract},
-    \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode},
-    \l {04-qdoc-commands-textformatting.html#bold}{\\bold},
-    \l {11-qdoc-commands-documentcontents.html#brief}{\\brief},
-    \l {04-qdoc-commands-textformatting.html#c}{\\c},
-    \l {09-qdoc-commands-graphic.html#caption}{\\caption},
-    \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter},
-    \l {06-qdoc-commands-verbatimcode.html#code}{\\code},
-    \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
-    \l {07-0-qdoc-commands-quoting.html#dots}{\\dots},
-    \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else},
-    \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif},
-    \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire},
-    \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote},
-    \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist},
-    \l {10-qdoc-commands-container.html#header}{\\header},
-    \l {04-qdoc-commands-textformatting.html#i}{\\i},
-    \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if},
-    \l {09-qdoc-commands-graphic.html#image}{\\image},
-    \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include},
-    \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage},
-    \l {08-qdoc-commands-linking.html#keyword}{\\keyword},
-    \l {08-qdoc-commands-linking.html#l}{\\l},
-    \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese},
-    \l {10-qdoc-commands-container.html#list}{\\list},
-    \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta},
-    \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode},
-    \l {10-qdoc-commands-container.html#o}{\\o},
-    \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode},
-    \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit},
-    \l {05-qdoc-commands-documentstructuring.html#part}{\\part},
-    \l {07-0-qdoc-commands-quoting.html#printline}{\\printline},
-    \l {07-0-qdoc-commands-quoting.html#printto}{\\printto},
-    \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil},
-    \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation},
-    \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile},
-    \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
-    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw},
-    \l {10-qdoc-commands-container.html#row}{\\row},
-    \l {08-qdoc-commands-linking.html#sa}{\\sa},
-    \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1},
-    \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2},
-    \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3},
-    \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4},
-    \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline},
-    \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto},
-    \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil},
-    \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet},
-    \l {04-qdoc-commands-textformatting.html#sub}{\\sub},
-    \l {04-qdoc-commands-textformatting.html#sup}{\\sup},
-    \l {10-qdoc-commands-container.html#table}{\\table},
-    \l {11-qdoc-commands-documentcontents.html#tableofcontents}
-       {\\tableofcontents},
-    \l {08-qdoc-commands-linking.html#target}{\\target},
-    \l {04-qdoc-commands-textformatting.html#tt}{\\tt},
-    \l {04-qdoc-commands-textformatting.html#underline}{\\underline},
-    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\unicode},
-    \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
+        Constructs a line edit containing the text \a contents.
+        The \a parent parameter is sent to the QWidget constructor.
+    \endquotation
 
-    \section1 Categories
-    \list
-    \o \l {Text Formatting Commands}
-    \o \l {Document Structuring Commands}
-    \o \l {Verbatim Code Commands}
-    \o \l {Quoting External Code Commands}
-    \o \l {Linking Commands}
-    \o \l {Graphic Commands}
-    \o \l {Container Commands}
-    \o \l {Document Contents Commands}
-    \o \l {Miscellaneous Commands}
-    \endlist
+    You can enclose the formal parameter name in curly brackets, if
+    you want to, but it isn't necessary.
 
-*/
+    \target c-command
+    \section1 \\c (code font)
+    
+    The \\c command is used for rendering variable names, user-defined
+    class names, and C++ keywords (e.g. \c int and \c for) in the code
+    font.
 
-/*!
-    \page 04-qdoc-commands-textformatting.html
-    \contentspage QDoc Manual - Table of Contents
-    \previouspage Markup Commands
-    \nextpage Document Structuring Commands
+    The command renders its argument using a typewriter font. For
+    example:
 
-    \title Text Formatting Commands
+    \code
+      / *!
+        The \c AnalogClock class provides a clock widget with hour
+        and minute hands that is automatically updated every
+        few seconds.
+      * /
+    \endcode
 
-    The text formatting commands indicate how the regular text in the
-    documentation is rendered.
+    QDoc renders this as:
 
-    \section1 Alphabetical List
+    \quotation
+        The \c AnalogClock class provides a clock widget with hour
+        and minute hands that is automatically updated every
+        few seconds.
+    \endquotation
 
-    \l {04-qdoc-commands-textformatting.html#backslash}{\\\\},
-    \l {04-qdoc-commands-textformatting.html#a}{\\a},
-    \l {04-qdoc-commands-textformatting.html#bold}{\\bold},
-    \l {04-qdoc-commands-textformatting.html#c}{\\c},
-    \l {04-qdoc-commands-textformatting.html#i}{\\i},
-    \l {04-qdoc-commands-textformatting.html#sub}{\\sub},
-    \l {04-qdoc-commands-textformatting.html#sup}{\\sup},
-    \l {04-qdoc-commands-textformatting.html#tt}{\\tt},
-    \l {04-qdoc-commands-textformatting.html#underline}{\\underline}
+    If the text to be rendered in the code font contains spaces, enclose the
+    entire text in curly brackets.
 
-    \section1 Command Descriptions
+    \code
+      \c {QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)}
+    \endcode
 
-    \table
-    \header
-        \o Command
-        \o Description
+    QDoc renders this as:
 
-    \row
+    \quotation
+      \c {QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)}
+    \endquotation
 
-        \o \bold \\\\ \target backslash
-        \o \bold {The \\\\ command expands to a single backslash.}
+    The \\c command accepts the special character \c \ within its
+    argument, i.e. it renders it as a normal character. So if you want
+    to use nested commands, you must use the \l {tt-command} {teletype
+    (\\tt)} command instead.
 
-           QDoc commands always start with a backslash alone. To
-           display an actual backslash in the text you need to type
-           two of the kind. If you want to display two backslashes,
-           you need to type four, and so forth. For example:
+    See also \l {tt-command} {\\tt} and \l {code-command} {\\code}.
+ 
+    \target div-command
+    \section1 \\div \span {class="newStuff"} {(new)}  
+ 
+    The \\div and \\enddiv commands delimit a large or small block of
+    text (which may include other QDoc commands) to which special
+    formatting attributes should be applied.
 
-           \code
-           / *!
-               The \\\\ command is useful if you want a
-               backslash to appear verbatim, for example,
-               writing C:\\windows\\home\\.
-           * /
-           \endcode
+    An argument must be provided in curly braces, as in the qdoc
+    comment shown below. The argument is not interpreted but is used
+    as attribute(s) of the tag that is ultimately output by qdoc.
 
-           will be rendered as
+    For example, we might want to render an inline image so that it
+    floats to the right of the current block of text:
 
-           \quotation
-               The \\\\ command is useful if you want a
-               backslash to appear verbatim, for example,
-               writing C:\\windows\\home\\.
-           \endquotation
+    \code
+      / *!
+         \div {class="float-right"}
+           \inlineimage qml-column.png
+         \enddiv
 
-           However, if you want your text to appear in a typewriter
-           font as well, you can use the \l {c}{\\c} command instead,
-           which accepts and renders the backslash as any other
-           character. For example:
+      * /
+    \endcode
 
-           \code
-           / *!
-               The \\c command is useful if you want a
-               backslash to appear verbatim, and the word
-               that contains it written in a typewriter font,
-               like this: \c {C:\windows\home\}.
-           * /
-           \endcode
+    If qdoc is generating HTML, it will translate these commands to:
 
-           will be rendered as
+    \code
+      <div class="float-right"><p><img src="images/qml-column.png" /></p></div>
+    \endcode
 
-           \quotation
-               The \\c command is useful if you want a
-               backslash to appear verbatim, and the word
-               that contains it written in a typewriter font,
-               like this: \c {C:\windows\home\}.
-           \endquotation
+    For HTML, the attribute value \e {float-right} then will refer to
+    a clause in the style.css file. which in this case could be:
 
-    \row
-        \o \bold \\a \target a
-        \o \bold {The \\a command indicates that the next word
-           is a parameter when documenting functions.}
-
-           Warnings are emitted when function parameters are
-           undocumented or misspelled, so whenever you write
-           documentation for functions you should make sure you
-           mention all the parameters and precede each of these by the
-           \\a command. The parameter is then rendered in italic. For
-           example:
+    \code	   
+       div.float-right
+       {
+          float: right; margin-left: 2em
+       }
+    \endcode
 
-           \code
-           / *!
-               Constructs a line edit containing the text
-               \a contents.
+    If qdoc is generating DITA XML, it will translate the commands to:
 
-               The \a parent parameter is sent to the
-               QWidget constructor.
-           * /
+    \code
+        <sectiondiv outputclass="float-right">
+            <p>
+                <fig>
+                    <image href="images/qml-column.png" placement="inline"/>
+                </fig>
+            </p>
+        </sectiondiv>
+    \endcode
 
-           QLineEdit::QLineEdit(const QString &contents, QWidget *parent)
-               :QWidget(parent)
-           {
-               ...
-           }
+    Your DITA XML publishing program must then recognize the \e
+    {outputclass} attribute value.
 
-           \endcode
+    \note The \bold {\\div} command can be nested. 
+	   
+    Below is an example taken from the index.qdoc file used to
+    generate index.html for Qt 4.7:
 
-           will be rendered as
+    \code
+        \div {class="indexbox guide"}
+            \div {class="heading"}
+                Qt Developer Guide 
+	    \enddiv
+            \div {class="indexboxcont indexboxbar"}
+                \div {class="section indexIcon"} \emptyspan
+                \enddiv
+                \div {class="section"}
+                    Qt is a cross-platform application and UI
+                    framework. Using Qt, you can write web-enabled
+                    applications once and deploy them across desktop,
+                    mobile and embedded operating systems without
+                    rewriting the source code.
+                \enddiv
+                \div {class="section sectionlist"}
+                    \list
+                       \o \l{Getting Started Guides} {Getting started}
+                       \o \l{Installation} {Installation}
+                       \o \l{how-to-learn-qt.html} {How to learn Qt}
+                       \o \l{tutorials.html} {Tutorials}
+                       \o \l{Qt Examples} {Examples}
+                       \o \l{qt4-7-intro.html} {What's new in Qt 4.7}
+                    \endlist
+                \enddiv
+            \enddiv
+        \enddiv
+    \endcode
 
-           \quotation
-               \bold {QLineEdit::QLineEdit ( const QString &
-               contents, QWidget *parent )}
+    When all the class attribute values are defined as they are in the
+    style.css file that is used for rendering the Qt 4.7 documentation, 
+    the above example is rendered as:
+
+          \div {class="indexbox guide"}
+            \div {class="heading"}
+              Qt Developer Guide 
+	    \enddiv
+            \div {class="indexboxcont indexboxbar"}
+              \div {class="section indexIcon"} \emptyspan
+              \enddiv
+              \div {class="section"}
+                Qt is a cross-platform application and UI
+                framework. Using Qt, you can write web-enabled
+                applications once and deploy them across desktop,
+                mobile and embedded operating systems without
+                rewriting the source code.
+              \enddiv
+              \div {class="section sectionlist"}
+                \list
+                  \o \l{Getting Started Guides} {Getting started}
+                  \o \l{Installation} {Installation}
+                  \o \l{how-to-learn-qt.html} {How to learn Qt}
+                  \o \l{tutorials.html} {Tutorials}
+                  \o \l{Qt Examples} {Examples}
+                  \o \l{qt4-7-intro.html} {What's new in Qt 4.7}
+                \endlist
+             \enddiv
+            \enddiv
+          \enddiv
+
+    When generating DITA XML, qdoc outputs the nested \e {div} commands as:
 
-           Constructs a line edit containing the text \a contents.
+    \code
+      <sectiondiv outputclass="indexbox guide">
+          <sectiondiv outputclass="heading">
+              <p>Qt Developer Guide</p>
+          </sectiondiv>
+          <sectiondiv outputclass="indexboxcont indexboxbar">
+              <sectiondiv outputclass="section indexIcon"/>
+              <sectiondiv outputclass="section">
+                  <p>Qt is a cross-platform application and UI
+                     framework. Using Qt, you can write
+                     web-enabled applications once and deploy
+                     them across desktop, mobile and embedded
+                     operating systems without rewriting the
+                     source code.
+                  </p>
+              </sectiondiv>
+              <sectiondiv outputclass="section sectionlist">
+                  <ul>
+                      <li>
+                          <xref href="gettingstarted.xml#id-606ee7a8-219b-47b7-8f94-91bc8c76e54c">Getting started</xref>
+                      </li>
+                      <li>
+                          <xref href="installation.xml#id-075c20e2-aa1e-4f88-a316-a46517e50443">Installation</xref>
+                      </li>
+                      <li>
+                          <xref href="how-to-learn-qt.xml#id-49f509b5-52f9-4cd9-9921-74217b9a5182">How to learn Qt</xref>
+                      </li>
+                      <li>
+                          <xref href="tutorials.xml#id-a737f955-a904-455f-b4aa-0dc69ed5a64f">Tutorials</xref>
+                      </li>
+                      <li>
+                          <xref href="all-examples.xml#id-98d95159-d65b-4706-b08f-13d80080448d">Examples</xref>
+                      </li>
+                      <li>
+                          <xref href="qt4-7-intro.xml#id-519ae0e3-4242-4c2a-b2be-e05d1e95f177">What's new in Qt 4.7</xref>
+                      </li>
+                  </ul>
+              </sectiondiv>
+          </sectiondiv>
+      </sectiondiv>
+    \endcode
 
-           The \a parent parameter is sent to the QWidget
-           constructor.
+    Your DITA XML publishing program must recognize the values of the
+    \e {outputclass} attribute.
+           
+    See also \l {span-command} {\\span}.
 
-           \endquotation
+    \target span -command
+    \section1 \\span \span {class="newStuff"} {(new)} 
+    
+    The \\span command is for applying special formatting
+    attributes to a small block of text.
+
+    Two arguments must be provided, each argument in curly braces, as
+    shown in the qdoc comment below. The first argument is not
+    interpreted but is used as the formatting attribute(s) of the tag
+    that is ultimately output by qdoc. The second argument is the text
+    to be rendered with the special formatting attributes.
+	   
+    For example, we might want to render the first word of each
+    element in a numeric list in blue.
 
-           The \\a command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument. However, a parameter
-           is always a single word, so braces are rarely
-           necessary. And for the same reason, parentheses seldom
-           occur.
+    \code
+        / *!
+            Global variables with complex types:
+	    \list 1
+                \o \span {class="variableName"} {mutableComplex1} in globals.cpp at line 14
+                \o \span {class="variableName"} {mutableComplex2} in globals.cpp at line 15
+                \o \span {class="variableName"} {constComplex1} in globals.cpp at line 16
+                \o \span {class="variableName"} {constComplex2} in globals.cpp at line 17
+            \endlist
+        * /
+    \endcode
 
-    \row
-        \o \bold \\c \target c
-        \o \bold {The \\c command can be used to render variables,
-           user-defined classes and C++ keywords like \c int,
-           \c for, etc.}
+    Class \e {variableName} refers to a clause in your style.css. 
 
-           The command renders its argument using a typewriter font. For
-           example:
+    \code
+        .variableName
+        {
+            font-family: courier;
+	    color: blue
+        }
+    \endcode
 
-           \code
-           / *!
-               The \c AnalogClock class provides a clock widget with hour
-               and minute hands that is automatically updated every
-               few seconds.
-           * /
-           \endcode
+    Using the \e {variableName} clause shown above, the example is rendered as:
 
-           will be rendered as
+    Global variables with complex types:
+    \list 1
+        \o \span {class="variableName"} {mutableComplex1} in globals.cpp at line 14
+        \o \span {class="variableName"} {mutableComplex2} in globals.cpp at line 15
+        \o \span {class="variableName"} {constComplex1} in globals.cpp at line 16
+        \o \span {class="variableName"} {constComplex2} in globals.cpp at line 17
+    \endlist
 
-           \quotation
-               The \c AnalogClock class provides a clock widget with hour
-               and minute hands that is automatically updated every
-               few seconds.
-           \endquotation
+    \note The \bold span command does not cause a new paragraph to be
+    started.
 
-           The \\c command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument.
+    See also \l {div-command} {\\div}.
+           
+    \target tt-command
+    \section1 \\tt (teletype font)
 
-           The \\c command accepts the special character \c \ within
-           its argument, i.e. it renders it as a normal character. So
-           if you want to use nested commands, you must use the \l
-           {tt}{teletype (\\tt)} command instead.
+    The \\tt command renders its argument in a monospace font. This
+    command behaves just like the \l {c-command} {\\c} command, except
+    that \\tt allows you to nest QDoc commands within the argument
+    (e.g. \l {i-command} {\\i}, \l {bold-command} {\\bold} and \l
+    {underline-command} {\\underline}).
 
-           See also \l {tt}{\\tt} and \l {code}{\\code}.
+    \code
+       / *!
+           After \c setupUi() populates the main container with
+           child widgets it scans the main container's list of
+           slots for names with the form
+           \tt{on_\e{objectName}_\e{signalName}().}
+       * /
+    \endcode
 
-    \row
-        \o \bold \\tt \target tt
-        \o \bold {The \\tt command can be used to render variables,
-           user-defined classes and C++ keywords like \c int, \c
-           for, etc.}
+    QDoc renders this as:
 
-           The \\tt command behaves just like the \l {c}{\\c} command,
-           except that \\tt parses QDoc commands (like \l {i}{\\i}, \l
-           {bold}{\\bold} and \l {underline}{\\underline}) contained
-           within its argument.
+    \quotation
+        After \c setupUi() populates the main container with
+        child widgets it scans the main container's list of
+        slots for names with the form
+        \tt{on_\e{objectName}_\e{signalName}().}
+    \endquotation
 
-           The command renders its argument using a monospace
-           font. For example:
+    If the text to be rendered in the code font contains spaces, enclose the
+    entire text in curly brackets.
 
-           \code
-           / *!
-               After \c setupUi() populates the main container with
-               child widgets it scans the main container's list of
-               slots for names with the form
-               \tt{on_\i{objectName}_\i{signalName}().}
-           * /
-           \endcode
+    \code
+      \tt {QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)}
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \quotation
-               After \c setupUi() populates the main container with
-               child widgets it scans the main container's list of
-               slots for names with the form
-               \tt{on_\i{objectName}_\i{signalName}().}
-           \endquotation
+    \quotation
+      \tt {QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)}
+    \endquotation
 
-           The \\tt command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument.
+    See also \l {c-command} {\\c}.
 
-           See also \l {c}{\\c}.
+    \target bold-command
+    \section1 \\bold 
 
-    \row
-        \o \bold \\bold \target bold
-        \o \bold {The \\bold command renders its argument using
-           a bold font.}
+    The \\bold command renders its argument in bold font.
 
-           For example:
+    For example:
 
-           \code
-           / *!
-               This is regular text; \bold {this text is
-               rendered using the \\bold command}.
-           * /
-           \endcode
+    \code
+    / *!
+        This is regular text; \bold {this text is
+        rendered using the \\bold command}.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \quotation
-           This is regular text; \bold {this text is rendered using
-           the \\bold command}.
-           \endquotation
+    \quotation
+    This is regular text; \bold {this text is rendered using
+    the \\bold command}.
+    \endquotation
 
-           The command follows the same conventions as the \l {i}{\\i}
-           command for \l {argument}{punctuation, parentheses and use
-           of braces} for the argument.
+    \target i-command
+    \section1 \\i (italics)
 
-    \row
-        \o \bold \\i \target i
-        \o \bold {The \\i command renders its argument in italic.}
+    The \\i command renders its argument in italics.
 
-           \warning This is preliminary functionality. For
-           more information, see the \l
-           {26-qdoc-commands-compatibility.html#i-versus-e}{compatibility}
-           section.
+    \warning If \\i doesn't work and you get some strange error
+    meesages from qdoc3 about using \\o outside of tables and lists,
+    use \bold{\\e} for italics instead of \\i. For more information,
+    see the relevant explanation in the section on \l
+    {26-qdoc-commands-compatibility.html#i-versus-e} {compatibility
+    issues}.
 
-           \target argument
-           Normally, a command argument ends at the next whitespace [1],
-           but braces can be used to group words [2]. For example:
+    If the argument contains spaces or other punctuation, enclose the
+    argument in curly brackets.
 
-           \code
-           / *!
-               Here, we render \i {a few words} in italic.
-           * /
-           \endcode
+    \code
+    / *!
+        Here, we render \i {a few words} in italic.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \quotation
-               Here, we render \i {a few words} in italic.
-           \endquotation
+    \quotation
+        Here, we render \e {a few words} in italic.
+    \endquotation
 
-           If you want to use other QDoc commands within an argument
-           that contains spaces, you always need to enclose the
-           argument with braces. But QDoc is smart enough to count
-           parentheses [3], so you don't need braces in cases like this:
+    If you want to use other QDoc commands within an argument that
+    contains spaces, you always need to enclose the argument with
+    braces. But QDoc is smart enough to count parentheses [3], so you
+    don't need braces in cases like this:
 
-           \code
-           / *!
-               An argument can sometimes contain whitespaces,
-               for example: \i QPushButton(tr("A Brand New Button"))
-           * /
-           \endcode
+    \code
+    / *!
+        An argument can sometimes contain whitespaces,
+        for example: \i QPushButton(tr("A Brand New Button"))
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \quotation
-               An argument can sometimes contain whitespaces,
-               for example: \i QPushButton(tr("A Brand New Button"))
-           \endquotation
+    \quotation
+       An argument can sometimes contain whitespaces,
+       for example: \e QPushButton(tr("A Brand New Button"))
+    \endquotation
 
-           Finally, trailing punctuation is not included in an
-           argument [4], nor is 's [5]
+    Finally, trailing punctuation is not included in an argument [4],
+    nor is 's [5]
 
-           \raw HTML
-               <table align="center" cellpadding="2"
-                   cellspacing="1" border="0">
-               <tr valign="top" bgcolor="#a2c511">
-                   <th></th>
-                   <th>QDoc Syntax</th>
-                   <th>Generated Documentation</th>
-               </tr>
+    \raw HTML
+        <table align="center" cellpadding="2"
+           cellspacing="1" border="0">
+        <tr valign="top" bgcolor="#a2c511">
+            <th></th>
+            <th>QDoc Syntax</th>
+            <th>Generated Documentation</th>
+        </tr>
+
+        <tr valign="top" bgcolor="#d0d0d0">
+           <td>1</td>
+            <td>A variation of a command button is a \e menu
+                button.</td>
+            <td>A variation of a command button is a <i>menu</i>
+                button.</td>
+        </tr>
+
+        <tr valign="top" bgcolor="#c0c0c0">
+            <td>2</td>
+            <td>The QPushButton widget provides a
+                \e {command button}.</td>
+            <td>The QPushButton widget provides a
+                <i>command button</i>.</td>
+        </tr>
+
+        <tr valign="top" bgcolor="#d0d0d0">
+            <td>3</td>
+            <td>Another class of buttons are option buttons
+                \e (see QRadioButton).</td>
+            <td>Another class of buttons are option buttons
+                <i> (see QRadioButton)</i>.</td>
+        </tr>
+
+        <tr valign="top" bgcolor="#c0c0c0">
+            <td>4</td>
+            <td>A push button emits the signal \e clicked().</td>
+            <td>A push button emits the signal <i>clicked</i>().</td>
+        </tr>
+
+        <tr valign="top" bgcolor="#d0d0d0">
+            <td>5</td>
+            <td>The \e QPushButton's checked property is
+                false by default.</td>
+            <td>The <i>QPushButton</i>'s checked property is
+                false by default.</td>
+        </tr>
 
-               <tr valign="top" bgcolor="#d0d0d0">
-                   <td>1</td>
-                   <td>A variation of a command button is a \i menu
-                       button.</td>
-                   <td>A variation of a command button is a <i>menu</i>
-                       button.</td>
-               </tr>
+        </table>
+    \endraw
 
-               <tr valign="top" bgcolor="#c0c0c0">
-                   <td>2</td>
-                   <td>The QPushButton widget provides a
-                       \i {command button}.</td>
-                   <td>The QPushButton widget provides a
-                       <i>command button</i>.</td>
-               </tr>
+    \target sub-command
+    \section1 \\sub 
 
-               <tr valign="top" bgcolor="#d0d0d0">
-                   <td>3</td>
-                   <td>Another class of buttons are option buttons
-                       \i (see QRadioButton).</td>
-                   <td>Another class of buttons are option buttons
-                       <i> (see QRadioButton)</i>.</td>
-               </tr>
+    The \\sub command renders its argument lower than the baseline of
+    the regular text, using a smaller font.
 
-               <tr valign="top" bgcolor="#c0c0c0">
-                   <td>4</td>
-                   <td>A push button emits the signal \i clicked().</td>
-                   <td>A push button emits the signal <i>clicked</i>().</td>
-               </tr>
+    For example:
 
-               <tr valign="top" bgcolor="#d0d0d0">
-                   <td>5</td>
-                   <td>The \i QPushButton's checked property is
-                       false by default.</td>
-                   <td>The <i>QPushButton</i>'s checked property is
-                       false by default.</td>
-               </tr>
+    \code
+    / *!
+        Definition (Range): Consider the sequence
+        {x\sub n}\sub {n > 1} . The set
 
-               </table>
-           \endraw
+        {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
 
-    \row
-        \o \bold \\sub \target sub
-        \o \bold {The \\sub command renders its argument lower
-           than the baseline of the regular text, using a smaller font.}
+        is called the range of the sequence.
+    * /
+    \endcode
 
-           For example:
+    QDoc renders this as:
 
-           \code
-           / *!
-               Definition (Range): Consider the sequence
-               {x\sub n}\sub {n > 1} . The set
+    \quotation
+        Definition (Range): Consider the sequence
+        {x\sub n}\sub {n > 1} . The set
 
-               {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
+        {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
 
-               is called the range of the sequence.
-           * /
-           \endcode
+        is called the range of the sequence.
+    \endquotation
 
-           will be rendered as
+    If the argument contains spaces or other punctuation, enclose the
+    argument in curly brackets.
 
-           \quotation
-               Definition (Range): Consider the sequence
-               {x\sub n}\sub {n > 1} . The set
+    \target sup-command
+    \section1 \\sup 
 
-               {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
+    The \\sup command renders its argument higher than
+    the baseline of the regular text, using a smaller font.
 
-               is called the range of the sequence.
-           \endquotation
+    For example:
 
-           The \\sub command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument.
+    \code
+    / *!
+        The series
 
-    \row
-        \o \bold \\sup \target sup
-        \o \bold {The \\sup command renders its argument higher than
-           the baseline of the regular text, using a smaller font.}
+        1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
 
-           For example:
+        is called the \i {geometric series}.
+    * /
+    \endcode
 
-           \code
-           / *!
-               The series
+    QDoc renders this as:
 
-               1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
+    \quotation
+        The series
 
-               is called the \i {geometric series}.
-           * /
-           \endcode
+        1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
 
-           will be rendered as
+        is called the \e {geometric series}.
+    \endquotation
 
-           \quotation
-               The series
+    If the argument contains spaces or other punctuation, enclose the
+    argument in curly brackets.
 
-               1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
+    \target underline-command
+    \section1 \\underline
 
-               is called the \i {geometric series}.
-           \endquotation
+    The \\underline command renders its argument underlined.
 
-           The \\sup command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument.
+    For example:
 
-    \row
-        \o \bold \\underline \target underline
-        \o \bold {The \\underline command renders its argument underlined.}
+    \code
+    / *!
+        The \underline {F}ile menu gives the users the possibility
+        to open, and edit, an existing file, save a new or modified
+        file, and exit the application.
+    * /
+    \endcode
 
-           For example:
+    QDoc renders this as:
 
-           \code
-           / *!
-               The \underline {F}ile menu gives the users the possibility
-               to open, and edit, an existing file, save a new or modified
-               file, and exit the application.
-           * /
-           \endcode
+    \quotation
+        The \underline {F}ile menu gives the users the possibility
+        to open, and edit, an existing file, save a new or modified
+        file, and exit the application.
+    \endquotation
 
-           will be rendered as
+    If the argument contains spaces or other punctuation, enclose the
+    argument in curly brackets.
 
-           \quotation
-               The \underline {F}ile menu gives the users the possibility
-               to open, and edit, an existing file, save a new or modified
-               file, and exit the application.
-           \endquotation
+    \target backslash-command
+    \section1 \\\\ (double backslash) 
 
-           The \\underline command follows the same conventions as the
-           \l {i}{\\i} command for \l {argument}{punctuation,
-           parentheses and use of braces} for the argument.  \endtable
-*/
+    The \\\\ command expands to a single backslash.
 
-/*!
-    \page 05-qdoc-commands-documentstructuring.html
-    \previouspage Text Formatting Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Verbatim Code Commands
+    QDoc commands always start with a backslash alone. To display an
+    actual backslash in the text you need to type two of the kind. If
+    you want to display two backslashes, you need to type four, and so
+    forth. For example:
 
-    \title Document Structuring Commands
+    \code
+    / *!
+        The \\\\ command is useful if you want a
+        backslash to appear verbatim, for example,
+        writing C:\\windows\\home\\.
+    * /
+    \endcode
 
-    The document structuring commands divide the documentation into
-    sections. In total, there are six levels of sections in QDoc: \c
-    \part, \c \chapter, \c \section1, \c \section2, \c \section3 and
-    \c \section4. \c \section1 to \c \section4 correspond to the
-    traditional section, subsection, subsubsection and
-    subsubsubsection.
+    QDoc renders this as:
 
-    \section1 Alphabetical List
+    \quotation
+        The \\\\ command is useful if you want a
+        backslash to appear verbatim, for example,
+        writing C:\\windows\\home\\.
+    \endquotation
 
-    \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter},
-    \l {05-qdoc-commands-documentstructuring.html#part}{\\part},
-    \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1},
-    \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2},
-    \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3},
-    \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4}
+    However, if you want your text to appear in a typewriter font as
+    well, you can use the \l {c-command} {\\c} command instead, which
+    accepts and renders the backslash as any other character. For
+    example:
 
-    \section1 Command Descriptions
+    \code
+    / *!
+        The \\c command is useful if you want a
+        backslash to appear verbatim, and the word
+        that contains it written in a typewriter font,
+        like this: \c {C:\windows\home\}.
+    * /
+    \endcode
 
-    \table
-    \header
-        \o Command
-        \o Description
+    QDoc renders this as:
 
-    \row
-        \o \bold \\part \target part
-        \o \bold {The \\part command is intended for use in
-           larger documents, and divides the document into parts.}
+    \quotation
+        The \\c command is useful if you want a
+        backslash to appear verbatim, and the word
+        that contains it written in a typewriter font,
+        like this: \c {C:\windows\home\}.
+    \endquotation
 
-           In general a document structuring command considers
-           everything that follows it until the first line break as
-           its argument. The argument is rendered as the unit's
-           title. If the title needs to be spanned over several lines,
-           make sure that each line (except the last one) is ended
-           with a backslash.
+*/
 
-           In total, there are six levels of sections in QDoc: \c
-           \part, \c \chapter, \c \section1, \c \section2, \c
-           \section3 and \c \section4. \c \section1 to \c \section4
-           correspond to the traditional section, subsection,
-           subsubsection and subsubsubsection.
+/*!
+    \page 05-qdoc-commands-documentstructure.html
+    \previouspage Text Markup
+    \contentspage Table of Contents
+    \nextpage Including Code Inline
+
+    \title Document Structure
+
+    The document structuring commands are for dividing your document
+    into sections. QDoc supports six kinds of sections: \c \part, \c
+    \chapter, \c \section1, \c \section2, \c \section3 and \c
+    \section4. The \c \section1..4 commands are the most useful. The
+    correspond to the traditional section, subsection, etc used in
+    outlining.
+
+    \target part-command
+    \section1 \\part 
+
+    The \\part command is intended for use in a large document, like a
+    book.
+
+    In general a document structuring command considers everything
+    that follows it until the first line break as its argument. The
+    argument is rendered as the unit's title. If the title needs to be
+    spanned over several lines, make sure that each line (except the
+    last one) is ended with a backslash.
+
+    In total, there are six levels of sections in QDoc: \c \part, \c
+    \chapter, \c \section1, \c \section2, \c \section3 and \c
+    \section4. \c \section1 to \c \section4 correspond to the
+    traditional section, subsection, subsubsection and
+    subsubsubsection.
 
-           There is a strict ordering of the section units:
+    There is a strict ordering of the section units:
 
            \code
            part
@@ -763,13 +872,12 @@
                                          section4
            \endcode
 
-           For example, a \c section1 unit can only appear as the top
-           level section or inside a \c chapter unit. Skipping a
-           section unit, for example from \c part to \c section1, is
-           not allowed.
+    For example, a \c section1 unit can only appear as the top level
+    section or inside a \c chapter unit. Skipping a section unit, for
+    example from \c part to \c section1, is not allowed.
 
-           You can \i begin with either of the three: \c part, \c
-           chapter or \c section1. For example:
+    You can \e begin with either of the three: \c part, \c chapter or
+    \c section1. For example:
 
 
            \code
@@ -829,7 +937,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
            \raw HTML
@@ -890,154 +998,98 @@
            \endraw
            \endquotation
 
-           Each section level is a logical unit within the
-           document. Its title will appear on the table of contents
-           generated by the \l
-           {11-qdoc-commands-documentcontents.html#tableofcontents}
-           {\\tableofcontents} command. For example:
+    Each section is a logical unit in the document. The section
+    heading appears in the automatically generated table of contents
+    that normally appears in the upper righthand corner of the page.
 
-           \code
-           / *!
-               Contents:
+    \target chapter-command	
+    \section1 \\chapter 
+    
+    The \\chapter command is intended for use in
+    larger documents, and divides the document into chapters.
 
-               \tableofcontents
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-               ...
-            * /
-            \endcode
+    \target sectionOne-command
+    \section1 \\section1 
 
-            will expand to
+    The \\section1 command starts a new section.
 
-            \quotation
-            \raw HTML
-                <p>Contents:</p>
-
-                <ul>
-                <li><a href="#Basic Qt">Basic Qt</a></li>
-                    <ul>
-                    <li><a href="#Getting Started">Getting Started</a></li>
-                        <ul>
-                        <li><a href="#Hello Qt">Hello Qt</a></li>
-                        <li><a href="#Making Connections">
-                            Making Connections</a></li>
-                        <li><a href="#Using the Reference Documentation">
-                            Using the Reference Documentation</a></li>
-                        </ul>
-                    <li><a href="#Creating Dialogs">Creating Dialogs</a></li>
-                        <ul>
-                        <li><a href="#Subclassing QDialog">
-                            Subclassing QDialog</a></li>
-                        </ul>
-                    </ul>
-                <li><a href="#Intermediate Qt">Intermediate Qt</a></li>
-                    <ul>
-                    <li><a href="#Layout Management">
-                        Layout Management</a></li>
-                        <ul>
-                        <li><a href="#Basic Layouts">Basic Layouts</a></li>
-                        </ul>
-                    </ul>
-                </ul>
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-                ...
-            \endraw
-            \endquotation
+    \target sectionTwo-command
+    \section1 \\section2 
 
-    \row
-        \o \bold \\chapter \target chapter
-        \o \bold {The \\chapter command is intended for use in
-           larger documents, and divides the document into chapters.}
+    The \\section2 command starts a new section.
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-    \row
-        \o \bold \\section1 \target sectionOne
-        \o \bold {The \\section1 command starts a new section.}
+    \target sectionThree-command
+    \section1 \\section3 
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
-    \row
-        \o \bold \\section2 \target sectionTwo
-        \o \bold {The \\section2 command starts a new section.}
+    The \\section3 command starts a new section.
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-    \row
-        \o \bold \\section3 \target sectionThree
-        \o \bold {The \\section3 command starts a new section.}
-
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
+    \target sectionFour-command
+    \section1 \\section4 
 
-    \row
-        \o \bold \\section4 \target sectionFour
-        \o \bold {The \\section4 command starts a new section.}
+    The \\section4 command starts a new section.
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-    \endtable
 */
 
 /*!
-    \page 06-qdoc-commands-verbatimcode.html
-    \previouspage Document Structuring Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Quoting External Code Commands
-
-    \title Verbatim Code Commands
-
-    The following commands are used to render verbatim code within the
-    documentation. The code is rendered on a new line, using a
-    typewriter font and the standard indentation.
-
-    \bold{Note:} Although all of these commands can be used to present
-    C++ code, the \l{07-0-qdoc-commands-quoting.html#snippet}{\\snippet}
-    and \l{07-0-qdoc-commands-quoting.html#codeline}{\\codeline} commands
-    should be used in preference to
-    the others when presenting valid code. This allows auxilliary tools
-    for Qt language bindings to substitute the relevant code snippets in
-    place of the C++ ones.
+    \page 06-qdoc-commands-includecodeinline.html
+    \previouspage Document Structure
+    \contentspage Table of Contents
+    \nextpage Including External Code
+
+    \title Including Code Inline
+
+    The following commands are used to render source code without
+    formatting. The source code begins on a new line, rendered in the
+    code.
+
+    \bold{Note:} Although all these commands are for rendering C++
+    code, the
+    \l{07-0-qdoc-commands-includingexternalcode.html#snippet-command}
+    {\\snippet} and
+    \l{07-0-qdoc-commands-includingexternalcode.html#codeline-command}
+    {\\codeline} commands are preferred over the others. These
+    commands allow equivalent code snippets for other Qt language
+    bindings to be substituted for the C++ snippets in the
+    documentation.
 
-    \section1 Alphabetical List
+    \target code-command
+    \section1 \\code 
 
-    \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode},
-    \l {06-qdoc-commands-verbatimcode.html#code}{\\code},
-    \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode},
-    \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode}
+    The \\code and \\endcode commands enclose a snippet of source code.
 
-    \section1 Command Descriptions
+    \note The \l {c-command} {\\c} command can be used for short code
+    fragments within a sentence. The \\code command is for longer code
+    snippets. It renders the code verbatim in a separate paragraph in
+    the code font.
 
-    \table
-    \header
-        \o Command
-        \o Description
+    When processing any of the \\code, \l {badcode-command}
+    {\\badcode}, \l {newcode-command} {\\newcode} or \l
+    {oldcode-command} {\\oldcode} commands, QDoc removes all
+    indentation that is common for the verbatim code blocks within a
+    \c{/}\c{*!} ...  \c{*}\c{/} comment before it adds the standard
+    indentation. For that reason the recommended style is to use 8
+    spaces for the verbatim code contained within these commands 
 
-    \row
-        \o \bold \\code \target code
-        \o \bold {The \\code command and the corresponding
-           \\endcode command delimit a piece of verbatim code.}
-
-           Whereas the \l {c}{\\c} command can be used for short code
-           fragments within a sentence, the \\code command is for
-           longer code snippets and renders the code verbatim in a
-           separate paragraph using a typewriter font and the standard
-           indentation.
-
-           When processing any of the \\code, \l {badcode}{\\badcode},
-           \l {newcode}{\\newcode} and \l {oldcode}{\\oldcode}
-           commands, QDoc basically removes all indentation that is
-           common for the verbatim code blocks within a \c{/}\c{*!} ...
-           \c{*}\c{/} comment before it adds the standard
-           indentation. For that reason the recommended style is to
-           use 8 spaces for the verbatim code contained within these
-           commands (note that this doesn't apply to externally
-           quoted code using the \l {quotefromfile}{\\quotefromfile}
-           or \l {quotefile}{\\quotefile} command).
+    \note This doesn't apply to externally quoted code using the \l
+    {quotefromfile-command} {\\quotefromfile} or \l
+    {quotefile-command} {\\quotefile} command.
 
-           For example:
+    For example:
 
            \code
            / *!
@@ -1053,7 +1105,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \code
                #include <QApplication>
@@ -1065,34 +1117,36 @@
                }
            \endcode
 
-           Other QDoc commands are disabled within
-           \\code... \\endcode, and the special character '\\' is
-           accepted and rendered like the rest of the code.
+    Other QDoc commands are disabled within \\code... \\endcode, and
+    the special character '\\' is accepted and rendered like the rest
+    of the code.
 
-           You need to type the code manually between the \\code and
-           \\endcode commands. If you want to include code snippets
-           from a particular file, use the \l
-           {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile}
-           command instead.
+    To include code snippets from an external file, use the
+    \l{07-0-qdoc-commands-includingexternalcode.html#snippet-command}
+    {\\snippet} and
+    \l{07-0-qdoc-commands-includingexternalcode.html#codeline-command}
+    {\\codeline} commands.
 
-           See also \l {c}{\\c}, \l
-           {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
-           \l {badcode}{\\badcode}, \l {newcode}{\\newcode} and \l
-           {oldcode}{\\oldcode}.
+    See also \l {c-command} {\\c}, \l
+    {07-0-qdoc-commands-includingexternalcode.html#quotefromfile-command}
+    {\\quotefromfile}, \l {badcode-command} {\\badcode}, \l
+    {newcode-command} {\\newcode} and \l {oldcode-command}
+    {\\oldcode}.
 
-    \row
-        \o \bold \\badcode \target badcode
-        \o \bold {The \\badcode command and the corresponding
-           \\endcode command delimit a piece of code that doesn't
-           compile or is wrong for some other reason.}
 
-           The \\badcode command is similar the \l {code}{\\code}
-           command, but renders the code using a grey font instead of
-           black (the default).
+    \target badcode-command
+    \section1 \\badcode 
+
+    The \\badcode and \\endcode commands delimit a snippet of code
+    that doesn't compile or is wrong for some other reason.
+
+    The \\badcode command is similar to the \l {code-command} {\\code}
+    command, but it renders the code snippet using a grey font instead
+    of black.
 
-           Like the \l {code}{\\code} command, it renders its code on
-           a new line in the documentation using a typewriter font and
-           the standard indentation. For example:
+    Like the \l {code-command} {\\code} command, this command begins
+    its code snippet on a new line rendered in the code font and with
+    the standard indentation. For example:
 
            \code
            / *!
@@ -1112,7 +1166,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The statement below is rendered using the
@@ -1130,30 +1184,29 @@
                \endcode
            \endquotation
 
-           Other QDoc commands are disabled within
-           \\badcode... \\endcode, and the special character '\\' is
-           accepted and rendered like the rest of the code.
+    Other QDoc commands are disabled within \\badcode... \\endcode,
+    and the special character '\\' is accepted and rendered like the
+    rest of the code.
 
-           See also \l {code}{\\code}, \l {newcode}{\\newcode} and \l
-           {oldcode}{\\oldcode}.
+    See also \l {code-command} {\\code}, \l {newcode-command}
+    {\\newcode} and \l {oldcode-command} {\\oldcode}.
 
-    \row
-        \o \bold \\newcode \target newcode
-        \o \bold {The \\newcode command, and the associated \\oldcode
-           and \\endcode commands, indicate how to port a piece of
-           code to a new version of an API.}
-
-           The \\newcode command, and its companion the \\oldcode
-           command, is a convenience combination of the \l
-           {code}{\\code} and \l {badcode}{\\badcode} commands: The
-           combination provides a text relating the two code snippets
-           to each other. The command requires a preceding \\oldcode
-           statement.
-
-           Like the \l {code}{\\code} and \l {badcode}{\\badcode}
-           commands, the \\newcode command renders its code on a new
-           line in the documentation using a typewriter font and the
-           standard indentation. For example:
+    \target newcode-command
+    \section1 \\newcode 
+
+    The \\newcode, \\oldcode, and \\endcode commands enable you to
+    show how to port a snippet of code to a new version of an API.
+
+    The \\newcode command, and its companion the \\oldcode command, is
+    a convenience combination of the \l {code-command} {\\code} and \l
+    {badcode-command} {\\badcode} commands: The combination provides a
+    text relating the two code snippets to each other. The command
+    requires a preceding \\oldcode statement.
+
+    Like the \l {code-command} {\\code} and \l {badcode-command}
+    {\\badcode} commands, the \\newcode command renders its code on a
+    new line in the documentation using a typewriter font and the
+    standard indentation. For example:
 
            \code
            / *!
@@ -1168,7 +1221,7 @@
            * /
            \endcode
 
-           is rendered like this:
+    QDoc renders this as:
 
            \quotation
                \oldcode
@@ -1181,76 +1234,55 @@
                \endcode
            \endquotation
 
-           Other QDoc commands are disabled within
-           \\oldcode ... \\endcode, and the '\\' character doesn't need
-           to be escaped.
+    Other QDoc commands are disabled within \\oldcode ... \\endcode,
+    and the '\\' character doesn't need to be escaped.
 
-    \row
-        \o \bold \\oldcode \target oldcode
-        \o \bold {The \\oldcode command requires a corresponding
-           \\newcode statement; otherwise QDoc fails to parse the command
-           and emits a warning.}
+    \target oldcode-command
+    \section1 \\oldcode 
 
-           See also \l {newcode}{\\newcode} and \l {badcode}{\\badcode}.
-    \endtable
+    The \\oldcode command requires a corresponding
+    \\newcode statement; otherwise QDoc fails to parse the command
+    and emits a warning.
+
+    See also \l {newcode-command} {\\newcode} and \l {badcode-command} {\\badcode}.
 */
 
 /*!
-    \page 07-0-qdoc-commands-quoting.html
-    \previouspage Verbatim Code Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Linking Commands
+    \page 07-0-qdoc-commands-includingexternalcode.html
+    \previouspage Including Code Inline
+    \contentspage Table of Contents
+    \nextpage Creating Links
 
-    \title Quoting External Code Commands
+    \title Including External Code
 
-    The following commands enable quoting from files in the
-    documentation: You can make QDoc include the complete contents of
+    The following commands enable you to include code snippets from
+    external files. You can make QDoc include the complete contents of
     a file, or you can quote specific parts of the file and skip
     others. The typical use of the latter is to quote a file chunk by
     chunk.
 
-    \bold{Note:} Although all of these commands can be used to present
-    C++ code, the \l{#snippet}{\\snippet} and \l{#codeline}{\\codeline}
-    commands should be used in preference to
-    the others when presenting valid code. This allows auxilliary tools
-    for Qt language bindings to substitute the relevant code snippets in
-    place of the C++ ones.
-
-    \section1 Alphabetical List
-
-    \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
-    \l {07-0-qdoc-commands-quoting.html#dots}{\\dots},
-    \l {07-0-qdoc-commands-quoting.html#printline}{\\printline},
-    \l {07-0-qdoc-commands-quoting.html#printto}{\\printto},
-    \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil},
-    \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile},
-    \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
-    \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline},
-    \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto},
-    \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil},
-    \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet}
-
-    \section1 Command Descriptions
+    \bold{Note:} Although all these commands are for rendering C++
+    code, the
+    \l{07-0-qdoc-commands-includingexternalcode.html#snippet-command}
+    {\\snippet} and
+    \l{07-0-qdoc-commands-includingexternalcode.html#codeline-command}
+    {\\codeline} commands are preferred over the others. These
+    commands allow equivalent code snippets for other Qt language
+    bindings to be substituted for the C++ snippets in the
+    documentation.
 
-    \table
-    \header
-        \o Command
-        \o Description
+    \target quotefile-command
+    \section1 \\quotefile 
 
-    \row
-        \o \bold \\quotefile \target quotefile
-        \o \bold {The \\quotefile command expands to the complete
-           contents of the file given as argument.}
+    The \\quotefile command expands to the complete contents of the
+    file given as argument.
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the file name with a line
-           break.
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the file name with a line break.
 
-           The file's contents is rendered in a separate paragraph,
-           using a typewriter font and the standard indentation. The
-           code is shown verbatim.
-
-           For example:
+    The file's contents is rendered in a separate paragraph, using a
+    typewriter font and the standard indentation. The code is shown
+    verbatim. For example:
 
            \code
            / *!
@@ -1263,7 +1295,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                This is a simple "Hello world" example:
@@ -1274,29 +1306,29 @@
                application up and running.
            \endquotation
 
-           \warning If you use the \l {QDoc
-           Compatibility}{compat.qdocconf} file this command is called
-           \\include.
+    \warning If you use the \l {Compatibility Issues}
+    {compat.qdocconf} file this command is called \\include.
 
-           See also \l {quotefromfile}{\\quotefromfile} and \l
-           {code}{\\code}.
+    See also \l {quotefromfile-command} {\\quotefromfile} and
+    \l {code-command} {\\code}.
 
-    \row
-        \o \bold \\quotefromfile \target quotefromfile
-        \o \bold {The \\quotefromfile command opens the file
-           given as argument for quoting.}
-
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the file name with a line
-           break.
-
-           The command is intended for use when quoting parts from
-           file with the walkthrough commands: \l
-           {printline}{\\printline}, \l {printto}{\\printto}, \l
-           {printuntil}{\\printuntil}, \l {skipline}{\\skipline}, \l
-           {skipto}{\\skipto}, \l {skipuntil}{\\skipuntil}. This
-           enables you to quote specific portions of a file. For
-           example:
+
+    \target quotefromfile-command
+    \section1 \\quotefromfile 
+
+    The \\quotefromfile command opens the file given as argument for
+    quoting.
+
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the file name with a line break.
+
+    The command is intended for use when quoting parts from file with
+    the walkthrough commands: \l {printline-command} {\\printline}, \l
+    {printto-command} {\\printto}, \l {printuntil-command}
+    {\\printuntil}, \l {skipline-command} {\\skipline}, \l
+    {skipto-command} {\\skipto}, \l {skipuntil-command}
+    {\\skipuntil}. This enables you to quote specific portions of a
+    file. For example:
 
            \code
            / *!
@@ -1321,7 +1353,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The whole application is contained within
@@ -1344,38 +1376,35 @@
                ...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           QDoc remembers which file it's quoting, and the current
-           position within that file (see \l {file}{\\printline} for
-           more information). There is no need to "close" the file.
+    QDoc remembers which file it's quoting, and the current position
+    within that file (see \l {file} {\\printline} for more
+    information). There is no need to "close" the file.
 
-           Earlier we called this command \\quotefile. For more
-           information, see the \l
-           {26-qdoc-commands-compatibility.html#quotefromfile-versus-quotefile}
-           {compatibility} section.
+    Earlier we called this command \\quotefile. For more information,
+    see the \l
+    {26-qdoc-commands-compatibility.html#quotefromfile-versus-quotefile}
+    {compatibility} section.
 
-           See also \l {quotefile}{\\quotefile}, \l {code}{\\code} and
-           \l {dots}{\\dots}.
+    See also \l {quotefile-command} {\\quotefile}, \l {code-command}
+    {\\code} and \l {dots} {\\dots}.
 
-    \row
-        \o \bold \\printline \target printline
-        \o \bold {The \\printline command expands to the line
-           from the current position to the next non-blank line of
-           the current souce file.}
-
-           To ensure that the documentation always is synchronized
-           with the source file, a substring of the line must be
-           specified as an argument to the command. Note that the
-           command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break.
+    \target printline-command
+    \section1 \\printline 
 
-           The line from the source file is rendered as a separate
-           paragraph, using a typewriter font and the standard
-           indentation. The code is shown verbatim.
+    The \\printline command expands to the line from the current
+    position to the next non-blank line of the current souce file.
 
-           For example:
+    To ensure that the documentation remains synchronized with the
+    source file, a substring of the line must be specified as an
+    argument to the command. Note that the command considers the rest
+    of the line as part of its argument, make sure to follow the
+    substring with a line break.
+
+    The line from the source file is rendered as a separate paragraph,
+    using a typewriter font and the standard indentation. The code is
+    shown verbatim. For example:
 
            \code
            / *!
@@ -1403,7 +1432,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                There has to be exactly one QApplication object
@@ -1430,22 +1459,20 @@
                The main function...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           \target file
+    \target file
 
-           QDoc reads the file sequentially. To move the current
-           position forward you can use either of the \l
-           {skipline}{\\skip...} commands. To move the current
-           position backward, you can use the \l
-           {quotefromfile}{\\quotefromfile} command again.
+    QDoc reads the file sequentially. To move the current position
+    forward you can use either of the \l {skipline-command}
+    {\\skip...} commands. To move the current position backward, you
+    can use the \l {quotefromfile-command} {\\quotefromfile} command
+    again.
 
-           \target substring
+    \target substring
 
-           If the substring argument is surrounded by slashes it is
-           interpreted as a \l {regular expression}.
-
-           For example:
+    If the substring argument is surrounded by slashes it is
+    interpreted as a \l {regular expression}. For example:
 
            \code
            / *!
@@ -1462,7 +1489,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                \quotefromfile widgets/scribble/mainwindow.cpp
@@ -1477,39 +1504,36 @@
                application.
            \endquotation
 
-           (\l {widgets/scribble}{The complete example file...})
+    (\l {widgets/scribble} {The complete example file...})
 
-           The regular expression \c /^\}/ makes QDoc print until the
-           first '}' character occurring at the beginning of the line
-           without indentation. /.../ encloses the regular expression,
-           and '^' means the beginning of the line. The '}' character
-           must be escaped since it is a special character in regular
-           expressions.
+    The regular expression \c /^\}/ makes QDoc print until the first
+    '}' character occurring at the beginning of the line without
+    indentation. /.../ encloses the regular expression, and '^' means
+    the beginning of the line. The '}' character must be escaped since
+    it is a special character in regular expressions.
 
-           QDoc will emit a warning if the specified substring or
-           regular expression cannot be located, i.e. if the source
-           code has changed.
+    QDoc will emit a warning if the specified substring or regular
+    expression cannot be located, i.e. if the source code has changed.
 
-           See also \l {printto}{\\printto} and \l
-           {printuntil}{\\printuntil}.
+    See also \l {printto-command} {\\printto} and \l
+    {printuntil-command} {\\printuntil}.
 
-    \row
-        \o \bold \\printto \target printto
-        \o \bold {The \\printto command expands to all the lines
-           from the current position up to and \i excluding the
-           next line containing a given substring.}
+    \target printto-command
+    \section1 \\printto 
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break. The command also follows the same conventions for \l
-           {file}{positioning} and \l {substring}{argument} as the \l
-           {printline}{\\printline} command.
+    The \\printto command expands to all the lines from the current
+    position up to and \e excluding the next line containing a given
+    substring.
 
-           The lines from the source file are rendered in a separate
-           paragraph, using a typewriter font and the standard
-           indentation. The code is shown verbatim.
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break. The
+    command also follows the same conventions for \l {file}
+    {positioning} and \l {substring} {argument} as the \l
+    {printline-command} {\\printline} command.
 
-           For example:
+    The lines from the source file are rendered in a separate
+    paragraph, using a typewriter font and the standard
+    indentation. The code is shown verbatim. For example:
 
            \code
            / *!
@@ -1524,7 +1548,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The whole application is contained within the
@@ -1538,28 +1562,27 @@
                and \c argv parameters...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {printline}{\\printline} and \l
-           {printuntil}{\\printuntil}.
+    See also \l {printline-command} {\\printline} and \l
+    {printuntil-command} {\\printuntil}.
 
-    \row
-        \o \bold \\printuntil \target printuntil
-        \o \bold {The \\printuntil command expands to all the lines
-           from the current position up to and \i including the next line
-           containing a given substring.}
+    \target printuntil-command
+    \section1 \\printuntil 
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break. The command also follows the same conventions for \l
-           {file}{positioning} and \l {substring}{argument} as the \l
-           {printline}{\\printline} command.
+    The \\printuntil command expands to all the lines from the current
+    position up to and \e including the next line containing a given
+    substring.
 
-           The lines from the source file are rendered in a separate
-           paragraph, using a typewriter font and the standard
-           indentation. The code is shown verbatim.
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break. The
+    command also follows the same conventions for \l {file}
+    {positioning} and \l {substring} {argument} as the \l
+    {printline-command} {\\printline} command.
 
-           For example:
+    The lines from the source file are rendered in a separate
+    paragraph, using a typewriter font and the standard
+    indentation. The code is shown verbatim. For example:
 
            \code
            / *!
@@ -1576,7 +1599,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The whole application is contained within the
@@ -1587,33 +1610,33 @@
                \printuntil hello
 
                First we create a \l
-               {http://qt.nokia.com/doc/4.0/qapplication}{QApplication}
+               {http://qt.nokia.com/doc/4.0/qapplication} {QApplication}
                object using the \c argc and \c argv parameters, then we
                create a \l
-               {http://qt.nokia.com/doc/4.0/qpushbutton}{QPushButton}.
+               {http://qt.nokia.com/doc/4.0/qpushbutton} {QPushButton}.
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {printline}{\\printline} and \l
-           {printto}{\\printto}.
+    See also \l {printline-command} {\\printline} and \l
+    {printto-command} {\\printto}.
 
-    \row
-        \o \bold \\skipline \target skipline
-        \o \bold {The \\skipline command ignores the next non-blank
-           line in the current source file.}
-
-           Doc reads the file sequentially, and the \\skipline command
-           is used to move the current position (omitting a line of
-           the source file). See the remark about \l {file}{file
-           positioning} above.
-
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break. The command also follows the same conventions for \l
-           {substring}{argument} as the \l {printline}{\\printline}
-           command, and it is used in conjunction with the \l
-           {quotefromfile}{\\quotefromfile} command. For example:
+    \target skipline-command
+    \section1 \\skipline 
+
+    The \\skipline command ignores the next non-blank line in the
+    current source file.
+
+    Doc reads the file sequentially, and the \\skipline command is
+    used to move the current position (omitting a line of the source
+    file). See the remark about \l {file} {file positioning} above.
+
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break. The
+    command also follows the same conventions for \l {substring}
+    {argument} as the \l {printline-command} {\\printline} command,
+    and it is used in conjunction with the \l {quotefromfile-command}
+    {\\quotefromfile} command. For example:
 
            \code
            / *!
@@ -1631,7 +1654,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                \l
@@ -1649,30 +1672,30 @@
                that contains its definition.
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {skipto}{\\skipto}, \l
-           {skipuntil}{\\skipuntil} and \l {dots}{\\dots}.
+    See also \l {skipto-command} {\\skipto}, \l {skipuntil-command}
+    {\\skipuntil} and \l {dots} {\\dots}.
 
-    \row
-        \o \bold \\skipto \target skipto
-        \o \bold {The \\skipto command ignores all the lines from the
-           current position up to and \i excluding the next line
-           containing a given substring.}
+    \target skipto-command
+    \section1 \\skipto 
 
-           QDoc reads the file sequentially, and the \\skipto command
-           is used to move the current position (omitting one or
-           several lines of the source file). See the remark about \l
-           {file}{file positioning} above.
+    The \\skipto command ignores all the lines from the current
+    position up to and \e excluding the next line containing a given
+    substring.
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break.
+    QDoc reads the file sequentially, and the \\skipto command is used
+    to move the current position (omitting one or several lines of the
+    source file). See the remark about \l {file} {file positioning}
+    above.
 
-           The command also follows the same conventions for \l
-           {substring}{argument} as the \l {printline}{\\printline}
-           command, and it is used in conjunction with the \l
-           {quotefromfile}{\\quotefromfile} command. For example:
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break.
+
+    The command also follows the same conventions for \l {substring}
+    {argument} as the \l {printline-command} {\\printline} command,
+    and it is used in conjunction with the \l {quotefromfile-command}
+    {\\quotefromfile} command. For example:
 
            \code
            / *!
@@ -1691,7 +1714,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The whole application is contained within
@@ -1707,30 +1730,30 @@
                reasonable size ...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {skipline}{\\skipline}, \l
-           {skipuntil}{\\skipuntil} and \l {dots}{\\dots}.
+    See also \l {skipline-command} {\\skipline}, \l
+    {skipuntil-command} {\\skipuntil} and \l {dots} {\\dots}.
 
-    \row
-        \o \bold \\skipuntil \target skipuntil
-        \o \bold {The \\skipuntil command ignores all the lines from
-           the current position up to and \i including the next line
-           containing a given substring.}
+    \target skipuntil-command
+    \section1 \\skipuntil 
+
+    The \\skipuntil command ignores all the lines from the current
+    position up to and \e including the next line containing a given
+    substring.
 
-           QDoc reads the file sequentially, and the \\skipuntil
-           command is used to move the current position (omitting one
-           or several lines of the source file). See the remark about
-           \l {file}{file positioning} above.
+    QDoc reads the file sequentially, and the \\skipuntil command is
+    used to move the current position (omitting one or several lines
+    of the source file). See the remark about \l {file} {file
+    positioning} above.
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break.
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break.
 
-           The command also follows the same conventions for \l
-           {substring}{argument} as the \l {printline}{\\printline}
-           command, and it is used in conjunction with the \l
-           {quotefromfile}{\\quotefromfile} command. For example:
+    The command also follows the same conventions for \l {substring}
+    {argument} as the \l {printline-command} {\\printline} command,
+    and it is used in conjunction with the \l {quotefromfile-command}
+    {\\quotefromfile} command. For example:
 
            \code
            / *!
@@ -1748,7 +1771,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The first thing we did in the \c main() function was to
@@ -1764,20 +1787,21 @@
                will return when the application exits...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {skipline}{\\skipline}, \l {skipto}{\\skipto}
-           and \l {dots}{\\dots}.
+    See also \l {skipline-command} {\\skipline}, \l {skipto-command}
+    {\\skipto} and \l {dots} {\\dots}.
 
-    \row
-        \o \bold \\dots \target dots
-        \o \bold {The \\dots command indicates that parts of the
-           source file have been omitted when quoting a file.}
+    \target dots-command
+    \section1 \\dots 
+
+    The \\dots command indicates that parts of the source file have
+    been omitted when quoting a file.
 
-           The command is used in conjunction with the \l
-           {quotefromfile}{\\quotefromfile} command, and should be
-           stated on its own line. The dots are rendered on a new
-           line, using a typewriter font. For example:
+    The command is used in conjunction with the \l
+    {quotefromfile-command} {\\quotefromfile} command, and should be
+    stated on its own line. The dots are rendered on a new line, using
+    a typewriter font. For example:
 
            \code
            / *!
@@ -1790,7 +1814,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotefromfile examples/main.cpp
            \skipto main
@@ -1799,54 +1823,54 @@
            \skipuntil exec
            \printline }
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           The default indentation is 4 spaces, but this can be
-           adjusted using the command's optional argument. For
-           example:
+    The default indentation is 4 spaces, but this can be adjusted
+    using the command's optional argument. For example:
 
-            \code
-           / *!
-               \dots 0
-               \dots
-               \dots 8
-               \dots 12
-               \dots 16
-           * /
-           \endcode
+    \code
+    / *!
+        \dots 0
+        \dots
+        \dots 8
+        \dots 12
+        \dots 16
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \dots 0
-           \dots
-           \dots 8
-           \dots 12
-           \dots 16
+    \dots 0
+    \dots
+    \dots 8
+    \dots 12
+    \dots 16
 
-           See also \l {skipline}{\\skipline}, \l
-           {skipto}{\\skipto} and \l {skipuntil}{\\skipuntil}.
+    See also \l {skipline-command} {\\skipline}, \l {skipto-command}
+    {\\skipto} and \l {skipuntil-command} {\\skipuntil}.
 
-    \row
-        \o \bold \\snippet \target snippet
-        \o \bold {The \\snippet command causes a code snippet to be included
-           verbatim as preformatted text, which may be syntax highlighted.}
-           
-           Each code snippet are referenced by the file that holds it and by
-           a unique identifier for that file. Snippet files are typically
-           stored in a \c{snippets} directory inside the documentation
-           directory (e.g., \c{$QTDIR/doc/src/snippets}).
+    \target snippet-command
+    \section1 \\snippet 
+    
+    The \\snippet command causes a code snippet to be included
+    verbatim as preformatted text, which may be syntax highlighted.
+
+    Each code snippet are referenced by the file that holds it and by
+    a unique identifier for that file. Snippet files are typically
+    stored in a \c{snippets} directory inside the documentation
+    directory (e.g., \c{$QTDIR/doc/src/snippets}).
 
-           For example, the following documentation references a snippet in
-           a file residing in a subdirectory of the documentation directory:
+    For example, the following documentation references a snippet in a
+    file residing in a subdirectory of the documentation directory:
            
            \code
            \snippet snippets/textdocument-resources/main.cpp Adding a resource
            \endcode
            
-           The text following the file name is the unique identifier for the
-           snippet. This is used to delimit the quoted code in the relevant
-           snippet file as shown in the following example that corresponds to
-           the above \c{\\snippet} command:
+    The text following the file name is the unique identifier for the
+    snippet. This is used to delimit the quoted code in the relevant
+    snippet file as shown in the following example that corresponds to
+    the above \c{\\snippet} command:
            
            \dots
            \code
@@ -1859,18 +1883,20 @@
            //! [Adding a resource]
            \endcode
            \dots
-    \row
-        \o \bold \\codeline \target codeline
-        \o \bold{The \\codeline command inserts a blank line of preformatted
-           text. It is used to insert gaps between snippets without closing
-           the current preformatted text area and opening a new one.}
-    \endtable
+
+    \target codeline-command
+    \section1 \\codeline 
+
+    The \\codeline command inserts a blank line of preformatted
+    text. It is used to insert gaps between snippets without closing
+    the current preformatted text area and opening a new one.
+
 */
 
 /*!
     \page  07-1-example.html
-    \previouspage Quoting External Code Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Including External Code
+    \contentspage Table of Contents
 
     \title Example File
 
@@ -1878,541 +1904,534 @@
 */
 
 /*!
-    \page 08-qdoc-commands-linking.html
-    \previouspage Quoting External Code Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Graphic Commands
+    \page 08-qdoc-commands-creatinglinks.html
+    \previouspage Including External Code
+    \contentspage Table of Contents
+    \nextpage Including Images
 
-    \title Linking Commands
+    \title Creating Links
 
-    The linking commands make it possible to create hyperlinks to
-    classes, functions, header files and examples. They also make it
-    possible to link to targets within a document, as well as to other
-    documents and URLs.
+    These commands are for creating hyperlinks to classes, functions,
+    examples, and other targets. 
 
-    \section1 Alphabetical List
+    \target l-command
+    \section1 \\l (link)
 
-    \l {08-qdoc-commands-linking.html#keyword}{\\keyword},
-    \l {08-qdoc-commands-linking.html#l}{\\l},
-    \l {08-qdoc-commands-linking.html#sa}{\\sa},
-    \l {08-qdoc-commands-linking.html#target}{\\target}
+    The \\l link command is used to create a hyperlink to many
+    different kinds of targets. The command's general syntax is
 
-    \section1 Command Descriptions
+    \code
+      \l {link target} {link text}
+    \endcode
 
-    \table
-    \header
-        \o Command
-        \o Description
+    For example:
 
-    \row
-        \o \bold \\l \target l
-        \o \bold {The \\l command is used to create hyperlinks. }
+    \code
+       / *!
+          Read the \l {http://qt.nokia.com/doc/4.0/}
+          {Qt's Reference Documentation} carefully.
+       * /
+    \endcode
 
-           The command's general syntax is
+    QDoc renders this as:
 
-           \code
-           \l {link target}{link text}
-           \endcode
+    \quotation
+       Read the \l {http://qt.nokia.com/doc/4.0/}
+       {Qt's Reference Documentation} carefully.
+    \endquotation
 
-           For example:
+    If the link target is equivalent to the link text, the second
+    argument can be omitted.
 
-           \code
-           / *!
-               Read the \l {http://qt.nokia.com/doc/4.0/}
-               {Qt's Reference Documentation} carefully.
-           * /
-           \endcode
+    For example, if you have documentation like:
 
-           will be rendered as
+    \code
+      / *!
+         \target assertions
 
-           \quotation
-              Read the \l {http://qt.nokia.com/doc/4.0/}
-              {Qt's Reference Documentation} carefully.
-           \endquotation
+         Assertions make some statement about the text at the
+         point where they occur in the regexp but they do not
+         match any characters.
+
+         ...
 
-           If the link target is equivalent to the link text, the
-           second argument can be omitted.
+         Regexps are built up from expressions, quantifiers, and
+         \l {assertions} {assertions}.
+      * /
+    \endcode
 
-           For example, if you have documentation like:
+    You can simplify this as follows:
 
-           \code
-           / *!
-               \target assertions
+    \code
+      / *!
+        \target assertions
 
-               Assertions make some statement about the text at the
-               point where they occur in the regexp but they do not
-               match any characters.
+        Assertions make some statement about the text at the
+        point where they occur in the regexp but they do not
+        match any characters.
 
-               ...
+        ...
 
-               Regexps are built up from expressions, quantifiers, and
-               \l {assertions}{assertions}.
-           * /
-           \endcode
+        Regexps are built up from expressions, quantifiers, and
+        \l assertions.
+      * /
+    \endcode
 
-           you can rewrite it as
+    For the one-parameter version the braces can often be omitted.
+    The \\l command supports several kinds of links:
 
-           \code
-           / *!
-               \target assertions
+    \list
 
-               Assertions make some statement about the text at the
-               point where they occur in the regexp but they do not
-               match any characters.
+    \o \c {\l QWidget} - The name of a class documented with the \l
+    {class-command} {\\class} command.
 
-               ...
+    \o \c {\l QWidget::sizeHint()} - The name of a member function,
+    documented with or without an \l {fn-command} {\\fn} command.
 
-               Regexps are built up from expressions, quantifiers, and
-               \l assertions.
-           * /
-           \endcode
+    \o \c {\l <QtGlobal>} - The subject of a \l {headerfile-command}
+    {\\headerfile} command.
 
-           For the one-parameter version the braces can often
-           be omitted. See the \l {i}{\\i} command for the \l
-           {argument}{argument conventions}.
+    \o \c {\l widgets/wiggly} - The relative path used in an \l
+    {example-command} {\\example} command.
 
-           The \\l command supports several kinds of links:
+    \o \c {\l {QWidget Class Reference}} - The title used in a
+    \l {title-command} {\\title} command.
 
-           \list
-           \o \c {\l QWidget} - a defined \l {class}{\\class}
-           \o \c {\l QWidget::sizeHint()} - a defined member
-               function (\l {fn}{\\fn})
-           \o \c {\l <QtGlobal>} - a defined \l {headerfile}{\\headerfile}
-           \o \c {\l widgets/wiggly} - a defined
-              \l {example-command}{\\example}
-           \o \c {\l {QWidget Class Reference}} - a defined \l {title}{\\title}
-           \o \c {\l {Introduction}}- a defined \l{part}{\\part},
-              \l{chapter}{\\chapter} or \l {sectionOne}{\\section...}
-           \o \c {\l fontmatching} - a defined \l {target}{\\target}
-           \o \c {\l {Shared Classes}} - a defined \l {keyword}{\\keyword}
-           \o \c {\l network.html} - a defined \l {page}{\\page}
-           \o \c {\l http://www.trolltech.com/} - a URL
-           \endlist
+    \o \c {\l {Introduction to QDoc}}- The text from one of the
+    \l{part-command} {\\part}, \l{chapter} {\\chapter} or \l
+    {sectionOne-command} {\\section} commands.
 
-           QDoc also tries to make a link out of any words that don't
-           resemble any normal English words, for example Qt class
-           names or functions, like QWidget or QWidget::sizeHint(). In
-           these cases, the \\l command can actually be omitted, but
-           by using the command, you ensure that QDoc will emit a
-           warning if it cannot find the link target. In addition, if
-           you only want the function name to appear in the link, you
-           can use the following syntax:
+    \o \c {\l fontmatching} - The argument of a \l {target-command}
+    {\\target} command.
 
-           \list
-               \o \c {\l {QWidget::}{sizeHint()}}
-           \endlist
+    \o \c {\l {Shared Classes}} - A keyword named in a \l
+    {keyword-command} {\\keyword} command.
 
-           See also \l {sa}{\\sa}, \l {target}{\\target} and \l
-           {keyword}{\\keyword}.
+    \o \c {\l network.html} - The file name used in a \l
+    {page-command} {\\page} command.
 
-    \row
-        \o \bold \\sa \target sa
-        \o \bold {The \\sa command defines a list of links that will
-           be rendered in a separate "See also" section at the bottom
-           of the documentation.}
+    \o \c {\l http://www.trolltech.com/} - A URL.
 
-           The command takes a comma-separated list of links as its
-           argument. If the line ends with a comma, you can continue
-           on a second line.  The general syntax is:
+    \endlist
 
-           \code
-           \sa {the first link}, {the second link},
-               {the third link}, ...
-           \endcode
+    QDoc also tries to make a link out of any words that don't
+    resemble any normal English words, for example Qt class names or
+    functions, like QWidget or QWidget::sizeHint(). In these cases,
+    the \\l command can actually be omitted, but by using the command,
+    you ensure that QDoc will emit a warning if it cannot find the
+    link target. In addition, if you only want the function name to
+    appear in the link, you can use the following syntax:
 
-           QDoc will automatically try to generate "See also" links
-           interconnecting a property's various functions. For
-           example, an setVisible() function will automatically get a
-           link to visible() and vice versa.
+    \list
+        \o \c {\l {QWidget::} {sizeHint()}}
+    \endlist
 
-           In general, QDoc will generate "See also" links that
-           interconnect the functions that access the same
-           property. It recognizes four different syntax versions:
+    QDoc renders this as:
 
-           \list
-           \o \c property()
-           \o \c setProperty()
-           \o \c isProperty()
-           \o \c hasProperty()
-           \endlist
+    \quotation
+    \l {QWidget::} {sizeHint()}   
+    \endquotation
 
-           The \\sa command supports the same kind
-           of links as the \l {l}{\\l} command. For example:
+    See also \l {sa-command} {\\sa}, \l {target-command} {\\target}
+    and \l {keyword-command} {\\keyword}.
 
-           \code
-           / *!
-               Appends the actions \a actions to this widget's
-               list of actions.
 
-               \sa removeAction(), QMenu, addAction()
-           * /
-           void QWidget::addActions(QList<QAction *> actions)
-           {
-           ...
-           }
-           \endcode
+    \target sa-command
+    \section1 \\sa (see also)
 
-           will be rendered as
+    The \\sa command defines a list of links that will be rendered in
+    a separate "See also" section at the bottom of the documentation
+    unit.
 
-           \quotation
-               \bold {void QWidget::addActions ( QList<QAction*>
-               \i actions )}
+    The command takes a comma-separated list of links as its
+    argument. If the line ends with a comma, you can continue
+    the list on the next line.  The general syntax is:
 
-               Appends the actions \i actions to this widget's
-               list of actions.
+    \code
+    \sa {the first link}, {the second link},
+        {the third link}, ...
+    \endcode
 
-               See also \l {QWidget::removeAction()}{removeAction()},
-               \l QMenu, and \l {QWidget::addAction()}{addAction()}.
-           \endquotation
+    QDoc will automatically try to generate "See also" links
+    interconnecting a property's various functions. For example, a
+    setVisible() function will automatically get a link to visible()
+    and vice versa.
 
-           See also \l {l}{\\l}, \l {target}{\\target} and \l
-           {keyword}{\\keyword}.
+    In general, QDoc will generate "See also" links that interconnect
+    the functions that access the same property. It recognizes four
+    different syntax versions:
 
-    \row
-        \o \bold \\target \target target
-        \o \bold {The \\target command defines an explicit point in the
-           documentation that you can later link to using the \l {l}{\\l}
-           and \l {sa}{\\sa} commands.}
+    \list
+      \o \c property()
+      \o \c setProperty()
+      \o \c isProperty()
+      \o \c hasProperty()
+    \endlist
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the target name with a line
-           break.
+    The \\sa command supports the same kind of links as the \l
+    {l-command} {\\l} command. For example:
 
-           For example:
+    \code
+      / *!
+         Appends the actions \a actions to this widget's
+         list of actions.
+
+         \sa removeAction(), QMenu, addAction()
+      * /
+      void QWidget::addActions(QList<QAction *> actions)
+      {
+      ...
+      }
+    \endcode
 
-           \code
-           / *!
-               \target capturing parentheses
-               \section1 Capturing Text
+    QDoc renders this as:
 
-               Parentheses allow us to group elements together so that
-               we can quantify and capture them.
+    \quotation
+        \bold {void QWidget::addActions ( QList<QAction*>
+        \e actions )}
 
-               ...
-           * /
-           \endcode
+        Appends the actions \e actions to this widget's list of
+        actions.
 
-           can be referenced with
+        See also \l {QWidget::removeAction()} {removeAction()},
+        \l QMenu, and \l {QWidget::addAction()} {addAction()}.
+    \endquotation
 
-           \list
-           \o \c {\l {capturing parentheses}}
-              (from elsewhere in the same comment)
-           \o \c {\l qregexp.html#capturing-parentheses}
-              (from anywhere else)
-           \endlist
+    See also \l {l-command} {\\l}, \l {target-command} {\\target} and
+    \l {keyword-command} {\\keyword}.
 
-           within a documentation unit, and with
 
-           \list
-           \o \c {\l http://www.trolltech.com/4.0/doc/html/qregexp.html#capturing-parentheses}
-           \endlist
+    \target target-command
+    \section1 \\target 
 
-           on a more global scale.
+    The \\target command names a place in the documentation that you
+    can link to using the \l {l-command} {\\l (link)} and \l
+    {sa-command} {\\sa (see also)} commands.
 
-           If the target name does't contain any spaces, the brackets can
-           be omitted as well.
+    The text up to the line break becomes the target name. Be sure to
+    follow the target name with a line break. Curly brackets are not
+    required around the target name, but they may be required when the
+    target name is used in a link cammand. See below.
 
-           See also \l {l}{\\l}, \l {sa}{\\sa} and \l
-           {keyword}{\\keyword}.
+    For example:
 
-    \row
-        \o \bold \\keyword \target keyword
-        \o \bold {The \\keyword command defines an explicit point in the
-           documentation that you can later link to using the \l {l}{\\l}
-           and \l {sa}{\\sa} commands.}
+    \code
+    / *!
+        \target capturing parentheses
+        \section1 Capturing Text
 
-           Keywords must be unique within the entire set of
-           documentation processed in on QDoc run.  The command
-           considers the rest of the line as part of its argument,
-           make sure to follow the keyword with a line break.
+        Parentheses allow us to group elements together so that
+        we can quantify and capture them.
 
-           The \\keyword command is similar to \l {target}{\\target},
-           but stronger.  A keyword can be referenced from anywhere
-           using a simple syntax. For example:
+        ...
+    * /
+    \endcode
 
-           \code
-           / *!
-               \class QRegExp
-               \reentrant
-               \brief The QRegExp class provides pattern
-                      matching using regular expressions.
-               \ingroup tools
-               \ingroup misc
-               \ingroup shared
-               \mainclass
+    The target name \e{capturing parentheses} can be linked from
+    within the same document containing the target in two ways:
 
-               \keyword regular expression
+    \list
+      \o \c {\l {capturing parentheses}} (from within the same qdoc comment)
+      \o \c {\l qregexp.html#capturing-parentheses} (from elsewhere in the same document)
+    \endlist
 
-               Regular expressions, or "regexps", provide a way to
-               find patterns within text.
+    \note The brackets in the link example are required because the
+    target name contains spaces.
 
-               ...
-           * /
-           \endcode
+    From other documents, the target name can be linked this way:
 
-           can be referenced like this
+    \list
+      \o \c {\l http://www.trolltech.com/4.0/doc/html/qregexp.html#capturing-parentheses}
+    \endlist
 
-           \code
-           / *!
-               When a string is surrounded by slashes, it's
-               interpreted as a \l regular expression.
-           * /
-           \endcode
+    See also \l {l-command} {\\l}, \l {sa-command} {\\sa} and \l
+    {keyword-command} {\\keyword}.
 
-           which will be rendered as
+    \target keyword-command
+    \section1 \\keyword 
 
-           \quotation
-               When a string is surrounded by slashes, it's
-               interpreted as a \l {regular expression}.
-           \endquotation
+    The \\keyword command names a place in the documentation that you
+    can link to using the \l {l-command} {\\l (link)} and \l
+    {sa-command} {\\sa (see also)} commands.
 
-           If the keyword does't contain any spaces, the brackets can
-           be omitted as well.
+    The \\keyword command is like the \l {target-command} {\\target}
+    command, but stronger. A keyword can be linked from anywhere using
+    a simple syntax. For example:
+
+    Keywords must be unique over all the documents processed during
+    the QDoc run. The command uses the rest of the line as its
+    argument. Be sure to follow the keyword with a line break.
+
+
+    \code
+    / *!
+        \class QRegExp
+        \reentrant
+        \brief The QRegExp class provides pattern
+               matching using regular expressions.
+        \ingroup tools
+        \ingroup misc
+        \ingroup shared
+        \mainclass
+
+        \keyword regular expression
+
+        Regular expressions, or "regexps", provide a way to
+        find patterns within text.
+
+        ...
+    * /
+    \endcode
+
+    The location marked with the keyword can be linked with:
+
+    \code
+    / *!
+        When a string is surrounded by slashes, it is
+        interpreted as a \l {regular expression}.
+    * /
+    \endcode
+
+    QDoc renders this as:
+
+    \quotation
+        When a string is surrounded by slashes, it's
+        interpreted as a \l {regular expression}.
+    \endquotation
+
+    If the keyword text contains spaces, the brackets are required.
+
+    See also \l {l-command} {\\l (link)}, \l {sa-command} {\\sa (see
+    also)} and \l {target-command} {\\target}.
 
-           See also \l {l}{\\l}, \l {sa}{\\sa} and \l
-           {target}{\\target}.
-    \endtable
 */
 
 /*!
-    \page 09-qdoc-commands-graphic.html
-    \previouspage Linking Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Container Commands
+    \page 09-qdoc-commands-includingimages.html
+    \previouspage Creating Links
+    \contentspage Table of Contents
+    \nextpage Tables and Lists
 
-    \title Graphic Commands
+    \title Including Images
 
     The graphic commands makes it possible to include images in the
     documentation. The images can be rendered as separate paragraphs,
     or within running text.
 
-    \section1 Alphabetical List
-
-    \l {09-qdoc-commands-graphic.html#caption}{\\caption},
-    \l {09-qdoc-commands-graphic.html#image}{\\image},
-    \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage}
+    \target image-command
+    \section1 \\image 
 
-    \section1 Command Descriptions
+    The \\image command expands to the image specified by its first
+    argument, and renders it centered as a separate paragraph.
 
-    \table
-    \header
-        \o Command
-        \o Description
+    The \\image command replaces the old \\img command. For more
+    information, see the \l
+    {26-qdoc-commands-compatibility.html#image-versus-img}
+    {compatibility} section.
 
-    \row
-        \o \bold \\image \target image
-        \o \bold {The \\image command expands to the image specified by its
-           argument, and renders it centered as a separate paragraph.}
-
-           The \\image command replaces the old \\img command. For more
-           information, see the \l
-           {26-qdoc-commands-compatibility.html#image-versus-img}
-           {compatibility} section.
-
-           The command takes two arguments. The first is the name of
-           the image file. The second argument is optional and is a
-           simple description of the image equivalent to the HTML
-           alt="" in an image tag. The description is used for
-           tooltips, and when a browser doesn't support images like
-           the Lynx text browser.
-
-           The command considers the rest of the line after the file
-           name its second argument, make sure that you follow the
-           filename or description with a line break. Braces are only
-           necessary if the description spans several lines.
+    The command takes two arguments. The first argument is the name of
+    the image file. The second argument is optional and is a simple
+    description of the image, equivalent to the HTML alt="" in an image
+    tag. The description is used for tooltips, and for when a browser
+    doesn't support images, like the Lynx text browser.
 
-           For example:
+    The remaining text \e{after} the file name is the optional,
+    description argument. Be sure to follow the file name or the
+    description with a line break. Curly brackets are required if the
+    description argument spans multiple lines.
 
-           \code
-           / *!
-               Qt by Trolltech is a C++ toolkit for cross-platform GUI
-               application development.
+    For example:
 
-               \image happyguy.jpg "Happy guy"
+    \code
+    / *!
+        Qt by Trolltech is a C++ toolkit for cross-platform GUI
+        application development.
 
-               Qt provides single-source portability across Microsoft
-               Windows, Mac OS X, Linux, and all major commercial Unix
-               variants. It is also available for embedded devices.
-           * /
-           \endcode
+        \image happyguy.jpg "Happy guy"
 
-           will be rendered as
+        Qt provides single-source portability across Microsoft
+        Windows, Mac OS X, Linux, and all major commercial Unix
+        variants. It is also available for embedded devices.
+    * /
+    \endcode
 
-           \quotation
-               Qt by Trolltech is a C++ toolkit for cross-platform GUI
-               application development.
+    QDoc renders this as:
 
-               \image happyguy.jpg image "Happy guy"
+    \quotation
+        Qt by Trolltech is a C++ toolkit for cross-platform GUI
+        application development.
 
-               Qt provides single-source portability across Microsoft
-               Windows, Mac OS X, Linux, and all major commercial Unix
-               variants. It is also available for embedded devices.
-           \endquotation
+        \image happyguy.jpg image "Happy guy"
 
-           See also \l {inlineimage}{\\inlineimage} and \l
-           {caption}{\\caption}.
+        Qt provides single-source portability across Microsoft
+        Windows, Mac OS X, Linux, and all major commercial Unix
+        variants. It is also available for embedded devices.
+        \endquotation
 
-    \row
-        \o \bold \\inlineimage \target inlineimage
-        \o \bold {The \\inlineimage command expands to the image
-           specified by its argument; the image is rendered inline
-           with the rest of the text.}
+    See also \l {inlineimage-command} {\\inlineimage} and \l
+    {caption-command} {\\caption}.
 
-           The command takes two arguments. The first is the name of
-           the image file. The second argument is optional and is a
-           simple description of the image equivalent to the HTML
-           alt="" in an image tag. The description is used for
-           tooltips, and when a browser doesn't support images like
-           the Lynx text browser.
+    \target inlineimage-command
+    \section1 \\inlineimage 
 
-           The most common use of the \\inlineimage command is in
-           lists and tables. For example:
+    The \\inlineimage command expands to the image specified by its
+    argument. The image is rendered inline with the rest of the text.
 
-           \code
-           / *!
-               \list 1
-               \o \inlineimage happy.gif Oh so happy!
-               \o \inlineimage happy.gif Oh so happy!
-               \o \inlineimage happy.gif Oh so happy!
-               \endlist
-           * /
-           \endcode
+    The command takes two arguments. The first argument is the name of
+    the image file. The second argument is optional and is a simple
+    description of the image, equivalent to the HTML alt="" in an image
+    tag. The description is used for tooltips, and for when a browser
+    doesn't support images, like the Lynx text browser.
 
-           will be rendered as
+    The most common use of the \\inlineimage command is in lists and
+    tables. Here is an example of including inline images in a list:
 
-           \list 1
-           \o \inlineimage happy.gif Oh so happy!
-           \o \inlineimage happy.gif Oh so happy!
-           \o \inlineimage happy.gif Oh so happy!
-           \endlist
+    \code
+    / *!
+        \list 1
+          \o \inlineimage happy.gif Oh so happy!
+          \o \inlineimage happy.gif Oh so happy!
+          \o \inlineimage happy.gif Oh so happy!
+        \endlist
+    * /
+    \endcode
 
-           And
+    QDoc renders this as:
 
-           \code
-           / *!
-               \table
-               \header
-                   \o Trolltech
-                   \o Trolltech
-               \row
-                   \o \inlineimage happy.gif Oh so happy!
-                   \o \inlineimage happy.gif Oh so happy!
-               \row
-                   \o \inlineimage happy.gif Oh so happy!
-                   \o \inlineimage happy.gif Oh so happy!
-               \endtable
-           * /
-           \endcode
+    \list 1
+      \o \inlineimage happy.gif Oh so happy!
+      \o \inlineimage happy.gif Oh so happy!
+      \o \inlineimage happy.gif Oh so happy!
+    \endlist
 
-           will be rendered as
+    Her eis an example of including inline images in a table:
 
-           \raw HTML
-               <table align="center" cellpadding="2"
-                   cellspacing="1" border="0">
-               <tr valign="top" bgcolor="#a2c511">
-                   <th>Trolltech</th>
-                   <th>Trolltech</th>
-               </tr>
+    \code
+    / *!
+        \table
+        \header
+            \o Trolltech
+            \o Trolltech
+        \row
+            \o \inlineimage happy.gif Oh so happy!
+            \o \inlineimage happy.gif Oh so happy!
+        \row
+            \o \inlineimage happy.gif Oh so happy!
+            \o \inlineimage happy.gif Oh so happy!
+        \endtable
+    * /
+    \endcode
 
-               <tr valign="top" bgcolor="#f0f0f0">
-                   <td><img src="images/happy.gif" alt="Oh so happy!" />
-                   </td>
-                   <td><img src="images/happy.gif" alt="Oh so happy!" />
-                   </td>
-               </tr>
+    QDoc renders this as:
 
-               <tr valign="top" bgcolor="#f0f0f0">
-                   <td><img src="images/happy.gif" alt="Oh so happy!"/>
-                   </td>
-                   <td><img src="images/happy.gif" alt="Oh so happy!" />
-                   </td>
-               </tr>
+    \raw HTML
+        <table align="center" cellpadding="2"
+            cellspacing="1" border="0">
+        <tr valign="top" bgcolor="#a2c511">
+            <th>Trolltech</th>
+            <th>Trolltech</th>
+        </tr>
+        <tr valign="top" bgcolor="#f0f0f0">
+            <td><img src="images/happy.gif" alt="Oh so happy!" />
+            </td>
+            <td><img src="images/happy.gif" alt="Oh so happy!" />
+            </td>
+        </tr>
+        <tr valign="top" bgcolor="#f0f0f0">
+            <td><img src="images/happy.gif" alt="Oh so happy!"/>
+            </td>
+            <td><img src="images/happy.gif" alt="Oh so happy!" />
+            </td>
+        </tr>
+        </table>
+    \endraw
 
-               </table>
-           \endraw
+    The command can also be used to insert an image inline with the
+    text. For example:
 
-           The command can also be used to insert an image
-           inline with the regular text. For example:
+    \code
+    / *!
+        \inlineimage training.jpg Training by Trolltech
+        The Qt Programming course is offered as a
+        five day Open Enrollment Course. The classes
+        are open to the public.While the course is open
+        to anyone who wants to learn, attendees should
+        have significant experience in C++ development
+        to derive maximum benefit from the course.
+    * /
+    \endcode
 
-           \code
-           / *!
-               \inlineimage training.jpg Training by Trolltech
-               The Qt Programming course is offered as a
-               five day Open Enrollment Course. The classes
-               are open to the public.While the course is open
-               to anyone who wants to learn, attendees should
-               have significant experience in C++ development
-               to derive maximum benefit from the course.
-           * /
-           \endcode
+    QDoc renders this as:
 
-           will be rendered as
+    \quotation
+       \inlineimage training.jpg Training by Trolltech
+        The Qt Programming course is offered as a
+        five day Open Enrollment Course. The classes
+        are open to the public.While the course is open
+        to anyone who wants to learn, attendees should
+        have significant experience in C++ development
+        to derive maximum benefit from the course.
+    \endquotation
 
-           \quotation
-               \inlineimage training.jpg Training by Trolltech
-               The Qt Programming course is offered as a
-               five day Open Enrollment Course. The classes
-               are open to the public.While the course is open
-               to anyone who wants to learn, attendees should
-               have significant experience in C++ development
-               to derive maximum benefit from the course.
-           \endquotation
+    See also \l {image-command} {\\image} and \l {caption-command} {\\caption}.
 
-           See also \l {image}{\\image} and \l {caption}{\\caption}.
+    \target caption-command
+    \section1 \\caption 
 
-    \row
-        \o \bold \\caption \target caption
-        \o \bold {The \\caption command provides a caption for an image.}
+    The \\caption command provides a caption for an image.
 
-           The command follows the same conventions for parentheses and use
-           of braces for its \l argument as the \l {i}{\\i} command.
+    The command takes all the text up to the end of the paragraph to
+    be the caption. Experiment until you get the effect you want.
 
-           \warning This is preliminary functionality. The
-           command is not fully implemented.
+    \code
+    / *!
+      \table 100%
+        \row
+          \o \image windowsvista-pushbutton.png 
+             \caption The QPushButton widget provides a command button.
+          \o \image windowsvista-toolbutton.png
+             \caption The QToolButton class provides a quick-access button to commands
+             or options, usually used inside a QToolBar.
+       \endtable
+    * /
+    \endcode
 
-           See also \l {image}{\\image} and \l
-           {inlineimage}{\\inlineimage}
+    QDoc renders this as:
 
+    \table 100%
+      \row
+        \o \image windowsvista-pushbutton.png 
+           \caption The QPushButton widget provides a command button.
+        \o \image windowsvista-toolbutton.png
+           \caption The QToolButton class provides a quick-access button to commands
+           or options, usually used inside a QToolBar.
     \endtable
+
+    See also \l {image-command} {\\image} and \l {inlineimage-command}
+    {\\inlineimage} 
 */
 
 /*!
-    \page 10-qdoc-commands-container.html
-    \previouspage Graphic Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Document Contents Commands
-
-    \title Container Commands
+    \page 10-qdoc-commands-tablesandlists.html
+    \previouspage Including Images
+    \contentspage Table of Contents
+    \nextpage Special Content
 
-    The container commands create tables and lists with associated
-    items and contents. A list is rendered left aligned as a separate
-    paragraph. A table is rendered centered as a separate paragraph,
-    and its width depends on its content.
+    \title Tables and Lists
 
-   \section1 Alphabetical List
+    These commands enable creating lists and tables. A list is
+    rendered left aligned as a separate paragraph. A table is rendered
+    centered as a separate paragraph. The table width depends on the
+    width of its contents.
 
-    \l {10-qdoc-commands-container.html#header}{\\header},
-    \l {10-qdoc-commands-container.html#list}{\\list},
-    \l {10-qdoc-commands-container.html#o}{\\o},
-    \l {10-qdoc-commands-container.html#omitvalue}{\\omitvalue},
-    \l {10-qdoc-commands-container.html#row}{\\row},
-    \l {10-qdoc-commands-container.html#table}{\\table},
-    \l {10-qdoc-commands-container.html#value}{\\value}
+    \target table-command
+    \section1 \\table 
 
-    \section1 Command Descriptions
+    The \\table and \\endtable commands delimit the contents of a
+    table.
 
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\table \target table
-        \o \bold {The \\table command and the corresponding \\endtable
-           command delimit the contents of a table.}
-
-           The command accepts a single argument specifying the
-           table's width in percentage:
+    The command accepts a single argument specifying the table's width
+    as a percentage of the page width:
 
            \code
            / *!
@@ -2424,15 +2443,15 @@
            * /
            \endcode
 
-           The code above ensures that the table will fill all
-           available space. If the table's width is smaller than 100 %,
-           the table will be centered in the generated documentation.
+    The code above ensures that the table will fill all available
+    space. If the table's width is smaller than 100 %, the table will
+    be centered in the generated documentation.
 
-           A table can contain headers, rows and columns. A row starts
-           with a \l {row}{\\row} command and consists of cells, which
-           starts with a \l {o}{\\o} command. There is also a \l
-           {header}{\\header} command which is a special kind of row
-           with a special formatting. For example:
+    A table can contain headers, rows and columns. A row starts with a
+    \l {row-command} {\\row} command and consists of cells, which
+    starts with a \l {o-command} {\\o} command. There is also a \l
+    {header-command} {\\header} command which is a special kind of row
+    with a special formatting. For example:
 
            \code
            / *!
@@ -2458,7 +2477,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2"
@@ -2498,8 +2517,8 @@
                </table>
            \endraw
 
-           You can also make cells span several rows and columns. For
-           example:
+    You can also make cells span several rows and columns. For
+    example:
 
            \code
            / *!
@@ -2519,7 +2538,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2" cellspacing="1"
@@ -2548,20 +2567,20 @@
                </table>
            \endraw
 
-           See also \l {header}{\\header}, \l {row}{\\row} and \l {o}{\\o}.
+    See also \l {header-command} {\\header}, \l {row-command} {\\row} and \l {o-command} {\\o}.
 
-    \row
-        \o \bold \\header \target header
-        \o \bold {The \\header command indicates that the following
-           table cells are the current table's column headers.}
+    \target header-command
+    \section1 \\header 
+
+    The \\header command indicates that the following table cells are
+    the current table's column headers.
 
-           The command can only be used within the \l{table}
-           {\\table...\\endtable} commands. A header can contain
-           several cells. A cell is created with the \l {o}{\\o}
-           command.
+    The command can only be used within the \l{table-command}
+    {\\table...\\endtable} commands. A header can contain several
+    cells. A cell is created with the \l {o-command} {\\o} command.
 
-           A header cell's text is centered within the table cell and
-           rendered using a bold font. For example:
+    A header cell's text is centered within the table cell and
+    rendered using a bold font. For example:
 
            \code
            / *!
@@ -2577,7 +2596,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2"
@@ -2598,23 +2617,22 @@
                </table>
            \endraw
 
-           See also \l {table}{\\table}, \l {row}{\\row} and \l {o}{\\o}.
+    See also \l {table-command} {\\table}, \l {row-command} {\\row} and \l {o-command} {\\o}.
 
-    \row
-        \o \bold \\row \target row
-        \o \bold {The \\row command indicates that the following table
-           cells belong to the same row in the current table.}
+    \target row-command
+    \section1 \\row 
 
-           The command can only be used within the \l{table}
-           {\\table...\\endtable} commands. A row can contain
-           several cells. A cell is created with the \l {o}{\\o}
-           command.
+    The \\row command begins a new row in a table. The \l {o-command}
+    {\\o items} that belong in the new row will immediately follow the
+    \\row.
 
-           The background cell color of each row alternate between two
-           shades of grey, making it easier to distinguish the rows
-           from each other. The cells' contents is left aligned.
+    The command can only be used within the \l{table-command}
+    {\\table...\\endtable} commands. A row can contain several
+    cells. A cell is created with the \l {o-command} {\\o} command.
 
-           For example:
+    The background cell color of each row alternates between two
+    shades of grey, making it easier to distinguish the rows from each
+    other. The cells' contents is left aligned. For example:
 
            \code
            / *!
@@ -2640,7 +2658,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2"
@@ -2680,44 +2698,45 @@
                </table>
            \endraw
 
-           See also \l {table}{\\table}, \l {header}{\\header} and \l
-           {o}{\\o}.
+    See also \l {table-command} {\\table}, \l {header-command}
+    {\\header} and \l {o-command} {\\o}.
 
-    \row
-        \o \bold \\value \target value
-        \o \bold {The \\value command starts the documentation of a C++ enum
-           item}.
+    \target value-command
+    \section1 \\value 
 
-           The command's first argument is the enum item. Then follows
-           its associated description. The description argument ends
-           at the next blank line or \\value. The arguments are
-           rendered within a table.
+    The \\value command starts the documentation of a C++ enum item.
 
-           The documentation will be located in the associated class,
-           header file or namespace documentation. See the \l
-           {enum}{\\enum} documentation for an example.
+    The command's first argument is the enum item. Then follows its
+    associated description. The description argument ends at the next
+    blank line or \\value. The arguments are rendered within a table.
 
-           See also \l {enum}{\\enum} and \l {omitvalue}{\\omitvalue}.
+    The documentation will be located in the associated class, header
+    file or namespace documentation. See the \l {enum-command}
+    {\\enum} documentation for an example.
 
-    \row
-        \o \bold \\omitvalue \target omitvalue
-        \o \bold {The \\omitvalue command excludes a C++ enum item
-           from the documentation}.
+    See also \l {enum-command} {\\enum} and \l {omitvalue-command} {\\omitvalue}.
+
+    \target omitvalue-command
+    \section1 \\omitvalue 
 
-           The command's only argument is the name of the enum item
-           that will be omitted. See the \l {enum}{\\enum}
-           documentation for an example.
+    The \\omitvalue command excludes a C++ enum item from the
+    documentation.
 
-           See also \l {enum}{\\enum} and \l {value}{\\value}.
+    The command's only argument is the name of the enum item that will
+    be omitted. See the \l {enum-command} {\\enum} documentation for
+    an example.
 
-    \row
-        \o \bold \\list \target list
-        \o \bold {The \\list command and the corresponding \\endlist
-           command delimit a list of items.}
+    See also \l {enum-command} {\\enum} and \l {value-command}
+    {\\value}.
+
+    \target list-command
+    \section1 \\list 
 
-           You need to create each list item explicitly using the \l
-           {o}{\\o} command. A list can contain one or more items; it
-           can also be nested. For example:
+    The \\list and \\endlist commands delimit a list of items.
+
+    Create each list item with the \l {o-command} {\\o} command. A
+    list always contains one or more items. Lists can be nested. For
+    example:
 
            \code
            / *!
@@ -2738,7 +2757,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \list
            \o Qt Reference Documentation: Getting Started
@@ -2755,8 +2774,8 @@
                \endlist
            \endlist
 
-           The \\list command takes an optional argument providing
-           alternative appearances for the list items. For example:
+    The \\list command takes an optional argument providing
+    alternative appearances for the list items. For example:
 
            \code
            / *!
@@ -2768,7 +2787,7 @@
            * /
            \endcode
 
-           will render the list items with bullets (the default):
+     QDoc renders the list items with bullets (the default):
 
            \list
                \o How to Learn Qt
@@ -2776,9 +2795,12 @@
                \o Tutorial and Examples
            \endlist
 
-           If you provide 'A' as an argument to the \\list command,
-           the bullets are replaced with characters following in
-           alphabetical order:
+    \warning There appears to be a bug in qdoc3 here. If you include
+    any of the argument types, you get a numeric list. We're looking
+    into it.
+
+    If you provide 'A' as an argument to the \\list command, the
+    bullets are replaced with characters in alphabetical order:
 
            \list A
                \o How to Learn Qt
@@ -2786,8 +2808,8 @@
                \o Tutorial and Examples
            \endlist
 
-           If you replace 'A' with '1', the list items are rendered
-           with numbers following in ascending order:
+     If you replace 'A' with '1', the list items are numbered in
+     ascending order:
 
            \list 1
                \o How to Learn Qt
@@ -2796,8 +2818,8 @@
 
            \endlist
 
-           If you provide 'i' as the argument, the default bullets are
-           replaced with roman numerals:
+    If you provide 'i' as the argument, the bullets are replaced with
+    roman numerals:
 
            \list i
                \o How to Learn Qt
@@ -2805,9 +2827,9 @@
                \o Tutorial and Examples
            \endlist
 
-           Or finally, you can make the list items appear with roman
-           numbers following in ascending order if you provide 'I' as
-           the optional argument:
+    Finally, you can make the list items appear with roman numbers
+    following in ascending order if you provide 'I' as the optional
+    argument:
 
            \list I
                \o How to Learn Qt
@@ -2815,9 +2837,9 @@
                \o Tutorial and Examples
            \endlist
 
-           You can also make the listing start at any character or
-           number by simply provide the number or character you want
-           to start at. For example:
+    You can also make the listing start at any character or number by
+    simply provide the number or character you want to start at. For
+    example:
 
            \code
            / *!
@@ -2829,7 +2851,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \list G
                \o How to Learn Qt
@@ -2837,30 +2859,30 @@
                \o Tutorial and Examples
            \endlist
 
-           See also \l {o}{\\o}.
+    See also \l {o-command} {\\o}.
 
-    \row
-        \o \bold \\o \target o
-        \o \bold {The \\o command announce a table or list item.}
-
-           Earlier we used the \l {i}{\\i} command for this purpose. For more
-           information see the \l
-           {26-qdoc-commands-compatibility.html#o-versus-i}{compatibility}
-           section.
-
-           The command can only be used within the \l{table}
-           {\\table...\\endtable} or \l{list}{\\list... \\endlist}
-           commands.
-
-           It considers everything until the next occurrence
-           of the \\o command, or the currently applicable \l
-           {table}{\\endtable} or \l {list}{\\endlist} command, as its
-           argument. For examples, see \l {table}{\\table} and \l
-           {list}{\\list}.
-
-           If the command is used within a table, you can in addition
-           specify how many rows or columns the item should span. For
-           example:
+    \target o-command
+    \section1 \\o (cell, item)
+
+    The \\o command announce a table or list item.
+
+    Earlier we used the \l {i-command} {\\i} command for this
+    purpose. For more information see the \l
+    {26-qdoc-commands-compatibility.html#o-versus-i} {compatibility}
+    section.
+
+    The command can only be used within the \l{table-command}
+    {\\table...\\endtable} or \l{list-command} {\\list... \\endlist}
+    commands.
+
+    It considers everything until the next occurrence of the \\o
+    command, or the currently applicable \l {table-command}
+    {\\endtable} or \l {list-command} {\\endlist} command, as its
+    argument. For examples, see \l {table-command} {\\table} and \l
+    {list-command} {\\list}.
+
+    If the command is used within a table, you can in addition specify
+    how many rows or columns the item should span. For example:
 
            \code
            / *!
@@ -2880,7 +2902,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2" cellspacing="1"
@@ -2909,333 +2931,133 @@
                </table>
            \endraw
 
-           If not specified, the item will span one column and one row.
+    If not specified, the item will span one column and one row.
+
+    See also \l {table-command} {\\table}, \l {header-command}
+    {\\header}, \l {list-command} {\\list} and \l {o-command} {\\o}.
 
-           See also \l {table}{\\table}, \l {header}{\\header},
-           \l {list}{\\list} and \l {o}{\\o}.
-    \endtable
 */
 
 /*!
-    \page 11-qdoc-commands-documentcontents.html
-    \previouspage Container Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Miscellaneous Commands
+    \page 11-qdoc-commands-specialcontent.html
+    \previouspage Tables and Lists
+    \contentspage Table of Contents
+    \nextpage Miscellaneous
 
-    \title Document Contents Commands
+    \title Special Content
 
     The document contents commands identify parts of the documentation,
     i.e. parts with a special rendering, conceptual meaning or
     function.
 
-    \section1 Alphabetical List
-
-    \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract},
-    \l {11-qdoc-commands-documentcontents.html#brief}{\\brief},
-    \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote},
-    \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese},
-    \l {11-qdoc-commands-documentcontents.html#tableofcontents}
-       {\\tableofcontents},
-    \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation},
-    \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
-
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\abstract \target abstract
-        \o \bold {The \\abstract command and the corresponding \\endabstract
-           command delimit a document's abstract section.}
-
-           The abstract section is rendered as an indented italicized
-           paragraph.
-
-           \warning This is preliminary funcionality. The
-           command is not fully implemented. Currently, the abstract
-           section is rendered as a regular HTML paragraph. For
-           example:
-
-           \code
-           / *!
-               \abstract
-                   Qt by Trolltech is a C++ toolkit for cross-platform
-                   GUI application development. Qt provides
-                   single-source portability across Microsoft Windows,
-                   Mac OS X, Linux, and all major commercial Unix
-                   variants. It is also available for embedded
-                   devices.
-               \endabstract
-           * /
-           \endcode
-
-           will be rendered as
+    \target abstract-command
+    \section1 \\abstract 
 
-           \abstract
-              Qt by Trolltech is a C++ toolkit for cross-platform GUI
-              application development. Qt provides single-source
-              portability across Microsoft Windows, Mac OS X, Linux,
-              and all major commercial Unix variants. It is also
-              available for embedded devices.
-           \endabstract
+    The \\abstract and \\endabstract commands delimit a
+    document's abstract section.
 
-    \row
-        \o \bold \\quotation \target quotation
-        \o \bold { The \\quotation command and the corresponding
-           \\endquotation command delimit a quotation remark.}
+    The abstract section is rendered as an indented italicized
+    paragraph.
 
-           This command replaces the old \\quote command. For more
-           information see the \l
-           {26-qdoc-commands-compatibility.html#quotation-versus-quote}
-           {compatibility} section.
+    \warning The \bold{\\abstract} and \bold{\\endabstract} commands
+    have not been implemented. The abstract section is rendered as a
+    regular HTML paragraph.
 
-           The remark is rendered as a separate centered
-           paragraph. For example:
+    \target quotation-command
+    \section1 \\quotation 
 
-           \code
-           / *!
-               While the prospect of a significantly broader market is
-               good news for Firstlogic, the notion also posed some
-               challenges. Dave Dobson, director of technology for the La
-               Crosse, Wisconsin-based company, said:
+    The \\quotation and \\endquotation commands delimit a long quotation.
 
+    The text in the delimited block is surrounded by
+    \bold{<blockquote>} and \bold{</blockquote>} in the html output,
+    e.g.:
 
-               \quotation
-                   As our solutions were being adopted into new
-                   environments, we saw an escalating need for easier
-                   integration with a wider range of enterprise
-                   applications.
-               \endquotation
-           * /
-           \endcode
-
-           will be rendered as
-
-           While the prospect of a significantly broader market is
-           good news for Firstlogic, the notion also posed some
-           challenges. Dave Dobson, director of technology for the La
-           Crosse, Wisconsin-based company, said:
-
-           \quotation
-               As our solutions were being adopted into new
-               environments, we saw an escalating need for easier
-               integration with a wider range of enterprise
-               applications.
-           \endquotation
-
-    \row
-        \o \bold \\footnote \target footnote
-        \o \bold {The \\footnote command and the corresponding
-           \\endfootnote command delimit a footnote.}
-
-           The footnote follows the standard conventions, rendered at the
-           bottom of the page.
-
-           \warning This is preliminary funcionality. The
-           command is not fully implemented.
-
-           For example:
-
-           \code
-           / *!
-               In Qt 4 we have tried to simplify the constructors of
-               QObject/QWidget subclasses. This makes subclassing
-               easier, at the same time as it helps make the Qt
-               library more efficient.
-
-               \footnote
-               Constructors no longer take a "const char *name"
-               parameter. If you want to specify a name for a QObject,
-               you must call QObject::setObjectName() after
-               construction. The object name is now a QString.
-               \endfootnote
-
-               QWidget's WFlags data type has been split in two:
-               Qt::WindowFlags specifies low-level window flags (the
-               type of window and the frame style), whereas
-               Qt::WidgetAttribute specifies various higher-level
-               attributes about the widget (e.g.,
-               WA_StaticContents).
-           * /
-           \endcode
-
-           will be rendered as
-
-           \quotation
-               In Qt 4 we have tried to simplify the constructors of
-               QObject/QWidget subclasses. This makes subclassing
-               easier, at the same time as it helps make the Qt
-               library more efficient.
-
-               \footnote
-               Constructors no longer take a "const char *name"
-               parameter. If you want to specify a name for a QObject,
-               you must call QObject::setObjectName() after
-               construction. The object name is now a QString.
-               \endfootnote
-
-               QWidget's WFlags data type has been split in two:
-               Qt::WindowFlags specifies low-level window flags (the
-               type of window and the frame style), whereas
-               Qt::WidgetAttribute specifies various higher-level
-               attributes about the widget (e.g.,
-               WA_StaticContents).
-           \endquotation
-
-    \row
-        \o \bold \\tableofcontents \target tableofcontents
-        \o \bold {The \\tableofcontents command generates a
-           table displaying the titles of the current documentation
-           unit's parts, chapters, sections, etc.}
-
-           The command accepts a single optional argument:
-
-           \code
-               \tableofcontents sectionN
-           \endcode
-
-           where \c sectionN is the deepest section to include (by
-           default all sections are included).
-
-           For example, it the documentation unit's structure looks
-           something like this:
-
-           \quotation
-           \raw HTML
-               <a name="Basic Qt">
-               <h1>Basic Qt</h1>
-               </a>
-               <p>This is the first part.</p>
-
-                   <a name="Getting started">
-                   <h2>Getting Started</h2>
-                   </a>
-                   This is the first part's first chapter.</p>
-
-                       <a name="Hello Qt">
-                       <h3>Hello Qt</h3>
-                       </a>
-                       <p>This is the first chapter's first section.</p>
-
-                       <a name="Making Connections">
-                       <h3>Making Connections</h3>
-                       </a>
-                       <p>This is the first chapter's second section.</p>
-
-                       <a name="Using the Reference Documentation">
-                       <h3>Using the Reference Documentation</h3>
-                       </a>
-                       <p>This is the first chapter's third section.</p>
-
-                   <a name="Creating Dialogs">
-                   <h2>Creating Dialogs</h2>
-                   </a>
-                   <p>This is the first part's second chapter.</p>
-
-                       <a name="Subclassing QDialog">
-                       <h3>Subclassing QDialog</h3>
-                       </a>
-                       <p>This is the second chapter's first section.</p>
-
-                       ...
+        \code
+        / *!
+          While the prospect of a significantly broader market is
+          good news for Firstlogic, the notion also posed some
+          challenges. Dave Dobson, director of technology for the La
+          Crosse, Wisconsin-based company, said:
+
+          \quotation
+             As our solutions were being adopted into new
+             environments, we saw an escalating need for easier
+             integration with a wider range of enterprise
+             applications.
+          \endquotation
+        * /
+        \endcode
 
-               <a name="Intermediate Qt">
-               <h1>Intermediate Qt</h1>
-               </a>
-               <p>This is the second part.</p>
+    The text in the \bold{\\quotation} block will appear in the generated HTML as:
 
-                   <a name="Layout Management">
-                   <h2>Layout Management</h2>
-                   </a>
-                   <p>This is the second part's first chapter.</p>
+	\code
+	<blockquote>
+	  <p>As our solutions were being adopted into new environments, 
+	  we saw an escalating need for easier integration with a wider 
+	  range of enterprise applications.</p> 
+        </blockquote> 
+	\endcode
 
-                       <a name="Basic Layouts">
-                       <h3>Basic Layouts</h3>
-                       </a>
-                       <p>This is the first chapter's first section.</p>
+    The built-in style sheet for most browsers will render the
+    contents of the <blockquote> tag with left and right
+    indentations. The example above would be rendered as:
 
-               ...
+          \quotation
+             As our solutions were being adopted into new
+             environments, we saw an escalating need for easier
+             integration with a wider range of enterprise
+             applications.
+          \endquotation
 
-           \endraw
-           \endquotation
+    But you can redefine the \bold{<blockquote>} tag in your style.css file.
 
-           Then
+    This command replaces the old \\quote command. For more
+    information see the \l
+    {26-qdoc-commands-compatibility.html#quotation-versus-quote}
+    {compatibility} section.
 
-           \code
-           / *!
-               Contents:
+    \target footnote-command
+    \section1 \\footnote 
 
-               \tableofcontents
+    The \\footnote and \\endfootnote commands delimit a footnote.
 
-               ...
-           * /
-           \endcode
+    The footnote is rendered at the bottom of the page.
 
-           will expand to
+    \warning The \bold{\\footnote} and \bold{\\endfootnote} commands
+    have not been implemented. The footnote is rendered as a regular
+    HTML paragraph.
 
-           \quotation
-           \raw HTML
-               <p>Contents:</p>
+    \target tableofcontents-command
+    \section1 \\tableofcontents 
 
-               <ul>
-               <li><a href="#Basic Qt">Basic Qt</a></li>
-                   <ul>
-                   <li><a href="#Getting Started">Getting Started</a></li>
-                       <ul>
-                       <li><a href="#Hello Qt">Hello Qt</a></li>
-                       <li><a href="#Making Connections">
-                           Making Connections</a></li>
-                       <li><a href="#Using the Reference Documentation">
-                           Using the Reference Documentation</a></li>
-                       </ul>
-                   <li><a href="#Creating Dialogs">Creating Dialogs</a></li>
-                       <ul>
-                       <li><a href="#Subclassing QDialog">
-                           Subclassing QDialog</a></li>
-                       </ul>
-                   </ul>
-               <li><a href="#Intermediate Qt">Intermediate Qt</a></li>
-                   <ul>
-                   <li><a href="#Layout Management">Layout Management</a></li>
-                       <ul>
-                       <li><a href="#Basic Layouts">Basic Layouts</a></li>
-                       </ul>
-                   </ul>
-               </ul>
+    The \\tableofcontents command has been disabled because QDoc 
+    now generates a table of contents automatically.
 
-               ...
-           \endraw
-           \endquotation
+    The automatically generated table of contents appears in the upper
+    righthand corner of the page.
 
-           Each table entry becomes a link to the corresponding part,
-           chapter or section.
+    \target brief-command
+    \section1 \\brief 
 
-    \row
-        \o \bold \\brief \target brief
-        \o \bold {The \\brief command introduces a one-sentence
-           description of a class, namespace, header file, property
-           or variable.}
+    The \\brief command introduces a one-sentence description of a
+    class, namespace, header file, property or variable.
 
-           The brief text is used to introduce the documentation of
-           the associated object, and in lists generated using the \l
-           {generatelist}{\\generatelist} command.
+    The brief text is used to introduce the documentation of the
+    associated object, and in lists generated using the \l
+    {generatelist-command} {\\generatelist} command.
 
-           The \\brief command can be used in two significant
-           different ways: \l {brief class}{One for classes,
-           namespaces and header files}, and \l {brief property}{one
-           for properties and variables}.
+    The \\brief command can be used in two significant different ways:
+    \l {brief class} {One for classes, namespaces and header files},
+    and \l {brief-property} {one for properties and variables}.
 
-           \target brief property
+    \target brief-property
 
-           When the \\brief command is used to describe a property or
-           a variable, the brief text must only be a sentence fragment
-           and start with "whether" (for boolean properties and
-           variables) or "the" (for any other property or variable).
+    When the \\brief command is used to describe a property or a
+    variable, the brief text must be a sentence fragment starting with
+    "whether" (for a boolean property or variable) or starting with
+    "the" (for any other property or variable).
 
-           For example the boolean QWidget::isWindow property:
+    For example the boolean QWidget::isWindow property:
 
            \code
            / *!
@@ -3270,7 +3092,7 @@
            * /
            \endcode
 
-           The latter will be rendered as
+    QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -3292,28 +3114,21 @@
                \endlist
 
                See also \l
-               {QWidget::frameGeometry()}{frameGeometry()}, \l
-               {QWidget::rect()}{rect()}, ...
+               {QWidget::frameGeometry()} {frameGeometry()}, \l
+               {QWidget::rect()} {rect()}, ...
            \endquotation
 
-           \target brief class
+    \target brief class
 
-           When the \\brief command is used to describe a class, the
-           brief text should be a complete sentence and must start
-           like this:
+    When the \\brief command is used to describe a class, the brief
+    text should be a complete sentence and must start like this:
 
            \code
            The <classname> class is|provides|contains|specifies...
            \endcode
 
-           and likewise when the command is used for namespaces or
-           header files.
-
-           \warning The brief statement is used as the first
-           paragraph of the detailed description. Do not repeat the
-           sentence.
-
-           For example:
+    \warning The brief statement is used as the first paragraph of the
+    detailed description. Do not repeat the sentence. For example:
 
            \code
            / *!
@@ -3333,7 +3148,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -3342,7 +3157,7 @@
 
                The PreviewWindow class is a custom widget displaying
                the names of its currently set window flags in a
-               read-only text editor. \l {preview window}{More...}
+               read-only text editor. \l {preview window} {More...}
 
                \raw HTML
                    <h3>Properties</h3>
@@ -3358,8 +3173,8 @@
                \endraw
 
                \list
-                   \o \l {constructor}{PreviewWindow}(QWidget *parent = 0)
-                   \o void \l {function}{setWindowFlags}(Qt::WindowFlags flags)
+                   \o \l {constructor} {PreviewWindow}(QWidget *parent = 0)
+                   \o void \l {function} {setWindowFlags}(Qt::WindowFlags flags)
                \endlist
 
                \list
@@ -3395,13 +3210,14 @@
                    <hr />
                    <h2>Detailed Description</h2>
                \endraw
+       
                The PreviewWindow class is a custom widget displaying
                the names of its currently set window flags in a
                read-only text editor.
 
                The PreviewWindow class inherits QWidget. The widget
                displays the names of its window flags set with the \l
-               {function}{setWindowFlags()} function. It is also
+               {function} {setWindowFlags()} function. It is also
                provided with a QPushButton that closes the window.
 
                ...
@@ -3418,7 +3234,7 @@
                    <h3>PreviewWindow(QWidget *parent = 0)</h3>
                \endraw
 
-               Constructs a preview window widget with \i parent.
+               Constructs a preview window widget with \e parent.
 
                \target function
                \raw HTML
@@ -3434,7 +3250,7 @@
                the text in the widgets text editor.
            \endquotation
 
-           Using \\brief with a namespace can for example look like this:
+    Using \\brief in a \l{namespace-command}{\\namespace}:
 
            \code
            / *!
@@ -3445,8 +3261,7 @@
            * /
            \endcode
 
-           and finally using \\brief with a header file can look
-           something like this:
+    Using \\brief in a \l{headerfile-command}{\\headerfile}:
 
            \code
            / *!
@@ -3460,107 +3275,83 @@
            * /
            \endcode
 
-           See also \l{property}{\\property}, \l{class}{\\class},
-           \l{namespace}{\\namespace} and  \l{headerfile}{\\headerfile}.
-
-    \row
-        \o \bold \\legalese \target legalese
-        \o \bold {The \\legalese command, and the corresponding \\endlegalese
-           command, delimit a licence agreement.}
-
-           If the \\endlegalese command is omitted, QDoc will still
-           process the \\legalese command but considers the rest of
-           the documentation page as the license agreement.
-
-           Ideally, the license documentation is located where the
-           licensed code is used.
-
-           Later the documentation identified by the \\legalese
-           command can be accumulated into a list using the \l
-           {generatelist}{\\generatelist} command with the \c legalese
-           argument. This is useful to generate an overview of all the
-           licenses associated with the source code.
-
-           For example:
+    See also \l{property-command} {\\property}, \l{class-command}
+    {\\class}, \l{namespace-command} {\\namespace} and
+    \l{headerfile-command} {\\headerfile}.
 
-           \code
-           \ * !
-               ...
-
-               On X11, Qt also supports drops via the Motif Drag \&
-               Drop Protocol. The implementation incorporates some
-               code that was originally written by Daniel Dardailler,
-               and adapted for Qt by Matt Koss \<koss@napri.sk\> and
-               Trolltech. Here is the original copyright notice:
+    \target legalese-command
+    \section1 \\legalese 
 
-               \legalese
-               \code
-
-               Copyright 1996 Daniel Dardailler.
+    The \\legalese and \\endlegalese commands delimit a licence agreement.
 
-               Permission to use, copy, modify, distribute, and sell
-               this software for any purpose is hereby granted without
-               fee, provided that the above copyright notice appear in
-               all copies and that both that copyright notice and this
-               permission notice appear in supporting documentation,
-               and that the name of Daniel Dardailler not be used in
-               advertising or publicity pertaining to distribution of
-               the software without specific, written prior
-               permission. Daniel Dardailler makes no representations
-               about the suitability of this software for any
-               purpose. It is provided "as is" without express or
-               implied warranty.
+    In the generated HTML, the delimited text is surrounded by a \bold
+    {<div class="LegaleseLeft">} and \bold {</div>} tags.
 
-               Modifications Copyright 1999 Matt Koss, under the same
-               license as above.
+    For example, here is a license agreement enclosed in \\legalese
+    and \\endlegalese:
 
-               \ endcode
-               \endlegalese
-           * /
-           \endcode
-
-           will be rendered as
-
-           \quotation
-               ...
-
-               On X11, Qt also supports drops via the Motif Drag \&
-               Drop Protocol. The implementation incorporates some
-               code that was originally written by Daniel Dardailler,
-               and adapted for Qt by Matt Koss \<koss@napri.sk\> and
-               Trolltech. Here is the original copyright notice:
-
-               \legalese
-               \code
-
-               Copyright 1996 Daniel Dardailler.
-
-               Permission to use, copy, modify, distribute, and sell
-               this software for any purpose is hereby granted without
-               fee, provided that the above copyright notice appear in
-               all copies and that both that copyright notice and this
-               permission notice appear in supporting documentation,
-               and that the name of Daniel Dardailler not be used in
-               advertising or publicity pertaining to distribution of
-               the software without specific, written prior
-               permission. Daniel Dardailler makes no representations
-               about the suitability of this software for any
-               purpose. It is provided "as is" without express or
-               implied warranty.
-
-               Modifications Copyright 1999 Matt Koss, under the same
-               license as above.
-
-               \endcode
-               \endlegalese
-           \endquotation
-
-    \row
-        \o \bold \\warning \target warning
-        \o \bold {The \\warning command renders a "Warning:" prefix to
-           the command's argument.}
+        \code
+	/ *!
+	  \legalese
+          Copyright 1996 Daniel Dardailler.
+
+          Permission to use, copy, modify, distribute, and sell this
+          software for any purpose is hereby granted without fee,
+          provided that the above copyright notice appear in all
+          copies and that both that copyright notice and this
+          permission notice appear in supporting documentation, and
+          that the name of Daniel Dardailler not be used in
+          advertising or publicity pertaining to distribution of the
+          software without specific, written prior permission. Daniel
+          Dardailler makes no representations about the suitability of
+          this software for any purpose. It is provided "as is"
+          without express or implied warranty.
+
+	  Modifications Copyright 1999 Matt Koss, under the same
+          license as above.
+          \endlegalese
+        * / 
+        \endcode
 
-           For example:
+        It will appear in the generated HTML as:
+
+       \code
+	 <div class="LegaleseLeft">
+	   <p>Copyright 1996 Daniel Dardailler.</p>
+           <p>Permission to use, copy, modify, distribute, and sell
+           this software for any purpose is hereby granted without fee,
+           provided that the above copyright notice appear in all
+           copies and that both that copyright notice and this
+           permission notice appear in supporting documentation, and
+           that the name of Daniel Dardailler not be used in
+           advertising or publicity pertaining to distribution of the
+           software without specific, written prior permission. Daniel
+           Dardailler makes no representations about the suitability of
+           this software for any purpose. It is provided "as is"
+           without express or implied warranty.</p>
+	  
+	   <p>Modifications Copyright 1999 Matt Koss, under the same
+           license as above.</p>
+	 </div>
+       \endcode
+
+    If the \\endlegalese command is omitted, QDoc will process the
+    \\legalese command but considers the rest of the documentation
+    page as the license agreement.
+
+    Ideally, the license text is located with the licensed code.
+
+   Elsewhere, the documentation identified as \e{\\legalese} command
+   can be accumulated using \l {generatelist-command} {\\generatelist}
+   with \c {legalese-command} as the argument. This is useful for
+   generating an overview of the license agreements associated with
+   the source code.
+
+    \target warning-command
+    \section1 \\warning 
+
+    The \\warning command prepends "Warning:" to the command's
+    argument, in bold font. For example:
 
            \code
            / *!
@@ -3573,7 +3364,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                Qt::HANDLE is a platform-specific handle type
@@ -3583,50 +3374,31 @@
 
                \warning Using this type is not portable.
            \endquotation
-    \endtable
+
 */
 
 /*!
     \page 12-0-qdoc-commands-miscellaneous.html
-    \previouspage Document Contents Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Topical Commands
+    \previouspage Special Content
+    \contentspage Table of Contents
+    \nextpage The QDoc Configuration File
 
-    \title Miscellaneous Commands
+    \title Miscellaneous
 
-    These commands provide miscellaneous functions
-    connected to the visual appearance of the documentation, and to the
-    process of generating the documentation.
+    These commands provide miscellaneous functions connected to the
+    visual appearance of the documentation, and to the process of
+    generating the documentation.
 
-    \section1 Alphabetical List
+    \target expire-command
+    \section1 \\expire 
 
-    \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else},
-    \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif},
-    \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire},
-    \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist},
-    \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if},
-    \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include},
-    \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta},
-    \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit},
-    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw},
-    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\unicode}
+    The \\expire command allows you to define an expiration
+    date for your documentation.
 
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\expire \target expire
-        \o \bold {The \\expire command allows you to define an expiration
-           date for your documentation.}
-
-           When using the \\expire command, QDoc will emit a warning
-           when the current date is larger than the specified
-           date. The command accepts one argument; the argument's
-           format is yyyy-mm-dd. For example:
+    When using the \\expire command, QDoc will emit a warning when the
+    current date is larger than the specified date. The command
+    accepts one argument; the argument's format is yyyy-mm-dd. For
+    example:
 
            \code
            / *!
@@ -3645,23 +3417,24 @@
            * /
            \endcode
 
-           If you run QDoc on 4 July 2005, it will emit the warning
+    If you run QDoc on 4 July 2005, it will emit the warning
 
            \quotation
                porting.qdoc:6: Documentation expired 185 days ago
            \endquotation
 
-    \row
-        \o \bold \\generatelist \target generatelist
-        \o \bold {The \\generatelist command expands to a list of
-           various documentation or links to documentation.}
 
-           For example in the Qt Reference Documentation:
+    \target generatelist-command
+    \section1 \\generatelist
+
+    The \\generatelist command expands to a list of various
+    documentation or links to documentation. Below is an example from
+    the Qt Reference Documentation:
 
            \code
            / *!
                \page classes.html
-               \title All Qt Classes (main index)
+               \title All Classes
 
                For a shorter list that only includes the most
                frequently used classes, see \l{Qt's Main Classes}. For
@@ -3672,434 +3445,308 @@
            * /
            \endcode
 
-           is used to generate \l {All Qt Classes (main index)}.
-
-           The command accepts the following arguments:
-
-           \target table example
-
-           \list
-           \o \c annotatedclasses
-
-              The \c annotatedclasses argument provides a table
-              containing the names of all the classes, and a
-              description of each class. Each class name is a link to
-              the class's reference documentation.
-
-              For example:
-
-              \quotation
-                  \raw HTML
-                  <table align="center" cellpadding="2"
-                      cellspacing="1" border="0">
-
-                  <tr valign="top" bgcolor="#d0d0d0">
-                      <td>
-                      <a href="http://qt.nokia.com/doc/4.0/qdial.html">
-                          QDial</a>
-                      </td>
-                      <td>Rounded range control (like a speedometer
-                          or potentiometer)</td>
-                  </tr>
-
-                  <tr valign="top" bgcolor="#d0d0d0">
-                      <td>
-                      <a href="http://qt.nokia.com/doc/4.0/qdialog.html">
-                          QDialog</a>
-                      </td>
-                      <td>The base class of dialog windows</td>
-                  </tr>
-
-                  <tr valign="top" bgcolor="#d0d0d0">
-                      <td>
-                      <a href="http://qt.nokia.com/doc/4.0/qdir.html">
-                          QDir</a>
-                      </td>
-                      <td>Access to directory structures and their
-                          contents</td>
-                  </tr>
-                  </table>
-                  \endraw
-              \endquotation
-
-              A class is identified within the documentation by the
-              the \l {class}{\\class} command, and the descriptions
-              are based on the argument of the \l {brief}{\\brief}
-              commands in the class documentation.
-
-           \target list example
-
-           \o \c classes
-
-              The \c classes argument provides a complete alphabetical
-              list of the classes. Each class name is a link to the
-              class's reference documentation.
-
-              For example:
-
-              \quotation
-                  \raw HTML
-                      <p><table width="100%">
-
-                      <tr>
-                      <td align="right"><b>A&nbsp;</b></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractbutton.html">QAbstractButton</a></td>
-
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractextensionmanager.html">QAbstractExtensionManager</a></td>
-
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemmodel.html">QAbstractItemModel</a></td>
-                      </tr>
-
-                      <tr>
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstracteventdispatcher.html">QAbstractEventDispatcher</a></td>
-
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractformbuilder.html">QAbstractFormBuilder</a></td>
-
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemview.html">QAbstractItemView</a></td>
-                      </tr>
+    This generates the \l {All Classes} page. The command accepts the
+    following arguments:
 
-                      <tr>
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractextensionfactory.html">QAbstractExtensionFactory</a></td>
+    \target table example
+    \section2 \c annotatedclasses
 
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemdelegate.html">QAbstractItemDelegate</a></td>
+    The \c annotatedclasses argument provides a table containing the
+    names of all the classes, and a description of each class. Each
+    class name is a link to the class's reference documentation. For
+    example:
 
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractlistmodel.html">QAbstractListModel</a></td>
-                      </tr>
-                      </table></p>
-                  \endraw
-              \endquotation
-
-              A class is identified within the documentation by the
-              the \l {class}{\\class} command.
-
-           \o \c classesbymodule
+    \table
+      \row
+        \o QDial
+	\o Rounded range control (like a speedometer or potentiometer)
+      \row
+        \o QDialog
+	\o The base class of dialog windows
+      \row
+        \o QDir
+        \o Access to directory structures and their contents
+    \endtable
 
-              This particular argument requests an additional argument,
-              i.e. a specification of the module.
+    A C++ class is documented with the \l {class-command} {\\class}
+    command. The annotation for the class is taken from the argument
+    of the class comment's \l {brief-command} {\\brief} command.
 
-              For example:
+    \target list example
+    \section2 \c classes
 
-              \code
-              / *!
-                  \page qtgui.html
-                  \contentspage Qt Classes by Module
-                  \previouspage QtCore Classes
-                  \nextpage QtNetwork Classes
+    The \c classes argument provides a complete alphabetical list of
+    the classes. Each class name is a link to the class's reference
+    documentation. This command is uded to generate the \l
+    {classes.html} {All Classes} page this way:
 
-                  \title QtGui Classes
+    \code
+    / *!
+        \page classes.html
+        \title All Classes
+        \ingroup classlists
 
-                  \keyword QtGui
+        \brief If you know the name of the class you want, find it here.
 
-                  \generatelist {classesbymodule QtGui}
-              * /
-              \endcode
+        This is a list of all Qt classes. For a list of the classes
+        provided for compatibility with Qt3, see \l{Qt3 Support
+        Classes}. For classes that have been deprecated, see the
+        \l{Obsolete Classes} list.
 
-              Together, these arguments provide a table containing the
-              classes considered members of the specified module,
-              accompanied with a brief description. Each class name is
-              a link to the class's reference documentation.
+        \generatelist classes
+    * /
+    \endcode
 
-              The generated table is rendered similarily to the one
-              generated when using the \l {table example}{\c
-              annotatedclasses} argument.
+    A C++ class is documented with the \l {class-command} {\\class}
+    command.
 
-              For the basic classes in Qt, a class's module is
-              determined by its location, i.e. its directory. However,
-              for extensions, like ActiveQt and Qt Designer, a class
-              is related to a module with the \l
-              {inmodule}{\\inmodule} command.
+    \section2 \c classesbymodule
 
-           \o \c classesbyedition
+    When this argument is used, a second argument is required, which
+    specifies the module whose classes are to be listed. QDoc
+    generates a table containing those classes. Each class is listed
+    with the text of its \l{brief-command} {\\brief} command.
 
-              This particular argument requests an additional argument,
-              i.e. a specification of the edition.
+    This command is used to generate the \l {phonon-module.html}
+    {Phonon Module} page this way.
 
-              For example:
+    \code
+      / *!
+          \page phonon-module.html
+          \module Phonon
+          \title Phonon Module
+          \ingroup modules
 
-              \code
-              / *!
-                  \page console-edition-classes.html
-                  \title Qt Console Edition Classes
+          \brief The Phonon module contains namespaces and classes for multimedia functionality.
 
-                  \generatelist{classesbyedition Console}
-              * /
-              \endcode
+          \generatelist{classesbymodule Phonon}
 
-              Together, these arguments provide a table containing the
-              classes considered members of the specified edition,
-              accompanied with a brief description. Each class name is
-              a link to the class's reference documentation.
+	  ...
 
-              The edition a given class can be found in is determined by
-              the module it belongs to.
+      * /
+    \endcode
 
-           \o \c compatclasses
+    Each class that is a member of the specified module must be marked
+    with the \l {inmodule-command} {\\inmodule} command in its \\class
+    comment.
 
-              The \c compatclasses argument provides a complete and
-              alphabetical list of the support classes.  A support
-              class is identified within the documentation by the \l
-              {compat}{\\compat} command. Each class name is a link to
-              the class's reference documentation. The list is
-              rendered similarily to the list generated by the \l
-              {list example}{\c classes} argument.
+    \section2 \c compatclasses
 
-              \warning The \c classesbymodule argument will at some
-              point replace the this argument.
+    The \c compatclasses argument generates a list in alphabetical
+    order of the support classes.  It is normally used only to
+    generate the \l {compatclasses.html} {Qt3 Support Classes} page
+    this way:
 
-           \o \c functionindex
+    \code
+    / *!
+        \page compatclasses.html
+        \title Qt3 Support Classes
+        \ingroup classlists
 
-              The \c functionindex argument provides a complete
-              alphabetical list of all the documented member
-              functions.
+        \brief These classes ease the porting of code from Qt 3 to Qt 4.
 
-              For example:
+        These are the classes that Qt provides for compatibility with Qt
+        3. Most of these are provided by the Qt3Support module.
 
-              \quotation
-                  \raw HTML
-                      <p><center><font size="+1"><b><a href="#a">A</a>&nbsp;<a href="#b">B</a>&nbsp;<a href="#c">C</a>&nbsp;<a href="#d">D</a>&nbsp;<a href="#e">E</a>&nbsp;<a href="#f">F</a>&nbsp;<a href="#g">G</a>&nbsp;<a href="#h">H</a>&nbsp;<a href="#i">I</a>&nbsp;<a href="#j">J</a>&nbsp;<a href="#k">K</a>&nbsp;<a href="#l">L</a>&nbsp;<a href="#m">M</a>&nbsp;<a href="#n">N</a>&nbsp;<a href="#o">O</a>&nbsp;<a href="#p">P</a>&nbsp;<a href="#q">Q</a>&nbsp;<a href="#r">R</a>&nbsp;<a href="#s">S</a>&nbsp;<a href="#t">T</a>&nbsp;<a href="#u">U</a>&nbsp;<a href="#v">V</a>&nbsp;<a href="#w">W</a>&nbsp;<a href="#x">X</a>&nbsp;<a href="#y">Y</a>&nbsp;<a href="#z">Z</a>&nbsp;</b></font></center></p>
+        \generatelist compatclasses
+    * /
+    \endcode
 
-                      <p>DTDHandler: <a href="http://qt.nokia.com/doc/4.0/qxmlreader.html#DTDHandler">QXmlReader</a></p>
+    A support class is identified in the \\class comment with the \l
+    {compat-command} {\\compat} command.
 
-                      <p>QAXCLASS: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXCLASS">global</a></p>
+    \section2 \c functionindex
 
-                      <p>QAXFACTORY_BEGIN: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_BEGIN">global</a></p>
+    The \c functionindex argument provides a complete alphabetical
+    list of all the documented member functions. It is normally used
+    only to generate the \l {functions.html} {Qt function index} page
+    this way:
 
-                      <p>QAXFACTORY_DEFAULT: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_DEFAULT">global</a></p>
+    \code
+    / *!
+        \page functions.html
+        \title All Functions
+        \ingroup funclists
 
-                      <p>QAXFACTORY_END: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_END">global</a></p>
+        \brief All documented Qt functions listed alphabetically with a
+        link to where each one is declared.
 
-                  \endraw
+        This is the list of all documented member functions and global
+        functions in the Qt API.  Each function has a link to the
+        class or header file where it is declared and documented.
 
-                  ...
-              \endquotation
-
-           \o \c legalese
-
-              The \c legalese argument provides a complete list of all
-              the licenses. The licenses are identified within the
-              documentation using the \l {legalese}{\\legalese}
-              command.
-
-              For example:
-
-              \quotation
-                  \raw HTML
-                      <hr />
-                      <p>
-                      Copyright (c) 1989 The Regents of the
-                      University of California. All rights reserved.
-                      </p>
-
-                      <p>
-                      Redistribution and use in source and binary
-                      forms are permitted provided that the above
-                      copyright notice and this paragraph are
-                      duplicated in all such forms and that any
-                      documentation, advertising materials, and other
-                      materials related to such distribution and use
-                      acknowledge that the software was developed by
-                      the University of California, Berkeley...
-                      </p>
-
-                      <ul>
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qdate.html#weekNumber">QDate::weekNumber()</a>
-                      </li>
-                      </ul>
-
-                      <hr />
-                      <p>
-                      Copyright (c) 1991 by AT&amp;T.
-                      </p>
-
-                      <p>
-                      Permission to use, copy, modify, and distribute
-                      this software for any purpose without fee is
-                      hereby granted, provided that this entire notice
-                      is included in all copies of any software which
-                      is or includes a copy or modification of this
-                      software and in all copies of the supporting
-                      documentation for such software...
-                      </p>
-
-                      <ul>
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qlocale.html">QLocale</a>
-                      </li>
-                      </ul>
-                      <hr />
-                  \endraw
-                  ...
-              \endquotation
+        \generatelist functionindex
+    * /
+    \endcode
 
-           \o \c mainclasses
+    \section2 \c legalese
 
-              The \c mainclasses argument provides a complete
-              alphabetical list of the main classes. Each class name
-              is a link to the class's reference documentation. A
-              class is related to the group of main classes by using
-              the \l {mainclass}{\\mainclass} command.
+    The \c legalese argument tells QDoc to generate a complete list of
+    licenses in the documentation. Each license is identified using
+    the \l {legalese-command} {\\legalese} command. This command is
+    used to generate the \l {licenses.html} {Qt license information}
+    page this way:
 
-              The list is rendered similarily to the list generated by
-              the \l {list example}{\c classes} argument.
+    \code
+    / *!
+        \page licenses.html
+        \title Other Licenses Used in Qt
+        \ingroup licensing
+        \brief Information about other licenses used for Qt components and third-party code.
+
+        Qt contains some code that is not provided under the
+        \l{GNU General Public License (GPL)},
+        \l{GNU Lesser General Public License (LGPL)} or the
+        \l{Qt Commercial Edition}{Qt Commercial License Agreement}, but rather under
+        specific licenses from the original authors. Some pieces of code were developed
+        by Nokia and others originated from third parties.
+        This page lists the licenses used, names the authors, and links
+        to the places where it is used.
+
+        Nokia gratefully acknowledges these and other contributions
+        to Qt. We recommend that programs that use Qt also acknowledge
+        these contributions, and quote these license statements in an
+        appendix to the documentation.
+
+        See also: \l{Licenses for Fonts Used in Qt for Embedded Linux}
+
+        \generatelist legalese
+    * /
+    \endcode
 
-           \o \c overviews
+    \section2 \c mainclasses
 
-              The \c overviews argument provides a complete
-              alphabetical overview of the documentation. Each list
-              entry is a link to the respective documentation page.
+    The \c mainclasses argument tells QDoc to generate an alphabetical
+    list of the main classes. A class is marked as a main class by
+    including a \l {mainclass-command} {\\mainclass} command in the
+    \\class comment.
 
-              The list includes pages declared using commands like \l
-              {page}{\\page} and \l {group}{\\group}. The list omits
-              examples and classes, and only lists the first page of
-              documentation that contains two or more pages using
-              commands like \l {nextpage}{\\nextpage}.
+    \note The Qt documentation no longer includes a main classes page,
+    but you can generate one for your main classes if you want it.
 
-              For example:
+    \section2 \c overviews
 
-              \quotation
-                  \raw HTML
-                      <ul>
+    The \c overviews argument is used to tell QDoc to generate a list
+    by concatenating the contents of all the \l {group-command}
+    {\\group} pages. Qt uses it to generate the \l {overviews.html}
+    {overviews} page this way:
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qtalgorithms.html">
-                      &lt;QtAlgorithms&gt; - Generic Algorithms
-                      </a>
-                      </li>
+    \code
+    / *!
+        \page overviews.html
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qtglobal.html">
-                      &lt;QtGlobal&gt; - Global Qt Declarations
-                      </a>
-                      </li>
+        \title All Overviews and HOWTOs
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qaxserver-demo-simple.html">
-                      A standard ActiveX and the &quot;simple&quot; ActiveQt widget
-                      </a>
-                      </li>
+        \generatelist overviews
+    * /
+    \endcode
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/aboutqt.html">
-                      About Qt
-                      </a>
-                      </li>
+    \section2 \c related
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/trolltech.html">
-                      About Trolltech
-                      </a>
-                      </li>
+    The \c related argument is used in combination with the \l
+    {group-command} {\\group} and \l {ingroup-command} {\\ingroup}
+    commands to list all the overviews related to a specified
+    group. For example, the page for the \l {Programming with Qt}
+    {Programming with Qt} page is generated this way:
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/abstractwidgets.html">
-                      Abstract Widget Classes
-                      </a>
-                      </li>
+    \code
+    / *!
+        \group qt-basic-concepts
+        \title Programming with Qt
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/accessibility.html">
-                      Accessibility Classes
-                      </a>
-                      </li>
-                      ...
-                      </ul>
-                  \endraw
-              \endquotation
+        \brief The basic architecture of the Qt cross-platform application and UI framework.
 
-           \o \c related
+        Qt is a cross-platform application and UI framework for
+        writing web-enabled applications for desktop, mobile, and
+        embedded operating systems. This page contains links to
+        articles and overviews explaining key components and
+        techniuqes used in Qt development.
 
-              The \c related argument is used in combination with the
-              \l {group}{\\group} command to list all the overviews
-              related to the given group. Each list entry is a link to
-              the respective documentation page.
+        \generatelist {related}
+    * /
+    \endcode
 
-           \o \c relatedinline
+    Each page listed on this group page contains the command:
 
-              The \c related argument is used in combination with the
-              \l {group}{\\group} command to collect all documentation
-              related to the given group. The various documentation
-              snippets are copied directly into the group page.
+    \code
+        \ingroup qt-basic-concepts
+    \endcode
 
-           \o \c service
+    \section2 \c service
 
-              The \c service argument provides a complete alphabetical
-              list of the services. Each service name is a link to the
-              service's reference documentation.
+    The \c service argument tells QDoc to generate an alphabetical
+    list of the services. Each service name is a link to the service's
+    reference documentation.
 
-              A service is identified within the documentation by the
-              \l {service}{\\service} command.
+    A service is identified with the \l {service-command} {\\service}
+    command.
 
-        \endlist
+    \note This command and the \l {service-command} {\\service}
+    command are not used in the Qt documentation.
 
+    \target if-command
+    \section1 \\if 
 
-    \row
-        \o \bold \\if \target if
-        \o \bold {The \\if command and the corresponding \\endif command
-           enclose parts of a QDoc comment that only will be included if
-           the condition specified by the command's argument is true.}
+    The \\if command and the corresponding \\endif command
+    enclose parts of a QDoc comment that only will be included if
+    the condition specified by the command's argument is true.
 
-           The command reads the rest of the line and parses it as an
-           C++ #if statement. For example:
+    The command reads the rest of the line and parses it as an C++ #if
+    statement. For example:
 
            \code
            / *!
                \if defined(opensourceedition)
 
                \bold{Note:} This edition is for the development of
-               \l{Qt Open Source Edition}{Free and Open Source}
+               \l{Qt Open Source Edition} {Free and Open Source}
                software only; see \l{Qt Commercial Editions}.
 
                \endif
            * /
            \endcode
 
-           This QDoc comment will only be rendered if the \c
-           opensourceedition preprocessor symbol is defined, and
-           specified in the \l {definesvariable}{defines} variable in
-           the configuration file to make QDoc process
-           the code within #ifdef and #endif:
+    This QDoc comment will only be rendered if the \c
+    opensourceedition preprocessor symbol is defined, and specified in
+    the \l {defines-variable} {defines} variable in the configuration
+    file to make QDoc process the code within #ifdef and #endif:
 
            \code
                defines = opensourceedition
            \endcode
 
-           You can also define the preprocessor symbol manually on the
-           command line. For more information see the documentation of
-           the \l {definesvariable}{defines} variable.
+    You can also define the preprocessor symbol manually on the
+    command line. For more information see the documentation of the \l
+    {defines-variable} {defines} variable.
 
-           See also \l{endif}{\\endif}, \l{else}{\\else}, \l
-           {definesvariable}{defines} and \l falsehoods.
+    See also \l{endif-command} {\\endif}, \l{else-command} {\\else},
+    \l {defines-variable} {defines} and \l {falsehoods-variable}
+    {falsehoods}.
 
-    \row
-        \o \bold \\endif \target endif
-        \o \bold {The \\endif command and the corresponding \\if command
-           enclose parts of a QDoc comment that will be included if
-           the condition specified by the \l {if}{\\if} command's
-           argument is true.}
+    \target endif-command
+    \section1 \\endif 
 
-           For more information, see the documentation of the \l
-           {if}{\\if} command.
+    The \\endif command and the corresponding \\if command
+    enclose parts of a QDoc comment that will be included if
+    the condition specified by the \l {if-command} {\\if} command's
+    argument is true.
 
-           See also \l{if}{\\if}, \l{else}{\\else}, \l
-           {definesvariable}{defines} and \l falsehoods.
+    For more information, see the documentation of the \l {if-command}
+    {\\if} command.
 
-    \row
-        \o \bold \\else \target else
-        \o \bold {The \\else command specifies an alternative if the
-           condition in the \l {if}{\\if} command is false.}
+    See also \l{if-command} {\\if}, \l{else-command} {\\else}, \l
+    {defines-variable} {defines} and \l {falsehoods-variable}
+    {falsehoods}.
+
+    \target else-command
+    \section1 \\else 
 
-           The \\else command can only be used within \l
-           {if}{\\if...\\endif} commands, but is useful when there is
-           only two alternatives. For example:
+    The \\else command specifies an alternative if the
+    condition in the \l {if-command} {\\if} command is false.
+
+    The \\else command can only be used within \l {if-command}
+    {\\if...\\endif} commands, but is useful when there is only two
+    alternatives. For example:
 
            \code
            / *!
@@ -4134,8 +3781,8 @@
            * /
            \endcode
 
-           If the \c QT3_SUPPORT is defined, the comment will be rendered
-           as
+    If the \c QT3_SUPPORT is defined, the comment will be rendered
+    like this:
 
            \quotation
                The Qt 3 support library is provided to keep old source
@@ -4146,8 +3793,8 @@
                API to cohabit with the new one.
            \endquotation
 
-           If \c QT3_SUPPORT isn't defined but \c QT3_SUPPORT_WARNINGS
-           is, the comment will be rendered as
+    If \c QT3_SUPPORT is not defined but \c QT3_SUPPORT_WARNINGS is
+    defined, the comment will be rendered like this:
 
            \quotation
                The Qt 3 support library is provided to keep old source
@@ -4186,32 +3833,31 @@
                GCC 3.2+ and MSVC 7.)
            \endquotation
 
-           See also \l{if}{\\if}, \l{endif}{\\endif}, \l
-           {definesvariable}{defines} and \l falsehoods.
+           See also \l{if-command} {\\if}, \l{endif-command} {\\endif}, \l
+           {defines-variable} {defines} and \l {falsehoods-variable}
+           {falsehoods}.
 
-    \row
-        \o \bold \\include \target include
-        \o \bold {The \\include command  expands to the contents of the
-            file specified by the command's argument.}
-
-            \warning This is preliminary functionality. For more
-            information, see the \l
-            {26-qdoc-commands-compatibility.html#include-versus-input}
-            {compatibility} section.
-
-            The command takes a file name as an argument, and is
-            useful when some piece of the documentation is used
-            repeatedly: Move the repetetive text into a separate file,
-            and use the \\include command whenever you want to insert
-            the separate documentation.
-
-            The contents of such a file should follow QDoc syntax,
-            excluding the enclosing \c{/}\c{*!} ... \c{*}\c{/} marks.
-            To ensure that QDoc won't attempt to read the file as a
-            stand-alone piece of documentation, we recommend that you
-            use the \c .qdocinc extension.
+    \target include-command
+    \section1 \\include 
 
-            For example:
+    The \\include command  expands to the contents of the
+    file specified by the command's argument.
+
+    \warning This is preliminary functionality. For more information,
+    see the \l
+    {26-qdoc-commands-compatibility.html#include-versus-input}
+    {compatibility} section.
+
+    The command takes a file name as an argument, and is useful when
+    some piece of the documentation is used repeatedly: Move the
+    repetetive text into a separate file, and use the \\include
+    command whenever you want to insert the separate documentation.
+
+    The contents of such a file should follow QDoc syntax, excluding
+    the enclosing \c{/}\c{*!} ... \c{*}\c{/} marks.  To ensure that
+    QDoc won't attempt to read the file as a stand-alone piece of
+    documentation, we recommend that you use the \c .qdocinc
+    extension. For example:
 
             \code
             / *!
@@ -4224,33 +3870,31 @@
             * /
             \endcode
 
-            will be rendered as
+    QDoc renders this as:
 
             \quotation
                 \raw HTML
                 <h1>Core Features</h1>
                 \endraw
 
-                \include examples/signalandslots.qdocinc
-                \include examples/objectmodel.qdocinc
-                \include examples/layoutmanagement.qdocinc
+                \input examples/signalandslots.qdocinc
+                \input examples/objectmodel.qdocinc
+                \input examples/layoutmanagement.qdocinc
             \endquotation
 
-            Here is the actual \c .qdocinc files: \l
-            signalandslots.qdocinc, \l objectmodel.qdocinc, \l
-            layoutmanagement.qdocinc
+    Here is the actual \c .qdocinc files: \l signalandslots.qdocinc,
+    \l objectmodel.qdocinc, \l layoutmanagement.qdocinc
 
-    \row
-        \o \bold \\meta \target meta
-        \o \bold {The \\meta command is the QDoc equivalent to the HTML
-           \c meta tag.}
+    \target meta-command
+    \section1 \\meta 
 
-           The command accepts two arguments: The first argument (the
-           following word) is equivalent to the HTML meta tag's \i
-           name variable, and the second argument (the rest of the
-           line) is equivalent to the tag's \i contents variable.
+    The \\meta command is the QDoc equivalent to the HTML
+    \c meta tag.
 
-           For example:
+    The command accepts two arguments: The first argument (the
+    following word) is equivalent to the HTML meta tag's \e name
+    variable, and the second argument (the rest of the line) is
+    equivalent to the tag's \e contents variable. For example:
 
            \code
            / *!
@@ -4274,7 +3918,7 @@
            * /
            \endcode
 
-           will be included in the generated HTML page as
+    QDoc renders this as:
 
            \code
            <head>
@@ -4284,13 +3928,12 @@
            </head>
            \endcode
 
-    \row
-        \o \bold \\omit \target omit
-        \o \bold {The \\omit command and the correspondning \\endomit
-           command delimit parts of the documentation that
-           you want QDoc to skip.}
+    \target omit-command
+    \section1 \\omit 
 
-           For example:
+    The \\omit command and the correspondning \\endomit command
+    delimit parts of the documentation that you want QDoc to skip. For
+    example:
 
             \code
             / *!
@@ -4314,7 +3957,7 @@
             * /
             \endcode
 
-            will be rendered as
+    QDoc renders this as:
 
             \raw HTML
                 <table align="center" cellpadding="2"
@@ -4333,17 +3976,24 @@
                 </table>
             \endraw
 
+    \target raw-command
+    \section1 \\raw \span {class="newStuff"} {(avoid)} 
 
-    \row
-        \o \bold \\raw \target raw
-        \o \bold {The \\raw command and the corresponding
-           \\endraw command delimit a block of raw mark-up language code.}
+    The \\raw command and the corresponding
+    \\endraw command delimit a block of raw mark-up language code.
 
-           The command takes an argument specifying the code's format;
-           currently the only supported format is HTML.
+    \note Avoid using this command if possible, because it generates
+    DITA XML code that causes problems. If you are trying to generate
+    special table or list behavior, try to get the behavior you want
+    using the \l {span-command} {\\span} and \l {div-command} {\\div}
+    commands in your \l {table-command} {\\table} or \l {list-command}
+    {\\list}.
+ 
+    The command takes an argument specifying the code's format;
+    currently the only supported format is HTML.
 
-           The \\raw command is useful if you want some special HTML
-           effects in your documentation. For example:
+    The \\raw command is useful if you want some special HTML effects
+    in your documentation. For example:
 
            \code
            / *!
@@ -4351,76 +4001,90 @@
 
                \raw HTML
                <style type="text/css" id="colorstyles">
-               #blue { background-color: #0000ff; color: #ffffff }
-               #darkBlue { background-color: #000080; color: #ffffff }
-               #cyan { background-color: #00ffff; color: #000000 }
+               #color-blue { background-color: #0000ff; color: #ffffff }
+               #color-darkBlue { background-color: #000080; color: #ffffff }
+               #color-cyan { background-color: #00ffff; color: #000000 }
                </style>
 
                <p>
-               <tt id="blue">Blue(#0000ff)</tt>,
-               <tt id="darkBlue">dark blue(#000080)</tt> and
-               <tt id="cyan">cyan(#00ffff)</tt>.
+               <tt id="color-blue">Blue(#0000ff)</tt>,
+               <tt id="color-darkBlue">dark blue(#000080)</tt> and
+               <tt id="color-cyan">cyan(#00ffff)</tt>.
+	       </p>
                \endraw
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                Qt has some predefined QColor objects. For example:
 
                \raw HTML
                <style type="text/css" id="colorstyles">
-               #blue { background-color: #0000ff; color: #ffffff }
-               #darkBlue { background-color: #000080; color: #ffffff }
-               #cyan { background-color: #00ffff; color: #000000 }
+               #color-blue { background-color: #0000ff; color: #ffffff }
+               #color-darkBlue { background-color: #000080; color: #ffffff }
+               #color-cyan { background-color: #00ffff; color: #000000 }
                </style>
 
                <p>
-               <tt id="blue">Blue(#0000ff)</tt>,
-               <tt id="darkBlue">dark blue(#000080)</tt> and
-               <tt id="cyan">cyan(#00ffff)</tt>.
+               <tt id="color-blue">Blue(#0000ff)</tt>,
+               <tt id="color-darkBlue">dark blue(#000080)</tt> and
+               <tt id="color-cyan">cyan(#00ffff)</tt>.
+	       </p>
                \endraw
            \endquotation
 
-    \row
-        \o \bold \\unicode \target unicode
-        \o \bold {The \\unicode command allows you to insert an
-                  arbitrary Unicode character in the document.}
+    \note But you can achieve the exact same thing using qdoc
+    commands. In this case, all you have to do is include the color
+    styles in your style.css file. Then you can write:
+
+	   \code
+           \tt {\span {id="color-blue"} {Blue(#0000ff)}},
+           \tt {\span {id="color-darkBlue"} {dark blue(#000080)}} and
+           \tt {\span {id="color-cyan"} {cyan(#00ffff)}}.
+	   \endcode
+
+	   ...which is rendered again as:
+
+           \tt {\span {id="color-blue"} {Blue(#0000ff)}},
+           \tt {\span {id="color-darkBlue"} {dark blue(#000080)}} and
+           \tt {\span {id="color-cyan"} {cyan(#00ffff)}}.
+
+    \target unicode-command
+    \section1 \\unicode 
+
+    The \\unicode command allows you to insert an arbitrary Unicode
+    character in the document.
 
-           The command takes an argument specifying the character as
-           an integer. By default, base 10 is assumed, unless a '0x'
-           or '0' prefix is specified (for base 16 and 8,
-           respectively). For example:
+    The command takes an argument specifying the character as an
+    integer. By default, base 10 is assumed, unless a '0x' or '0'
+    prefix is specified (for base 16 and 8, respectively). For
+    example:
 
            \code
                 O G\unicode{0xEA}nio e as Rosas
 
                 \unicode 0xC0 table en famille avec 15 \unicode 0x20AC par jour
 
-                \unicode 0x3A3 \i{a}\sub{\i{i}}
+                \unicode 0x3A3 \e{a}\sub{\e{i}}
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                 O G\unicode{0xEA}nio e as Rosas
 
                 \unicode 0xC0 table en famille avec 15 \unicode 0x20AC par jour
 
-                \unicode 0x3A3 \i{a}\sub{\i{i}}
+                \unicode 0x3A3 \e{a}\sub{\e{i}}
            \endquotation
-
-           The \\raw command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation and use of
-           braces} for the argument.
-    \endtable
 */
 
 /*!
     \page 12-1-signalandslots.html
-    \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Miscellaneous
+    \contentspage Table of Contents
 
     \title signalandslots.qdocinc
 
@@ -4429,8 +4093,8 @@
 
 /*!
     \page 12-2-objectmodel.html
-    \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Miscellaneous
+    \contentspage Table of Contents
 
     \title objectmodel.qdocinc
 
@@ -4439,8 +4103,8 @@
 
 /*!
     \page 12-3-layoutmanagement.html
-    \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Miscellaneous
+    \contentspage Table of Contents
 
     \title layoutmanagement.qdocinc
 
@@ -4448,70 +4112,55 @@
 */
 
 /*!
-    \page 13-qdoc-commands-topical.html
-    \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Contextual Commands
-
-    \title Topical Commands
-
-    The topical commands tell QDoc what is being documented
-    (i.e. existing units like classes, functions and examples), and
-    some of the commands allows you to create extra pages.
-
-    \section1 Alphabetical List
-
-    \l {13-qdoc-commands-topical.html#class}{\\class},
-    \l {13-qdoc-commands-topical.html#enum}{\\enum},
-    \l {13-qdoc-commands-topical.html#example-command}{\\example},
-    \l {13-qdoc-commands-topical.html#externalpage}{\\externalpage},
-    \l {13-qdoc-commands-topical.html#fn}{\\fn},
-    \l {13-qdoc-commands-topical.html#group}{\\group},
-    \l {13-qdoc-commands-topical.html#headerfile}{\\headerfile},
-    \l {13-qdoc-commands-topical.html#macro}{\\macro},
-    \l {13-qdoc-commands-topical.html#module}{\\module},
-    \l {13-qdoc-commands-topical.html#namespace}{\\namespace},
-    \l {13-qdoc-commands-topical.html#page}{\\page},
-    \l {13-qdoc-commands-topical.html#property}{\\property},
-    \l {13-qdoc-commands-topical.html#service}{\\service},
-    \l {13-qdoc-commands-topical.html#typedef}{\\typedef},
-    \l {13-qdoc-commands-topical.html#variable}{\\variable},
+    \page 13-qdoc-commands-topics.html
+    \previouspage The QDoc Commands
+    \contentspage Table of Contents
+    \nextpage Context Commands
+
+    \title Topic Commands
+
+    A topic command tells QDoc which source code element is being
+    documented. Some topic commands allow you to create documentation
+    pages that aren't tied to any underlying source code element.
 
     \section1 General Description
 
-    When QDoc is processing a comment, it will try to connect the
-    documentation to the source code. For that reason it will first
-    look for the topical commands. If there is no such command, it
-    will try to tie the documentation to the immediately following
-    code. If there is no topical command, and the documentation cannot
-    be tied to following code, the documentation is simply lost.
+    When QDoc processes a QDoc comment, it tries to connect the
+    comment to an element in the source code by first looking for a
+    topic command that names the source code element. If there is no
+    topic command, QDoc tries to connect the comment to the source
+    code element that immediately follows the comment. If it can't do
+    either of these and if there is no topic command that indicates
+    the comment does not have an underlying source code element (e.g.
+    \l{page-command} {\\page}), then the comment is discarded.
 
-    \target topical argument
+    \target topic argument
 
-    The documented unit's name is passed as the unique argument for
-    all the topical commands. The argument's naming convention is the
-    documented unit's complete name. For example:
+    The name of the thing being documented is the unique argument for
+    each topic command. The naming convention is to use the complete
+    name. For example:
 
     \code
         \enum QComboBox::InsertPolicy
     \endcode
 
-    Functions is a special case, the argument's naming convention for
-    the \l {fn}{\\fn} command is that of the function's definition
-    outside the class definition. For example:
+    The \l {fn-command} {\\fn} command is a special case. For the \l
+    {fn-command} {\\fn} command, use the function's signature
+    including the class qualifier. For example:
 
     \code
-        \fn void PreviewWindow::setWindowFlags()
+        \fn void QGraphicsWidget::setWindowFlags(Qt::WindowFlags wFlags)
     \endcode
 
-    A topical command can appear anywhere in a comment, but must stand
-    alone on its own line. If the argument spans several lines, make
-    sure that each line (except the last one) is ended with a
+    A topic command can appear anywhere in a comment but must stand
+    alone on its own line. Best practice is to put the topic commend
+    at the top of the comment. If the argument spans several lines,
+    make sure that each line (except the last one) is ended with a
     backslash. In addition QDoc counts parentheses, which means that
     if it encounters a '(' it considers everything until the closing
     ')' as its argument.
 
-    If a topical command is repeated with different arguments, the
+    If a topic command is repeated with different arguments, the
     same documentation will appear for both the units. For example:
 
     \code
@@ -4532,232 +4181,224 @@
     ControllerWindow::setWindowFlags() functions will get the same
     documentation.
 
-    \section1 Command Descriptions
+    \target class-command
+    \section1 \\class 
 
-    \table
-    \header
-        \o Command
-        \o Description
+    The \\class command is for documenting a C++ class. The argument
+    is the complete name of the class. The command tells QDoc that a
+    class is part of the public API, and lets you enter a detailed
+    description.
 
-    \row
-        \o \bold \\class \target class
-        \o \bold {The \\class command tells QDoc that a class is
-           part of the public API, and lets you enter a detailed
-           description.}
+    \code
+    / *!
+        \class QMap::iterator
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument, and supports
-           nested classes, for example:
+        \brief The QMap::iterator class provides an STL-style
+        non-const iterator for QMap and QMultiMap.
 
-           \code
-           / *!
-               \class QMap::iterator
+        QMap features both \l{STL-style iterators} and
+        \l{Java-style iterators}. The STL-style iterators ...
+    * /
+    \endcode
 
-               \brief The QMap::iterator class provides an STL-style
-               non-const iterator for QMap and QMultiMap.
+    The HTML documentation for the named class is written to a
+    \c{.html} file named from the class name, in lower case, and with
+    the double colon qulifier(s) replaced with '-'. For example, the
+    documentation for the \c QMap::Iterator class is written to \c
+    qmap-iterator.html.
 
-               QMap features both \l{STL-style iterators} and
-               \l{Java-style iterators}. The STL-style iterators ...
-           * /
-           \endcode
+    \target framework
 
-           The generated HTML documentation for the specified class is
-           put in \c <lower-case>classname.html. For example, the
-           documentation for the \c PreviewWindow class is located in
-           \c previewwindow.html.
+    The file contains the class description from the \\class comment,
+    plus the documentation generated from QDoc comments for all the
+    class members, i.e. a list of the class's types, properties,
+    functions, signals, and slots.
 
-           \target framework
+    In addition to the detailed description of the class, the \\class
+    comment typically contains a \l {brief-command} {\\brief} command
+    and one or more \l{Markup Commands}. See the \\class command for
+    any of the Qt class for examples. Here is a very simple example:
 
-           In addition to render the detailed description, the \\class
-           comand will generate the documentation framework, i.e. a
-           list of the class's types, properties, functions, signals
-           and slots with empty documentation.
+    \code
+    / *!
+        \class PreviewWindow
+        \brief The PreviewWindow class is a custom widget
+               displaying the names of its currently set
+               window flags in a read-only text editor.
 
-           The command is typically accompanied with a \l
-           {brief}{\\brief} command, a \l {mainclass}{\\mainclass}
-           command, an \l {ingroup}{\\ingroup} command and a \l
-           {sa}{\\sa} command. For example:
+        \ingroup miscellaneous
 
-           \code
-           / *!
-               \class PreviewWindow
-               \brief The PreviewWindow class is a custom widget
-                      displaying the names of its currently set
-                      window flags in a read-only text editor.
+        The PreviewWindow class inherits QWidget. The widget
+        displays the names of its window flags set with the \l
+        {function} {setWindowFlags()} function. It is also
+        provided with a QPushButton that closes the window.
 
-               \mainclass
-               \ingroup miscellaneous
+        ...
 
-               The PreviewWindow class inherits QWidget. The widget
-               displays the names of its window flags set with the \l
-               {function}{setWindowFlags()} function. It is also
-               provided with a QPushButton that closes the window.
+        \sa QWidget
+    * /
+    \endcode
 
-               ...
+    The way QDoc renders this \\class will depend a lot on your \c
+    {style.css} file, but the general outline of the class reference
+    page will look like this:
 
-              \sa QWidget
-           * /
-           \endcode
+    \quotation
+        \raw HTML
+            <h1>PreviewWindow Class Reference</h1>
+        \endraw
 
-           will be rendered as
+        The PreviewWindow class is a custom widget displaying
+        the names of its currently set window flags in a
+        read-only text editor. \l {preview window} {More...}
 
-           \quotation
-               \raw HTML
-                   <h1>PreviewWindow Class Reference</h1>
-               \endraw
+        \raw HTML
+            <h3>Properties</h3>
+        \endraw
 
-               The PreviewWindow class is a custom widget displaying
-               the names of its currently set window flags in a
-               read-only text editor. \l {preview window}{More...}
+        \list
+            \o 52 properties inherited from QWidget
+            \o 1 property inherited from QObject
+        \endlist
 
-               \raw HTML
-                   <h3>Properties</h3>
-               \endraw
+        \raw HTML
+            <h3>Public Functions</h3>
+        \endraw
 
-               \list
-                   \o 52 properties inherited from QWidget
-                   \o 1 property inherited from QObject
-               \endlist
+        \list
+            \o \l {constructor} {PreviewWindow}(QWidget *parent = 0)
+            \o void \l {function} {setWindowFlags}(Qt::WindowFlags flags)
+        \endlist
 
-               \raw HTML
-                   <h3>Public Functions</h3>
-               \endraw
+        \list
+            \o 183 public functions inherited from QWidget
+            \o 28 public functions inherited from QObject
+        \endlist
 
-               \list
-                   \o \l {constructor}{PreviewWindow}(QWidget *parent = 0)
-                   \o void \l {function}{setWindowFlags}(Qt::WindowFlags flags)
-               \endlist
+        \raw HTML
+           <h3>Public Slots</h3>
+        \endraw
 
-               \list
-                   \o 183 public functions inherited from QWidget
-                   \o 28 public functions inherited from QObject
-               \endlist
+        \list
+            \o 17 public slots inherited from QWidget
+            \o 1 public slot inherited from QObject
+        \endlist
 
-               \raw HTML
-                   <h3>Public Slots</h3>
-               \endraw
+        \raw HTML
+            <h3>Additional Inherited Members</h3>
+        \endraw
 
-               \list
-                   \o 17 public slots inherited from QWidget
-                   \o 1 public slot inherited from QObject
-               \endlist
+        \list
+            \o 1 signal inherited from QWidget
+            \o 1 signal inherited from QObject
+            \o 4 static public members inherited from QWidget
+            \o 4 static public members inherited from QObject
+            \o 39 protected functions inherited from QWidget
+            \o 7 protected functions inherited from QObject
+        \endlist
 
-               \raw HTML
-                   <h3>Additional Inherited Members</h3>
-               \endraw
+        \target preview window
 
-               \list
-                   \o 1 signal inherited from QWidget
-                   \o 1 signal inherited from QObject
-                   \o 4 static public members inherited from QWidget
-                   \o 4 static public members inherited from QObject
-                   \o 39 protected functions inherited from QWidget
-                   \o 7 protected functions inherited from QObject
-               \endlist
+        \raw HTML
+            <hr />
+            <h2>Detailed Description</h2>
+        \endraw
 
-               \target preview window
+        The PreviewWindow class is a custom widget displaying
+        the names of its currently set window flags in a
+        read-only text editor.
 
-               \raw HTML
-                   <hr />
-                   <h2>Detailed Description</h2>
-               \endraw
+        The PreviewWindow class inherits QWidget. The widget
+        displays the names of its window flags set with the \l
+        {function} {setWindowFlags()} function. It is also
+        provided with a QPushButton that closes the window.
 
-               The PreviewWindow class is a custom widget displaying
-               the names of its currently set window flags in a
-               read-only text editor.
+        ...
 
-               The PreviewWindow class inherits QWidget. The widget
-               displays the names of its window flags set with the \l
-               {function}{setWindowFlags()} function. It is also
-               provided with a QPushButton that closes the window.
+        See also QWidget.
 
-               ...
+        \raw HTML
+            <hr />
+            <h2>Member Function Documentation</h2>
+        \endraw
 
-               See also QWidget.
+        \target constructor
+        \raw HTML
+           <h3>PreviewWindow(QWidget *parent = 0)</h3>
+        \endraw
 
-               \raw HTML
-                   <hr />
-                   <h2>Member Function Documentation</h2>
-               \endraw
+        Constructs a preview window widget with \e parent.
 
-               \target constructor
-               \raw HTML
-                   <h3>PreviewWindow(QWidget *parent = 0)</h3>
-               \endraw
+        \target function
+        \raw HTML
+            <h3>setWindowFlags(Qt::WindowFlags flags)</h3>
+        \endraw
 
-               Constructs a preview window widget with \i parent.
+        Sets the widgets flags using the
+        QWidget::setWindowFlags() function.
 
-               \target function
-               \raw HTML
-                   <h3>setWindowFlags(Qt::WindowFlags flags)</h3>
-               \endraw
+        Then runs through the available window flags,
+        creating a text that contains the names of the flags
+        that matches the flags parameter, displaying
+        the text in the widgets text editor.
+    \endquotation
 
-               Sets the widgets flags using the
-               QWidget::setWindowFlags() function.
+    \target enum-command
+    \section1 \\enum 
 
-               Then runs through the available window flags,
-               creating a text that contains the names of the flags
-               that matches the flags parameter, displaying
-               the text in the widgets text editor.
-           \endquotation
+    The \\enum command is for documenting a C++ enum type. The
+    argument is the full name of the enum type.
 
-    \row
-        \o \bold \\enum \target enum
-        \o \bold {The \\enum command allows you to document a C++ enum.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
-
-           The enum items are documented using the \l {value}{\\value}
-           command. If an item isn't documented, QDoc will emit a
-           warning. This can be avoided using the \l
-           {omitvalue}{\\omitvalue} command excluding an item from the
-           documentation. The enum documentation will be located in
-           the associated class, header file or namespace
-           documentation.
+    The enum values are documented in the \\enum comment using the \l
+    {value-command} {\\value} command. If an enum value is not
+    documented with \\value, QDoc emits a warning. These warnings can
+    be avoided using the \l {omitvalue-command} {\\omitvalue} command
+    to tell QDoc that an enum value should not be documented. The enum
+    documentation will be included on the class reference page, header
+    file page, or namespace page where the enum type is defined. For
+    example, consider the enum type \c {Corner} in the Qt namespace:
 
-           For example:
-
-           \code
-               enum Corner {
-                   TopLeftCorner = 0x00000,
-                   TopRightCorner = 0x00001,
-                   BottomLeftCorner = 0x00002,
-                   BottomRightCorner = 0x00003
-           #if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-                   ,TopLeft = TopLeftCorner,
-                   TopRight = TopRightCorner,
-                   BottomLeft = BottomLeftCorner,
-                   BottomRight = BottomRightCorner
-           #endif
-               };
-           \endcode
+    \code
+        enum Corner {
+            TopLeftCorner = 0x00000,
+            TopRightCorner = 0x00001,
+            BottomLeftCorner = 0x00002,
+            BottomRightCorner = 0x00003
+        #if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
+            ,TopLeft = TopLeftCorner,
+            TopRight = TopRightCorner,
+            BottomLeft = BottomLeftCorner,
+            BottomRight = BottomRightCorner
+        #endif
+        };
+    \endcode
 
-           In case of the Qt::Corner enum,
+    This enum can be cocumented this way:
 
-           \code
-           / *!
-               \enum Qt::Corner
-
-               This enum type specifies a corner in a rectangle:
-
-               \value TopLeftCorner
-                      The top-left corner of the rectangle.
-               \value TopRightCorner
-                      The top-right corner of the rectangle.
-               \value BottomLeftCorner
-                      The bottom-left corner of the rectangle.
-               \value BottomRightCorner
-                      The bottom-right corner of the rectangle.
-
-               \omitvalue TopLeft
-               \omitvalue TopRight
-               \omitvalue BottomLeft
-               \omitvalue BottomRight
-           * /
-           \endcode
+    \code
+    / *!
+        \enum Qt::Corner
+
+        This enum type specifies a corner in a rectangle:
+
+        \value TopLeftCorner
+               The top-left corner of the rectangle.
+        \value TopRightCorner
+               The top-right corner of the rectangle.
+        \value BottomLeftCorner
+               The bottom-left corner of the rectangle.
+        \value BottomRightCorner
+               The bottom-right corner of the rectangle.
+
+        \omitvalue TopLeft
+        \omitvalue TopRight
+        \omitvalue BottomLeft
+        \omitvalue BottomRight
+    * /
+    \endcode
 
-           this associated QDoc comment will be rendered as
+    Note the inclusion of the namespace qualifier. QDoc will render
+    this enum type in \c {qt.html} something like this:
 
            \quotation
            \raw HTML
@@ -4800,231 +4441,211 @@
            \endraw
            \endquotation
 
-           in qt.html.
+    See also \l {value-command} {\\value} and \l {omitvalue-command} {\\omitvalue}.
 
-           See also \l {value}{\\value} and \l {omitvalue}{\\omitvalue}.
+    \target example-command
+    \section1 \\example 
 
-    \row
-        \o \bold \\example \target example-command
-        \o \bold {The \\example command allows you to document an
-           example.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument. In particular
-           the command's argument is the example's path relative to
-           the paths listed in the \l exampledirs configuration
-           variable.
+    The \\example command is for documenting an example. The argument
+    is the example's path relative to omne of the paths listed in the
+    \l {exampledirs-variable} {exampledirs} variable in the QDoc
+    configuration file.
 
-           The documentation will be located in \i
-           {path-to-example}.html, and QDoc will add a list of all the
-           example files at the top of this documentation page.
+    The documentation page will be output to \c {path-to-example}.html.  
+    QDoc will add a list of all the example's source files at the top 
+    of the page.
 
-           For example, if \l exampledirs contain \c
-           $QTDIR/examples/widgets/imageviewer, then
+    For example, if \l {exampledirs-variable} {exampledirs} contains
+    \c $QTDIR/examples/widgets/imageviewer, then
 
-           \code
-           / *!
-               \example widgets/imageviewer
-               \title ImageViewer Example
-               \subtitle
+    \code
+    / *!
+        \example widgets/imageviewer
+        \title ImageViewer Example
+        \subtitle
 
-               The example shows how to combine QLabel and QScrollArea
-               to display an image.
+        The example shows how to combine QLabel and QScrollArea
+        to display an image.
 
-               ...
-           * /
-           \endcode
+        ...
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this example in widgets-imageviewer.html:
 
-           \quotation
-               \raw HTML
-               <center><h1>Image Viewer Example</h1></center>
-               \endraw
+    \quotation
+        \raw HTML
+        <center><h1>Image Viewer Example</h1></center>
+        \endraw
 
-               Files:
-               \list
-               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-cpp.html}
-                  {widgets/imageviewer/imageviewer.cpp}
-               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-h.html}
-                  {widgets/imageviewer/imageviewer.h}
-               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-main-cpp.html}
-                  {widgets/imageviewer/main.cpp}
-               \endlist
+        Files:
+        \list
+        \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-cpp.html}
+           {widgets/imageviewer/imageviewer.cpp}
+        \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-h.html}
+           {widgets/imageviewer/imageviewer.h}
+        \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-main-cpp.html}
+           {widgets/imageviewer/main.cpp}
+        \endlist
 
-               The example shows how to combine QLabel and QScrollArea
-               to display an image.
+        The example shows how to combine QLabel and QScrollArea
+        to display an image.
 
-               ...
-           \endquotation
+        ...
+    \endquotation
 
-           in widgets-imageviewer.html.
+    \target fn-command
+    \section1 \\fn (function)
 
-    \row
-        \o \bold \\fn \target fn
-        \o \bold {The \\fn command allows you to document a function.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument. In particular
-           it is important that the return type of the function,
-           whether it is \c const or not and the complete set of
-           arguments with type are included in the argument.  If the
-           referenced function doesn't exist, QDoc will emit a
-           warning.
-
-           Also, the \\fn command is QDoc's default command, i.e. when
-           no topical command can be found within a QDoc comment, QDoc
-           tries to tie the documentation to the following code as if
-           it was function documentation.
-
-           This means that the command normally isn't necessary since
-           the recommended style is to write the function
-           documentation directly before the function implementation
-           in the \c .cpp file. In fact, it should only be used for
-           inline functions implemented in the \c .h file.
+    The \\fn command is for documenting a function. The argument is
+    the function's signature, including its return type, const-ness,
+    and list of formal arguments with types. If the named function
+    doesn't exist, QDoc emits a warning.
 
-           For example:
+    \note The \\fn command is QDoc's default command, i.e. when no
+    topic command can be found in a QDoc comment, QDoc tries to tie
+    the documentation to the following code as if it is the
+    documentation for a function. Hence, it is normally not necessary
+    to include this command when documenting a function, if the
+    function's QDoc comment is written immediately above the function
+    implementation in the \c .cpp file. But it must be present when
+    documenting an inline function in the \c .cpp file that is
+    implemented in the \c .h file. For example:
 
-           \code
-           / *!
-               \fn bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
+    \code
+    / *!
+        \fn bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
 
-               Returns true if this toolbar is dockable in the given
-               \a area; otherwise returns false.
-           * /
-           \endcode
+        Returns true if this toolbar is dockable in the given
+        \a area; otherwise returns false.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \quotation
-               \raw HTML
-               <h3>bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
-               </h3>
-               \endraw
+    \quotation
+        \raw HTML
+           <h3>bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
+           </h3>
+        \endraw
 
-               Returns true if this toolbar is dockable in the given
-               \a area; otherwise returns false.
-           \endquotation
+        Returns true if this toolbar is dockable in the given
+        \a area; otherwise returns false.
+    \endquotation
 
-           See also \l {overload}{\\overload}.
+    See also \l {overload-command} {\\overload}.
 
-    \row
-        \o \bold \\group \target group
-        \o \bold {The \\group command creates a separate page that
-           lists the classes belonging to the group specified by the
-           command's argument.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument. The \\group
-           command is typically followed by a \l {title}{\\title}
-           command and a short introduction to the group.  The
-           generated HTML documentation for the specified group is put
-           in <lower-case>\i{group}.html.
-
-           A class can be related to a group by using the \l
-           {ingroup}{\\ingroup} command. In addition, overviews can be
-           related to a group using the same command, but these must
-           be listed explicitly using the \l
-           {generatelist}{\\generatelist} command (see example below).
-
-           Each class is listed with a link to the class reference
-           page and a brief description based on the classes' \l
-           {brief}{\\brief} texts. For example:
+    \target group-command
+    \section1 \\group 
 
-           \code
-           / *!
-               \group io
+    The \\group command creates a separate page that lists the classes
+    belonging to the group. The argument is the group name. 
 
-               \title Input/Output and Networking
+    A class is included in a group by using the \l {ingroup-command}
+    {\\ingroup} command. Overview pages can also be related to a group
+    using the same command, but the list of overview pages must be
+    requested explicitly using the \l {generatelist-command}
+    {\\generatelist} command (see example below).
 
-               These classes are used to handle input and output to
-               and from external devices, processes, files etc. as
-               well as manipulating files and directories.
-           * /
-           \endcode
+    The \\group command is typically followed by a \l {title-command}
+    {\\title} command and a short introduction to the group.  The
+    HTML page for the group is written to a \c {.html} file put in
+    <lower-case>\e{group}.html.
 
-           will be rendered as
+    Each class name is listed as a link to the class reference page
+    followed by the text from the class's \l {brief-command} {\\brief}
+    texts. For example:
 
-           \quotation
-                \raw HTML
+    \code
+    / *!
+        \group io
 
-                <h1>Input/Output and Networking</h1>
-
-                <p>These classes are used to handle input and output
-                to and from external devices, processes, files etc. as
-                well as manipulating files and directories.</p>
-
-                <p>
-                <table width="100%">
-                    <tr valign="top" bgcolor="#e0e0e0">
-                    <td><b>
-                    <a href="http://qt.nokia.com/doc/4.0/qabstractsocket.html">QAbstractSocket</a>
-                    </b></td>
-                    <td>
-                    The base functionality common to all socket types
-                    </td></tr>
-
-                    <tr valign="top" bgcolor="#e0e0e0">
-                    <td><b>
-                    <a href="http://qt.nokia.com/doc/4.0/qbuffer.html">QBuffer</a>
-                    </b></td>
-                    <td>
-                    QIODevice interface for a QByteArray
-                    </td></tr>
-
-                    <tr valign="top" bgcolor="#e0e0e0">
-                    <td><b>
-                    <a href="http://qt.nokia.com/doc/4.0/qclipboard.html">QClipboard</a>
-                    </b></td>
-                    <td>
-                    Access to the window system clipboard
-                    </td></tr>
-                </table>
-                \endraw
-           \endquotation
+        \title Input/Output and Networking
 
-           in io.html.
+        These classes are used to handle input and output to
+        and from external devices, processes, files etc. as
+        well as manipulating files and directories.
+    * /
+    \endcode
 
-           Note that overviews related to the given group, must be
-           listed explicitly using the \l
-           {generatelist}{\\generatelist} command with the \c related
-           argument. For example:
+    QDoc generates a group page in \c{io.html} that will look
+    something like this:
 
-           \code
-           / *!
-               \group architecture
+    \quotation
+         \raw HTML
+
+         <h1>Input/Output and Networking</h1>
+
+         <p>These classes are used to handle input and output
+         to and from external devices, processes, files etc. as
+         well as manipulating files and directories.</p>
+
+         <p>
+         <table width="100%">
+             <tr valign="top" bgcolor="#e0e0e0">
+             <td><b>
+             <a href="http://qt.nokia.com/doc/4.0/qabstractsocket.html">QAbstractSocket</a>
+             </b></td>
+             <td>
+             The base functionality common to all socket types
+             </td></tr>
+
+             <tr valign="top" bgcolor="#e0e0e0">
+             <td><b>
+             <a href="http://qt.nokia.com/doc/4.0/qbuffer.html">QBuffer</a>
+             </b></td>
+             <td>
+             QIODevice interface for a QByteArray
+             </td></tr>
+
+             <tr valign="top" bgcolor="#e0e0e0">
+             <td><b>
+             <a href="http://qt.nokia.com/doc/4.0/qclipboard.html">QClipboard</a>
+             </b></td>
+             <td>
+             Access to the window system clipboard
+             </td></tr>
+         </table>
+         \endraw
+    \endquotation
 
-               \title Architecture
+    Note that overview pages related to the group, must be listed
+    explicitly using the \l {generatelist-command} {\\generatelist}
+    command with the \c related argument. For example:
 
-               These documents describe aspects of Qt's architecture
-               and design, including overviews of core Qt features and
-               technologies.
+    \code
+    / *!
+        \group architecture
 
-               \generatelist{related}
-           * /
-           \endcode
+        \title Architecture
 
-           See also \l {ingroup}{\\ingroup} and \l
-           {generatelist}{\\generatelist}.
+        These documents describe aspects of Qt's architecture
+        and design, including overviews of core Qt features and
+        technologies.
 
-    \row
-        \o \bold \\headerfile \target headerfile
-        \o \bold {The \\headerfile command allows you to document
-           global functions, types and macros declared in a header file.}
+        \generatelist{related}
+    * /
+    \endcode
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument, and the
-           generated HTML documentation for the specified header file
-           is put in <lower-case>\i{headerfilename}.html.
+    See also \l {ingroup-command} {\\ingroup} and \l
+    {generatelist-command} {\\generatelist}.
 
-           A function, type or macro can be associated with a
-           headerfile using the \l {relates}{\\relates} command.
+    \target headerfile-command
+    \section1 \\headerfile 
 
-           If the referenced header file doesn't exist, the
-           \\headerfile command will still create a documentation page
-           for a header file with the referenced file's name.
+    The \\headerfile command is for documenting the global functions,
+    types and macros that are declared in a header file but not in a
+    namespace. The argument is the name of the header file.  The HTML
+    page is written to a \c {.html} file constructed from the header 
+    file aregument.
 
-           For example:
+    The documentation for a function, type, or macro that is declared
+    in the header file being documented is included in the header file
+    page using the \l {relates-command} {\\relates} command.
+
+    If the argument doesn't exist as a header file, the \\headerfile
+    command creates a documentation page for the header file anyway.
+    For example:
 
            \code
            / *!
@@ -5041,7 +4662,8 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc generates a header file page \c{qtalgorithms.html} that looks
+    something like this:
 
            \quotation
                \raw HTML
@@ -5049,7 +4671,7 @@
                            Generic Algorithms</h1></center>
                <p>The <QtAlgorithms> header file provides generic
                template-based algorithms.
-               <a href="13-qdoc-commands-topical.html#header">More...</a>
+               <a href="13-qdoc-commands-topics.html#header-command">More...</a>
                </p>
 
                <h3>Functions</h3>
@@ -5077,163 +4699,139 @@
                ...
            \endquotation
 
-           in qtalgorithms.html.
-
-    \row
-        \o \bold \\macro \target macro
-        \o \bold {The \\macro command allows you to document a C++ macro.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
-
-           QDoc recognizes three different macro syntax: function-like
-           macros like Q_ASSERT(), declaration-style macros like
-           Q_PROPERTY() and macros without parentheses like Q_OBJECT.
-
-           The \\macro command must be followed by a \l
-           {relates}{\\relates} command which attaches the
-           documentation to that of a related class, header file. or
-           namespace. Otherwise the documentation will be lost.
-
-           For example:
-
-           \code
-           / *!
-               \macro void Q_ASSERT(bool test)
-               \relates <QtGlobal>
-
-               Prints a warning message containing the source code
-               file name and line number if \a test is false.
-
-               ...
-
-               \sa Q_ASSERT_X(), qFatal(), {Debugging Techniques}
-           * /
-           \endcode
-
-           will be rendered as
-
-           \quotation
-               \raw HTML
-               <h3>void Q_ASSERT ( bool <i>test</i> )</h3>
-               \endraw
+    \target macro-command
+    \section1 \\macro 
 
-               Prints a warning message containing the source code
-               file name and line number if \a test is false.
+    The \\macro command is for documententin a C++ macro. The argument
+    is the macro in one of three styles: function-like macros like
+    Q_ASSERT(), declaration-style macros like Q_PROPERTY(), and macros
+    without parentheses like Q_OBJECT.
 
-               ...
+    The \\macro comment must contain a \l {relates-command}
+    {\\relates} command that attaches the macro comment to a class,
+    header file, or namespace. Otherwise, the documentation will be
+    lost. Here are three example macro comments followed by what they
+    might look like in \c {qtglobal.html} or \c {qobject.html}:
 
-               See also Q_ASSERT_X(), qFatal() and \l {Debugging
-               Techniques}.
-           \endquotation
+    \code
+    / *!
+        \macro void Q_ASSERT(bool test)
+        \relates <QtGlobal>
 
-           in qtglobal.html. And
+        Prints a warning message containing the source code
+        file name and line number if \a test is false.
 
-           \code
-           / *!
-               \macro Q_PROPERTY(...)
-               \relates QObject
+        ...
 
-               This macro declares a QObject property. The syntax is:
+        \sa Q_ASSERT_X(), qFatal(), {Debugging Techniques}
+    * /
+    \endcode
 
-               ...
+    \quotation
+        \raw HTML
+        <h3>void Q_ASSERT ( bool <i>test</i> )</h3>
+        \endraw
 
-               \sa {Qt's Property System}
-           * /
-           \endcode
+        Prints a warning message containing the source code
+        file name and line number if \a test is false.
 
-           will be rendered as
+        ...
 
-           \quotation
-               \raw HTML
-               <h3>Q_PROPERTY ( ... )</h3>
-               \endraw
+        See also Q_ASSERT_X(), qFatal() and \l {Debugging Techniques}.
+ 
+   \endquotation
 
-               This macro declares a QObject property. The syntax is:
+    \code
+    / *!
+        \macro Q_PROPERTY(...)
+        \relates QObject
 
-               ...
+        This macro declares a QObject property. The syntax is:
 
-               See also \l {Qt's Property System}.
-           \endquotation
+        ...
 
-           in qobject.html. And
+        \sa {Qt's Property System}
+    * /
+    \endcode
 
-           \code
-           / *!
-               \macro Q_OBJECT
-               \relates QObject
+    \quotation
+        \raw HTML
+        <h3>Q_PROPERTY ( ... )</h3>
+        \endraw
 
-               The Q_OBJECT macro must appear in the private section
-               of a class definition that declares its own signals and
-               slots or that uses other services provided by Qt's
-               meta-object system.
+        This macro declares a QObject property. The syntax is:
 
-               ...
+        ...
 
-               \sa {Meta-Object System}, {Signals and Slots}, {Qt's
-               Property System}
-           * /
-           \endcode
+        See also \l {Qt's Property System}.
+    \endquotation
 
-           will be rendered as
+    \code
+    / *!
+        \macro Q_OBJECT
+        \relates QObject
 
-           \quotation
-               \raw HTML
-               <h3>Q_OBJECT</h3>
-               \endraw
+        The Q_OBJECT macro must appear in the private section
+        of a class definition that declares its own signals and
+        slots or that uses other services provided by Qt's
+        meta-object system.
 
-               The Q_OBJECT macro must appear in the private section
-               of a class definition that declares its own signals and
-               slots or that uses other services provided by Qt's
-               meta-object system.
+        ...
 
-               ...
+        \sa {Meta-Object System}, {Signals and Slots}, {Qt's
+        Property System}
+    * /
+    \endcode
 
-               See also \l {Meta-Object System}, \l {Signals and
-               Slots} and \l {Qt's Property System}.
-           \endquotation
+    \quotation
+        \raw HTML
+        <h3>Q_OBJECT</h3>
+        \endraw
 
-           in qobject.html.
+        The Q_OBJECT macro must appear in the private section
+        of a class definition that declares its own signals and
+        slots or that uses other services provided by Qt's
+        meta-object system.
 
-    \row
-        \o \bold \\module \target module
-        \o \bold {The \\module creates a separate page that lists the
-           classes belonging to the module specified by the command's
-           argument.}
+        ...
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+        See also \l {Meta-Object System}, \l {Signals &
+        Slots} and \l {Qt's Property System}.
+    \endquotation
 
-           A class can be related to a module using the \l
-           {inmodule}{\\inmodule} command.
+    \target module-command
+    \section1 \\module 
 
-           The \\module command is typically followed by the \l
-           {title}{\\title} and \l {brief}{\\brief} commands. Each
-           class is listed with a link to the class reference page and
-           a brief description based on the classes' \l
-           {brief}{\\brief} texts.
+    The \\module creates a page that lists the classes belonging to
+    the module specified by the command's argument.  A class included
+    in the module by including the \l {inmodule-command} {\\inmodule}
+    command in the \\class comment.
 
-           For example:
+    The \\module command is typically followed by a \l {title-command}
+    {\\title} and a \l {brief-command} {\\brief} command. Each class
+    is listed as a link to the class reference page followed by the
+    text from the class's \l {brief-command} {\\brief} command. For
+    example:
 
-           \code
-           / *!
-               \module QtNetwork
+    \code
+    / *!
+        \module QtNetwork
 
-               \title QtNetwork Module
+        \title QtNetwork Module
 
-               \brief The QtNetwork module offers classes that allow
-               you to write TCP/IP clients and servers.
+        \brief The QtNetwork module offers classes that allow
+        you to write TCP/IP clients and servers.
 
-               The network module provides classes to make network
-               programming easier and portable. It offers both
-               high-level classes such as QHttp and QFtp that
-               implement specific application-level protocols, and
-               lower-level classes such as QTcpSocket, QTcpServer, and
-               QUdpSocket.
-           * /
-           \endcode
+        The network module provides classes to make network
+        programming easier and portable. It offers both
+        high-level classes such as QHttp and QFtp that
+        implement specific application-level protocols, and
+        lower-level classes such as QTcpSocket, QTcpServer, and
+        QUdpSocket.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this in \c {qtnetwork.html} something like this:
 
            \quotation
                \raw HTML
@@ -5242,7 +4840,7 @@
 
                The QtNetwork module offers classes that allow you to
                write TCP/IP clients and servers.\l {module
-               details}{More...}
+               details} {More...}
 
                \raw HTML
                <p>
@@ -5296,43 +4894,33 @@
 
            \endquotation
 
-           in qtnetwork.html.
+    See also \l {inmodule-command} {\\inmodule}
 
-           See also \l {inmodule}{\\inmodule}
+    \target namespace-command
+    \section1 \\namespace 
 
-    \row
-        \o \bold \\namespace \target namespace
-        \o \bold {The \\namespace command allows you to document a C++
-           namespace.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
-
-           QDoc will generate the same additional links and
-           documentation for all the members of the namespace as it
-           does for \l {framework}{classes}. The documentation for
-           the specified namespace is put in <lower-case>\i
-           {namespace}.html.
+    The \\namespace command is for documenting the contents of the C++
+    namespace named as its argument. The documentation outline QDoc
+    generates for a namespace is similar to the outline it generates
+    for a C++ class. For example:
 
-           For example:
-
-           \code
-           / *!
-               \namespace Qt
+    \code
+    / *!
+        \namespace Qt
 
-               \brief The Qt namespace contains miscellaneous
-               identifiers used throughout the Qt library.
-           * /
-           \endcode
+        \brief The Qt namespace contains miscellaneous
+        identifiers used throughout the Qt library.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this in \c{qt.html} something like this:
 
            \quotation
                \raw HTML
                <center><h1>Qt Namespace Reference</h1></center>
                <p>The Qt namespace contains miscellaneous
                identifiers used throughout the Qt library.
-               <a href="13-qdoc-commands-topical.html#name">More...</a>
+               <a href="13-qdoc-commands-topics.html#name">More...</a>
                </p>
 
                <pre>#include &lt;Qt&gt;</pre>
@@ -5362,18 +4950,13 @@
                ...
            \endquotation
 
-           in qt.html.
-
-    \row
-        \o \bold \\page \target page
-        \o \bold {The \\page command allows you to create a stand-alone
-           documentation page.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    \target page-command
+    \section1 \\page 
 
-           The page's title can be set using the \l {title}{\\title}
-           command. For example:
+    The \\page command is for creating a stand-alone documentation
+    page.  The argument is the name of the file where QDoc should
+    store the page. The page title is set using the \l {title-command}
+    {\\title} command. For example:
 
            \code
            / *!
@@ -5398,69 +4981,64 @@
             * /
             \endcode
 
-           will be rendered in its own HTML file: \l{About Qt}.
+    QDoc renders this page in \c {aboutqt.html}.
 
-    \row
-        \o \bold {\\externalpage} \target externalpage
-        \o \bold {The \\externalpage command gives a title to
-            an external URL.}
+    \target externalpage-command
+    \section1 \\externalpage 
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    The \\externalpage command assigns a title to an external URL.
+    For example:
 
-           For example:
+    \code
+    / *!
+        \externalpage http://doc.trolltech.com/4.3/qtopiacore.html
+        \title Qtopia Core
+    * /
+    \endcode
 
-           \code
-           / *!
-               \externalpage http://www.trolltech.com/products/embedded/index.html
-               \title Qtopia Core
-           * /
-           \endcode
+    This allows you to include a link to the external page in your
+    documentation this way:
 
-           The QDoc comment above allows you to link to the Qtopia
-           Core webpage by simply linking to the given title. For
-           example:
+    \code
+    / *!
+        The broad scope of the \l {Qtopia Core} API enables it to
+        be used across a wide variety of development projects.
+    * /
+    \endcode
 
-           \code
-           / *!
-               The broad scope of the \l {Qtopia Core} API enables it to
-               be used across a wide variety of development projects.
-           * /
-           \endcode
+    QDoc renders this as:
 
-           will be rendered as
+    \quotation
+        The broad scope of the \l
+        {http://doc.trolltech.com/4.3/qtopiacore.html} {Qtopia
+        Core} API enables it to be used across a wide variety
+        of development projects.
+    \endquotation
 
-           \quotation
-               The broad scope of the \l
-               {http://www.trolltech.com/products/embedded/index.html}{Qtopia
-               Core} API enables it to be used across a wide variety
-               of development projects.
-           \endquotation
+    To achieve the same result without using the \\externalpage
+    command, you would have to hard code the adress into your
+    documentation:
 
-           To achieve the same result without using the
-           \\externalpage command, you would have to hard code the
-           adress into your documentation:
+    \code
+    / *!
+        The broad scope of the \l
+        {http://doc.trolltech.com/4.3/qtopiacore.html} {Qtopia
+        Core} API enables it to be used across a wide variety
+        of development projects.
+    * /
+    \endcode
 
-           \code
-           / *!
-               The broad scope of the \l
-               {http://www.trolltech.com/products/embedded/index.html}{Qtopia
-               Core} API enables it to be used across a wide variety
-               of development projects.
-           * /
-           \endcode
+    The \\externalpage command makes it easier to maintain the
+    documentation. If the adress changes, you only need to change the
+    argument of the \\externalpage command.
 
-           The \\externalpage command makes it easier to maintain the
-           documentation. If the adress changes, you only need to change the
-           argument of the \\externalpage command.
+    \target property-command
+    \section1 \\property 
 
-    \row
-        \o \bold \\property \target property
-        \o \bold {The \\property command allows you to document a Qt
-           property.}
+    The \\property command allows you to document a Qt property.
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+           The command follows \l {topic argument} {the general
+           topic command convention} for the argument.
 
            A property is defined using the Q_PROPERTY() macro. The
            macro takes as arguments the property's name and its set,
@@ -5478,13 +5056,13 @@
            property.
 
            The \\property command is typically accompanied with a \l
-           {brief}{\\brief} command.  In the case of a property, the
-           \l {brief}{\\brief} command's argument is a sentence
-           fragment that will be included in a one-sentence
-           description of the property generated by QDoc. The command
-           follows the same rules for the \l {brief
-           property}{description} as the \l {variable}{\\variable}
-           command.
+           {brief-command} {\\brief} command.  In the case of a
+           property, the \l {brief-command} {\\brief} command's
+           argument is a sentence fragment that will be included in a
+           one-sentence description of the property generated by
+           QDoc. The command follows the same rules for the \l
+           {brief-property} {description} as the \l {variable-command}
+           {\\variable} command.
 
            For example:
 
@@ -5497,7 +5075,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -5531,7 +5109,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -5550,18 +5128,19 @@
                \o \bold { int width () const}
                \endlist
 
-               See also \l{QWidget::geometry}{geometry},
-               \l{QWidget::height}{height}, and \l{QWidget::size}{size}.
+               See also \l{QWidget::geometry} {geometry},
+               \l{QWidget::height} {height}, and \l{QWidget::size} {size}.
            \endquotation
 
            in qwidget.html.
 
-    \row
-        \o \bold \\service \target service
 
-        \o \bold {The \\service command tells QDoc that a class is a
-            service class and specifies its alias, i.e. the associated
-            service's name.}
+    \target service-command
+    \section1 \\service 
+
+    The \\service command tells QDoc that a class is a
+    service class and specifies its alias, i.e. the associated
+    service's name.
 
             The command takes two arguments, the service class's name
             and the associated alias. For example:
@@ -5577,21 +5156,22 @@
                 }
             \endcode
 
-            See also \l {class}{\\class} and \l
-            {generatelist}{\\generatelist}.
+            See also \l {class-command} {\\class} and \l
+            {generatelist-command} {\\generatelist}.
 
-    \row
-        \o \bold \\typedef \target typedef
-        \o \bold {The \\typedef command allows you to document a C++ type
-           definition.}
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    \target typedef-command
+    \section1 \\typedef 
+
+    The \\typedef command allows you to document a C++ type definition.
+
+           The command follows \l {topic argument} {the general
+           topic command convention} for the argument.
 
            The documentation will be located in the associated class,
            header file or namespace documentation. When documenting a
            global type definition, the \\typedef command must be
-           accompanied with a \l {relates}{\\relates} command. For
+           accompanied with a \l {relates-command} {\\relates} command. For
            example:
 
            \code
@@ -5603,7 +5183,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -5631,7 +5211,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -5662,7 +5242,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -5674,20 +5254,22 @@
 
            in qlinkedlist.html.
 
-    \row
-        \o \bold \\variable \target variable
-        \o \bold {The \\variable command allows you to document a
-           member variable or a constant.}
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    \target variable-command
+    \section1 \\variable 
+
+    The \\variable command allows you to document a
+    member variable or a constant.
 
-           The \\variable command is typically followed by a \l
-           {brief}{\\brief} command; QDoc will generate the
-           documentation for the variable based on the brief
-           description. The command follows the same rules for the \l
-           {brief property}{description} as the \l
-           {property}{\\property} command.
+           The command follows \l {topic argument} {the general
+           topic command convention} for the argument.
+
+           The \\variable command is typically followed by a 
+	   \l {brief-command} {\\brief} command; QDoc will generate the
+           documentation for the variable based on the brief command
+           description. The command follows the same rules for the 
+	   \l {brief-property} {description} as the \l {property-command}
+           {\\property} command.
 
            The documentation will be located in the in the associated
            class, header file or namespace documentation.
@@ -5702,7 +5284,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -5753,7 +5335,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -5764,8 +5346,8 @@
 
                The default type for tree widget items.
 
-               See also \l {QTreeWidgetItem::UserType}{UserType} and
-               \l {QTreeWidgetItem::type()}{type()}.
+               See also \l {QTreeWidgetItem::UserType} {UserType} and
+               \l {QTreeWidgetItem::type()} {type()}.
 
                \raw HTML
                <h3>
@@ -5776,83 +5358,77 @@
                The minimum value for custom types. Values below
                UserType are reserved by Qt.
 
-               See also \l {QTreeWidgetItem::Type}{Type} and
-               \l{QTreeWidgetItem::type()}{type()}.
+               See also \l {QTreeWidgetItem::Type} {Type} and
+               \l{QTreeWidgetItem::type()} {type()}.
 
            \endquotation
 
            in qtreewidget.html.
-    \endtable
+
 */
 
 /*!
-    \page 14-qdoc-commands-contextualcommands.html
-    \previouspage Topical Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Navigation Commands
+    \page 14-qdoc-commands-contextcommands.html
+    \previouspage Topic Commands
+    \contentspage Table of Contents
+    \nextpage Navigating
 
-    \title Contextual Commands
+    \title Context Commands
 
-    The contextual commands provide QDoc with information, that it
+    The context commands provide QDoc with information, that it
     wouldn't figure out otherwise, about the documented object. For
     example whether a class is thread-safe or not.
 
     These commands can appear anywhere within a QDoc comment.
 
-    \section1 Alphabetical List
-
-    \l {16-qdoc-commands-status.html#compat}{\\compat},
-    \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage},
-    \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage},
-    \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup},
-    \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule},
-    \l {16-qdoc-commands-status.html#internal}{\\internal},
-    \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass},
-    \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage},
-    \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant},
-    \l {16-qdoc-commands-status.html#obsolete}{\\obsolete},
-    \l {18-qdoc-commands-relating.html#overload}{\\overload},
-    \l {16-qdoc-commands-status.html#preliminary}{\\preliminary},
-    \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage},
-    \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant},
-    \l {18-qdoc-commands-relating.html#reimp}{\\reimp},
-    \l {18-qdoc-commands-relating.html#relates}{\\relates},
-    \l {15-qdoc-commands-navigation.html#startpage}{\\startpage},
-    \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe},
-    \l {20-qdoc-commands-title.html#title}{\\title}
-
     \section1 Categories
     \list
-    \o \l {Navigation Commands}
-    \o \l {Status Commands}
-    \o \l {Thread Support Commands}
-    \o \l {Relating Commands}
-    \o \l {Grouping Commands}
-    \o \l {Title Commands}
+    \o \l {Navigating}
+    \o \l {Reporting Status}
+    \o \l {Thread Support}
+    \o \l {Relating Things}
+    \o \l {Grouping Things}
+    \o \l {Naming Things}
+    \endlist
+
+    \section1 Command List
+
+    \list
+    \o \l {16-qdoc-commands-status.html#compat-command} {\\compat}
+    \o \l {15-qdoc-commands-navigation.html#contentspage-command} {\\contentspage}
+    \o \l {15-qdoc-commands-navigation.html#indexpage-command} {\\indexpage}
+    \o \l {19-qdoc-commands-grouping.html#ingroup-command} {\\ingroup}
+    \o \l {19-qdoc-commands-grouping.html#inmodule-command} {\\inmodule}
+    \o \l {16-qdoc-commands-status.html#internal-command} {\\internal}
+    \o \l {19-qdoc-commands-grouping.html#mainclass-command} {\\mainclass}
+    \o \l {15-qdoc-commands-navigation.html#nextpage-command} {\\nextpage}
+    \o \l {17-qdoc-commands-thread.html#nonreentrant-command} {\\nonreentrant}
+    \o \l {16-qdoc-commands-status.html#obsolete-command} {\\obsolete}
+    \o \l {18-qdoc-commands-relating.html#overload-command} {\\overload}
+    \o \l {16-qdoc-commands-status.html#preliminary-command} {\\preliminary}
+    \o \l {15-qdoc-commands-navigation.html#previouspage-command} {\\previouspage}
+    \o \l {17-qdoc-commands-thread.html#reentrant-command} {\\reentrant}
+    \o \l {18-qdoc-commands-relating.html#reimp-command} {\\reimp}
+    \o \l {18-qdoc-commands-relating.html#relates-command} {\\relates}
+    \o \l {15-qdoc-commands-navigation.html#startpage-command} {\\startpage}
+    \o \l {17-qdoc-commands-thread.html#threadsafe-command} {\\threadsafe}
+    \o \l {20-qdoc-commands-namingthings.html#title-command} {\\title}
     \endlist
 */
 
 /*!
     \page 15-qdoc-commands-navigation.html
-    \previouspage Contextual Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Status Commands
+    \previouspage Context Commands
+    \contentspage Table of Contents
+    \nextpage Reporting Status
 
-    \title Navigation Commands
+    \title Navigating
 
     The navigation commands allow you to link the pages of a multipage
     document together. They provide the components of a navigation bar
     at the top and bottom of the document. They also provide browser
     and search engine support.
 
-    \section1 Alphabetical List
-
-    \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage},
-    \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage},
-    \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage},
-    \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage},
-    \l {15-qdoc-commands-navigation.html#startpage}{\\startpage}
-
     \section1 General Description
 
     The QDoc comments below shows a typical example using the
@@ -5861,7 +5437,7 @@
     \code
     / *!
         \page basicqt.html
-        \contentspage {Basic Qt}{Contents}
+        \contentspage {Basic Qt} {Contents}
         \nextpage Getting Started
 
         \indexpage Index
@@ -5885,7 +5461,7 @@
     / *!
         \page gettingstarted.html
         \previouspage Basic Qt
-        \contentspage {Basic Qt}{Contents}
+        \contentspage {Basic Qt} {Contents}
         \nextpage Creating Dialogs
 
         \indexpage Index
@@ -5901,7 +5477,7 @@
     / *!
         \page creatingdialogs.html
         \previouspage Getting Started
-        \contentspage {Basic Qt}{Contents}
+        \contentspage {Basic Qt} {Contents}
 
         \indexpage Index
         \startpage Basic Qt
@@ -5928,7 +5504,7 @@
     \endcode
 
     The second page of this multipage document, "Getting Started",
-    will be rendered as
+    QDoc renders this as:
 
     \quotation
     \raw HTML
@@ -5965,8 +5541,8 @@
 
     in creatingdialogs.html.
 
-    In addition, the \l {indexpage}{\\indexpage} and \l
-    {startpage}{\\startpage} commands specifies links to the page's
+    In addition, the \l {indexpage-command} {\\indexpage} and \l
+    {startpage-command} {\\startpage} commands specifies links to the page's
     index page and start page. These links are used by browsers and
     search engines.
 
@@ -5986,17 +5562,11 @@
     </head>
     \endcode
 
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
+    \target previouspage-command
+    \section1 \\previouspage 
 
-    \row
-        \o \bold \\previouspage \target previouspage
-        \o \bold {The \\previouspage command links the current page
-           to the previous one in an ordered series of documents}.
+    The \\previouspage command links the current page
+    to the previous one in an ordered series of documents.
 
            The command has two arguments, each enclosed by curly
            braces: The first is the link target, i.e. the title of the
@@ -6010,20 +5580,24 @@
            the current page. For an example, see the \l {General
            Description} section.
 
-    \row
-        \o \bold \\nextpage \target nextpage
-        \o \bold {The \\nextpage command links the current
-           page to the next page in an ordered series of documents}.
+
+    \target nextpage-command
+    \section1 \\nextpage 
+
+    The \\nextpage command links the current
+    page to the next page in an ordered series of documents.
 
            The command follows the same syntax and argument convention
-           as the \l {previouspage}{\\previouspage} command.
+           as the \l {previouspage-command} {\\previouspage} command.
 
            For an example, see the \l {General Description} section.
 
-    \row
-        \o \bold \\startpage \target startpage
-        \o \bold {The \\startpage command specifies the first document
-           in a collection of documents.}
+
+    \target startpage-command
+    \section1 \\startpage 
+
+    The \\startpage command specifies the first document
+    in a collection of documents.
 
            The command must stand alone on its own line, and its
            unique argument is the title of the first document.
@@ -6036,20 +5610,24 @@
 
            For an example, see the \l {General Description} section.
 
-    \row
-        \o \bold \\contentspage \target contentspage
-        \o \bold {The \\contentspage command links the current
-           page to a contents page}.
+
+    \target contentspage-command
+    \section1 \\contentspage
+
+    The \\contentspage command links the current
+    page to a contents page.
 
            The command follows the same syntax and argument convention
-           as the \l {previouspage}{\\previouspage} command.
+           as the \l {previouspage-command} {\\previouspage} command.
 
            For an example, see the \l {General Description} section.
 
-    \row
-        \o \bold \\indexpage \target indexpage
-        \o \bold {The \\indexpage command specifies a document providing
-           an index for the current document}.
+
+    \target indexpage-command
+    \section1 \\indexpage 
+
+    The \\indexpage command specifies a document providing
+    an index for the current document.
 
            The command must stand alone on its own line, and its
            unique argument is the title of the index document.
@@ -6062,16 +5640,16 @@
 
            For an example, see the \l {General Description} section.
 
-    \endtable
+
 */
 
 /*!
     \page 16-qdoc-commands-status.html
-    \previouspage Navigation Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Thread Support Commands
+    \previouspage Navigating
+    \contentspage Table of Contents
+    \nextpage Thread Support
 
-    \title Status Commands
+    \title Reporting Status
 
     The usage commands can indicate whether a documented object is
     under development, becoming obsolete, provided for compatibility
@@ -6079,25 +5657,11 @@
     describe the history of minor versions. And they can also describe
     a documented object's ability to handle multithreaded programming.
 
-    \section1 Alphabetical List
-
-    \l {16-qdoc-commands-status.html#compat}{\\compat},
-    \l {16-qdoc-commands-status.html#internal}{\\internal},
-    \l {16-qdoc-commands-status.html#obsolete}{\\obsolete},
-    \l {16-qdoc-commands-status.html#preliminary}{\\preliminary},
-    \l {16-qdoc-commands-status.html#since}{\\since}
+    \target preliminary-command
+    \section1 \\preliminary 
 
-    \section1 Command Description
-
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\preliminary \target preliminary
-        \o \bold {The \\preliminary command indicates that the
-           referenced function is under development.}
+    The \\preliminary command indicates that the
+    referenced function is under development.
 
            The command must stand on its own line.
 
@@ -6119,7 +5683,7 @@
            }
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -6150,12 +5714,14 @@
              \endlist
          \endquotation
 
-    \row
-        \o \bold \\obsolete \target obsolete
-        \o \bold {The \\obsolete command indicates that the referenced
-           function no longer should be used in new code;
-           there is no guarantee for how long it will remain in
-           the library.}
+
+    \target obsolete-command
+    \section1 \\obsolete 
+
+    The \\obsolete command indicates that the referenced
+    function no longer should be used in new code;
+    there is no guarantee for how long it will remain in
+    the library.
 
            The command must stand on its own line.
 
@@ -6175,7 +5741,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -6206,11 +5772,13 @@
            in myclass-obsolete.html
 
 
-    \row
-        \o \bold \\compat \target compat
-        \o \bold {The \\compat command indicates that the referenced class
-           or function is part of the support library provided to keep
-           old source code working.}
+
+    \target compat-command
+    \section1 \\compat 
+
+    The \\compat command indicates that the referenced class
+    or function is part of the support library provided to keep
+    old source code working.
 
            The command must stand on its own line.
 
@@ -6229,14 +5797,14 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \bold {This class is part of the Qt 3 support
                library.} It is provided to keep old source code
                working. We strongly advise against using it in new
                code. See the \l
-               {http://qt.nokia.com/doc/4.0/porting4.html}{Porting
+               {http://qt.nokia.com/doc/4.0/porting4.html} {Porting
                Guide} for more information.
            \endquotation
 
@@ -6256,7 +5824,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -6288,10 +5856,12 @@
            in myclass-qt3.html
 
 
-    \row
-        \o \bold \\internal \target internal
-        \o \bold {The \\internal command indicates that the referenced
-           function is not part of the public interface.}
+
+    \target internal-command
+    \section1 \\internal 
+
+    The \\internal command indicates that the referenced
+    function is not part of the public interface.
 
            The command must stand on its own line.
 
@@ -6319,10 +5889,12 @@
 
            in qspinbox.cpp, will not be rendered at all.
 
-    \row
-        \o \bold \\since \target since
-        \o \bold {The \\since command tells in which minor release
-           the associated functionality was added.}
+
+    \target since-command
+    \section1 \\since 
+
+    The \\since command tells in which minor release
+    the associated functionality was added.
 
            For example:
 
@@ -6341,7 +5913,7 @@
            }
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -6355,40 +5927,34 @@
                ...
 
                See also \l
-               {QStyle::standardIconImplementation()}{standardIconImplementation()}
-               and \l {QStyle::standardPixmap()}{standardPixmap()}.
+               {QStyle::standardIconImplementation()} {standardIconImplementation()}
+               and \l {QStyle::standardPixmap()} {standardPixmap()}.
                \endquotation
 
            QDoc generates the "Qt" reference from the \l
-           {25-qdoc-configuration-derivedprojects.html#project}{\c
+           {25-qdoc-configuration-derivedprojects.html#project} {\c
            project} configuration variable. For that reason this
            reference will change according to the current
            documentation project.
 
            See also \l
-           {25-qdoc-configuration-derivedprojects.html#project}{\c
+           {25-qdoc-configuration-derivedprojects.html#project} {\c
            project}.
 
-    \endtable
+
 */
 
 /*!
     \page 17-qdoc-commands-thread.html
-    \previouspage Status Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Relating Commands
+    \previouspage Reporting Status
+    \contentspage Table of Contents
+    \nextpage Relating Things
 
-    \title Thread Support Commands
+    \title Thread Support
 
     The thread support commands specify the level of support for
     multithreaded programming of a class or function.
 
-    \section1 Alphabetical List
-
-    \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant},
-    \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant},
-    \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe}
-
     \section1 General Description
 
     There are three levels of support for multithreaded programming of
@@ -6407,10 +5973,10 @@
     invocation references shared data.
 
     When a class is declared \c reentrant or \c threadsafe, using the
-    \l {reentrant}{\\reentrant} and \l {threadsafe}{\\threadsafe}
+    \l {reentrant-command} {\\reentrant} and \l {threadsafe-command} {\\threadsafe}
     commands respectively, functions in the referenced class can be
     declared \c nonreentrant, using the \l
-    {nonreentrant}{\\nonreentrant} command, excluding the functions
+    {nonreentrant-command} {\\nonreentrant} command, excluding the functions
     from the general view.
 
     For example:
@@ -6453,7 +6019,7 @@
     }
     \endcode
 
-    will be rendered as
+    QDoc renders this as:
 
     \quotation
         \raw HTML
@@ -6468,8 +6034,8 @@
         \endcode
 
         \bold {Note:} All the functions in this class are \l
-        {threads.html#reentrant}{reentrant}, except \l
-        {QLocale::setDefault()}{setDefault()}.
+        {threads.html#reentrant} {reentrant}, except \l
+        {QLocale::setDefault()} {setDefault()}.
 
         ...
 
@@ -6495,8 +6061,8 @@
 
         \warning This function is not reentrant.
 
-        See also \l {QLocale::system()}{system()} and \l
-        {QLocale::c()}{c()}.
+        See also \l {QLocale::system()} {system()} and \l
+        {QLocale::c()} {c()}.
 
         ...
     \endquotation
@@ -6504,7 +6070,7 @@
     As shown above, QDoc generates a notification when a class is
     declared reentrant, and lists the exceptions (the declared
     nonreentrant functions). A link to the general documentation on \l
-    {threads.html#reentrant}{reentrancy and thread-safety} is
+    {threads.html#reentrant} {reentrancy and thread-safety} is
     included.  In addition a warning, "\bold Warning: This function is
     not reentrant.", is generated in the nonreentrant functions'
     documentation.
@@ -6513,92 +6079,78 @@
     is declared threadsafe.
 
     For more information see the general documentation on \l
-    {threads.html#reentrant}{reentrancy and thread-safety}.
-
-    \section1 Command Descriptions
+    {threads.html#reentrant} {reentrancy and thread-safety}.
 
-    \table
-    \header
-        \o Command
-        \o Description
+    \target threadsafe-command
+    \section1 \\threadsafe 
 
-    \row
-        \o \bold \\threadsafe \target threadsafe
-        \o \bold {The \\threadsafe command indicates that the
-           associated class or function can be called simultaneously by
-           multiple threads even when each invocation references
-           shared data.}
+    The \\threadsafe command indicates that the
+    associated class or function can be called simultaneously by
+    multiple threads even when each invocation references
+    shared data.
 
            The command must stand on its own line.
 
            The generated documentation resulting from using the
            \\threadsafe command is similar to the result of using the
-           \l {reentrant}{\\reentrant} command. For an example, see
+           \l {reentrant-command} {\\reentrant} command. For an example, see
            the \l {General Description} section.
 
-           See also \l{reentrant}{\\reentrant} and
-           \l{nonreentrant}{\\nonreentrant}.
+           See also \l{reentrant-command} {\\reentrant} and
+           \l{nonreentrant-command} {\\nonreentrant}.
 
-    \row
-        \o \bold \\reentrant \target reentrant
-        \o \bold {The \\reentrant command indicates that the associated
-           class or function  can be called simultaneously
-           by multiple threads, provided that each invocation of the
-           functions reference unique data.}
+
+    \target reentrant-command
+    \section1 \\reentrant 
+
+    The \\reentrant command indicates that the associated
+    class or function  can be called simultaneously
+    by multiple threads, provided that each invocation of the
+    functions reference unique data.
 
            The command must stand on its own line.
 
            For an example, see the \l {General Description} section.
 
-           See also \l{nonreentrant}{\\nonreentrant} and
-            \l{threadsafe}{\\threadsafe}.
+           See also \l{nonreentrant-command} {\\nonreentrant} and
+            \l{threadsafe-command} {\\threadsafe}.
 
-    \row
-        \o \bold \\nonreentrant \target nonreentrant
-        \o \bold {The \\nonreentrant command indicates that the
-           associated class or function cannot be called by
-           multiple threads.}
+
+    \target nonreentrant-command
+    \section1 \\nonreentrant 
+
+    The \\nonreentrant command indicates that the
+    associated class or function cannot be called by
+    multiple threads.
 
            The command must stand on its own line.
 
            For an example, see the \l {General Description} section.
 
-           See also \l{reentrant}{\\reentrant} and
-           \l{threadsafe}{\\threadsafe}.
+           See also \l{reentrant-command} {\\reentrant} and
+           \l{threadsafe-command} {\\threadsafe}.
+
 
-    \endtable
 */
 
 /*!
     \page 18-qdoc-commands-relating.html
-    \previouspage Thread Support Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Grouping Commands
+    \previouspage Thread Support
+    \contentspage Table of Contents
+    \nextpage Grouping Things
 
-    \title Relating Commands
+    \title Relating Things
 
     The relation commands discribe how the documented object relates
     to its context: Whether it is an overloaded function, a
     reimplemented function or a global function related to a specified
     class or header file.
 
-    \section1 Alphabetical List
+    \target overload-command
+    \section1 \\overload 
 
-    \l {18-qdoc-commands-relating.html#overload}{\\overload},
-    \l {18-qdoc-commands-relating.html#reimp}{\\reimp},
-    \l {18-qdoc-commands-relating.html#relates}{\\relates},
-
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\overload \target overload
-        \o \bold {The \\overload command indicates that the 
-           function is a secondary overload of its name.}
+    The \\overload command indicates that the 
+    function is a secondary overload of its name.
 
            The command must stand on its own line.
 
@@ -6611,7 +6163,7 @@
 
 	   From Qt 4.5, you can include the function name plus '()'
 	   as a parameter to the \bold{\\overload} command, which 
-	   will include a standard \i{This function overloads...} 
+	   will include a standard \e{This function overloads...} 
 	   line of text with a link to the documentation for the 
 	   primary version of the function. 
 
@@ -6636,7 +6188,7 @@
            }
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -6646,10 +6198,10 @@
                </h3>
                \endraw
 
-	       This function overloads \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction}{addAction()}
+	       This function overloads \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction} {addAction()}
 
                This convenience function creates a new action with an
-               \i icon and some \i text. The function adds the newly
+               \e icon and some \e text. The function adds the newly
                created action to the menu's list of actions, and
                returns it.
 
@@ -6669,11 +6221,13 @@
                convenience. 
 	   \endquotation.
 
-    \row
-        \o \bold \\reimp \target reimp
-        \o \bold {The \\reimp command indicates that the
-           referenced function is a reimplementation of a virtual function,
-           where the reimplementation has no effect on the interface.}
+
+    \target reimp-command
+    \section1 \\reimp 
+
+    The \\reimp command indicates that the
+    referenced function is a reimplementation of a virtual function,
+    where the reimplementation has no effect on the interface.
 
            The command must stand on its own line.
 
@@ -6698,10 +6252,12 @@
            QAbstractButton::nextCheckState() will appear in the
            documentation.
 
-    \row
-        \o \bold \\relates \target relates
-        \o \bold {The \\relates command attaches the documentation of
-           a global function to that of a related class or header file.}
+
+    \target relates-command
+    \section1 \\relates 
+
+    The \\relates command attaches the documentation of
+    a global function to that of a related class or header file.
 
            The command's argument is a class name, an the command (and
            its argument) must stand on its own line.
@@ -6725,39 +6281,27 @@
 
            will be rendered with the QChar documentation.
 
-    \endtable
+
 */
 
 /*!
     \page 19-qdoc-commands-grouping.html
-    \previouspage Relating Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Title Commands
+    \previouspage Relating Things
+    \contentspage Table of Contents
+    \nextpage Naming Things
 
-    \title Grouping Commands
+    \title Grouping Things
 
     The grouping commands relate classes to defined groups and
     modules. The groups are used when generating lists of related
     classes in the documentation, while the modules are elements of
     Qt's structure.
 
-    \section1 Alphabetical List
+    \target mainclass-command
+    \section1 \\mainclass 
 
-    \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup},
-    \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule},
-    \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass},
-
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\mainclass \target mainclass
-        \o \bold {The \\mainclass command relates the documented class to
-           a group called mainclasses.}
+    The \\mainclass command relates the documented class to
+    a group called mainclasses.
 
            The command must stand on its own line.
 
@@ -6778,19 +6322,20 @@
            will ensure that the QWidget class is included in the \c
            mainclasses group, which means, for example, that the class
            will appear on the list created by calling the \l
-           {generatelist}{\\generatelist} command with the \c
+           {generatelist-command} {\\generatelist} command with the \c
            mainclasses argument:
 
            \l http://qt.nokia.com/doc/4.0/mainclasses.html
 
-           See also \l {generatelist}{\\generatelist}.
+           See also \l {generatelist-command} {\\generatelist}.
 
-    \row
-        \o \bold \\ingroup \target ingroup
 
-        \o \bold {The \\ingroup command indicates that the given
-           overview or documented class belongs to a certain group of
-           related docmentation.}
+    \target ingroup-command
+    \section1 \\ingroup 
+
+    The \\ingroup command indicates that the given
+    overview or documented class belongs to a certain group of
+    related docmentation.
 
            A class or overview may belong to many groups.
 
@@ -6812,19 +6357,21 @@
 
            will ensure that the QDir class is included in the \c io
            group, which means, for example, that QDir will appear on
-           the list created by calling the \l {group}{\\group} command
+           the list created by calling the \l {group-command} {\\group} command
            with the \c io argument.
 
            Note that to list overviews that are related to a given
            group, you must generate the list exlicitly by using the \l
-           {generatelist}{\\generatelist} command with the \c related
+           {generatelist-command} {\\generatelist} command with the \c related
            argument.
 
-           See also \l {group}{\\group}.
-    \row
-        \o \bold \\inmodule \target inmodule
-        \o \bold {The \\inmodule command relates the documented class
-           to the module specified by the command's argument.}
+           See also \l {group-command} {\\group}.
+
+    \target inmodule-command
+    \section1 \\inmodule 
+
+    The \\inmodule command relates the documented class
+    to the module specified by the command's argument.
 
            For the basic classes in Qt, a class's module is determined
            by its location, i.e. its directory. However, for
@@ -6846,43 +6393,32 @@
            will ensure that the QDesignerTaskMenuExtension class is
            included in the \c QtDesigner module, which means, for
            example, that the class will appear on the list created by
-           calling the \l {generatelist}{\\generatelist} command with
+           calling the \l {generatelist-command} {\\generatelist} command with
            the \c {{classesbymodule QtDesigner}} argument.
 
-           See also \l {module}{\\module} and \l
-           {generatelist}{\\generatelist}.
-    \endtable
+           See also \l {module-command} {\\module} and \l
+           {generatelist-command} {\\generatelist}.
+
 */
 
 /*!
-    \page 20-qdoc-commands-title.html
-    \previouspage Grouping Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage QDoc Configuration
+    \page 20-qdoc-commands-namingthings.html
+    \previouspage Grouping Things
+    \contentspage Table of Contents
+    \nextpage Markup Commands
 
-    \title Title Commands
+    \title Naming Things
 
     In general a title command considers everything that follows it
     until the first line break as its argument.  If the title needs to
     be spanned over several lines, make sure to end each line (except
     the last one) with a backslash.
 
-    \section1 Alphabetical List
-
-    \l {20-qdoc-commands-title.html#title}{\\title},
-    \l {20-qdoc-commands-title.html#subtitle}{\\subtitle}
-
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
+    \target title-command
+    \section1 \\title 
 
-    \row
-        \o \bold \\title \target title
-        \o \bold {The \\title command sets the title for a
-           documentation page, or allows you to override it.}
+    The \\title command sets the title for a
+    documentation page, or allows you to override it.
 
            For example:
 
@@ -6890,7 +6426,7 @@
            / *!
                \page signalandslots.html
 
-               \title Signals and Slots
+               \title Signals & Slots
 
                Signals and slots are used for communication between
                objects. The signals and slots mechanism is a central
@@ -6901,7 +6437,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -6915,12 +6451,14 @@
 
                ...
            \endquotation
-           See also \l {subtitle}{\\subtitle}.
+           See also \l {subtitle-command} {\\subtitle}.
 
-    \row
-        \o \bold \\subtitle \target subtitle
-        \o \bold {The \\subtitle command sets a subtitle for a
-           documentation page.}
+
+    \target subtitle-command
+    \section1 \\subtitle 
+
+    The \\subtitle command sets a subtitle for a
+    documentation page.
 
            For example:
 
@@ -6939,7 +6477,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -6954,36 +6492,34 @@
                ...
            \endquotation
 
-           See also \l {title}{\\title}.
-    \endtable
+           See also \l {title-command} {\\title}.
+
 */
 
 /*!
     \page 21-0-qdoc-configuration.html
-    \previouspage Title Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Miscellaneous
+    \contentspage Table of Contents
     \nextpage General Configuration Variables
 
-    \title QDoc Configuration
+    \title The QDoc Configuration File
 
-    \tableofcontents
+    Before running QDoc to to extract and format your QDOC comments,
+    you must create a QDoc configuration file to tell QDoc where to find 
+    them.
 
     \list
     \o \l {Supporting Derived Projects}
-    \o \l {QDoc Compatibility}
+    \o \l {Compatibility Issues}
     \endlist
 
     When running QDoc to generate the documentation, you must specify
     a configuration file on the command line:
 
-    \quotation
-        \bold {/currentdirectory$ qdoc3 my-documentation.qdocconf}
-    \endquotation
-
     \section1 General Description
 
     The configuration file is a list of entries of entries of the form
-    \i {"variable = value"}. Using the configuration variables, you
+    \e {"variable = value"}. Using the configuration variables, you
     can define where QDoc should find the various source files, images
     and examples, where to put generated documentation etc. The
     configuration file can also contain directives like \c
@@ -7037,51 +6573,43 @@
 
     \section1 Configuration Variables
 
-    \section2 Alphabetical List
-
-    \l {22-qdoc-configuration-generalvariables.html#alias}{alias},
-    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoredirectives}
-       {Cpp.ignoredirectives},
-    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoretoken}
-       {Cpp.ignoretokens},
-    \l {22-qdoc-configuration-generalvariables.html#definesvariable}{defines},
-    \l {22-qdoc-configuration-generalvariables.html#edition}{edition},
-    \l {22-qdoc-configuration-generalvariables.html#exampledirs}{exampledirs},
-    \l {22-qdoc-configuration-generalvariables.html#examples}{examples},
-    \l {22-qdoc-configuration-generalvariables.html#examples.fileextensions}
-       {examples.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#extraimages}{extraimages},
-    \l {22-qdoc-configuration-generalvariables.html#falsehoods}{falsehoods},
-    \l {22-qdoc-configuration-generalvariables.html#headerdirs}{headerdirs},
-    \l {22-qdoc-configuration-generalvariables.html#headers}{headers},
-    \l {22-qdoc-configuration-generalvariables.html#headers.fileextensions}
-       {headers.fileextensions},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.footer}{HTML.footer},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.postheader}
-       {HTML.postheader},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.style}{HTML.style},
-    \l {22-qdoc-configuration-generalvariables.html#imagedirs}{imagedirs},
-    \l {22-qdoc-configuration-generalvariables.html#images}{images},
-    \l {22-qdoc-configuration-generalvariables.html#images.fileextensions}
-       {images.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#language}{language},
-    \l {22-qdoc-configuration-generalvariables.html#macro}{macro},
-    \l {22-qdoc-configuration-generalvariables.html#outputdir}{outputdir},
-    \l {22-qdoc-configuration-generalvariables.html#outputformats}
-       {outputformats},
-    \l {22-qdoc-configuration-generalvariables.html#outputprefixes}
-       {outputprefixes},
-    \l {22-qdoc-configuration-generalvariables.html#slow}{slow},
-    \l {22-qdoc-configuration-generalvariables.html#sourcedirs}{sourcedirs},
-    \l {22-qdoc-configuration-generalvariables.html#sources}{sources},
-    \l {22-qdoc-configuration-generalvariables.html#sources.fileextensions}
-       {sources.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#spurious}{spurious},
-    \l {22-qdoc-configuration-generalvariables.html#tabsize}{tabsize},
-    \l {22-qdoc-configuration-generalvariables.html#version}{version},
-    \l {22-qdoc-configuration-generalvariables.html#versionsym}{versionsym}
-
-    \section2 Categories
+    \section1 Variable List
+
+    \list
+    \o \l {22-qdoc-configuration-generalvariables.html#alias-variable} {alias}
+    \o \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoredirectives-variable} {Cpp.ignoredirectives}
+    \o \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoretokens-variable} {Cpp.ignoretokens}
+    \o \l {22-qdoc-configuration-generalvariables.html#defines-variable} {defines}
+    \o \l {22-qdoc-configuration-generalvariables.html#edition-variable} {edition}
+    \o \l {22-qdoc-configuration-generalvariables.html#exampledirs-variable} {exampledirs}
+    \o \l {22-qdoc-configuration-generalvariables.html#examples-variable} {examples}
+    \o \l {22-qdoc-configuration-generalvariables.html#examples.fileextensions-variable} {examples.fileextensions}
+    \o \l {22-qdoc-configuration-generalvariables.html#extraimages-variable} {extraimages}
+    \o \l {22-qdoc-configuration-generalvariables.html#falsehoods-variable} {falsehoods}
+    \o \l {22-qdoc-configuration-generalvariables.html#headerdirs-variable} {headerdirs}
+    \o \l {22-qdoc-configuration-generalvariables.html#headers-variable} {headers}
+    \o \l {22-qdoc-configuration-generalvariables.html#headers.fileextensions-variable} {headers.fileextensions}
+    \o \l {24-qdoc-configuration-htmlvariables.html#HTML.footer-variable} {HTML.footer}
+    \o \l {24-qdoc-configuration-htmlvariables.html#HTML.postheader-variable} {HTML.postheader}
+    \o \l {24-qdoc-configuration-htmlvariables.html#HTML.style-variable} {HTML.style}
+    \o \l {22-qdoc-configuration-generalvariables.html#imagedirs-variable} {imagedirs}
+    \o \l {22-qdoc-configuration-generalvariables.html#images-variable} {images}
+    \o \l {22-qdoc-configuration-generalvariables.html#images.fileextensions-variable} {images.fileextensions}
+    \o \l {22-qdoc-configuration-generalvariables.html#language-variable} {language}
+    \o \l {22-qdoc-configuration-generalvariables.html#macro-variable} {macro}
+    \o \l {22-qdoc-configuration-generalvariables.html#outputdir-variable} {outputdir}
+    \o \l {22-qdoc-configuration-generalvariables.html#outputformats-variable} {outputformats}
+    \o \l {22-qdoc-configuration-generalvariables.html#slow-variable} {slow}
+    \o \l {22-qdoc-configuration-generalvariables.html#sourcedirs-variable} {sourcedirs}
+    \o \l {22-qdoc-configuration-generalvariables.html#sources-variable} {sources}
+    \o \l {22-qdoc-configuration-generalvariables.html#sources.fileextensions-variable} {sources.fileextensions}
+    \o \l {22-qdoc-configuration-generalvariables.html#spurious-variable} {spurious}
+    \o \l {22-qdoc-configuration-generalvariables.html#tabsize-variable} {tabsize}
+    \o \l {22-qdoc-configuration-generalvariables.html#version-variable} {version}
+    \o \l {22-qdoc-configuration-generalvariables.html#versionsym-variable} {versionsym}
+    \endlist
+
+    \section1 Categories
 
     \list
     \o \l {General Configuration Variables}
@@ -7099,8 +6627,9 @@
 
 /*!
     \page 21-1-minimum-qdocconf.html
-    \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage qt.qdocconf
+    \contentspage Table of Contents
+    \nextpage Table of Contents
 
     \title minimum.qdocconf
 
@@ -7109,8 +6638,9 @@
 
 /*!
     \page 21-2-qt-qdocconf.html
-    \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Compatibility Issues
+    \contentspage Table of Contents
+    \nextpage minimum.qdocconf
 
     \title qt.qdocconf
 
@@ -7119,8 +6649,8 @@
 
 /*!
     \page 22-qdoc-configuration-generalvariables.html
-    \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage The QDoc Configuration File
+    \contentspage Table of Contents
     \nextpage Creating Help Project Files
 
     \title General Configuration Variables
@@ -7131,59 +6661,13 @@
     documentation. You can also do some minor manipulation of QDoc
     itself, controlling its output and processing behavior.
 
-    \section1 Alphabetical List
-
-    \l {22-qdoc-configuration-generalvariables.html#alias}{alias},
-    \l {22-qdoc-configuration-generalvariables.html#codeindent}{codeindent},
-    \l {22-qdoc-configuration-generalvariables.html#definesvariable}{defines},
-    \l {22-qdoc-configuration-generalvariables.html#edition}{edition},
-    \l {22-qdoc-configuration-generalvariables.html#exampledirs}{exampledirs},
-    \l {22-qdoc-configuration-generalvariables.html#examples}{examples},
-    \l {22-qdoc-configuration-generalvariables.html#examples.fileextensions}
-       {examples.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#extraimages}{extraimages},
-    \l {22-qdoc-configuration-generalvariables.html#falsehoods}{falsehoods},
-    \l {22-qdoc-configuration-generalvariables.html#generateindex}{generateindex},
-    \l {22-qdoc-configuration-generalvariables.html#headerdirs}{headerdirs},
-    \l {22-qdoc-configuration-generalvariables.html#headers}{headers},
-    \l {22-qdoc-configuration-generalvariables.html#headers.fileextensions}
-       {headers.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#imagedirs}{imagedirs},
-    \l {22-qdoc-configuration-generalvariables.html#images}{images},
-    \l {22-qdoc-configuration-generalvariables.html#images.fileextensions}
-       {images.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#language}{language},
-    \l {22-qdoc-configuration-generalvariables.html#macro}{macro},
-    \l {22-qdoc-configuration-generalvariables.html#outputdir}{outputdir},
-    \l {22-qdoc-configuration-generalvariables.html#outputformats}
-       {outputformats},
-    \l {22-qdoc-configuration-generalvariables.html#outputprefixes}
-       {outputprefixes},
-    \l {22-qdoc-configuration-generalvariables.html#slow}{slow},
-    \l {22-qdoc-configuration-generalvariables.html#sourcedirs}{sourcedirs},
-    \l {22-qdoc-configuration-generalvariables.html#sources}{sources},
-    \l {22-qdoc-configuration-generalvariables.html#sources.fileextensions}
-       {sources.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#spurious}{spurious},
-    \l {22-qdoc-configuration-generalvariables.html#tabsize}{tabsize},
-    \l {22-qdoc-configuration-generalvariables.html#tagfile}{tagfile},
-    \l {22-qdoc-configuration-generalvariables.html#version}{version},
-    \l {22-qdoc-configuration-generalvariables.html#versionsym}{versionsym}
-
-    \section1 Variable Descriptions
-
-    \table
-
-    \header
-        \o Variable
-        \o Description
+    \target alias-variable
+    \section1 alias 
 
-    \row
-        \o \bold alias \target alias
-        \o \bold {The \c alias variable renames a QDoc command.}
+    The \c alias variable renames a QDoc command.
 
-           The general syntax is \tt {alias.\i{original-command-name}
-           = \i temporary-command-name}.
+           The general syntax is \tt {alias.\e{original-command-name}
+           = \e temporary-command-name}.
 
            For example:
 
@@ -7194,30 +6678,34 @@
            renames the built-in command \\i (italics) to \\e.
 
            The \c alias variable is often used for compatibility
-           reasons; for more information see the \l {QDoc
-           Compatibility}{compatibility section}.
+           reasons; for more information see the 
+	   \l {Compatibility Issues} {compatibility section}.
 
-           See also \l macro.
+           See also \l {macro-command} {macro}.
 
-    \row
-        \o \bold codeindent \target codeindent
-        \o \bold {The \c codeindent variable specifies the level of
-           indentation that QDoc uses when writing code snippets.}
+
+    \target codeindent-variable
+    \section1 codeindent 
+
+    The \c codeindent variable specifies the level of
+    indentation that QDoc uses when writing code snippets.
 
            QDoc originally used a hard-coded value of four spaces for
            code indentation to ensure that code snippets could be easily
            distinguished from surrounding text. Since we can use
-           \l{HTML Specific Configuration Variables#HTML.stylesheets}{stylesheets} to
+           \l{HTML Specific Configuration Variables#HTML.stylesheets} {stylesheets} to
            adjust the appearance of certain types of HTML elements, this
            level of indentation is not always required.
 
-    \row
-        \o \bold defines \target definesvariable
-        \o \bold {The \c defines variable specifies the C++ preprocessor
-           symbols that QDoc will recognize and respond to.}
+
+    \target defines-variable
+    \section1 defines 
+
+    The \c defines variable specifies the C++ preprocessor
+    symbols that QDoc will recognize and respond to.
 
            When a preprocessor symbol is specified using the \c
-           defines variable, you can also use the \l {if}{\\if}
+           defines variable, you can also use the \l {if-command} {\\if}
            command to enclose documentation that only will be included
            if the preprocessor symbol is defined.
 
@@ -7265,13 +6753,15 @@
            consoleedition preprocessor symbol is defined when QDoc
            processes the source files defined in the qt.qdocconf file.
 
-           See also \l falsehoods and \l {if}{\\if}.
+           See also \l {falsehoods-variable} {falsehoods} and \l {if-command} {\\if}.
 
-    \row
-        \o \bold edition \target edition
-        \o \bold {The \c edition variable specifies which modules are
-           included in each edition of a package, and provides QDoc
-           with information to provide class lists for each edition.}
+
+    \target edition-variable
+    \section1 edition 
+
+    The \c edition variable specifies which modules are
+    included in each edition of a package, and provides QDoc
+    with information to provide class lists for each edition.
 
            This feature is mostly used when providing documentation
            for Qt packages.
@@ -7290,29 +6780,33 @@
            In the above examples, the \c Console edition only includes
            the contents of four modules. Only the classes from these
            modules will be used when the
-           \l{Miscellaneous Commands#generatelist}{generatelist} command
+           \l{Miscellaneous#generatelist-command} {generatelist} command
            is used to generate a list of classes for this edition:
 
            \code
            \generatelist{classesbyedition Console}
            \endcode
 
-    \row
-        \o \bold exampledirs \target exampledirs
-        \o \bold {The \c exampledirs variable specifies the directories
-           containing the source code of the example files.}
-
-           The \l {examples}{\c examples} and \c exampledirs variables
-           are used by the \l {quotefromfile}{\\quotefromfile}, \l
-           {quotefile}{\\quotefile} and \l {example}{\\example}
-           commands.  If both the \l {examples}{\c examples} and \c
-           exampledirs variables are defined, QDoc will search in
-           both, first in \l {examples}{\c examples} then in \c
-           exampledirs.
+
+    \target exampledirs-variable
+    \section1 exampledirs 
+
+    The \c exampledirs variable specifies the directories
+    containing the source code of the example files.
+
+           The \l {examples-variable} {examples} {examples} and \l
+	   {exampledirs-variable} {exampledirs} variables are used by
+	   the \l {quotefromfile-command} {\\quotefromfile}, \l
+	   {quotefile-command} {\\quotefile} and \l {example-command}
+	   {\\example} commands.  If both the \l {examples-variable}
+	   {examples} and \l {exampledirs-variable} {exampledirs}
+	   variables are defined, QDoc will search in both, first in
+	   \l {examples-variable} {examples} then in \l
+	   {exampledirs-variable} {exampledirs}.
 
            QDoc will search through the directories in the specified
            order, and accept the first matching file it finds. It will
-           only search in the specified directories, \i not in
+           only search in the specified directories, \e not in
            subdirectories.
 
            For example:
@@ -7333,7 +6827,7 @@
            \endcode
 
            QDoc will then see if there exists a file called \c
-           calculator.cpp listed as a value in the \l {examples}{\c
+           calculator.cpp listed as a value in the \l {examples} {\c
            examples} variable. If it doesn't, it will search in the \c
            exampledirs variable, and first see if there exists a file
            called
@@ -7353,41 +6847,43 @@
 
            See also \l examples.
 
-    \row
-        \o \bold examples \target examples
-        \o \bold {The \c examples variable allows you to specify individual
-           example files in addition to those located in the directories
-           specified by the \l {exampledirs}{\c exampledirs} variable.}
-
-           The \c examples and \l {exampledirs}{\c exampledirs}
-           variables are used by the \l
-           {quotefromfile}{\\quotefromfile}, \l
-           {quotefile}{\\quotefile} and \l {example}{\\example}
-           commands. If both the \c examples and \l {exampledirs}{\c
-           exampledirs} variables are defined, QDoc will search in
-           both, first in \c examples then in \l {exampledirs}{\c
-           exampledirs}.
-
-           QDoc will search through the values listed for the \c
-           examples variable, in the specified order, and accept
-           the first one it finds.
-
-           For an extensive example, see the \l {exampledirs}{\c
-           exampledirs} command. But note that if you know the file is
-           listed in the \c examples variable, you don't need to
-           specify its path:
+
+    \target examples-variable
+    \section1 examples 
+
+    The \c examples variable allows you to specify individual
+    example files in addition to those located in the directories
+    specified by the \l {exampledirs-variable} {\c exampledirs} variable.
+
+           The \c examples and \l {exampledirs-variable} {\c exampledirs} 
+	   variables are used by the \l {quotefromfile-command} {\\quotefromfile}, 
+	   \l {quotefile-command} {\\quotefile} and \l {example}
+           {\\example} commands. If both the \c examples and \l {exampledirs-variable} 
+	   {\c exampledirs} variables are defined, QDoc will search in both, first in 
+	   \c examples then in \l {exampledirs-variable} {\c exampledirs}.
+
+           QDoc will search through the values listed for the \c examples 
+	   variable, in the specified order, and accept the
+           first one it finds.
+
+           For an extensive example, see the \l {exampledirs-variable} 
+	   {\c exampledirs} command. But note that if you know the file is
+           listed in the \c examples variable, you don't need to specify its 
+	   path:
 
            \code
                \quotefromfile calculator.cpp
            \endcode
 
-           See also \l exampledirs.
+           See also \l {exampledirs-variable} {exampledirs}.
 
-    \row
-        \o \bold examples.fileextensions \target examples.fileextensions
-        \o \bold {The \c examples.fileextensions variable specifies the
-           file extensions that qdoc will look for when collecting example
-           files for display in the documentation.}
+
+    \target examples.fileextensions-variable
+    \section1 examples.fileextensions 
+
+    The \c examples.fileextensions variable specifies the
+    file extensions that qdoc will look for when collecting example
+    files for display in the documentation.
 
            The default extensions are *.cpp, *.h, *.js, *.xq, *.svg, *.xml
            and *.ui. However, if 
@@ -7402,19 +6898,21 @@
 
            See also \l{headers.fileextensions}.
 
-    \row
-        \o \bold extraimages \target extraimages
-        \o \bold {The \c extraimages variable tells QDoc to incorporate
-           specific images in the generated documentation.}
+
+    \target extraimages-variable
+    \section1 extraimages 
+
+    The \c extraimages variable tells QDoc to incorporate
+    specific images in the generated documentation.
 
            QDoc will not recognize images used within HTML (or any
            other markup language). If we want the images to be copied
-           from the directories specified by \l {imagedirs}{\c
+           from the directories specified by \l {imagedirs} {\c
            imagedirs} (the images in question must be located in these
            directories) to the output directory, we must specify the
            images using the \c extraimages variable.
 
-           The general syntax is \tt {extraimages.\i{format} = \i
+           The general syntax is \tt {extraimages.\e{format} = \e
            image}. The file extension is optional.
 
            For example, in \l qt.qdocconf we use a couple of images
@@ -7428,10 +6926,12 @@
 
            See also \l images and \l imagedirs.
 
-    \row
-        \o \bold falsehoods \target falsehoods
-        \o \bold {The \c falsehoods variable defines the truth value of
-           specified preprocessor symbols as false.}
+
+    \target falsehoods-variable
+    \section1 falsehoods 
+
+    The \c falsehoods variable defines the truth value of
+    specified preprocessor symbols as false.
 
            If this variable is not set for a preprocessor symbol, QDoc
            assumes its truth value is true. The exception is '0',
@@ -7458,7 +6958,7 @@
            #endif
            \endcode
 
-           QDoc will evaluate it as true by default, \i unless the
+           QDoc will evaluate it as true by default, \e unless the
            preprocessor symbol is specified within the \c falsehoods
            variable entry:
 
@@ -7468,21 +6968,25 @@
 
            See also \l defines.
 
-    \row
-        \o \bold generateindex \target generateindex
-        \o \bold{The \c generateindex variable contains a boolean value that
-           specifies whether to generate an index file when HTML documentation
-           is generated.}
+
+    \target generateindex-variable
+    \section1 generateindex 
+
+    The \c generateindex variable contains a boolean value that
+    specifies whether to generate an index file when HTML documentation
+    is generated.
 
            By default, an index file is always generated with HTML documentation,
            so this variable is typically only used when disabling this feature
            (by setting the value to \c false) or when enabling index generation
            for the WebXML output (by setting the value to \c true).
-    \row
-        \o \bold headerdirs \target headerdirs
-        \o \bold {The \c headerdirs variable specifies the directories
-           containing the header files associated with the \c .cpp source
-           files used in the documentation.}
+
+    \target headerdirs-variable
+    \section1 headerdirs 
+
+    The \c headerdirs variable specifies the directories
+    containing the header files associated with the \c .cpp source
+    files used in the documentation.
 
            For example:
 
@@ -7496,38 +7000,41 @@
            \endcode
 
            When executed, the first QDoc will do is to read through
-           the headers specified in the \l {headers}{\c headers}
+           the headers specified in the \l {headers} {\c headers}
            variable, and the ones located in the directories specified
            in the \c headerdir variable (including all
            subdirectories), building an internal structure of the
            classes and their functions.
 
            Then it will read through the sources specified in the \l
-           {sources}{\c sources}, and the ones located in the
-           directories specified in the \l {sourcedirs}{\c sourcedirs}
+           {sources-variable} {\c sources}, and the ones located in the
+           directories specified in the \l {sourcedirs-variable} 
+	   {\c sourcedirs}
            varible (including all subdirectories), merging the
            documentation with the structure it retrieved from the
            header files.
 
            If both the \c headers and \c headerdirs variables are
-           defined, QDoc will read through both, first \l {headers}{\c
+           defined, QDoc will read through both, first \l {headers} {\c
            headers} then \c headerdirs.
 
            In the specified directories, QDoc will only read the files
            with the fileextensions specified in the \l
-           {headers.fileextensions}{\c headers.fileextensions}
+           {headers.fileextensions} {\c headers.fileextensions}
            variable. The default extensions are *.ch, *.h, *.h++,
            *.hh, *.hpp and *.hxx". The files specified by \l
-           {headers}{\c headers} will be read independent of their
+           {headers} {\c headers} will be read independent of their
            fileextensions.
 
            See also \l headers and \l headers.fileextensions.
 
-    \row
-        \o \bold headers \target headers
-        \o \bold {The \c headers variable allows you to specify individual
-           header files in addition to those located in the directories
-           specified by the \l {headerdirs}{\c headerdirs} variable.}
+
+    \target headers-variable
+    \section1 headers 
+
+    The \c headers variable allows you to specify individual
+    header files in addition to those located in the directories
+    specified by the \l {headerdirs} {\c headerdirs} variable.
 
            For example:
 
@@ -7537,19 +7044,21 @@
            \endcode
 
            When processing the \c headers variable, QDoc behaves in the
-           same way as it does when processing the \l {headerdirs}{\c
+           same way as it does when processing the \l {headerdirs} {\c
            headerdirs} variable. For more information, see the \l
-           {headerdirs}{\c headerdirs} variable.
+           {headerdirs} {\c headerdirs} variable.
 
            See also \l headerdirs.
 
-    \row
-        \o \bold headers.fileextensions \target headers.fileextensions
-        \o \bold {The \c headers.fileextensions variable specify the
-           extension used by the headers.}
+
+    \target headers.fileextensions-variable
+    \section1 headers.fileextensions 
+
+    The \c headers.fileextensions variable specify the
+    extension used by the headers.
 
            When processing the header files specified in the \l
-           {headerdirs}{\c headerdirs} variable, QDoc will only read
+           {headerdirs} {\c headerdirs} variable, QDoc will only read
            the files with the fileextensions specified in the \c
            headers.fileextensions variable. In this way QDoc avoid
            spending time reading irrelevant files.
@@ -7569,21 +7078,23 @@
 
            See also \l headerdirs.
 
-    \row
-        \o \bold imagedirs \target imagedirs
-        \o \bold {The \c imagedirs variable specifies the directories
-           containing the images used in the documentation.}
-
-           The \l {images}{\c images} and \c imagedirs variables are
-           used by the \l {image}{\\image} and \l
-           {inlineimage}{\\inlineimage} commands.  If both the \l
-           {images}{\c images} and \c imagedirs variables are defined,
-           QDoc will search in both, first in \l {images}{\c images}
+
+    \target imagedirs-variable
+    \section1 imagedirs 
+
+    The \c imagedirs variable specifies the directories
+    containing the images used in the documentation.
+
+           The \l {images} {\c images} and \c imagedirs variables are
+           used by the \l {image-command} {\\image} and \l
+           {inlineimage-command} {\\inlineimage} commands.  If both the \l
+           {images} {\c images} and \c imagedirs variables are defined,
+           QDoc will search in both, first in \l {images} {\c images}
            then in \c imagedirs.
 
            QDoc will search through the directories in the specified
            order, and accept the first matching file it finds. It will
-           only search in the specified directories, \i not in
+           only search in the specified directories, \e not in
            subdirectories.
 
            For example:
@@ -7617,23 +7128,25 @@
            \endcode
 
            You can filter the images in an image directory using the
-           \l {images.fileextensions}{\c images.fileextensions}
+           \l {images.fileextensions} {\c images.fileextensions}
            variable.  The general idea behind the \l
-           {images.fileextensions}{\c images.fileextensions} variable
+           {images.fileextensions} {\c images.fileextensions} variable
            is to enable different image format for different output
            format.
 
-           \warning The \l {images.fileextensions}{\c
+           \warning The \l {images.fileextensions} {\c
            images.fileextensions} variable's functionality is
            preliminay since QDoc at this point only support HTML.
 
            See also \l images and \l images.fileextensions.
 
-    \row
-        \o \bold images \target images
-        \o \bold {The \c images variable allows you to specify individual
-           image files in addition to those located in the directories
-           specified by the \l {imagedirs}{\c imagedirs} variable.}
+
+    \target images-variable
+    \section1 images 
+
+    The \c images variable allows you to specify individual
+    image files in addition to those located in the directories
+    specified by the \l {imagedirs} {\c imagedirs} variable.
 
            For example:
 
@@ -7642,20 +7155,22 @@
            \endcode
 
            When processing the \c images variable, QDoc behaves in the
-           same way as it does when processing the \l {imagedirs}{\c
+           same way as it does when processing the \l {imagedirs} {\c
            imagedirs} variable. For more information, see the \l
-           {imagedirs}{\c imagedirs} variable.
+           {imagedirs} {\c imagedirs} variable.
 
            See also \l imagedirs and \l images.fileextensions.
 
-    \row
-        \o \bold images.fileextensions \target images.fileextensions
-        \o \bold {The images.fileextensions variable filters the files within
-           an image directory.}
+
+    \target images.fileextensions-variable
+    \section1 images.fileextensions 
+
+    The images.fileextensions variable filters the files within
+    an image directory.
 
            The variable's values (the extensions) are given as
            standard wildcard expressions.  The general syntax is: \tt
-           {images.fileextensions.\i{format} = *.\i{extension}}.
+           {images.fileextensions.\e{format} = *.\e{extension}}.
 
            The idea is to enable different image format for different
            output format. For example:
@@ -7665,8 +7180,8 @@
                images.fileextensions.LOUT = *.eps
            \endcode
 
-           Then, when processing the \l {image}{\\image} and \l
-           {inlineimage}{\\inlineimage} commands, QDoc will only
+           Then, when processing the \l {image-command} {\\image} and \l
+           {inlineimage-command} {\\inlineimage} commands, QDoc will only
            search for files with extensions specified in the output
            format's associated image extension variable.
 
@@ -7685,10 +7200,12 @@
 
            See also \l imagedirs and \l images.
 
-    \row
-        \o \bold language \target language
-        \o \bold {The \c language variable specifies the language of the
-           source code that is used in the documentation.}
+
+    \target language-variable
+    \section1 language 
+
+    The \c language variable specifies the language of the
+    source code that is used in the documentation.
 
            Currently, C++ is the only language that QDoc
            understands. It is also the default language, and doesn't
@@ -7701,13 +7218,15 @@
 
            identifies the language of the Qt source code as C++.
 
-    \row
-        \o \bold macro \target macro
-        \o \bold {The \c macro variable can be used to create your
-           own QDoc commands.}
 
-           The general syntax is \tt {macro.\i{command} =
-           "\i{definition}}". The definition can be described using
+    \target macro-variable
+    \section1 macro 
+
+    The \c macro variable can be used to create your
+    own QDoc commands.
+
+           The general syntax is \tt {macro.\e{command} =
+           "\e{definition}}". The definition can be described using
            QDoc syntax. In addition it is possible to provide an HTML
            definition by appending .HTML to the variable.
 
@@ -7721,10 +7240,12 @@
            makes sure that the \\gui command renders its argument using a
            bold font, and that \\raisedaster renders a '*'.
 
-    \row
-        \o \bold naturallanguage \target naturallanguage
-        \o \bold {The \c naturallanguage variable specifies the natural
-           language used for the documentation generated by qdoc.}
+
+    \target naturallanguage-variable
+    \section1 naturallanguage 
+
+    The \c naturallanguage variable specifies the natural
+    language used for the documentation generated by qdoc.
 
            For example:
 
@@ -7738,14 +7259,17 @@
            qdoc will add the natural language information to the HTML
            it generates, using the \c lang and \c xml:lang attributes.
 
-           See also \l sourceencoding, \l outputencoding,
-           \l{http://www.w3.org/TR/xhtml1/#C_7}{C.7. The lang and xml:lang Attributes} and
-           \l{http://www.w3.org/TR/i18n-html-tech-lang/#ri20040429.113217290}{Best Practice 13: Using Hans and Hant codes}.
+           See also \l {sourceencoding-variable} {sourceencoding}, 
+	   \l {outputencoding-variable} {outputencoding},
+           \l{http://www.w3.org/TR/xhtml1/#C_7} {C.7. The lang and xml:lang Attributes} and
+           \l{http://www.w3.org/TR/i18n-html-tech-lang/#ri20040429.113217290} {Best Practice 13: Using Hans and Hant codes}.
 
-    \row
-        \o \bold outputdir \target outputdir
-        \o \bold {The \c outputdir variable specifies the directory
-           where QDoc will put the generated documentation.}
+
+    \target outputdir-variable
+    \section1 outputdir 
+
+    The \c outputdir variable specifies the directory
+    where QDoc will put the generated documentation.
 
            In qt.qdocconf:
 
@@ -7766,10 +7290,12 @@
            \warning When running QDoc multiple times using the same output
            directory, all files from the previous run will be lost.
 
-    \row
-        \o \bold outputencoding \target outputencoding
-        \o \bold {The \c outputencoding variable specifies the encoding
-           used for the documentation generated by qdoc.}
+
+    \target outputencoding-variable
+    \section1 outputencoding 
+
+    The \c outputencoding variable specifies the encoding
+    used for the documentation generated by qdoc.
 
            For example:
 
@@ -7791,19 +7317,23 @@
 
            See also \l outputencoding and \l naturallanguage.
 
-    \row
-        \o \bold outputformats \target outputformats
-        \o \bold {The \c outputformats variable specifies the format of
-           the generated documentation.}
+
+    \target outputformats-variable
+    \section1 outputformats 
+
+    The \c outputformats variable specifies the format of
+    the generated documentation.
 
            Currently, QDoc only supports the HTML format. It is also
            the default format, and doesn't need to be specified.
 
-    \row
-        \o \bold outputprefixes \target outputprefixes
-        \o \bold {The \c outputprefixes variable specifies a mapping between
-           types of files and the prefixes to prepend to the HTML file names
-           in the generated documentation.}
+
+    \target outputprefixes
+    \section1 outputprefixes
+
+           The \c outputprefixes variable specifies a mapping between types of files
+           and the prefixes to prepend to the HTML file names in the generated
+           documentation.
 
            For example:
 
@@ -7812,33 +7342,43 @@
            outputprefixes.QML = qt-components-
            \endcode
 
-           Be default, files containing the API documentation for QML elements
+           By default, files containing the API documentation for QML elements
            or components are prefixed with "qml-". In the above example, the
            prefix "qt-components-" is used instead.
 
-    \row
-        \o \bold qhp \target qhp
-        \o \bold{The \c qhp variable is used to define the information to be
-           written out to Qt Help Project (\c{qhp}) files.}
 
-           See the \l{Creating Help Project Files} chapter for information
-           about this process.
+    \target qhp-variable
+    \section1 qhp 
 
-    \row
-        \o \bold slow (removed) \target slow
-        \o \bold {The \c slow variable previously specified whether QDoc should
-           do time-consuming processing, such as syntax highlighting.}
+    The \c qhp variable is used to define the information to be
+    written out to Qt Help Project (\c{qhp}) files.
+
+    See the \l{Creating Help Project Files} chapter for information
+    about this process.
+
+
+    \target slow-variable
+    \section1 slow 
+
+    The \c slow variable specifies whether QDoc should do
+    time-consuming processing, such as syntax highlighting.
+
+           By default, this setting is false.
+
+           Example:
 
            This option has been replaced by the \l{syntaxhighlighing} option.
 
            For compatibility, the \c -slow command-line option has been
            retained. This has the effect of enabling syntax highlighting.
 
-    \row
-        \o \bold sourcedirs \target sourcedirs
-        \o \bold {The \c sourcedirs variable specifies the directories
-           containing the \c .cpp or \c .qdoc files used in
-           the documentation.}
+
+    \target sourcedirs-variable
+    \section1 sourcedirs 
+
+    The \c sourcedirs variable specifies the directories
+    containing the \c .cpp or \c .qdoc files used in
+    the documentation.
 
            For example in \l qt.qdocconf
 
@@ -7853,36 +7393,39 @@
            \endcode
 
            When executed, the first QDoc will do is to read through
-           the headers specified in the \l {header}{\c header}
+           the headers specified in the \l {header-command} {\c header}
            variable, and the ones located in the directories specified
            in the \c headerdir variable (including all
            subdirectories), building an internal structure of the
            classes and their functions.
 
            Then it will read through the sources specified in the \l
-           {sources}{\c sources}, and the ones located in the
-           directories specified in the \l {sourcedirs}{\c sourcedirs}
+           {sources} {\c sources}, and the ones located in the
+           directories specified in the \l {sourcedirs} {\c sourcedirs}
            varible (including all subdirectories), merging the
            documentation with the structure it retrieved from the
            header files.
 
            If both the \c sources and \c sourcedirs variables are
-           defined, QDoc will read through both, first \l {sources}{\c
+           defined, QDoc will read through both, first \l {sources} {\c
            sources} then \c sourcedirs.
 
            In the specified directories, QDoc will only read the files
            with the fileextensions specified in the \l
-           {sources.fileextensions}{\c sources.fileextensions}
+           {sources.fileextensions} {\c sources.fileextensions}
            variable. The default extensions are *.c++, *.cc, *.cpp and
-           *.cxx. The files specified by \l {sources}{\c sources} will
+           *.cxx. The files specified by \l {sources} {\c sources} will
            be read independent of their fileextensions.
 
-           See also \l sources and \l sources.fileextensions.
+           See also \l {sources-variable} {sources} and 
+	   \l {sources.fileextensions-variable} {sources.fileextensions}.
 
-    \row
-        \o \bold sourceencoding \target sourceencoding
-        \o \bold {The \c sourceencoding variable specifies the encoding
-           used for the source code and documentation.}
+
+    \target sourceencoding-variable
+    \section1 sourceencoding 
+
+    The \c sourceencoding variable specifies the encoding
+    used for the source code and documentation.
 
            For example:
 
@@ -7901,14 +7444,16 @@
            In cases like these, it is possible to write API documentation
            completely in documentation files.
 
-           See also \l naturallanguage and \l outputencoding.
+           See also \l {naturallanguage-variable} {naturallanguage} and 
+	   \l {outputencoding-variable} {outputencoding}.
 
-    \row
-        \o \bold sources \target sources
-        \o \bold {The \c sources variable allows you to specify
-           individual source files in addition to those located in the
-           directories specified by the \l {sourcedir}{\c sourcedir}
-           variable.}
+
+    \target sources-variable
+    \section1 sources 
+
+    The \c sources variable allows you to specify individual source
+    files in addition to those located in the directories specified by
+    the \l {sourcedirs-variable} {sourcedirs} variable.
 
            For example:
 
@@ -7918,19 +7463,21 @@
            \endcode
 
            When processing the \c sources variable, QDoc behaves in the
-           same way as it does when processing the \l {sourcedirs}{\c
-           sourcedirs} variable. For more information, see the \l
-           {sourcedirs}{\c sourcedirs} variable.
+           same way as it does when processing the \l {sourcedirs-variable}
+	   {sourcedirs} variable. For more information, see the \l
+           {sourcedirs-variable} {sourcedirs} variable.
 
-           See also \l sourcedirs.
+           See also \l {sourcedirs-variable} {sourcedirs}.
 
-    \row
-        \o \bold sources.fileextensions \target sources.fileextensions
-        \o \bold {The \c sources.fileextensions variable filters the
-           files within a source directory.}
+
+    \target sources.fileextensions-variable
+    \section1 sources.fileextensions 
+
+    The \c sources.fileextensions variable filters the
+    files within a source directory.
 
            When processing the source files specified in the \l
-           {sourcedirs}{\c sourcedirs} variable, QDoc will only read
+           {sourcedirs} {\c sourcedirs} variable, QDoc will only read
            the files with the fileextensions specified in the \c
            sources.fileextensions variable. In this way QDoc avoid
            spending time reading irrelevant files.
@@ -7947,12 +7494,15 @@
 
            \warning The above assignment may not work as described.
 
-           See also \l sourcedirs and \l sources.
+           See also \l {sourcedirs-variable} {sourcedirs} and 
+	   \l (sources-variable} {sources}.
 
-    \row
-        \o \bold spurious \target spurious
-        \o \bold {The \c spurious variable excludes specified
-           QDoc warnings from the output.}
+
+    \target spurious-variable
+    \section1 spurious 
+
+    The \c spurious variable excludes specified
+    QDoc warnings from the output.
 
            The warnings are specified using standard wildcard
            expressions. For example:
@@ -7971,11 +7521,12 @@
            qt-4.0/src/opengl/qgl_mac.cpp:156: Missing parameter name
            \endcode
 
-    \row
-        \o \bold syntaxhighlighting \target syntaxhighlighting
-        \o \bold{The \c syntaxhighlighting variable specifies whether QDoc
+    \target syntaxhighlighting
+    \section1 syntaxhighlighting
+
+           The \c syntaxhighlighting variable specifies whether QDoc
            should perform syntax highlighting on source code quoted in the
-           documentation it output.}
+           documentation it generates.
 
            For example:
 
@@ -7986,10 +7537,11 @@
            will enable syntax highlighting for all supported programming
            languages.
 
-    \row
-        \o \bold tabsize \target tabsize
-        \o \bold {The \c tabsize variable defines the size of a tab
-           character.}
+
+    \target tabsize-variable
+    \section1 tabsize 
+
+    The \c tabsize variable defines the size of a tab character.
 
            For example:
 
@@ -8002,14 +7554,18 @@
            The default value of the variable is 8, and doesn't need to
            be specified.
 
-    \row
-        \o \bold tagfile \target tagfile
-        \o \bold{The \c tagfile variable specifies the Doxygen tag file to be written
-           when HTML is generated.}
-    \row
-        \o \bold version \target version
-        \o \bold {The \c version variable specifies the version number of the
-           documented software.}
+
+    \target tagfile-variable
+    \section1 tagfile 
+        
+    The \c tagfile variable specifies the Doxygen tag file to be written
+    when HTML is generated.
+
+    \target version-variable
+    \section1 version 
+
+    The \c version variable specifies the version number of the
+    documented software.
 
            For example:
 
@@ -8028,11 +7584,13 @@
 
            See also \l versionsym.
 
-    \row
-        \o \bold versionsym \target versionsym
-        \o \bold {The \c versionsym variable specifies a C++
-           preprocessor symbol that defines the version number
-           of the documented software.}
+
+    \target versionsym-variable
+    \section1 versionsym 
+
+    The \c versionsym variable specifies a C++
+    preprocessor symbol that defines the version number
+    of the documented software.
 
            For example in \l qt.qdocconf:
 
@@ -8054,15 +7612,15 @@
            \warning The \\version command's functionality is not fully
            implemented; currently it only works within raw HTML code.
 
-           See also \l {version}{\\version}.
+           See also \l {version} {\\version}.
+
 
-    \endtable
 */
 
 /*!
     \page 22-creating-help-project-files.html
     \previouspage General Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage C++ Specific Configuration Variables
 
     \title Creating Help Project Files
@@ -8131,7 +7689,7 @@
 /*!
     \page 23-qdoc-configuration-cppvariables.html
     \previouspage Creating Help Project Files
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage HTML Specific Configuration Variables
 
     \title C++ Specific Configuration Variables
@@ -8139,25 +7697,11 @@
     The C++ specific configuration variables are provided to avoid
     erroneous documentation due to non-standard C++ constructs.
 
-    \section1 Alphabetical List
-
-    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoredirectives}
-       {Cpp.ignoredirectives},
-    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoretoken}
-       {Cpp.ignoretokens}
-
-    \section1 Variable Descriptions
-
-    \table
-
-    \header
-        \o Variable
-        \o Description
+    \target Cpp.ignoredirectives-variable
+    \section1  Cpp.ignoredirectives 
 
-    \row
-        \o \bold  Cpp.ignoredirectives \target Cpp.ignoredirectives
-        \o \bold {The \c Cpp.ignoredirectives variable makes QDoc ignore
-           the specified non-standard constructs, within C++ source code.}
+    The \c Cpp.ignoredirectives variable makes QDoc ignore
+    the specified non-standard constructs, within C++ source code.
 
            If not specified by the \tt {\l Cpp.ignoretokens} or \tt
            {\l Cpp.ignoredirectives} variables, non-standard
@@ -8210,10 +7754,12 @@
 
            See also \l Cpp.ignoretokens.
 
-    \row
-        \o \bold  Cpp.ignoretokens \target Cpp.ignoretokens
-        \o \bold {The \c Cpp.ignoretokens variable makes QDoc ignore
-           the specified non-standard constructs, within C++ source code.}
+
+    \target Cpp.ignoretokens-variable
+    \section1  Cpp.ignoretokens 
+
+    The \c Cpp.ignoretokens variable makes QDoc ignore
+    the specified non-standard constructs, within C++ source code.
 
            If not specified by the \tt {\l Cpp.ignoretokens} or \tt
            {\l Cpp.ignoredirectives} variables, non-standard
@@ -8262,14 +7808,14 @@
 
            See also \l Cpp.ignoredirectives.
 
-    \endtable
+
 */
 
 
 /*!
     \page 24-qdoc-configuration-htmlvariables.html
     \previouspage C++ Specific Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Supporting Derived Projects
 
     \title HTML Specific Configuration Variables
@@ -8279,27 +7825,11 @@
     documentation's footer or postheader. The format of the variable
     values are raw HTML.
 
-    \section1 Alphabetical List
-
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.footer}{HTML.footer},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.postheader}
-       {HTML.postheader},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.style}{HTML.style},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.stylesheets}{HTML.stylesheets}
-
-
-    \section1 Variable Descriptions
-
-    \table
-
-    \header
-        \o Variable
-        \o Description
+    \target HTML.footer-variable
+    \section1 HTML.footer 
 
-    \row
-        \o \bold HTML.footer \target HTML.footer
-        \o \bold {The \c HTML.footer variable defines the content
-           of the generated HTML documentation's footer.}
+    The \c HTML.footer variable defines the content
+    of the generated HTML documentation's footer.
 
            The footer is rendered at the bottom of the generated
            documentation page.
@@ -8318,13 +7848,15 @@
 
            The complete variable entry in \l qt.qdocconf provides the
            standard footer of the \l
-           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
+           {http://qt.nokia.com/doc/4.0/index.html} {Qt Reference
            Documentation}.
 
-    \row
-        \o \bold HTML.postheader \target HTML.postheader
-        \o \bold {The \c HTML.postheader variable defines the content
-           of the generated HTML documentation's postheader.}
+
+    \target HTML.postheader-variable
+    \section1 HTML.postheader 
+
+    The \c HTML.postheader variable defines the content
+    of the generated HTML documentation's postheader.
 
            The header is rendered at the top of the generated
            documentation page.
@@ -8347,13 +7879,15 @@
 
            The complete variable entry in \l qt.qdocconf provides the
            standard header of the \l
-           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
+           {http://qt.nokia.com/doc/4.0/index.html} {Qt Reference
            Documentation}.
 
-    \row
-        \o \bold HTML.style \target HTML.style
-        \o \bold {The HTML.style variable defines the style for
-           the generated HTML documentation.}
+
+    \target HTML.style-variable
+    \section1 HTML.style 
+
+    The HTML.style variable defines the style for
+    the generated HTML documentation.
 
            The variable's value is given as raw HTML enclosed by
            quotation marks. Note that if the value spans several
@@ -8373,13 +7907,15 @@
            \endcode
 
            provides the HTML style for the \l
-           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
+           {http://qt.nokia.com/doc/4.0/index.html} {Qt Reference
            Documentation}.
 
-    \row
-        \o \bold HTML.stylesheets \target HTML.stylesheets
-        \o \bold {The HTML.stylesheets variable defines a list of stylesheets
-           to use for the generated HTML documentation.}
+
+    \target HTML.stylesheets-variable
+    \section1 HTML.stylesheets 
+
+    The HTML.stylesheets variable defines a list of stylesheets
+    to use for the generated HTML documentation.
 
            Using separate stylesheets for the documentation makes it easier to
            customize and experiment with the style used once the contents has
@@ -8393,51 +7929,37 @@
            QDoc expects to find stylesheets in the directory containing the
            \l qt.qdocconf file, and it will copy those specified to the output
            directory alongside the HTML pages.
-    \endtable
+
 */
 
 /*!
     \page 25-qdoc-configuration-derivedprojects.html
     \previouspage HTML Specific Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage QDoc Compatibility
+    \contentspage Table of Contents
+    \nextpage Compatibility Issues
 
     \title Supporting Derived Projects
 
-    \tableofcontents
-
     Some particular configuration variables allow you to use QDoc to
     support Qt-based projects; i.e to make projects, such as Qt Solutions,
     contain references to the online Qt documentation. This
     means that QDoc will be able to create links to the class reference
     documentation, without any explicit linking command.
 
-    \section1 The Configuration Variables
+    \target description-variable
+    \section1 description 
 
-    \section2 Alphabetical List
+    The description variable holds a short description of
+    the associated project.
 
-    \l{25-qdoc-configuration-derivedprojects.html#description}{description},
-    \l{25-qdoc-configuration-derivedprojects.html#indexes}{indexes},
-    \l{25-qdoc-configuration-derivedprojects.html#project}{project},
-    \l{25-qdoc-configuration-derivedprojects.html#url}{url}
+           See also \l project.
 
-    \section2 Variable Descriptions
 
-    \table
-    \header
-        \o Variable
-        \o Description
-    \row
-        \o \bold description \target description
-        \o \bold {The description variable holds a short description of
-           the associated project.}
+    \target indexes-variable
+    \section1 indexes 
 
-           See also \l project.
-
-    \row
-        \o \bold indexes \target indexes
-        \o \bold {The \c indexes variable lists the index files
-           that will be used to generate references.}
+    The \c indexes variable lists the index files
+    that will be used to generate references.
 
            For example. to make a derived Qt project contain links to
            the Qt Reference documentation, you need to specify the
@@ -8449,13 +7971,15 @@
 
            See also \l project and \l url.
 
-    \row
-        \o \bold project \target project
-        \o \bold {The \c project variable provides a name for the project
-           associated with the \c .qdocconf file.}
+
+    \target project-variable
+    \section1 project 
+
+    The \c project variable provides a name for the project
+    associated with the \c .qdocconf file.
 
            The project's name is used to form a file name for the
-           associated project's \i index file. For example:
+           associated project's \e index file. For example:
 
            \code
                project = QtMotif
@@ -8465,10 +7989,12 @@
            created.
 
            See also \l description and \l indexes.
-    \row
-        \o \bold url \target url
-        \o \bold {The \c url variable holds the base URL for the
-            reference documentation associated with the current project.}
+
+    \target url-variable
+    \section1 url 
+
+    The \c url variable holds the base URL for the
+    reference documentation associated with the current project.
 
             The URL is stored in the generated index file for the
             project. When we use the index on its own, QDoc will use
@@ -8491,7 +8017,7 @@
 
             See also \l indexes.
 
-    \endtable
+
 
     \target howto
     \section1 How to Support Derived Projects
@@ -8544,7 +8070,7 @@
     The code above requires that you run QDoc from the directory that
     contains this file. You need to include the compat.qdocconf
     file for compatibility reasons; this is further explained in the
-    \l {QDoc Compatibility} section.
+    \l {Compatibility Issues} section.
 
     \bold {To resolve the actual links to Qt classes, the
     mini-project's \c .qdocconf file needs to assign a value to the \l
@@ -8561,47 +8087,43 @@
 /*!
     \page 26-qdoc-commands-compatibility.html
     \previouspage Supporting Derived Projects
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage QDoc Commands - Alphabetical List
+    \contentspage Table of Contents
+    \nextpage qt.qdocconf
 
-    \title QDoc Compatibility
-
-    \tableofcontents
+    \title Compatibility Issues
 
     \section1 General Description
 
     \target reason
 
-    QDoc is a tool that constantly evolves to suit our needs, for that
-    reason there are some compatibility issues in the transition
-    between old and new practices.
+    Because QDoc evolves to suit our documentation needs, there can be
+    some compatibility issues when converting to a new version.
 
-    To make the transition as smooth and rapid as possible, the
-    general idea is to adopt the new commands and usage in new
-    documentation.  While waiting for the occurrences of the old
-    practices to be eliminated from the old parts of the
-    documentation, you can map the new commands and usage to the old
-    ones using a compat.qdocconf file.
+    To allow you to proceed at your own speed when converting your
+    qdoc comments to use new qdoc commands and formats, the ability to
+    include a configuration file called \c {compat.qdocconf} is
+    provided.
 
-    A compat.qdocconf file is a separate \c .qdocconf file which you
-    can include in your main configuration file. It typically contains
-    the mapping between old and new commands using the \l alias and \l
-    {22-qdoc-configuration-generalvariables.html#macro}{macro}
-    configuration variables.
+    A \c {compat.qdocconf} file is a separate configuration file,
+    which you include in your main configuration file. It typically
+    contains the mappings from old qdoc commands to new ones using 
+    \l {alias} and 
+    \l {22-qdoc-configuration-generalvariables.html#macro-variable}
+    {macro} configuration variables.
 
     \section1 Qt Compatibility
 
     In Qt's documentation there still exist occurrences of old
-    commands, and the Qt \l {qt.qdocconf}{configuration file} needs to
+    commands, and the Qt \l {qt.qdocconf} {configuration file} needs to
     include the compat.qdocconf file tailored for Qt. For more
     detailed information about the commands creating compatibility
-    issues, see the \l {Command Comments}{command comments}.
+    issues, see the \l {Command Comments} {command comments}.
 
-    \section2 Qt's current compat.qdocconf file
+    \section1 Qt's current compat.qdocconf file
 
     \quotefile files/compat.qdocconf
 
-    \section2 Command Comments
+    \section1 Command Comments
 
     \table
     \header
@@ -8619,7 +8141,7 @@
            \\e command name.
 
            \bold {We still need to use the \\e command to render in
-           italic in new documentation for \l {reason}{compatibility
+           italic in new documentation for \l {reason} {compatibility
            reasons}}.
 
     \row
@@ -8633,7 +8155,7 @@
 
            \bold {We still need to use the \\input command to include
            plain text in new documentation for \l
-           {reason}{compatibility reasons}}.
+           {reason} {compatibility reasons}}.
 
     \row
         \o \\quotefile \target quotefile-versus-include
@@ -8646,7 +8168,7 @@
 
            \bold {We still need to use the \\include command to quote
            the entire contents of a source file in new documentation
-           for \l {reason}{compatibility reasons}}.
+           for \l {reason} {compatibility reasons}}.
 
     \row
         \o \\quotefromfile \target quotefromfile-versus-quotefile
@@ -8656,7 +8178,7 @@
            that command to quote an entire file, we introduce the new
            \\quotefromfile command to quote from file.
 
-           \bold {Use \l {quotefromfile}{\\quotefromfile} to quote
+           \bold {Use \l {quotefromfile-command} {\\quotefromfile} to quote
            parts from a source file in new documentation}.
 
     \row
@@ -8667,7 +8189,7 @@
            in italic instead, we introduce the new \\o command for
            this purpose.
 
-           \bold {Use \l {o}{\\o} to indicate list and table items in
+           \bold {Use \l {o-command} {\\o} to indicate list and table items in
            new documentation}.
 
     \row
@@ -8676,7 +8198,7 @@
         \o These commands are equivalent, and represent a simple name
           change.
 
-          \bold {Use \l {quotation}{\\quotation} in new
+          \bold {Use \l {quotation} {\\quotation} in new
           documentation}.
 
     \row
@@ -8685,116 +8207,120 @@
         \o These commands are equivalent, and represent a simple name
            change.
 
-           \bold {Use \l {image}{\\image} in new documentation}.
+           \bold {Use \l {image-command} {\\image} in new documentation}.
 
     \endtable
 */
 
 /*!
     \page 27-qdoc-commmands-alphabetical.html
-    \previouspage QDoc Compatibility
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Introduction to QDoc
+    \contentspage Table of Contents
+    \nextpage Topic Commands
+
+    \title The QDoc Commands
 
-    \title QDoc Commands - Alphabetical List
+    This is a complete, alphabetized list of the QDoc commands.
 
     \list
 
-    \o \l {04-qdoc-commands-textformatting.html#a}{\\a}
-    \o \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract}
-    \o \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode}
-    \o \l {04-qdoc-commands-textformatting.html#bold}{\\bold}
-    \o \l {11-qdoc-commands-documentcontents.html#brief}{\\brief}
-    \o \l {04-qdoc-commands-textformatting.html#c}{\\c}
-    \o \l {09-qdoc-commands-graphic.html#caption}{\\caption}
-    \o \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter}
-    \o \l {13-qdoc-commands-topical.html#class}{\\class}
-    \o \l {06-qdoc-commands-verbatimcode.html#code}{\\code}
-    \o \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
-    \o \l {16-qdoc-commands-status.html#compat}{\\compat}
-    \o \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage}
-    \o \l {07-0-qdoc-commands-quoting.html#dots}{\\dots}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif}
-    \o \l {13-qdoc-commands-topical.html#enum}{\\enum}
-    \o \l {13-qdoc-commands-topical.html#example-command}{\\example}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire}
-    \o \l {13-qdoc-commands-topical.html#externalpage}{\\externalpage}
-    \o \l {13-qdoc-commands-topical.html#fn}{\\fn}
-    \o \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist}
-    \o \l {13-qdoc-commands-topical.html#group}{\\group}
-    \o \l {10-qdoc-commands-container.html#header}{\\header}
-    \o \l {13-qdoc-commands-topical.html#headerfile}{\\headerfile}
-    \o \l {04-qdoc-commands-textformatting.html#i}{\\i}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if}
-    \o \l {09-qdoc-commands-graphic.html#image}{\\image}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include}
-    \o \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage}
-    \o \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup}
-    \o \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule}
-    \o \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage}
-    \o \l {16-qdoc-commands-status.html#internal}{\\internal}
-    \o \l {08-qdoc-commands-linking.html#keyword}{\\keyword}
-    \o \l {08-qdoc-commands-linking.html#l}{\\l}
-    \o \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese}
-    \o \l {10-qdoc-commands-container.html#list}{\\list}
-    \o \l {13-qdoc-commands-topical.html#macro}{\\macro}
-    \o \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta}
-    \o \l {13-qdoc-commands-topical.html#module}{\\module}
-    \o \l {13-qdoc-commands-topical.html#namespace}{\\namespace}
-    \o \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage}
-    \o \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode}
-    \o \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant}
-    \o \l {10-qdoc-commands-container.html#o}{\\o}
-    \o \l {16-qdoc-commands-status.html#obsolete}{\\obsolete}
-    \o \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit}
-    \o \l {10-qdoc-commands-container.html#omitvalue}{\\omitvalue}
-    \o \l {18-qdoc-commands-relating.html#overload}{\\overload}
-    \o \l {13-qdoc-commands-topical.html#page}{\\page}
-    \o \l {05-qdoc-commands-documentstructuring.html#part}{\\part}
-    \o \l {16-qdoc-commands-status.html#preliminary}{\\preliminary}
-    \o \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage}
-    \o \l {07-0-qdoc-commands-quoting.html#printline}{\\printline}
-    \o \l {07-0-qdoc-commands-quoting.html#printto}{\\printto}
-    \o \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil}
-    \o \l {13-qdoc-commands-topical.html#property}{\\property}
-    \o \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation}
-    \o \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile}
-    \o \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw}
-    \o \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant}
-    \o \l {18-qdoc-commands-relating.html#reimp}{\\reimp}
-    \o \l {18-qdoc-commands-relating.html#relates}{\\relates}
-    \o \l {10-qdoc-commands-container.html#row}{\\row}
-    \o \l {08-qdoc-commands-linking.html#sa}{\\sa}
-    \o \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1}
-    \o \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2}
-    \o \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3}
-    \o \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4}
-    \o \l {13-qdoc-commands-topical.html#service}{\\service}
-    \o \l {16-qdoc-commands-status.html#since}{\\since}
-    \o \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline}
-    \o \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto}
-    \o \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil}
-    \o \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet},
-    \o \l {15-qdoc-commands-navigation.html#startpage}{\\startpage}
-    \o \l {04-qdoc-commands-textformatting.html#sub}{\\sub}
-    \o \l {20-qdoc-commands-title.html#subtitle}{\\subtitle}
-    \o \l {04-qdoc-commands-textformatting.html#sup}{\\sup}
-    \o \l {10-qdoc-commands-container.html#table}{\\table}
-    \o \l {11-qdoc-commands-documentcontents.html#tableofcontents}
-          {\\tableofcontents}
-    \o \l {08-qdoc-commands-linking.html#target}{\\target}
-    \o \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe}
-    \o \l {20-qdoc-commands-title.html#title}{\\title}
-    \o \l {04-qdoc-commands-textformatting.html#tt}{\\tt}
-    \o \l {13-qdoc-commands-topical.html#typedef}{\\typedef}
-    \o \l {04-qdoc-commands-textformatting.html#underline}{\\underline}
-    \o \l {13-qdoc-commands-topical.html#variable}{\\variable}
-    \o \l {10-qdoc-commands-container.html#value}{\\value}
-    \o \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
+    \o \l {04-qdoc-commands-textmarkup.html#a-command} {\\a}
+    \o \l {11-qdoc-commands-specialcontent.html#abstract-command} {\\abstract}
+    \o \l {06-qdoc-commands-includecodeinline.html#badcode-command} {\\badcode}
+    \o \l {04-qdoc-commands-textmarkup.html#bold-command} {\\bold}
+    \o \l {11-qdoc-commands-specialcontent.html#brief-command} {\\brief}
+    \o \l {04-qdoc-commands-textmarkup.html#c-command} {\\c}
+    \o \l {09-qdoc-commands-includingimages.html#caption-command} {\\caption}
+    \o \l {05-qdoc-commands-documentstructure.html#chapter-command} {\\chapter}
+    \o \l {13-qdoc-commands-topics.html#class-command} {\\class}
+    \o \l {06-qdoc-commands-includecodeinline.html#code-command} {\\code}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#codeline-command} {\\codeline},
+    \o \l {16-qdoc-commands-status.html#compat-command} {\\compat}
+    \o \l {15-qdoc-commands-navigation.html#contentspage-command} {\\contentspage}
+    \o \l {04-qdoc-commands-textmarkup.html#div-command} {\\div} \span {class="newStuff"} {(new)}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#dots-command} {\\dots}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#else-command} {\\else}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#endif-command} {\\endif}
+    \o \l {13-qdoc-commands-topics.html#enum-command} {\\enum}
+    \o \l {13-qdoc-commands-topics.html#example-command} {\\example}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#expire-command} {\\expire}
+    \o \l {13-qdoc-commands-topics.html#externalpage-command} {\\externalpage}
+    \o \l {13-qdoc-commands-topics.html#fn-command} {\\fn}
+    \o \l {11-qdoc-commands-specialcontent.html#footnote-command} {\\footnote}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#generatelist-command} {\\generatelist}
+    \o \l {13-qdoc-commands-topics.html#group-command} {\\group}
+    \o \l {10-qdoc-commands-tablesandlists.html#header-command} {\\header}
+    \o \l {13-qdoc-commands-topics.html#headerfile-command} {\\headerfile}
+    \o \l {04-qdoc-commands-textmarkup.html#i-command} {\\i}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#if-command} {\\if}
+    \o \l {09-qdoc-commands-includingimages.html#image-command} {\\image}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#include-command} {\\include}
+    \o \l {15-qdoc-commands-navigation.html#indexpage-command} {\\indexpage}
+    \o \l {19-qdoc-commands-grouping.html#ingroup-command} {\\ingroup}
+    \o \l {19-qdoc-commands-grouping.html#inmodule-command} {\\inmodule}
+    \o \l {09-qdoc-commands-includingimages.html#inlineimage-command} {\\inlineimage}
+    \o \l {16-qdoc-commands-status.html#internal-command} {\\internal}
+    \o \l {08-qdoc-commands-creatinglinks.html#keyword-command} {\\keyword}
+    \o \l {08-qdoc-commands-creatinglinks.html#l-command} {\\l}
+    \o \l {11-qdoc-commands-specialcontent.html#legalese-command} {\\legalese}
+    \o \l {10-qdoc-commands-tablesandlists.html#list-command} {\\list}
+    \o \l {13-qdoc-commands-topics.html#macro-command} {\\macro}
+    \o \l {19-qdoc-commands-grouping.html#mainclass-command} {\\mainclass}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#meta-command} {\\meta}
+    \o \l {13-qdoc-commands-topics.html#module-command} {\\module}
+    \o \l {13-qdoc-commands-topics.html#namespace-command} {\\namespace}
+    \o \l {15-qdoc-commands-navigation.html#nextpage-command} {\\nextpage}
+    \o \l {06-qdoc-commands-includecodeinline.html#newcode-command} {\\newcode}
+    \o \l {17-qdoc-commands-thread.html#nonreentrant-command} {\\nonreentrant}
+    \o \l {10-qdoc-commands-tablesandlists.html#o-command} {\\o}
+    \o \l {16-qdoc-commands-status.html#obsolete-command} {\\obsolete}
+    \o \l {06-qdoc-commands-includecodeinline.html#oldcode-command} {\\oldcode}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#omit-command} {\\omit}
+    \o \l {10-qdoc-commands-tablesandlists.html#omitvalue-command} {\\omitvalue}
+    \o \l {18-qdoc-commands-relating.html#overload-command} {\\overload}
+    \o \l {13-qdoc-commands-topics.html#page-command} {\\page}
+    \o \l {05-qdoc-commands-documentstructure.html#part-command} {\\part}
+    \o \l {16-qdoc-commands-status.html#preliminary-command} {\\preliminary}
+    \o \l {15-qdoc-commands-navigation.html#previouspage-command} {\\previouspage}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printline-command} {\\printline}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printto-command} {\\printto}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printuntil-command} {\\printuntil}
+    \o \l {13-qdoc-commands-topics.html#property-command} {\\property}
+    \o \l {11-qdoc-commands-specialcontent.html#quotation-command} {\\quotation}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#quotefile-command} {\\quotefile}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#quotefromfile-command} {\\quotefromfile}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#raw-command} {\\raw} \span {class="newStuff"} {(avoid)}
+    \o \l {17-qdoc-commands-thread.html#reentrant-command} {\\reentrant}
+    \o \l {18-qdoc-commands-relating.html#reimp-command} {\\reimp}
+    \o \l {18-qdoc-commands-relating.html#relates-command} {\\relates}
+    \o \l {10-qdoc-commands-tablesandlists.html#row-command} {\\row}
+    \o \l {08-qdoc-commands-creatinglinks.html#sa-command} {\\sa}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionOne-command} {\\section1}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionTwo-command} {\\section2}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionThree-command} {\\section3}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionFour-command} {\\section4}
+    \o \l {13-qdoc-commands-topics.html#service-command} {\\service}
+    \o \l {16-qdoc-commands-status.html#since-command} {\\since}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipline-command} {\\skipline}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipto-command} {\\skipto}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipuntil-command} {\\skipuntil}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#snippet-command} {\\snippet},
+    \o \l {04-qdoc-commands-textmarkup.html#span-command} {\\span} \span {class="newStuff"} {(new)}
+    \o \l {15-qdoc-commands-navigation.html#startpage-command} {\\startpage}
+    \o \l {04-qdoc-commands-textmarkup.html#sub-command} {\\sub}
+    \o \l {20-qdoc-commands-namingthings.html#subtitle-command} {\\subtitle}
+    \o \l {04-qdoc-commands-textmarkup.html#sup-command} {\\sup}
+    \o \l {10-qdoc-commands-tablesandlists.html#table-command} {\\table}
+    \o \l {11-qdoc-commands-specialcontent.html#tableofcontents-command} {\\tableofcontents}
+    \o \l {08-qdoc-commands-creatinglinks.html#target-command} {\\target}
+    \o \l {17-qdoc-commands-thread.html#threadsafe-command} {\\threadsafe}
+    \o \l {20-qdoc-commands-namingthings.html#title-command} {\\title}
+    \o \l {04-qdoc-commands-textmarkup.html#tt-command} {\\tt}
+    \o \l {13-qdoc-commands-topics.html#typedef-command} {\\typedef}
+    \o \l {04-qdoc-commands-textmarkup.html#underline-command} {\\underline}
+    \o \l {13-qdoc-commands-topics.html#variable-command} {\\variable}
+    \o \l {10-qdoc-commands-tablesandlists.html#value-command} {\\value}
+    \o \l {11-qdoc-commands-specialcontent.html#warning-command} {\\warning}
     \endlist
 */