From 341f6017cbfc653c0754be42abe4b2054623d060 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 9 Apr 2018 13:52:19 -0700
Subject: [PATCH 1/4] Adjust repo stub wording

---
 generate-repo-stub-readme.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/generate-repo-stub-readme.sh b/generate-repo-stub-readme.sh
index dfe248b95566..9cea21b3d5dc 100755
--- a/generate-repo-stub-readme.sh
+++ b/generate-repo-stub-readme.sh
@@ -17,7 +17,7 @@ EOUSAGE
 fi
 
 gitRepo='https://github.com/docker-library/docs'
-hubPage="https://registry.hub.docker.com/_/$repo/"
+hubPage="https://hub.docker.com/_/$repo/"
 
 canonicalRepo="https://github.com/docker-library/$repo"
 if [ -s "$repo/github-repo" ]; then
@@ -36,11 +36,11 @@ fi
 cat <<EOREADME
 # About this Repo
 
-This is the Git repo of the Docker [official image](https://docs.docker.com/docker-hub/official_repos/) for [$repo]($hubPage). See [the Docker Hub page]($hubPage) for the full readme on how to use this Docker image and for information regarding contributing and issues.
+This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [$repo]($hubPage) (which does not necessarily mean it is "official" according to $repo upstream). See [the Docker Hub page]($hubPage) for the full readme on how to use this Docker image and for information regarding contributing and issues.
 
-The full readme is generated over in [docker-library/docs]($gitRepo), specifically in [docker-library/docs/$repo]($gitRepo/tree/master/$repo).
+The [full description from Docker Hub]($hubPage) is generated over in [docker-library/docs]($gitRepo), specifically in [docker-library/docs/$repo]($gitRepo/tree/master/$repo).
 
-See a change merged here that doesn't show up on the Docker Hub yet? Check [the "library/$repo" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/$repo), especially [PRs with the "library/$repo" label on that repo](https://github.com/docker-library/official-images/labels/library%2F$repo). For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md).
+See a change merged here that doesn't show up on Docker Hub yet? Check [the "library/$repo" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/$repo), especially [PRs with the "library/$repo" label on that repo](https://github.com/docker-library/official-images/labels/library%2F$repo). For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md).
 EOREADME
 
 badges=()

From c375ce07a20d67c8953ce1350b4349b928193426 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 13 Apr 2018 10:48:39 -0700
Subject: [PATCH 2/4] Add exact "Maintained by" text instead of generic
 disclaimer

---
 generate-repo-stub-readme.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/generate-repo-stub-readme.sh b/generate-repo-stub-readme.sh
index 9cea21b3d5dc..f72de58ea666 100755
--- a/generate-repo-stub-readme.sh
+++ b/generate-repo-stub-readme.sh
@@ -26,6 +26,8 @@ fi
 canonicalRepo="$(curl -fsSLI -o /dev/null -w '%{url_effective}\n' "$canonicalRepo")" # follow redirects (http://stackoverflow.com/a/3077316/433558)
 travisRepo="${canonicalRepo#*://github.com/}"
 
+maintainer="$(sed -e 's!%%GITHUB-REPO%%!'"$canonicalRepo"'!g' "$repo/maintainer.md")"
+
 if [ -f "$repo/deprecated.md" ]; then
 	echo '# DEPRECATED'
 	echo
@@ -36,7 +38,7 @@ fi
 cat <<EOREADME
 # About this Repo
 
-This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [$repo]($hubPage) (which does not necessarily mean it is "official" according to $repo upstream). See [the Docker Hub page]($hubPage) for the full readme on how to use this Docker image and for information regarding contributing and issues.
+This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [$repo]($hubPage) (maintained by: $maintainer). See [the Docker Hub page]($hubPage) for the full readme on how to use this Docker image and for information regarding contributing and issues.
 
 The [full description from Docker Hub]($hubPage) is generated over in [docker-library/docs]($gitRepo), specifically in [docker-library/docs/$repo]($gitRepo/tree/master/$repo).
 

From 246766ec1023e3cec6e1d8c615974d41265d2166 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 13 Apr 2018 10:52:26 -0700
Subject: [PATCH 3/4] Adjust wording slightly further

---
 generate-repo-stub-readme.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/generate-repo-stub-readme.sh b/generate-repo-stub-readme.sh
index f72de58ea666..be9ad8e1dc8f 100755
--- a/generate-repo-stub-readme.sh
+++ b/generate-repo-stub-readme.sh
@@ -36,9 +36,11 @@ if [ -f "$repo/deprecated.md" ]; then
 fi
 
 cat <<EOREADME
-# About this Repo
+# $canonicalRepo
 
-This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [$repo]($hubPage) (maintained by: $maintainer). See [the Docker Hub page]($hubPage) for the full readme on how to use this Docker image and for information regarding contributing and issues.
+## Maintained by: $maintainer
+
+This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [$repo]($hubPage) (not to be confused with any official $repo image provided by $repo upstream). See [the Docker Hub page]($hubPage) for the full readme on how to use this Docker image and for information regarding contributing and issues.
 
 The [full description from Docker Hub]($hubPage) is generated over in [docker-library/docs]($gitRepo), specifically in [docker-library/docs/$repo]($gitRepo/tree/master/$repo).
 

From dd8c3217b7a18b50609f2c1cfae3b10353ec6da5 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 13 Apr 2018 13:02:18 -0700
Subject: [PATCH 4/4] Apply suggested modification

---
 generate-repo-stub-readme.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/generate-repo-stub-readme.sh b/generate-repo-stub-readme.sh
index be9ad8e1dc8f..d7a537321999 100755
--- a/generate-repo-stub-readme.sh
+++ b/generate-repo-stub-readme.sh
@@ -44,7 +44,11 @@ This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/do
 
 The [full description from Docker Hub]($hubPage) is generated over in [docker-library/docs]($gitRepo), specifically in [docker-library/docs/$repo]($gitRepo/tree/master/$repo).
 
-See a change merged here that doesn't show up on Docker Hub yet? Check [the "library/$repo" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/$repo), especially [PRs with the "library/$repo" label on that repo](https://github.com/docker-library/official-images/labels/library%2F$repo). For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md).
+## See a change merged here that doesn't show up on Docker Hub yet?
+
+Check [the "library/$repo" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/$repo), especially [PRs with the "library/$repo" label on that repo](https://github.com/docker-library/official-images/labels/library%2F$repo).
+
+For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md).
 EOREADME
 
 badges=()