Doc: fixing bugs and typos based on feedback

11 files changed, 12 insertions, 12 deletions

diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 8671b48..d48b5d3 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -48,7 +48,7 @@ data from over a network.
 The XMLHttpRequest API implements the same \l {http://www.w3.org/TR/XMLHttpRequest/}{W3C standard}
 as many popular web browsers with following exceptions:
 \list
-\i QML's XMLHttpRequest does not enforce the same origin policty.
+\i QML's XMLHttpRequest does not enforce the same origin policy.
 \i QML's XMLHttpRequest does not support \e synchronous requests.
 \endlist
 
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index 7895c9f..b7d09a1 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -103,7 +103,7 @@ So, to implement your reusable button, you would simply build a QML component.
 
 Parent widgets each provide a generic way to interface to one or more arbitrary other widgets.
 A QTabWidget provides an interface to multiple "pages", one of which is visible at any time,
-and a mechanism for selecting among them (the QTabBar). A QScollArea provides scrollbars around
+and a mechanism for selecting among them (the QTabBar). A QScrollArea provides scrollbars around
 a widget that is otherwise too large to fit in available space.
 
 Nearly all such components can be created directly in QML. Only a few cases
diff --git a/doc/src/examples/textfinder.qdoc b/doc/src/examples/textfinder.qdoc
index 31fe785..e92bb98 100644
--- a/doc/src/examples/textfinder.qdoc
+++ b/doc/src/examples/textfinder.qdoc
@@ -80,7 +80,7 @@
 
     \snippet examples/uitools/textfinder/textfinder.h 0
 
-    The slot \c{on_find_Button_clicked()} is a slot named according to the
+    The slot \c{on_findButton_clicked()} is a slot named according to the
     \l{Using a Designer UI File in Your Application#Automatic Connections}
     {Automatic Connection} naming convention required
     by \c uic.
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 2b8078e..502fb65 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -33,7 +33,7 @@
 	\section1
 	Creating applications using Qt and QML is easy enough once you get started.
 	To get you started we have created two tutorials creating two similar applications,
-	but using diiferent approaches. One tutorial implements the user interface using
+	but using different approaches. One tutorial implements the user interface using
 	QML, while the other implements the whole application using traditional Qt.
 	
 	Please click on the links below to start the ride.
diff --git a/doc/src/howtos/HWacceleration.qdoc b/doc/src/howtos/HWacceleration.qdoc
index 7cc3346..b5a4733 100644
--- a/doc/src/howtos/HWacceleration.qdoc
+++ b/doc/src/howtos/HWacceleration.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \page HWAcc_rendering.html
-    \title Hardware Acceleration &amp Embedded Platforms.
+    \title Hardware Acceleration & Embedded Platforms.
     \brief How to use hardware acceleration for fast rendering.
 
     \ingroup best-practices
diff --git a/doc/src/howtos/restoring-geometry.qdoc b/doc/src/howtos/restoring-geometry.qdoc
index 005a29e..b3d6355 100644
--- a/doc/src/howtos/restoring-geometry.qdoc
+++ b/doc/src/howtos/restoring-geometry.qdoc
@@ -28,7 +28,7 @@
 /*!
     \page restoring-geometry.html
     \title Restoring a Window's Geometry
-    \brief How to save &amp restore window geometry.
+    \brief How to save & restore window geometry.
     \ingroup best-practices
 
     This document describes how to save and restore a \l{Window
diff --git a/doc/src/howtos/sharedlibrary.qdoc b/doc/src/howtos/sharedlibrary.qdoc
index 5b47618..3e611b9 100644
--- a/doc/src/howtos/sharedlibrary.qdoc
+++ b/doc/src/howtos/sharedlibrary.qdoc
@@ -59,7 +59,7 @@
     \endlist
 
     Now, we need to ensure that the right macro is invoked -- whether we
-    compile a share library itself, or just the client using the shared
+    compile a shared library itself, or just the client using the shared
     library.
     Typically, this can be solved by adding a special header.
 
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 9dbf7a7..60dd028 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -40,7 +40,7 @@
     \header \o {2,1} \bold{Modules for general software development}
     \row \o \l{QtCore} \o Core non-graphical classes used by other modules
     \row \o \l{QtGui} \o Graphical user interface (GUI) components
-    \row \o \l{qtmultimedia-module.html}{QtMultimedia} \o Classes for low-level multimedia functionality
+    \row \o \l{qtmultimedia.html}{QtMultimedia} \o Classes for low-level multimedia functionality
     \row \o \l{QtNetwork} \o Classes for network programming
     \row \o \l{QtOpenGL} \o OpenGL support classes
     \row \o \l{QtOpenVG} \o OpenVG support classes
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 11e1f7b..f51e320 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -42,7 +42,7 @@
     Qt is a cross-platform application and UI framework for writing
     web-enabled applications for desktop, mobile, and embedded
     operating systems. This page contains links to articles and overviews
-	explaining key components and techniuqes used in Qt development.
+	explaining key components and techniques used in Qt development.
 	
     \generatelist {related}
  */
@@ -51,7 +51,7 @@
     \group qt-gui-concepts
     \title UI Design with Qt
 
-    \brief The Qt components for constructing native look & feel desktop UI's.
+    \brief The Qt components for constructing native look and feel desktop UI's.
 
     These pages are about Qt's traditional set of GUI components for
     building both native look & feel and custom UI's for the desktop
diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc
index 49e2581..9b8a3b5 100644
--- a/doc/src/snippets/code/doc_src_stylesheet.qdoc
+++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc
@@ -213,7 +213,7 @@ namespace ns {
 }
 
 // ...
-qApp->setSytleSheet("ns--MyPushButton { background: yellow; }");
+qApp->setStyleSheet("ns--MyPushButton { background: yellow; }");
 //! [27]
 
 
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc
index bf3e3a8..0bf4909 100644
--- a/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -37,7 +37,7 @@
     \ingroup qt-gui-concepts
 
     A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
-    Usually, windows have a frame and a title bar, although it is also possible to create
+    (Usually, windows have a frame and a title bar, although it is also possible to create
     windows without such decoration using suitable window flags). In Qt, QMainWindow
     and the various subclasses of QDialog are the most common window types.