Index: tools/CMakeLists.txt
===================================================================
--- tools/CMakeLists.txt
+++ tools/CMakeLists.txt
@@ -26,12 +26,17 @@
   add_clang_subdirectory(scan-view)
 endif()
 
-# We support checking out the clang-tools-extra repository into the 'extra'
-# subdirectory. It contains tools developed as part of the Clang/LLVM project
-# on top of the Clang tooling platform. We keep them in a separate repository
-# to keep the primary Clang repository small and focused.
-# It also may be included by LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR.
-add_llvm_external_project(clang-tools-extra extra)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/extra)
+
+    # Documentation for working with SVN used to recommend using
+    # the name 'extra'.  Support that for now as backwards
+    # compatibility
+    message(DEPRECATION "Checking out clang-tools-extra into a directory called 'extra' is deprecated.
+Rename the directory to 'clang-tools-extra' instead.")
+    add_llvm_external_project(clang-tools-extra extra)
+else()
+    add_llvm_external_project(clang-tools-extra)
+endif()
 
 # libclang may require clang-tidy in clang-tools-extra.
 add_clang_subdirectory(libclang)
Index: www/get_started.html
===================================================================
--- www/get_started.html
+++ www/get_started.html
@@ -66,7 +66,7 @@
   <ul>
     <li><tt>cd llvm/tools/clang/tools</tt></li>
     <li><tt>svn co http://llvm.org/svn/llvm-project/clang-tools-extra/trunk
-        extra</tt></li>
+        clang-tools-extra</tt></li>
     <li><tt>cd ../../../..</tt></li>
   </ul>
   </li>