From 24f1af30170f0b09b817844e1e54aec9740768d0 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <pchalin@gmail.com>
Date: Thu, 11 Jun 2020 09:25:53 -0400
Subject: [PATCH] All languages covered

---
 content/docs/languages/android/_index.md      |  2 +-
 content/docs/languages/cpp/_index.md          |  4 +---
 content/docs/languages/cpp/api.md             |  6 ++++++
 content/docs/languages/cpp/async.md           |  2 ++
 content/docs/languages/csharp/_index.md       |  3 +--
 content/docs/languages/csharp/dotnet.md       |  2 +-
 content/docs/languages/dart/_index.md         |  2 +-
 content/docs/languages/dart/api.md            |  6 ++++++
 content/docs/languages/go/_index.md           |  2 +-
 content/docs/languages/go/api.md              |  6 ++++++
 content/docs/languages/go/generated-code.md   |  1 +
 content/docs/languages/java/_index.md         |  2 +-
 content/docs/languages/java/generated-code.md |  1 +
 content/docs/languages/objective-c/_index.md  |  2 +-
 layouts/_default/_markup/render-link.html     |  2 +-
 layouts/index.redirects                       | 16 +++++++++-------
 16 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 content/docs/languages/cpp/api.md
 create mode 100644 content/docs/languages/dart/api.md
 create mode 100644 content/docs/languages/go/api.md

diff --git a/content/docs/languages/android/_index.md b/content/docs/languages/android/_index.md
index 8a782e7..6cf8a62 100644
--- a/content/docs/languages/android/_index.md
+++ b/content/docs/languages/android/_index.md
@@ -6,4 +6,4 @@ These language-specific pages are available:
 
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
-- [API reference](api)
+- [API reference](api/grpc-java/javadoc)
diff --git a/content/docs/languages/cpp/_index.md b/content/docs/languages/cpp/_index.md
index f5a6fe7..7de5651 100644
--- a/content/docs/languages/cpp/_index.md
+++ b/content/docs/languages/cpp/_index.md
@@ -7,6 +7,4 @@ These language-specific pages are available:
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
 - [Asynchronous-API tutorial](async)
