summaryrefslogtreecommitdiffstats
path: root/doc/src/linguist-manual.qdoc
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-08-14 16:29:13 +1000
committerWarwick Allison <warwick.allison@nokia.com>2009-08-14 16:29:13 +1000
commit0c831b8cf84c72ee8673d1d38f4e93e350dddd5f (patch)
tree84fc3c89d73342ec70d77b2bdf99066f987536b8 /doc/src/linguist-manual.qdoc
parentb98b7d305ffebb700e471bd64a7dee59d947e056 (diff)
parent4b1b93f3f97de70af316052bc38048f52631b9e4 (diff)
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc/src/linguist-manual.qdoc')
-rw-r--r--doc/src/linguist-manual.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/linguist-manual.qdoc b/doc/src/linguist-manual.qdoc
index fd062bb1e..a67d65ad1 100644
--- a/doc/src/linguist-manual.qdoc
+++ b/doc/src/linguist-manual.qdoc
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -1414,8 +1414,8 @@
\c -pluralonly command line option, which allows the creation of
TS files containing only entries with plural forms.
- See the \l{http://doc.trolltech.com/qq/}{Qt Quarterly} Article
- \l{http://doc.trolltech.com/qq/qq19-plurals.html}{Plural Forms in Translations}
+ See the \l{http://qt.nokia.com/doc/qq/}{Qt Quarterly} Article
+ \l{http://qt.nokia.com/doc/qq/qq19-plurals.html}{Plural Forms in Translations}
for further details on this issue.
\section2 Coping With C++ Namespaces