summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-04-17 04:41:48 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-04-17 04:41:48 (GMT)
commitc67b487217832ce67c362030516d49974daef0bc (patch)
treedc4cfaaac16e6b680193b60eabae87ece3beb4a1
parent095c4209fe8fea6d46cc6c1486d2bc6471e8f0a5 (diff)
parente389dc42a1d3d473eac34987767b94dbe623a275 (diff)
downloadQt-c67b487217832ce67c362030516d49974daef0bc.zip
Qt-c67b487217832ce67c362030516d49974daef0bc.tar.gz
Qt-c67b487217832ce67c362030516d49974daef0bc.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
-rw-r--r--doc/src/qt4-intro.qdoc9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index cd66c10..5d83ef2 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -161,9 +161,9 @@
\o Support for OLE verbs and MIME data handling in \l{ActiveQt}.
\endlist
- For more information about improvements in the current release, see
- the \l{http://www.qtsoftware.com/developer/changes/changes-4.1.4/}
- {detailed list of changes}.
+ For more information about improvements in each Qt release, see
+ the \l{http://www.qtsoftware.com/developer/changes/}
+ {detailed lists of changes}.
\section1 Significant Improvements
@@ -447,11 +447,10 @@
\l{http://www.qtsoftware.com/developer/changes/changes-4.5.0}{available online}.
A \l{Known Issues in %VERSION%}{list of known issues} for this release is also
available.
- \omit
+
Changes between this release and the previous release are provided
in the \c{changes-%VERSION%} file (also
\l{http://www.qtsoftware.com/developer/changes/changes-%VERSION%}{available online}).
- \endomit
A list of other Qt 4 features can be found on the
\bold{\l{What's New in Qt 4}} page.