diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-08-11 08:07:59 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-08-11 08:07:59 (GMT) |
| commit | 02e0523fe2b1dfd08eadaf127023306f6aa64c6f (patch) | |
| tree | 26f374407ac0976e69f092517d69e1c93332492c /tools/qdoc3 | |
| parent | d501b04974df3615ac12fa93e11e893a44fbe715 (diff) | |
| parent | c7a18308a2725e4d1763777cb549f1ae74848005 (diff) | |
| download | Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.zip Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.gz Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.bz2 | |
Merge commit 'remotes/origin/4.7' into qt47s2
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index d23b41e..eb33ce9 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2027,7 +2027,7 @@ void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker) } /*! - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, @@ -2113,7 +2113,7 @@ void HtmlGenerator::generateTableOfContents(const Node *node, /*! Revised for the new doc format. - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, |