summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2011-04-07 11:21:25 (GMT)
committerMartin Smith <martin.smith@nokia.com>2011-04-07 11:21:25 (GMT)
commitbd0f7729ad5371b3b0ba42976451b622b1209b45 (patch)
tree9f5b775a4a4132033f8bbcc067ed41b99118cd56
parent58e28ff518ee983f6af0e8937bbd355a2587c4d3 (diff)
downloadQt-bd0f7729ad5371b3b0ba42976451b622b1209b45.zip
Qt-bd0f7729ad5371b3b0ba42976451b622b1209b45.tar.gz
Qt-bd0f7729ad5371b3b0ba42976451b622b1209b45.tar.bz2
qdoc: Updated the QDoc manual.
-rw-r--r--tools/qdoc3/doc/qdoc-manual.qdoc11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index 9039296..da0646e 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -7061,7 +7061,7 @@
information see the \l {Compatibility Issues} {compatibility
section}.
- See also \l {macro-command} {macro}.
+ See also \l {macro-variable} {macro}.
\target codeindent-variable
\section1 codeindent
@@ -7561,11 +7561,10 @@
\section1 macro
The \c macro variable is used to create your own simple QDoc
- commands or to redefine existing QDoc commands. The syntax is \tt
- {macro.\e{command} = \e{definition}}, where the definition is
- written using QDoc syntax.
+ commands. The syntax is \tt {macro.\e{command} = \e{definition}},
+ where the definition is written using QDoc syntax.
- A macro command can be restricted for use in one type of output
+ A macro variable can be restricted for use in one type of output
generation. By appending \c {.HTML} to the macro name, for
example, the macro is only used when generating HTML output. By
appending \c {.DITAXML} to the macro name, the macro is only used
@@ -7581,6 +7580,8 @@
command to render a superscript asterisk, but only when generating
HTML.
+ See also \l {alias-variable} {alias}.
+
\target naturallanguage-variable
\section1 naturallanguage