Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  Corrected spelling mistake and whitespace fixes.
  Doc: fixing unclosed <p>
  Changed language of the AutoConnection description.
  Changed Javascript guide link in Intro to the QML Language page.
  Doc: Clearing details around default settings.
  Doc: making links more visible when they are visited.
  Doc: Fixing doc bugs for the symbian platform
  Doc: Adding note to tier 2: The ppc architecture on Mac has been downgraded from tier 1 to tier 2 for 4.7.

10 files changed, 47 insertions, 21 deletions

diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index 87dafb0..1d807e3 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -37,7 +37,7 @@ interface is specified as a tree of objects with properties.
 
 This introduction is meant for those with little or no programming
 experience. JavaScript is used as a scripting language in QML, so you may want
-to learn a bit more about it (\l{JavaScript: The Definitive Guide}) before diving
+to learn a bit more about it (\l{Javascript Guide}) before diving
 deeper into QML. It's also helpful to have a basic understanding of other web
 technologies like HTML and CSS, but it's not required.
 
@@ -65,8 +65,8 @@ types always begin with a capital letter. In the above example, there are
 two objects, a \l Rectangle, and an \l Image. Between the braces, we can specify
 information about the object, such as its properties.
 
-Properties are specified as \c {property: value}. In the above example, we 
-can see the Image has a property named \c source, which has been assigned the 
+Properties are specified as \c {property: value}. In the above example, we
+can see the Image has a property named \c source, which has been assigned the
 value \c "pics/logo.png". The property and its value are separated by a colon.
 
 Properties can be specified one-per-line:
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 664f002..c078316 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -756,6 +756,7 @@
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 21
 
     to your .pro file. The \c embed_manifest_dll option is enabled by default.
+	The \c embed_manifest_exe option is NOT enabled by default.
 
     You can find more information about manifest files and side-by-side
     assemblies at the
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 018362e..d65967d 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -939,7 +939,9 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 130
 
-    The default values depend on the version of the Symbian SDK you're using.
+    The default values depend on the version of the Symbian SDK you're using,
+	however, the Qt toolchain sets this to the maximum possible value and this
+	should not be changed.
 
     \section2 Compiler specific options
 
@@ -958,23 +960,30 @@
     Symbian applications may have unique identifiers attached to them.
     Here is how to define them in a project file:
 
-    There are four types of IDs supported: \c UID2, \c UID3, \c SID, and \c VID. They
+    There are four available types of IDs supported: \c UID2, \c UID3, \c SID, and \c VID. They
     are specified like this:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 132
 
-    If \c UID2 is not specified, it defaults to the same value as \c UID3.
+    If \c SID is not specified, it defaults to the same value as \c UID3.
     If \c UID3 is not specified, qmake will automatically generate a \c UID3
     suitable for development and debugging. This value should be manually
     specified for applications that are to be released. In order to obtain
-    an official UID, please contact Nokia. Both \c SID and \c VID default to empty values.
-
-    For more information about unique identifiers and their meaning for
-    Symbian applications, please refer to the Symbian SDK documentation.
-
+    an official UID, please contact \l{Symbian}{http:\\www.symbiansigned.com}.
+	Both \c SID and \c VID default to empty values.
+
+    There exists one UID1 too, but this should not be touched by any application.
+	
+	The UID2 has a specific value for different types of files - e.g. apps/exes
+	are always 0x100039CE. The toolchain will set this for value for the most common file types like,
+	EXE/APP and shared library DLL. 
+	
+	For more information about unique identifiers and their meaning for Symbian applications,
+	please refer to the \l{Symbian SDK documentation}{http://developer.symbian.org/main/documentation/reference/s3/pdk/GUID-380A8C4F-3EB6-5E1C-BCFB-ED5B866136D9.html}
+	
     \section2 Capabilities
 
-    Capabilities define extra priviledges for the application, such as the
+    Capabilities define extra privileges for the application, such as the
     ability to list all files on the file system. Capabilities are defined
     in the project file like this:
 
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 3041046..a23ae4d 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -440,6 +440,11 @@
 */
 
 /*!
+    \externalpage https://developer.mozilla.org/en/JavaScript/Guide
+    \title JavaScript Guide
+*/
+
+/*!
     \externalpage https://developer.mozilla.org/en/JavaScript/About_JavaScript
     \title About JavaScript
 */
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 398eee8..c4892a8 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -36,7 +36,7 @@
 
    You can run the examples from the \l{Examples and Demos Launcher}
    application (except see \l{QML Examples and Demos} {QML Examples}
-   for special instructions for running thos examples).
+   for special instructions for running those examples).
 
    The examples are listed below by functional area. Each example
    listed in a particular functional area is meant to illustrate how
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 31866c4..5218690 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -123,6 +123,8 @@
                                      \o RVCT 2.2 [build 686 or later], WINSCW 3.2.5 [build 482 or later], GCCE (for applications)
     \endtable
 
+	\note The PPC architecture on Mac has been downgraded from tier 1 to tier 2 for 4.7. 
+	
     \section1 Tier 3 Platforms (Not supported by Nokia)
 
     All platforms not specifically listed above are not supported by Nokia. Nokia does
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 12d297d..536b3c8 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -926,6 +926,15 @@
         color: #4c0033;
         text-decoration: underline;
     }
+	descr p a
+    {
+        text-decoration: underline;
+    }
+	
+    .descr p a:visited
+    {
+        text-decoration: underline;
+    }
     .feedback
     {
         float: none;
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 1c41eca..dd02e17 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -511,11 +511,11 @@
     delivery at a later time.
 
     \value AutoConnection
-            (default) If the object sending the signal is in a different thread
-            than the receiving object, the signal is queued, behaving as
-            Qt::QueuedConnection. If both objects are in the same thread,
-            the slot is invoked directly, behaving as Qt::DirectConnection. The
-            type of connection is determined when the signal is emitted.
+            (default) If the signal is emitted from a different thread than the
+            receiving object, the signal is queued, behaving as
+            Qt::QueuedConnection. Otherwise, the slot is invoked directly,
+            behaving as Qt::DirectConnection. The type of connection is
+            determined when the signal is emitted.
 
     \value DirectConnection
 	   The slot is invoked immediately, when the signal is
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 9831d5f..1ffd3bd 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -261,9 +261,9 @@ void QDeclarativeRectangle::doUpdate()
     A width of 1 creates a thin line. For no line, use a width of 0 or a transparent color.
 
     If \c border.width is an odd number, the rectangle is painted at a half-pixel offset to retain
-    border smoothness. Also, the border is rendered evenly on either side of the 
+    border smoothness. Also, the border is rendered evenly on either side of the
     rectangle's boundaries, and the spare pixel is rendered to the right and below the
-    rectangle (as documented for QRect rendering). This can cause unintended effects if 
+    rectangle (as documented for QRect rendering). This can cause unintended effects if
     \c border.width is 1 and the rectangle is \l{Item::clip}{clipped} by a parent item:
 
     \beginfloatright
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index c804d09..7b719c8 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -4234,7 +4234,7 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
                 if (qpgn->isDefault())
                     out() << "<span class=\"qmldefault\">default</span>";
                 generateQmlItem(qpn, relative, marker, false);
-                out() << "</td></tr>";
+                out() << "</p></td></tr>";
             }
             ++p;
         }