-- API reference:
-  - [gRPC C++](https://grpc.github.io/grpc/cpp)
-  - [gRPC core](https://grpc.github.io/grpc/core)
+- [API reference](api)
diff --git a/content/docs/languages/cpp/api.md b/content/docs/languages/cpp/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/cpp/api.md
@@ -0,0 +1,6 @@
+---
+title: API reference
+short: API
+weight: 90
+# Note: this is a placeholder page. The URL to this page redirects elsewhere.
+---
diff --git a/content/docs/languages/cpp/async.md b/content/docs/languages/cpp/async.md
index 5befd4f..ed7ab37 100644
--- a/content/docs/languages/cpp/async.md
+++ b/content/docs/languages/cpp/async.md
@@ -1,5 +1,7 @@
 ---
 title: Asynchronous-API Tutorial
+short: Async-API Tutorial
+weight: 60
 ---
 
 This tutorial shows you how to write a simple server and client in C++ using
diff --git a/content/docs/languages/csharp/_index.md b/content/docs/languages/csharp/_index.md
index bf321a2..d7c6733 100644
--- a/content/docs/languages/csharp/_index.md
+++ b/content/docs/languages/csharp/_index.md
@@ -7,8 +7,7 @@ core-library][core-library] implementation is covered here:
 
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
-- [API reference](api?path=/api/Grpc.Core)
-- [API reference](api)
+- [API reference](api/api/Grpc.Core)
 
 For details concerning the newer gRPC for .NET implementation, see [gRPC for
 .NET](dotnet).
diff --git a/content/docs/languages/csharp/dotnet.md b/content/docs/languages/csharp/dotnet.md
index 87adebe..993bb93 100644
--- a/content/docs/languages/csharp/dotnet.md
+++ b/content/docs/languages/csharp/dotnet.md
@@ -8,7 +8,7 @@ The following pages cover the C# implementation of gRPC for .NET
 
 - [Introduction to gRPC on .NET Core](https://docs.microsoft.com/aspnet/core/grpc)
 - [Tutorial: Create a gRPC client and server in ASP.NET Core][tutorial]
-- [API reference](api)
+- [API reference](../api/grpc/csharp-dotnet/api/Grpc.Core)
 
 Several sample applications are available from the [examples][] folder in the
 [grpc-dotnet][] repository.
diff --git a/content/docs/languages/dart/_index.md b/content/docs/languages/dart/_index.md
index 58c39a2..b3579d8 100644
--- a/content/docs/languages/dart/_index.md
+++ b/content/docs/languages/dart/_index.md
@@ -6,4 +6,4 @@ These language-specific pages are available:
 
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
-- [API reference](https://pub.dev/documentation/grpc)
+- [API reference](api/pub.dev/documentation/grpc?ext=1)
diff --git a/content/docs/languages/dart/api.md b/content/docs/languages/dart/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/dart/api.md
@@ -0,0 +1,6 @@
+---
+title: API reference
+short: API
+weight: 90
+# Note: this is a placeholder page. The URL to this page redirects elsewhere.
+---
diff --git a/content/docs/languages/go/_index.md b/content/docs/languages/go/_index.md
index 7d5215d..c8ed535 100644
--- a/content/docs/languages/go/_index.md
+++ b/content/docs/languages/go/_index.md
@@ -7,4 +7,4 @@ These language-specific pages are available:
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
 - [Generated-code reference](generated-code)
-- [API reference](https://godoc.org/google.golang.org/grpc)
+- [API reference](api/pkg.go.dev/google.golang.org/grpc?ext=1)
diff --git a/content/docs/languages/go/api.md b/content/docs/languages/go/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/go/api.md
@@ -0,0 +1,6 @@
+---
+title: API reference
+short: API
+weight: 90
+# Note: this is a placeholder page. The URL to this page redirects elsewhere.
+---
diff --git a/content/docs/languages/go/generated-code.md b/content/docs/languages/go/generated-code.md
index 48a9df3..1a5d3af 100644
--- a/content/docs/languages/go/generated-code.md
+++ b/content/docs/languages/go/generated-code.md
@@ -1,6 +1,7 @@
 ---
 title: Go Generated-code Reference
 short: Generated Code
+weight: 80
 ---
 
 This page describes the code generated with the [grpc plugin](https://godoc.org/github.com/golang/protobuf/protoc-gen-go/grpc) to `protoc-gen-go`
diff --git a/content/docs/languages/java/_index.md b/content/docs/languages/java/_index.md
index cb3f662..454853b 100644
--- a/content/docs/languages/java/_index.md
+++ b/content/docs/languages/java/_index.md
@@ -7,4 +7,4 @@ These language-specific pages are available:
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
 - [Generated-code reference](generated-code)
-- [API reference](https://grpc.github.io/grpc-java/javadoc)
+- [API reference](api/grpc-java/javadoc)
diff --git a/content/docs/languages/java/generated-code.md b/content/docs/languages/java/generated-code.md
index 78b4b64..9e1c78d 100644
--- a/content/docs/languages/java/generated-code.md
+++ b/content/docs/languages/java/generated-code.md
@@ -1,6 +1,7 @@
 ---
 title: Java Generated-code Reference
 short: Generated Code
+weight: 80
 ---
 
 ## Packages
diff --git a/content/docs/languages/objective-c/_index.md b/content/docs/languages/objective-c/_index.md
index 4445edf..344a9a4 100644
--- a/content/docs/languages/objective-c/_index.md
+++ b/content/docs/languages/objective-c/_index.md
@@ -7,4 +7,4 @@ These language-specific pages are available:
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
 - [OAuth2 tutorial](oauth2)
-- [API reference](api?lang=objc)
+- [API reference](api/grpc/objc)
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index 1464575..294a162 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1,4 +1,4 @@
-{{ $isExternal := or (hasPrefix .Destination "http") (findRE "^(/docs/languages/.+?/)?api(/.*)?(\\?.*)?$" .Destination) -}}
+{{ $isExternal := or (hasPrefix .Destination "http") (findRE "^(|../|/docs/languages/.+?/)api(/.*)?(\\?.*)?$" .Destination) -}}
 <a href="{{ .Destination | safeURL }}"
   {{- with .Title }} title="{{ . }}"{{ end -}}
   {{- if $isExternal }} target="_blank" rel="noopener"{{ end -}}
diff --git a/layouts/index.redirects b/layouts/index.redirects
index b2cf8d5..76e76cd 100644
--- a/layouts/index.redirects
+++ b/layouts/index.redirects
@@ -19,11 +19,13 @@
 
 # API reference docs
 
-# /docs/languages/android/api       https://grpc.github.io/grpc-java/javadoc 301!
-# /docs/languages/csharp/dotnet/api https://grpc.github.io/grpc/csharp-dotnet/api/Grpc.Core 301!
-# /docs/languages/csharp/api        https://grpc.github.io/grpc/csharp/api/Grpc.Core 301!
+# API docs hosted on an external site (other than grpc.github.io)
+# (We can't encode the path as a param because Netlify escapes path separators.)
+/docs/languages/:_/api/* ext=:_ https://:splat 301!
 
-/docs/languages/:lang/api/* ext=:ext      https://:splat 301!
-/docs/languages/:lang/api/* sep=:sep      https://grpc.github.io/grpc:sep:lang/:splat 301!
-/docs/languages/:notUsed/api/* lang=:lang https://grpc.github.io/grpc/:lang/:splat 301! # objc
-/docs/languages/:lang/api/*               https://grpc.github.io/grpc/:lang/:splat 301!
+# API hosted on grpc.github.io using path indicated by splat
+/docs/languages/:_/api/grpc/* https://grpc.github.io/grpc/:splat
+/docs/languages/:_/api/grpc-* https://grpc.github.io/grpc-:splat
+
+# Base rule: API hosted on grpc.github.io
+/docs/languages/:lang/api/*       https://grpc.github.io/grpc/:lang/:splat 301!