5 files changed, 7 insertions, 22 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 47219bf..a13e2b8 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -746,7 +746,7 @@
 
     If the shared library has dependencies that are different from the
     application using it, the manifest file needs to be embedded into the DLL
-    binary. Since Qt 4.1.3, the follwoing \c CONFIG options are available for
+    binary. Since Qt 4.1.3, the following \c CONFIG options are available for
     embedding manifests:
 
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 20
@@ -1555,15 +1555,4 @@
 
     For more information about creating a \c .sis file and installing it to device see also
     \l {The Symbian platform - Introduction to Qt#Installing your own applications}{here}.
-
-    \section1 Further Reading
-
-    This document aims to cover the common case for developers who want to
-    deploy Qt applications on devices using the Smart Installer. It does not
-    aim to cover every possible way of installing applications, Qt and other
-    dependencies on a device.
-
-    A wider selection of deployment methods is described in the
-    \l{Deploying a Qt Application article} on the Symbian Foundation
-    Developer Wiki.
 */
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 63e11c8..f528bf2 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -425,11 +425,6 @@
 */
 
 /*!
-    \externalpage http://developer.symbian.org/wiki/index.php/Deploying_a_Qt_Application
-    \title Deploying a Qt Application article
-*/
-
-/*!
     \externalpage http://www.ecma-international.org/publications/standards/Ecma-262.htm
     \title ECMAScript Language Specification
 */
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index bd21a12..af418e0 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -37,7 +37,8 @@
             \enddiv
             \list
             \o \l{Qt Features Overview}
-            \o \l{Introduction to Qt Quick}{Qt Quick}
+            \o \l{How to Learn Qt}
+            \o \l{Introduction to Qt Quick}
             \o \l{external: Qt Mobility Manual}{Qt Mobility}
             \o \l{Qt WebKit}
             \endlist
diff --git a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp b/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp
index aa5225a..812adf9 100644
--- a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp
+++ b/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp
@@ -52,7 +52,7 @@ program.bind();
 //! [1]
 program.addShaderFromSourceCode(QGLShader::Vertex,
     "attribute highp vec4 vertex;\n"
-    "attribute mediump mat4 matrix;\n"
+    "uniform highp mat4 matrix;\n"
     "void main(void)\n"
     "{\n"
     "   gl_Position = matrix * vertex;\n"
@@ -67,7 +67,7 @@ program.link();
 program.bind();
 
 int vertexLocation = program.attributeLocation("vertex");
-int matrixLocation = program.attributeLocation("matrix");
+int matrixLocation = program.uniformLocation("matrix");
 int colorLocation = program.uniformLocation("color");
 //! [1]
 
diff --git a/doc/src/snippets/myscrollarea.cpp b/doc/src/snippets/myscrollarea.cpp
index 93b487d..9a41ed8 100644
--- a/doc/src/snippets/myscrollarea.cpp
+++ b/doc/src/snippets/myscrollarea.cpp
@@ -98,8 +98,8 @@ void MyScrollArea::updateArea()
     QSize areaSize = viewport()->size();
     QSize  widgetSize = widget->size();
 
-    verticalScrollBar()->setPageStep(widgetSize.height());
-    horizontalScrollBar()->setPageStep(widgetSize.width());
+    verticalScrollBar()->setPageStep(areaSize.height());
+    horizontalScrollBar()->setPageStep(areaSize.width());
     verticalScrollBar()->setRange(0, widgetSize.height() - areaSize.height());
     horizontalScrollBar()->setRange(0, widgetSize.width() - areaSize.width());
     updateWidgetPosition();