diff --git a/README.md b/README.md
index 8907f95e00bf9f..ef5dc64222fef1 100644
--- a/README.md
+++ b/README.md
@@ -27,11 +27,11 @@ Find more background about Bazel in our [FAQ](docs/FAQ.md)
 
   * How to [install Bazel](docs/install.md)
   * How to [get started using Bazel](docs/getting-started.md)
+  * The blaze command line is documented in the  [user manual](docs/bazel-user-manual.html)
   * The rule reference documentation is in the [build encyclopedia](docs/build-encyclopedia.html).
   * How to [use the query command](docs/bazel-query-v2.html)
   * How to [extend Bazel](docs/skylark/index.md)
-  * TODO(bazel-team): link to the user-manual
-  * TODO(bazel-team): link to the test encyclopedia?
+  * The test environment is described the [test encyclopedia](docs/test-encyclopedia.html).
 
 * About the Bazel project:
 
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 3b62ff8a135c65..769c66c137cf54 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -235,9 +235,7 @@ should also hold for our open-source codebase.
 How can I start using Bazel?
 ----------------------------
 
-See our [getting started doc](getting-started.md)
-
-TODO(bazel-team): link to an index of all our docs.
+See our [getting started document](getting-started.md).
 
 
 Why do I need to have a tools/ directory in my source tree?
@@ -301,9 +299,6 @@ will need to take some extra care:
   * Avoid processes that use random numbers, in particular, dictionary
     traversal is randomized in many programming languages.
 
-TODO(bazel-team): maybe this should be part of the skylark docs
-instead, or the genrule docs?
-
 
 Do you have binary releases?
 ----------------------------
@@ -326,7 +321,7 @@ fails, and this should be enough for basic CI integration.  Since
 Bazel does not need clean builds for correctness, the CI system can
 be configured to not clean before starting a build/test run.
 
-TODO(bazel-team): link to exit codes.
+Further details on exit codes are in the [User Manual](docs/bazel-user-manual.html).
 
 What future features can we expect in Bazel?
 --------------------------------------------
diff --git a/docs/contributing.md b/docs/contributing.md
index 2f2061dbc81cfc..55d4b7e126cff4 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -42,7 +42,7 @@ uses:
   * ijar is a tool to extracts the class interfaces of jars and is a third
     party software at `//third_party/ijar`.
 * For Objective-C / iOS support
-  * TODO(bazel-team): fill ups the tools description
+  * TODO(bazel-team): add tools description
 
 When modifying Bazel, you want to make sure that the following still works:
 
diff --git a/docs/windows.md b/docs/windows.md
index b237f58b6eb7ee..e9c99f366bcffa 100644
--- a/docs/windows.md
+++ b/docs/windows.md
@@ -1,8 +1,6 @@
 Building Bazel on Windows
 =========================
 
-TODO(bazel-team): Publish this file when Windows support is mature enough.
-
 Warning: Windows support on Bazel is still at a very early stage, many things
 will not work.