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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
  Doc: Fixed a reference to the wrong image.
  Fixed a bug that caused marked up inline text to be truncated.
  Doc: Renamed an image to ensure that it does not clash with another.
  Doc: Fixed QML, unindented snippet.
  Doc: Removed unnecessary HTML entity from the title.
  Doc: Fixed broken links to the old Symbian Foundation Wiki.
  Doc: Updated the copyright statements in the templates.
  Doc: Fixing typo
  Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
  Doc: Adjusted the font sizes for the offline documentation.
  Doc: Added a missing style sheet to the qhp manifest.
  Doc: Fixed the qthelp namespace for the Qt documentation.
  Doc: including missing pages in overviews.
  Doc: Fixed typo in QCoreApplication docs
  Fixed whitespace.
  Avoid hard-coding product names in page titles.
  Doc: Unindented a code snippet.
  Doc: Fixed confusing wording of a sentence.
  Doc: Fixed a broken link.
  Doc: Updated the information about commercial editions of Qt.
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 9aade98..8baaa50 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1096,9 +1096,9 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
 
     \snippet doc/src/snippets/declarative/gridview/ContactModel.qml 0
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage gridview-simple.png
-    \endfloat
+    \enddiv
 
     This model can be referenced as \c ContactModel in other QML files. See \l{QML Modules}
     for more information about creating reusable components like this.
@@ -1112,9 +1112,9 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     \codeline
     \snippet doc/src/snippets/declarative/gridview/gridview.qml classdocs simple
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage gridview-highlight.png
-    \endfloat
+    \enddiv
 
     The view will create a new delegate for each item in the model. Note that the delegate
     is able to access the model's \c name and \c portrait data directly.