clang-modernize: Tweak docs after rename

* Removing sphinx warnings about docs not in a toctree.
* Adding more links to cpp11-migrate redirect docs.

llvm-svn: 190195
diff --git a/clang-tools-extra/docs/MigratorUsage.rst b/clang-tools-extra/docs/MigratorUsage.rst
index b5b5ef5..22d2e38 100644
--- a/clang-tools-extra/docs/MigratorUsage.rst
+++ b/clang-tools-extra/docs/MigratorUsage.rst
@@ -2,5 +2,5 @@
 cpp11-migrate Usage
 ===================
 
-This program has been renamed :program:`clang-modernize`, and its usage is now
+This program has been renamed :doc:`clang-modernize <clang-modernize>`, and its usage is now
 found in :doc:`ModernizerUsage`.
diff --git a/clang-tools-extra/docs/clang-modernize.rst b/clang-tools-extra/docs/clang-modernize.rst
index 6567dcd..bbcba93 100644
--- a/clang-tools-extra/docs/clang-modernize.rst
+++ b/clang-tools-extra/docs/clang-modernize.rst
@@ -14,6 +14,8 @@
    PassByValueTransform
    ReplaceAutoPtrTransform
    ModernizerUsage
+   cpp11-migrate
+   MigratorUsage
 
 :program:`clang-modernize` is a standalone tool used to automatically convert
 C++ code written against old standards to use features of the newest C++
diff --git a/clang-tools-extra/docs/cpp11-migrate.rst b/clang-tools-extra/docs/cpp11-migrate.rst
index 09ee2fd..6854535 100644
--- a/clang-tools-extra/docs/cpp11-migrate.rst
+++ b/clang-tools-extra/docs/cpp11-migrate.rst
@@ -1,7 +1,5 @@
-.. index:: clang-modernize
-
 ============================
 C++11 Migrator User's Manual
 ============================
 
-This tool has been renamed :program:`clang-modernize`.
+This tool has been renamed :doc:`clang-modernize <clang-modernize>`.