[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1028-g47485f0

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  47485f0dfa70754c6ff54d297546ab4b9b79fa31 (commit)
       via  4c07a00f07ce42b6b02da4a9002d5c802637d3bc (commit)
      from  4ba9e0cbf0e93f200535e6c20e71728390d2b8af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47485f0dfa70754c6ff54d297546ab4b9b79fa31
commit 47485f0dfa70754c6ff54d297546ab4b9b79fa31
Merge: 4ba9e0c 4c07a00
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 2 15:53:27 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 2 15:53:27 2014 -0500

    Merge topic 'CPackIFW-doc-typos' into next
    
    4c07a00f CPackIFW: Correction of the module documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c07a00f07ce42b6b02da4a9002d5c802637d3bc
commit 4c07a00f07ce42b6b02da4a9002d5c802637d3bc
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Tue Dec 2 23:39:33 2014 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 2 15:52:07 2014 -0500

    CPackIFW: Correction of the module documentation

diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index 6f2eeb3..e5b7601 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -14,19 +14,19 @@
 # Overview
 # ^^^^^^^^
 #
-# CPack ``IFW`` generator helps you create online and offline
+# CPack ``IFW`` generator helps you to create online and offline
 # binary cross-platform installers with a graphical user interface.
 #
-# CPack IFW generator prepare project installation and generate configuration
+# CPack IFW generator prepares project installation and generates configuration
 # and meta information for QtIFW_ tools.
 #
 # The QtIFW_ provides a set of tools and utilities to create
 # installers for the supported desktop Qt platforms: Linux, Microsoft Windows,
 # and Mac OS X.
 #
-# To use CPack ``IFW`` generator you must also install QtIFW_.
-# If you are not using the default path for the installation, please set
-# the path to the variable ``QTIFWDIR``.
+# You should also install QtIFW_ to use CPack ``IFW`` generator.
+# If you don't use a default path for the installation, please set
+# the used path in the variable ``QTIFWDIR``.
 #
 # Variables
 # ^^^^^^^^^
@@ -61,7 +61,7 @@
 #
 # .. variable:: CPACK_IFW_PACKAGE_LOGO
 #
-#  Filename for a logo used as QWizard::LogoPixmap.
+#  Filename for a logo is used as QWizard::LogoPixmap.
 #
 # .. variable:: CPACK_IFW_TARGET_DIRECTORY
 #
@@ -149,12 +149,12 @@
 # This command should be called after cpack_add_component command.
 #
 # ``COMMON`` if set, then the component will be packaged and installed as part
-# of a group to which he belongs.
+# of a group to which it belongs.
 #
 # ``VERSION`` is version of component.
 # By default used :variable:`CPACK_PACKAGE_VERSION`.
 #
-# ``SCRIPT`` is relative or absolute path to operations script
+# ``SCRIPT`` is a relative or absolute path to operations script
 # for this component.
 #
 # ``NAME`` is used to create domain-like identification for this component.
@@ -190,7 +190,7 @@
 # ``NAME`` is used to create domain-like identification for this component group.
 # By default used origin component group name.
 #
-# ``SCRIPT`` is relative or absolute path to operations script
+# ``SCRIPT`` is a relative or absolute path to operations script
 # for this component group.
 #
 # ``PRIORITY`` is priority of the component group in the tree.
@@ -255,7 +255,7 @@
 # Online installer
 # ^^^^^^^^^^^^^^^^
 #
-# By defaul CPack IFW generator make offline installer. This means that all
+# By default CPack IFW generator makes offline installer. This means that all
 # components will be packaged into a binary file.
 #
 # To make a component downloaded, you must set the ``DOWNLOADED`` option in
@@ -267,7 +267,7 @@
 # You also can use command :command:`cpack_ifw_add_repository` and
 # variable :variable:`CPACK_IFW_DOWNLOAD_ALL` for more specific configuration.
 #
-# CPack IFW generator create "repository" dir in current binary dir. You
+# CPack IFW generator creates "repository" dir in current binary dir. You
 # would copy content of this dir to specified ``site`` (``url``).
 #
 # See Also

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackIFW.cmake |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake