Index: docs/CMake.rst
===================================================================
--- docs/CMake.rst
+++ docs/CMake.rst
@@ -662,10 +662,10 @@
 Embedding LLVM in your project
 ==============================
 
-From LLVM 3.5 onwards both the CMake and autoconf/Makefile build systems export
-LLVM libraries as importable CMake targets. This means that clients of LLVM can
-now reliably use CMake to develop their own LLVM-based projects against an
-installed version of LLVM regardless of how it was built.
+From LLVM 3.5 onwards the CMake build system exports LLVM libraries as
+importable CMake targets. This means that clients of LLVM can now reliably use
+CMake to develop their own LLVM-based projects against an installed version of
+LLVM regardless of how it was built.
 
 Here is a simple example of a CMakeLists.txt file that imports the LLVM libraries
 and uses them to build a simple application ``simple-tool``.
Index: docs/FAQ.rst
===================================================================
--- docs/FAQ.rst
+++ docs/FAQ.rst
@@ -45,12 +45,6 @@
 services abstracted to a support library.  The tools required to build and
 test LLVM have been ported to a plethora of platforms.
 
-Some porting problems may exist in the following areas:
-
-* The autoconf/makefile build system relies heavily on UNIX shell tools,
-  like the Bourne Shell and sed.  Porting to systems without these tools
-  (MacOS 9, Plan 9) will require more effort.
-
 What API do I use to store a value to one of the virtual registers in LLVM IR's SSA representation?
 ---------------------------------------------------------------------------------------------------
 
Index: docs/HowToReleaseLLVM.rst
===================================================================
--- docs/HowToReleaseLLVM.rst
+++ docs/HowToReleaseLLVM.rst
@@ -109,9 +109,8 @@
 ^^^^^^^^^^^^^^^^^^^
 
 After creating the LLVM release branch, update the release branches'
-``autoconf`` and ``configure.ac`` versions from '``X.Ysvn``' to '``X.Y``'.
+``CMakeLists.txt`` versions from '``X.Ysvn``' to '``X.Y``'.
 Update it on mainline as well to be the next version ('``X.Y+1svn``').
-Regenerate the configure scripts for both ``llvm`` and the ``test-suite``.
 
 In addition, the version numbers of all the Bugzilla components must be updated
 for the next release.
Index: docs/ProgrammersManual.rst
===================================================================
--- docs/ProgrammersManual.rst
+++ docs/ProgrammersManual.rst
@@ -3387,8 +3387,8 @@
 turning on assertions also turns on `LLVM_ENABLE_ABI_BREAKING_CHECKS`
 so a default +Asserts build is not ABI compatible with a
 default -Asserts build.  Clients that want ABI compatibility
-between +Asserts and -Asserts builds should use the CMake or autoconf
-build systems to set `LLVM_ENABLE_ABI_BREAKING_CHECKS` independently
+between +Asserts and -Asserts builds should use the CMake build system
+to set `LLVM_ENABLE_ABI_BREAKING_CHECKS` independently
 of `LLVM_ENABLE_ASSERTIONS`.
 
 .. _coreclasses:
Index: lib/Support/Errno.cpp
===================================================================
--- lib/Support/Errno.cpp
+++ lib/Support/Errno.cpp
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/Errno.h"
-#include "llvm/Config/config.h" // Get autoconf configuration settings
+#include "llvm/Config/config.h"
 #include "llvm/Support/raw_ostream.h"
 #include <string.h>
 
Index: lib/Support/PrettyStackTrace.cpp
===================================================================
--- lib/Support/PrettyStackTrace.cpp
+++ lib/Support/PrettyStackTrace.cpp
@@ -14,7 +14,7 @@
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm-c/ErrorHandling.h"
 #include "llvm/ADT/SmallString.h"
-#include "llvm/Config/config.h" // Get autoconf configuration settings
+#include "llvm/Config/config.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/Watchdog.h"
Index: lib/Support/Unix/Unix.h
===================================================================
--- lib/Support/Unix/Unix.h
+++ lib/Support/Unix/Unix.h
@@ -18,7 +18,7 @@
 //===          is guaranteed to work on all UNIX variants.
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Config/config.h" // Get autoconf configuration settings
+#include "llvm/Config/config.h"
 #include "llvm/Support/Chrono.h"
 #include "llvm/Support/Errno.h"
 #include <algorithm>