Doc: Various fixes to documentation, some based on changes in master.

diff --git a/doc/src/examples/codeeditor.qdoc b/doc/src/examples/codeeditor.qdoc
index 23a2fd4..c4c72c0 100644 (file)
--- a/doc/src/examples/codeeditor.qdoc
+++ b/doc/src/examples/codeeditor.qdoc
@@ -190,6 +190,8 @@
     used to implement parenthesis matching. In the \c
     highlightCurrentLine(), the data of the currentBlock() can be
     fetched with QTextBlock::userData(). Matching parentheses can be
-    highlighted with an extra selection.
+    highlighted with an extra selection. The "Matching Parentheses
+    with QSyntaxHighlighter" article in Qt Quarterly 31 implements
+    this. You find it here: \l{http://doc.qt.nokia.com/qq/}.
 
 */

diff --git a/doc/src/examples/syntaxhighlighter.qdoc b/doc/src/examples/syntaxhighlighter.qdoc
index 4018be8..2511900 100644 (file)
--- a/doc/src/examples/syntaxhighlighter.qdoc
+++ b/doc/src/examples/syntaxhighlighter.qdoc
@@ -239,4 +239,14 @@
     function. The QSyntaxHighlighter class also provides the \l
     {QSyntaxHighlighter::document()}{document()} function which
     returns the currently set document.
+
+    \section1 Other Code Editor Features
+
+    It is possible to implement parenthesis matching with
+    QSyntaxHighlighter. The "Matching Parentheses with
+    QSyntaxHighlighter" article in Qt Quarterly 31
+    (\l{http://doc.qt.nokia.com/qq/}) implements this. We also have
+    the \l{Code Editor Example}, which shows how to implement line
+    numbers and how to highlight the current line.
+
 */