Merge branch '4.6'

Conflicts:
	translations/assistant_adp_pl.ts
	translations/assistant_adp_ru.ts

2 files changed, 7 insertions, 5 deletions

diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index a36debb..05940e4 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -1072,18 +1072,17 @@
 /*!
     \page examples-gestures.html
     \title Gestures Examples
-    
+
     \previouspage Animation Framework Examples
     \contentspage Qt Examples
     \nextpage D-Bus Examples
 
     The API of the gesture framework is not yet finalized and
     still subject to change.
-\omit
+
     \list
-    \o \l{widgets/imageviewer}{Image Viewer}
+    \o \l{gestures/imagegestures}{Image Gestures}
     \endlist
-\endomit
 */
 
 /*!
@@ -1121,7 +1120,6 @@
     \o \l{qws/svgalib}{Accelerated Graphics Driver}\raisedaster
     \o \l{qws/dbscreen}{Double Buffered Graphics Driver}\raisedaster
     \o \l{qws/mousecalibration}{Mouse Calibration}\raisedaster
-    \o \l{qws/ahigl}{OpenGL for Embedded Systems}\raisedaster
     \o \l{qws/simpledecoration}{Simple Decoration}\raisedaster
     \endlist
 */
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index 40ac1c7..0b63423 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -53,6 +53,10 @@
     For a list list of known bugs in Qt %VERSION%, see the \l{Task Tracker}
     on the Qt website.
 
+    An overview of known issues may also be found at:
+    \l{http://qt.gitorious.org/qt/pages/Qt460BetaKnownIssues}
+    {Known Issues Wiki}.
+
     \section1 Installation Issues
 
     \section2 Building the Source Package on Windows 7