diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
tree | 598d682291945055e4f6feb08a228212648482c1 /src/tools/qdoc/doc/qdoc-manual.qdoc | |
parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/tools/qdoc/doc/qdoc-manual.qdoc')
-rw-r--r-- | src/tools/qdoc/doc/qdoc-manual.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual.qdoc b/src/tools/qdoc/doc/qdoc-manual.qdoc index 3e67579f2a..e6bdf5af27 100644 --- a/src/tools/qdoc/doc/qdoc-manual.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \page index.html + \page qdoc-index.html \nextpage Introduction to QDoc \title Table of Contents @@ -138,11 +138,11 @@ \section1 Running QDoc - The current name of the QDoc program is \c {qdoc3}. To run qdoc3 + The current name of the QDoc program is \c {qdoc}. To run qdoc from the command line, give it the name of a configuration file: \quotation - \c {$ ../../bin/qdoc3 ./config.qdocconf} + \c {$ ../../bin/qdoc ./config.qdocconf} \endquotation QDoc recognizes the \c {.qdocconf} suffix as a \l{The QDoc @@ -2907,7 +2907,7 @@ \li Tutorial and Examples \endlist - \warning There appears to be a bug in qdoc3 here. If you include + \warning There appears to be a bug in qdoc here. If you include any of the argument types, you get a numeric list. We're looking into it. @@ -7062,7 +7062,7 @@ QDoc on the command line: \quotation - \c {/current/dir$ ../../bin/qdoc3 ./config.qdocconf} + \c {/current/dir$ ../../bin/qdoc ./config.qdocconf} \endquotation \section1 General Description @@ -7307,7 +7307,7 @@ looking for \e qt5. For example, this file would be: \code - ~/depot/qt5/qtdoc/tools/qdoc3/doc/qdoc-manual.qdoc + ~/depot/qt5/qtdoc/tools/qdoc/doc/qdoc-manual.qdoc \endcode QDoc scans the path for the basedir \e{qt5} and the next subdirectory @@ -7365,7 +7365,7 @@ line using the -D option. For example: \code - currentdirectory$ qdoc3 -Dconsoleedition qt.qdocconf + currentdirectory$ qdoc -Dconsoleedition qt.qdocconf \endcode In this case the -D option ensures that the \c consoleedition |