Changes file updates

Also fixed some it's -> its

diff --git a/dist/changes-1.2.0 b/dist/changes-1.2.0
index 6bfe395..605fad3 100644 (file)
--- a/dist/changes-1.2.0
+++ b/dist/changes-1.2.0
@@ -12,9 +12,10 @@ API, so if you created your own custom plugins these need to be adapted.
 
 General:
    * Reworked Welcome Screen
-   * Speed improvement: Store large amounts of persistent data
-     (e.g. locator cache) in an SQLite database.
-   
+   * Speed improvement: store large amounts of persistent data
+     (e.g. locator cache) in an SQLite database
+   * Show current file name in the window title
+
 Editing
    * Added option to allow alphabetical method combo box
    * Introduced Block highlighting
@@ -26,6 +27,8 @@ Editing
    * Fixed possibly missing code completion with mingw toolchain
    * Added option for turning antialiasing of text editor fonts off
    * Added searching with regular expressions in text editors
+   * Added an action that deletes a line without copying it
+   * Added copy line up/down actions (Ctrl+Alt+Up/Down)
 
 Building and Running
    * New options: Auto-Save before Build and Run without building
@@ -40,7 +43,7 @@ Debugging
    * Changed method of dumper loading on Windows, enabling it for MinGW 64
    * Make it possible to disable breakpoints
    * Make it possible to float the debugger views
-   
+
 Wizards
 
 Designer
@@ -62,7 +65,7 @@ Platform Specific
 
 Windows
   * Show native path separators
-  * Experimental support for the Microsoft C++ compilers from Windows SDKs 
+  * Experimental support for the Microsoft C++ compilers from Windows SDKs
     or VS 2005/2008 (x86 and AMD64)
 
 Mac
@@ -71,11 +74,12 @@ Linux
 
 Other Unixes
    * Made Qt Creator less dependant on Linux specific defines
-   
+
 Additional credits go to:
-   * axasia <axasia@gmail.com> (japanese translation)
+   * axasia <axasia@gmail.com> (japanese translation, compile fixes)
    * Christian Hoenig <christian@hoenig.cc> ("Build Project Only" submenu and
      build project dependencies, various patches)
    * Enrico Ros <enrico.ros@gmail.com> (italian translation)
-   * Joel Nordell <joel.nordell@chloridepower.com> (XCode-style tab behavior, various patches)
-   * Serge Ratke <dev.serge.ratke@gmx.de> (copy lines up/down by Ctrl+Alt+Up/Down)
+   * Joel Nordell <joel.nordell@chloridepower.com> (XCode-style tab behavior,
+     various patches)
+   * Serge Ratke <dev.serge.ratke@gmx.de> (copy lines up/down)

diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp
index 3db8f0d..5cefea7 100644 (file)
--- a/src/libs/extensionsystem/iplugin.cpp
+++ b/src/libs/extensionsystem/iplugin.cpp
@@ -122,7 +122,7 @@
     A plugin with given \c name, \c version and \c compatVersion matches
     the dependency if
     \list
-        \o it's \c name matches \c dependencyName, and
+        \o its \c name matches \c dependencyName, and
         \o \c {compatVersion <= dependencyVersion <= version}.
     \endlist
 
@@ -211,7 +211,7 @@
     that depend on that plugin also fail.
 
     Plugins have access to the plugin manager
-    (and it's object pool) via the PluginManager::instance()
+    (and its object pool) via the PluginManager::instance()
     method.
 */
 

diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp
index ae79d99..9b62545 100644 (file)
--- a/src/libs/extensionsystem/pluginerrorview.cpp
+++ b/src/libs/extensionsystem/pluginerrorview.cpp
@@ -103,7 +103,7 @@ void PluginErrorView::update(PluginSpec *spec)
         tooltip = tr("Plugin was shut down");
     case PluginSpec::Deleted:
         text = tr("Deleted");
-        tooltip = tr("Plugin ended it's life cycle and was deleted");
+        tooltip = tr("Plugin ended its life cycle and was deleted");
     }
     m_ui->state->setText(text);
     m_ui->state->setToolTip(tooltip);

diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index 9008ade..3241286 100644 (file)
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -88,7 +88,7 @@
     information about the plugin's current state.
 
     The plugin spec is also filled with more information as the plugin
-    goes through it's loading process (see PluginSpec::State).
+    goes through its loading process (see PluginSpec::State).
     If an error occurs, the plugin spec is the place to look for the
     error details.
 */
@@ -102,7 +102,7 @@
     \value  Invalid
             Starting point: Even the xml description file was not read.
     \value  Read
-            The xml description file has been successfully read, and it's
+            The xml description file has been successfully read, and its
             information is available via the PluginSpec.
     \value  Resolved
             The dependencies given in the description file have been

diff --git a/src/plugins/coreplugin/dialogs/iwizard.cpp b/src/plugins/coreplugin/dialogs/iwizard.cpp
index d1e4067..03f4279 100644 (file)
--- a/src/plugins/coreplugin/dialogs/iwizard.cpp
+++ b/src/plugins/coreplugin/dialogs/iwizard.cpp
@@ -122,7 +122,7 @@
     This method is executed when the wizard has been selected by the user
     for execution. Any dialogs the wizard opens should use the given \a parent.
     The \a path argument is a suggestion for the location where files should be
-    created. The wizard should fill this in it's path selection elements as a
+    created. The wizard should fill this in its path selection elements as a
     default path.
     Returns a list of files (absolute paths) that have been created, if any.
 */

diff --git a/src/plugins/projectexplorer/nodesvisitor.cpp b/src/plugins/projectexplorer/nodesvisitor.cpp
index 66afdc6..de9f4f2 100644 (file)
--- a/src/plugins/projectexplorer/nodesvisitor.cpp
+++ b/src/plugins/projectexplorer/nodesvisitor.cpp
@@ -72,7 +72,7 @@ using namespace ProjectExplorer;
 /*!
   \class FindNodeForFileVisitor
 
-  Searches the first node that has the given file as it's path.
+  Searches the first node that has the given file as its path.
  */
 
 FindNodesForFileVisitor::FindNodesForFileVisitor(const QString &fileToSearch)