From 857a295683f0581392d18d37827c92dc6c45c444 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <pchalin@gmail.com>
Date: Thu, 11 Jun 2020 09:25:38 -0400
Subject: [PATCH] Another redirect-rule variant trial

---
 content/docs/languages/android/api.md           |  1 +
 content/docs/languages/csharp/_index.md         |  1 +
 content/docs/languages/csharp/api.md            |  1 +
 content/docs/languages/java/api.md              |  6 ++++++
 content/docs/languages/kotlin/_index.md         |  2 +-
 content/docs/languages/kotlin/api.md            |  6 ++++++
 content/docs/languages/node/_index.md           |  2 +-
 content/docs/languages/node/api.md              |  6 ++++++
 content/docs/languages/objective-c/_index.md    |  2 +-
 content/docs/languages/objective-c/api.md       |  6 ++++++
 content/docs/languages/objective-c/oauth2.md    |  1 +
 content/docs/languages/php/_index.md            |  2 +-
 content/docs/languages/php/api.md               |  6 ++++++
 content/docs/languages/python/_index.md         |  2 +-
 content/docs/languages/python/api.md            |  6 ++++++
 content/docs/languages/python/generated-code.md |  1 +
 content/docs/languages/ruby/_index.md           |  2 +-
 content/docs/languages/ruby/api.md              |  6 ++++++
 layouts/_default/_markup/render-link.html       |  2 +-
 layouts/index.redirects                         | 12 ++++++++----
 20 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 content/docs/languages/java/api.md
 create mode 100644 content/docs/languages/kotlin/api.md
 create mode 100644 content/docs/languages/node/api.md
 create mode 100644 content/docs/languages/objective-c/api.md
 create mode 100644 content/docs/languages/php/api.md
 create mode 100644 content/docs/languages/python/api.md
 create mode 100644 content/docs/languages/ruby/api.md

diff --git a/content/docs/languages/android/api.md b/content/docs/languages/android/api.md
index 2b1514e..ea8f670 100644
--- a/content/docs/languages/android/api.md
+++ b/content/docs/languages/android/api.md
@@ -1,5 +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/csharp/_index.md b/content/docs/languages/csharp/_index.md
index 3656de9..bf321a2 100644
--- a/content/docs/languages/csharp/_index.md
+++ b/content/docs/languages/csharp/_index.md
@@ -7,6 +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)
 
 For details concerning the newer gRPC for .NET implementation, see [gRPC for
diff --git a/content/docs/languages/csharp/api.md b/content/docs/languages/csharp/api.md
index 2b1514e..ea8f670 100644
--- a/content/docs/languages/csharp/api.md
+++ b/content/docs/languages/csharp/api.md
@@ -1,5 +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/java/api.md b/content/docs/languages/java/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/java/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/kotlin/_index.md b/content/docs/languages/kotlin/_index.md
index cebff19..6da882f 100644
--- a/content/docs/languages/kotlin/_index.md
+++ b/content/docs/languages/kotlin/_index.md
@@ -6,4 +6,4 @@ These language-specific pages are available:
 
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
-- [API reference](https://javadocs.dev/io.grpc/grpc-kotlin-stub/latest)
+- [API reference](api/javadocs.dev/io.grpc/grpc-kotlin-stub/latest?ext=1)
diff --git a/content/docs/languages/kotlin/api.md b/content/docs/languages/kotlin/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/kotlin/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/node/_index.md b/content/docs/languages/node/_index.md
index 65d860f..d40fd12 100644
--- a/content/docs/languages/node/_index.md
+++ b/content/docs/languages/node/_index.md
@@ -6,4 +6,4 @@ These language-specific pages are available:
 
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
-- [API reference](https://grpc.github.io/grpc/node)
+- [API reference](api)
diff --git a/content/docs/languages/node/api.md b/content/docs/languages/node/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/node/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/objective-c/_index.md b/content/docs/languages/objective-c/_index.md
index 02aa784..4445edf 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](https://grpc.github.io/grpc/objc)
+- [API reference](api?lang=objc)
diff --git a/content/docs/languages/objective-c/api.md b/content/docs/languages/objective-c/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/objective-c/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/objective-c/oauth2.md b/content/docs/languages/objective-c/oauth2.md
index 1b3952e..a31dc66 100644
--- a/content/docs/languages/objective-c/oauth2.md
+++ b/content/docs/languages/objective-c/oauth2.md
@@ -1,5 +1,6 @@
 ---
 title: OAuth2
+weight: 60
 ---
 
 This example demonstrates how to use OAuth2 on gRPC to make
diff --git a/content/docs/languages/php/_index.md b/content/docs/languages/php/_index.md
index 645d29f..2c0ce3a 100644
--- a/content/docs/languages/php/_index.md
+++ b/content/docs/languages/php/_index.md
@@ -6,4 +6,4 @@ These language-specific pages are available:
 
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
-- [API reference](https://grpc.github.io/grpc/php/namespace-Grpc)
+- [API reference](api/namespace-Grpc)
diff --git a/content/docs/languages/php/api.md b/content/docs/languages/php/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/php/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/python/_index.md b/content/docs/languages/python/_index.md
index a7f34a2..fca4b69 100644
--- a/content/docs/languages/python/_index.md
+++ b/content/docs/languages/python/_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/python)
+- [API reference](api)
diff --git a/content/docs/languages/python/api.md b/content/docs/languages/python/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/python/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/python/generated-code.md b/content/docs/languages/python/generated-code.md
index a626c55..a81b02d 100644
--- a/content/docs/languages/python/generated-code.md
+++ b/content/docs/languages/python/generated-code.md
@@ -1,6 +1,7 @@
 ---
 title: Python Generated-code Reference
 short: Generated Code
+weight: 80
 ---
 
 ## Introduction
diff --git a/content/docs/languages/ruby/_index.md b/content/docs/languages/ruby/_index.md
index 5c136cb..c79cd13 100644
--- a/content/docs/languages/ruby/_index.md
+++ b/content/docs/languages/ruby/_index.md
@@ -6,4 +6,4 @@ These language-specific pages are available:
 
 - [Quick start](quickstart)
 - [Basics tutorial](basics)
-- [API reference](https://www.rubydoc.info/gems/grpc)
+- [API reference](api/rubydoc.info/gems/grpc?ext=1)
diff --git a/content/docs/languages/ruby/api.md b/content/docs/languages/ruby/api.md
new file mode 100644
index 0000000..ea8f670
--- /dev/null
+++ b/content/docs/languages/ruby/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/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index d55879e..1464575 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 df6c6f2..b2cf8d5 100644
--- a/layouts/index.redirects
+++ b/layouts/index.redirects
@@ -19,7 +19,11 @@
 
 # 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!
-#/docs/languages/:lang/api         https://grpc.github.io/grpc/:lang 301!
+# /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!
+
+/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!