diff --git a/README.md b/README.md
index 6126f1e..6e724be 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,10 @@ the total syscall/resource footprint of all its libraries.
## Documentation
Developer documentation is available on the Google Developers site for
-[Sandboxed API](https://developers.google.com/sandboxed-api).
+[Sandboxed API](https://developers.google.com/code-sandboxing/sandboxed-api).
There is also a
-[Getting Started](https://developers.google.com/sandboxed-api/docs/getting-started)
+[Getting Started](https://developers.google.com/code-sandboxing/sandboxed-api/getting-started)
guide.
## Getting Involved
diff --git a/oss-internship-2020/curl/README.md b/oss-internship-2020/curl/README.md
index 6d75700..b1c0e15 100644
--- a/oss-internship-2020/curl/README.md
+++ b/oss-internship-2020/curl/README.md
@@ -12,7 +12,7 @@ Alternatively, if the repository has already been cloned but the submodules have
not, these can be cloned using: `git submodule update --init --recursive`
The full list of Sandboxed API dependencies can be found on
-[Sandboxed API Getting Started page](https://developers.google.com/sandboxed-api/docs/getting-started).
+[Sandboxed API Getting Started page](https://developers.google.com/code-sandboxing/sandboxed-api/getting-started).
The following commands, used from the current `curl/` directory, build the
library:
diff --git a/oss-internship-2020/libuv/README.md b/oss-internship-2020/libuv/README.md
index 0e1cb76..73311e1 100644
--- a/oss-internship-2020/libuv/README.md
+++ b/oss-internship-2020/libuv/README.md
@@ -18,7 +18,7 @@ git submodule update --init --recursive
```
The full list of Sandboxed API dependencies can be found on
-[Sandboxed API Getting Started page](https://developers.google.com/sandboxed-api/docs/getting-started).
+[Sandboxed API Getting Started page](https://developers.google.com/code-sandboxing/sandboxed-api/getting-started).
The following commands, used from the current `libuv/` directory, build the
library:
diff --git a/sandboxed_api/docs/getting-started.md b/sandboxed_api/docs/getting-started.md
index 97f1a7a..e980e62 100644
--- a/sandboxed_api/docs/getting-started.md
+++ b/sandboxed_api/docs/getting-started.md
@@ -1,9 +1,9 @@
# Getting started with SAPI
Detailed developer documentation is available on the Google Developers site for
-[Sandboxed API](https://developers.google.com/sandboxed-api).
+[Sandboxed API](https://developers.google.com/code-sandboxing/sandboxed-api).
Visit the
-[Getting Started](https://developers.google.com/sandboxed-api/docs/getting-started)
+[Getting Started](https://developers.google.com/code-sandboxing/sandboxed-api/getting-started)
guide.
diff --git a/sandboxed_api/sandbox2/README.md b/sandboxed_api/sandbox2/README.md
index 6f1d7db..270f94e 100644
--- a/sandboxed_api/sandbox2/README.md
+++ b/sandboxed_api/sandbox2/README.md
@@ -8,9 +8,9 @@ in the protected region cause no harm.
## Documentation
Detailed developer documentation is available on the Google Developers site for Sandboxed API under
-[Sandbox2](https://developers.google.com/sandboxed-api/docs/sandbox2/overview).
+[Sandbox2](https://developers.google.com/code-sandboxing/sandbox2).
There is also a
-[Getting Started](https://developers.google.com/sandboxed-api/docs/sandbox2/getting-started)
+[Getting Started](https://developers.google.com/code-sandboxing/sandbox2/getting-started)
guide for Sandbox2.
diff --git a/sandboxed_api/tools/clang_generator/generator_tool.cc b/sandboxed_api/tools/clang_generator/generator_tool.cc
index a3ca793..9d2aa76 100644
--- a/sandboxed_api/tools/clang_generator/generator_tool.cc
+++ b/sandboxed_api/tools/clang_generator/generator_tool.cc
@@ -39,7 +39,8 @@ static auto* g_tool_category =
static auto* g_common_help =
new llvm::cl::extrahelp(clang::tooling::CommonOptionsParser::HelpMessage);
static auto* g_extra_help = new llvm::cl::extrahelp(
- "Full documentation at: \n"
+ "Full documentation at: "
+ "\n"
"Report bugs to \n");
// Command line options