Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 0fec40050e..301019e909 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -382,13 +382,15 @@ void Document::addUndefinedMacroUse(const QByteArray &name, unsigned offset)
 
 /*!
     \class Document::MacroUse
-    \brief Represents the usage of a macro in a \l {Document}.
+    \brief The MacroUse class represents the usage of a macro in a
+    \l {Document}.
     \sa Document::UndefinedMacroUse
 */
 
 /*!
     \class Document::UndefinedMacroUse
-    \brief Represents a macro that was looked up, but not found.
+    \brief The UndefinedMacroUse class represents a macro that was looked for,
+    but not found.
 
     Holds data about the reference to a macro in an \tt{#ifdef} or \tt{#ifndef}
     or argument to the \tt{defined} operator inside an \tt{#if} or \tt{#elif} that does