diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 86067cbbcce..98f5073a1d1 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -1364,6 +1364,7 @@
 
     Since Qt Creator 1.1, support for \c CMake project files is available.
 
+
     \section1 Opening CMake Projects
 
     To open a \c CMake project select \gui Open from the \gui File menu and
@@ -1389,18 +1390,18 @@
     depending on your platform. The build errors and warnings are parsed and
     displayed in the \gui{Build Issues} output pane.
 
-    By default Qt Creator builds the "all" target. You can change which
-    targets get build in the Project/Build Settings.
+    By default Qt Creator builds the \e{all} target. You can specify which
+    targets to build in \gui{Project} mode, under \gui{Build Settings}.
 
     \image qtcreator-cmake-build-settings.png
 
-    Currently only one build configuration is supported and the
-    build directory can't be changed after the initial import. This
-    limitation will be fixed for the next version.
+    Qt Creator supports multiple build configurations. Also, the build
+    directory can be modified after the initial import.
+
 
     \section1 Running CMake Projects
-    Qt Creator automatically adds Run Configurations for all the
-    targets specified in the \c CMake project file.
+    Qt Creator automatically adds \gui{Run Configurations} for all targets
+    specified in the \c CMake project file.
 
     Known issues for the current version can be found
     \l{Known Issues of Version 1.1.80}{here}.
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index a31bf453997..cd683f7990b 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -2358,7 +2358,7 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
 
                 if (drawBox) {
                     bool expanded = nextBlock.isVisible();
-                    QRect box(extraAreaWidth + collapseBoxWidth/4 + 1, top + collapseBoxWidth/4,
+                    QRect box(extraAreaWidth + collapseBoxWidth/4, top + collapseBoxWidth/4,
                               2 * (collapseBoxWidth/4) + 1, 2 * (collapseBoxWidth/4) + 1);
                     drawFoldingMarker(&painter, box, expanded, active);
                 }
@@ -2408,7 +2408,7 @@ void BaseTextEditor::drawFoldingMarker(QPainter *painter, const QRect &rect,
                                        bool expanded, bool hovered) const
 {
     QStyleOptionViewItemV2 opt;
-    opt.rect = QRect(rect.center(), QSize());
+    opt.rect = rect;
     opt.state = QStyle::State_Active | QStyle::State_Item | QStyle::State_Children;
 
     if (expanded)