Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628

6 files changed, 13 insertions, 7 deletions

diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp
index b3cda5f508..132e5078f3 100644
--- a/src/libs/extensionsystem/iplugin.cpp
+++ b/src/libs/extensionsystem/iplugin.cpp
@@ -35,7 +35,7 @@
 /*!
     \class ExtensionSystem::IPlugin
     \mainclass
-    \brief Base class for all plugins.
+    \brief The IPlugin class is the base class for all plugins.
 
     The IPlugin class is an abstract class that must be implemented
     once for each plugin.
diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp
index cb9e792443..a7464cce17 100644
--- a/src/libs/extensionsystem/plugindetailsview.cpp
+++ b/src/libs/extensionsystem/plugindetailsview.cpp
@@ -35,7 +35,8 @@
 
 /*!
     \class ExtensionSystem::PluginDetailsView
-    \brief Widget that displays the contents of a PluginSpec.
+    \brief The PluginDetailsView class implements a widget that displays the
+    contents of a PluginSpec.
 
     Can be used for integration in the application that
     uses the plugin manager.
diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp
index 81d3c63f1b..d5c4fe7f56 100644
--- a/src/libs/extensionsystem/pluginerrorview.cpp
+++ b/src/libs/extensionsystem/pluginerrorview.cpp
@@ -35,7 +35,8 @@
 
 /*!
     \class ExtensionSystem::PluginErrorView
-    \brief Widget that displays the state and error message of a PluginSpec.
+    \brief The PluginErrorView class implements a widget that displays the
+    state and error message of a PluginSpec.
 
     Can be used for integration in the application that
     uses the plugin manager.
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 373f96a923..87fa98b931 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -76,7 +76,8 @@ enum { debugLeaks = 0 };
     \class ExtensionSystem::PluginManager
     \mainclass
 
-    \brief Core plugin system that manages the plugins, their life cycle and their registered objects.
+    \brief The PluginManager class implements the core plugin system that
+    manages the plugins, their life cycle, and their registered objects.
 
     The plugin manager is used for the following tasks:
     \list
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index c9ccce4ce2..ed0d3350ab 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -63,7 +63,8 @@
 
 /*!
     \class ExtensionSystem::PluginDependency
-    \brief Struct that contains the name and required compatible version number of a plugin's dependency.
+    \brief The PluginDependency class contains the name and required compatible
+    version number of a plugin's dependency.
 
     This reflects the data of a dependency tag in the plugin's xml description file.
     The name and version are used to resolve the dependency, i.e. a plugin with the given name and
@@ -102,7 +103,8 @@
 
 /*!
     \class ExtensionSystem::PluginSpec
-    \brief Contains the information of the plugins xml description file and
+    \brief The PluginSpec class contains the information of the plugin's XML
+    description file and
     information about the plugin's current state.
 
     The plugin spec is also filled with more information as the plugin
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index 5469a2fce9..61fcc577dc 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -42,7 +42,8 @@
 
 /*!
     \class ExtensionSystem::PluginView
-    \brief Widget that shows a list of all plugins and their state.
+    \brief The PluginView class implements a widget that shows a list of all
+    plugins and their state.
 
     This can be embedded e.g. in a dialog in the application that
     uses the plugin manager.