diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:56:44 +0200 |
| commit | f60ab55b4c68a8f3e3029c122c427806cdf51a1d (patch) | |
| tree | bc38cef4350ccbe0bd425c5117d43372fb21021a /src/qdoc/doc/qdoc-manual-markupcmds.qdoc | |
| parent | f74df71c48e5878de8eb44ee107aeed42385eff6 (diff) | |
| parent | 6bbf06477f6508b84b4fdf2a885ac880013f1892 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I10c51b1983bcc48043b89b9aac9780da311ff802
Diffstat (limited to 'src/qdoc/doc/qdoc-manual-markupcmds.qdoc')
| -rw-r--r-- | src/qdoc/doc/qdoc-manual-markupcmds.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc index 4e4641ecb..6e1951666 100644 --- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -488,7 +488,7 @@ \section1 \\e (emphasis, italics) The \\e command renders its argument in a special font, normally italics. This - command used to be called \\i, which is now deprecated. Use \e for italics. + command used to be called \\i, which is now deprecated. If the argument contains spaces or other punctuation, enclose the argument in curly brackets. |