summaryrefslogtreecommitdiffstats
path: root/doc/src/legal/trademarks.qdoc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-02-08 19:19:38 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-02-08 19:21:47 (GMT)
commitdeb0f3c17bcbdf4565eb7652ca4ed086f0938bfe (patch)
tree58685d3479e73591085e1ac22156b582fb628a3c /doc/src/legal/trademarks.qdoc
parentf2ba5e4d83f112f14a08e65e032497754750e8fa (diff)
downloadQt-deb0f3c17bcbdf4565eb7652ca4ed086f0938bfe.zip
Qt-deb0f3c17bcbdf4565eb7652ca4ed086f0938bfe.tar.gz
Qt-deb0f3c17bcbdf4565eb7652ca4ed086f0938bfe.tar.bz2
Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.
We now write UTF-8 encoded XHTML and assume all pure documentation which isn't pure ASCII is now UTF-8 encoded. Reviewed-by: Trust Me
Diffstat (limited to 'doc/src/legal/trademarks.qdoc')
-rw-r--r--doc/src/legal/trademarks.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index a7b5764..23d0cf6 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -47,7 +47,7 @@
\brief Information about trademarks owned by Nokia and other organisations.
Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia
-  Corporation and/or its subsidiaries in Finland and other countries.
+  Corporation and/or its subsidiaries in Finland and other countries.
\list
\o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of