diff --git a/src/dlmalloc b/src/dlmalloc
deleted file mode 160000
index c99638dc2ec..00000000000
--- a/src/dlmalloc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c99638dc2ecfc750cc1656f6edb2bd062c1e0981
diff --git a/src/doc/rustdoc/src/unstable-features.md b/src/doc/rustdoc/src/unstable-features.md
index 905b0646534..92ea366686c 100644
--- a/src/doc/rustdoc/src/unstable-features.md
+++ b/src/doc/rustdoc/src/unstable-features.md
@@ -417,3 +417,7 @@ JavaScript, and font files in a single location, rather than duplicating it once
 (grouping of crate docs generated into the same output directory, like with `cargo doc`). Per-crate
 files like the search index will still load from the documentation root, but anything that gets
 renamed with `--resource-suffix` will load from the given path.
+
+### `--persist-doctests`: persist doctest executables after running
+
+This feature allows the persistence of the doctest executables to the specified path.
\ No newline at end of file
diff --git a/src/libcompiler_builtins b/src/libcompiler_builtins
deleted file mode 160000
index fe74674f6e4..00000000000
--- a/src/libcompiler_builtins
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fe74674f6e4be76d47b66f67d529ebf4186f4eb1
diff --git a/src/liblibc b/src/liblibc
deleted file mode 160000
index c75ca6465a1..00000000000
--- a/src/liblibc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c75ca6465a139704e00295be355b1f067af2f535
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 1c14dbf1cef..635d071b8e0 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -68,7 +68,8 @@ pub struct Options {
     pub should_test: bool,
     /// List of arguments to pass to the test harness, if running tests.
     pub test_args: Vec<String>,
-    /// Otional path to persist the doctest executables to.
+    /// Optional path to persist the doctest executables to, defaults to a
+    /// temporary directory if not set.
     pub persist_doctests: Option<PathBuf>,
 
     // Options that affect the documentation process
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 08bbc95ad65..4bbc01d32de 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -340,6 +340,7 @@ fn opts() -> Vec<RustcOptGroup> {
             o.optflag("",
                       "disable-per-crate-search",
                       "disables generating the crate selector on the search box")
+        }),
         unstable("persist-doctests", |o| {
              o.optopt("",
                        "persist-doctests",