summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-16 15:51:16 -0500
committerBrad King <brad.king@kitware.com>2015-01-16 15:51:16 -0500
commit99f66e9b4aae95f1d229f83e53c26f9d7c212b79 (patch)
tree36814cfe4b4040d80a95037738e51c4a1efd760f
parent8741991e4bf913e009030a66cac81004f63d7b45 (diff)
parent91fbcda28fff000f8ece00ba7b23cc4fa4889cef (diff)
downloadcmake-99f66e9b4aae95f1d229f83e53c26f9d7c212b79.tar.gz
Merge branch 'fix-cmake-org-links' into release
-rw-r--r--Auxiliary/cmake-indent.vim2
-rw-r--r--Auxiliary/cmake-syntax.vim2
-rw-r--r--Help/manual/LINKS.txt4
3 files changed, 4 insertions, 4 deletions
diff --git a/Auxiliary/cmake-indent.vim b/Auxiliary/cmake-indent.vim
index a26dd06a25..6cee9c8581 100644
--- a/Auxiliary/cmake-indent.vim
+++ b/Auxiliary/cmake-indent.vim
@@ -16,7 +16,7 @@
" Version: $Revision$
"
" Licence: The CMake license applies to this file. See
-" http://www.cmake.org/HTML/Copyright.html
+" http://www.cmake.org/licensing
" This implies that distribution with Vim is allowed
if exists("b:did_indent")
diff --git a/Auxiliary/cmake-syntax.vim b/Auxiliary/cmake-syntax.vim
index 782130d9ee..3e4a12275b 100644
--- a/Auxiliary/cmake-syntax.vim
+++ b/Auxiliary/cmake-syntax.vim
@@ -16,7 +16,7 @@
" Version: $Revision$
"
" Licence: The CMake license applies to this file. See
-" http://www.cmake.org/HTML/Copyright.html
+" http://www.cmake.org/licensing
" This implies that distribution with Vim is allowed
" For version 5.x: Clear all syntax items
diff --git a/Help/manual/LINKS.txt b/Help/manual/LINKS.txt
index f6f707df50..38fd1516f2 100644
--- a/Help/manual/LINKS.txt
+++ b/Help/manual/LINKS.txt
@@ -11,12 +11,12 @@ Frequently Asked Questions
A Wiki is provided containing answers to frequently asked questions.
Online Documentation
- http://www.cmake.org/HTML/Documentation.html
+ http://www.cmake.org/documentation
Links to available documentation may be found on this web page.
Mailing List
- http://www.cmake.org/HTML/MailingLists.html
+ http://www.cmake.org/mailing-lists
For help and discussion about using cmake, a mailing list is
provided at cmake@cmake.org. The list is member-post-only but one