Merge branch 'stable' into release

Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e

1 files changed, 7 insertions, 4 deletions

diff --git a/src/quick/doc/src/concepts/positioning/anchors.qdoc b/src/quick/doc/src/concepts/positioning/anchors.qdoc
index bec0949fb3..d0a14f7392 100644
--- a/src/quick/doc/src/concepts/positioning/anchors.qdoc
+++ b/src/quick/doc/src/concepts/positioning/anchors.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -140,7 +140,8 @@ carefully ordered, or they may produce unexpected outcomes. The following exampl
 \table
 \row
 \li
-    \badcode
+    \code
+    //bad code
     Rectangle {
         width: 50
         anchors.left: parent.left
@@ -185,7 +186,8 @@ conditional bindings, as this can lead to the ordering issue described above. In
 the Rectangle will eventually grow to the full width of its parent, because both left and right anchors
 will be simultaneously set during binding update.
 
-\badcode
+\code
+//bad code
 Rectangle {
     width: 50; height: 50
     anchors.left: state == "right" ? undefined : parent.left;
@@ -201,7 +203,8 @@ ordering issues internally.
 For performance reasons, you can only anchor an item to its siblings and direct parent. For example,
 the following anchor is invalid and would produce a warning:
 
-\badcode
+\code
+//bad code
 Item {
     id: group1
     Rectangle { id: rect1; ... }