Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069

3 files changed, 11 insertions, 14 deletions

diff --git a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
index ee0a7b41db..fe43938968 100644
--- a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
@@ -3775,7 +3775,7 @@
            <author>Qt Development Frameworks</author>
            <publisher>Qt Project</publisher>
            <copyright>
-               <copyryear year="2013"/>
+               <copyryear year="2014"/>
                <copyrholder>Qt Project</copyrholder>
            </copyright>
            <permissions view="all"/>
diff --git a/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
index 3adcf9b213..a28e65e976 100644
--- a/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
@@ -1569,7 +1569,7 @@
     dita.metadata.default.author      = Qt Development Frameworks
     dita.metadata.default.permissions = all
     dita.metadata.default.publisher   = Qt Project
-    dita.metadata.default.copyryear = 2013
+    dita.metadata.default.copyryear = 2014
     dita.metadata.default.copyrholder = Qt Project
     dita.metadata.default.audience = programmer
     \endcode
diff --git a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
index 68f3f9652b..b9667b7758 100644
--- a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
@@ -1113,27 +1113,24 @@
     \section1 \\qmlattachedsignal
 
     The \\qmlattachedsignal command is for documenting an attachable
-    \l{http://qt-project.org/doc/qt-4.7/qdeclarativeintroduction.html#signal-handlers}
-    {signal handler}. The \\qmlattachedsignal command is used just like
-    the \l{qmlsignal-command} {\\qmlsignal} command.
+    \l{Signal and Handler Event System}{signal}. The \\qmlattachedsignal
+    command is used just like the \l{qmlsignal-command} {\\qmlsignal} command.
 
     The argument is the rest of the line. It should be the name of the
-    QML type where the signal handler is declared, the \c{::}
-    qualifier, and finally the signal handler name. If we have a QML
-    attached signal handler named \c onAdd() in the \c GridView
-    element, the \\qmlattachedsignal for it would look like this:
+    QML type where the signal is declared, the \c{::}
+    qualifier, and finally the signal name. For example, a QML
+    attached signal named \c add() in the \c GridView
+    element is documented like this:
 
     \code
     / *!
-        \qmlattachedsignal GridView::onAdd()
-        This attached handler is called immediately after an item is
-    added to the view.
+        \qmlattachedsignal GridView::add()
+        This attached signal is emitted immediately after an item is added to the view.
     * /
     \endcode
 
     QDoc includes this documentation on the QML reference page for the
-    \l{http://qt-project.org/doc/qt-4.7/qml-gridview.html#onAdd-signal}
-    {GridView} element.
+    \l GridView element.
 
     \target qmlbasictype-command
     \section1 \\qmlbasictype