Merge topic 'minor-cleanups'

187385a cmCoreTryCompile: Fix typo in comments.
af2a3ab cmTarget: Remove unused variable.
620b0e9 target_link_libraries(): Fix code snippet in documentation.
2d4ce80 cmPolicies: Fix typo
d6dd264 include(): Use lower case and () to refer to the include() command.

5 files changed, 6 insertions, 6 deletions

diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst
index a1e3e22..41265fd 100644
--- a/Help/command/target_link_libraries.rst
+++ b/Help/command/target_link_libraries.rst
@@ -59,10 +59,11 @@ for <target>:
 If an <item> is a library in a Mac OX framework, the Headers directory
 of the framework will also be processed as a "usage requirement".
 This has the same effect as passing the framework directory as an
-include directory.  target_link_libraries(<target>
+include directory.
 
 ::
 
+  target_link_libraries(<target>
                       <PRIVATE|PUBLIC|INTERFACE> <lib> ...
                       [<PRIVATE|PUBLIC|INTERFACE> <lib> ... ] ...])
 
diff --git a/Help/policy/CMP0017.rst b/Help/policy/CMP0017.rst
index c93e8b2..f74e6f0 100644
--- a/Help/policy/CMP0017.rst
+++ b/Help/policy/CMP0017.rst
@@ -11,7 +11,7 @@ the modules belonging to CMake always get those files included which
 they expect, and against which they were developed and tested.  In all
 other cases, the files found in CMAKE_MODULE_PATH still take
 precedence over the ones in the CMake module directory.  The OLD
-behaviour is to always prefer files from CMAKE_MODULE_PATH over files
+behavior is to always prefer files from CMAKE_MODULE_PATH over files
 from the CMake modules directory.
 
 This policy was introduced in CMake version 2.8.4.  CMake version
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index bc4bf18..0ac969b 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -372,8 +372,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
       }
 
     /* for the TRY_COMPILEs we want to be able to specify the architecture.
-      So the user can set CMAKE_OSX_ARCHITECTURE to i386;ppc and then set
-      CMAKE_TRY_COMPILE_OSX_ARCHITECTURE first to i386 and then to ppc to
+      So the user can set CMAKE_OSX_ARCHITECTURES to i386;ppc and then set
+      CMAKE_TRY_COMPILE_OSX_ARCHITECTURES first to i386 and then to ppc to
       have the tests run for each specific architecture. Since
       cmLocalGenerator doesn't allow building for "the other"
       architecture only via CMAKE_OSX_ARCHITECTURES.
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 5b93171..e8ee33f 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -19,7 +19,7 @@ bool cmIncludeCommand
   if (args.size()< 1 || args.size() > 4)
     {
       this->SetError("called with wrong number of arguments.  "
-                     "Include only takes one file.");
+                     "include() only takes one file.");
       return false;
     }
   bool optional = false;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b6182ab..cab7e7c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1990,7 +1990,6 @@ static void processIncludeDirectories(cmTarget *tgt,
             {
             case cmPolicies::WARN:
               {
-              cmOStringStream w;
               e << (mf->GetPolicies()
                     ->GetPolicyWarning(cmPolicies::CMP0021)) << "\n";
               messageType = cmake::AUTHOR_WARNING;