diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/tools/qdoc/doc/qdoc-manual.qdoc | |
parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools/qdoc/doc/qdoc-manual.qdoc')
-rw-r--r-- | src/tools/qdoc/doc/qdoc-manual.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual.qdoc b/src/tools/qdoc/doc/qdoc-manual.qdoc index 6da996ecb3..f157f0a2d9 100644 --- a/src/tools/qdoc/doc/qdoc-manual.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual.qdoc @@ -5024,9 +5024,9 @@ / *! \module QtNetwork - \title QtNetwork Module + \title Qt Network Module - \brief The QtNetwork module offers classes that allow + \brief The Qt Network module offers classes that allow you to write TCP/IP clients and servers. The network module provides classes to make network @@ -5042,10 +5042,10 @@ \quotation \raw HTML - <h1><center>QtNetwork Module</center></h1> + <h1><center>Qt Network Module</center></h1> \endraw - The QtNetwork module offers classes that allow you to + The Qt Network module offers classes that allow you to write TCP/IP clients and servers.\l {module details} {More...} @@ -5083,7 +5083,7 @@ <h2>Detailed Description</h2> <p> - The QtNetwork module offers classes that allow you to + The Qt Network module offers classes that allow you to write TCP/IP clients and servers. </p> @@ -6897,7 +6897,7 @@ \endcode This ensures that the QDesignerTaskMenuExtension class is included - in the \c QtDesigner module, which means, for example, that the + in the Qt Designer module, which means, for example, that the class will appear on the list created by calling the \l {generatelist-command} {\\generatelist} command with the \c {{classesbymodule QtDesigner}} argument. |