diff --git a/buildpack-deps/README.md b/buildpack-deps/README.md
index 1903d690f..475ccac93 100644
--- a/buildpack-deps/README.md
+++ b/buildpack-deps/README.md
@@ -1,7 +1,7 @@
 # Tags and `Dockerfile` links
 
-- [jessie, latest](https://github.com/docker-library/docker-buildpack-deps/blob/c75f8bc5aac9e1f0c7bc4d262038247e6777e204/jessie/Dockerfile)
-- [wheezy](https://github.com/docker-library/docker-buildpack-deps/blob/c75f8bc5aac9e1f0c7bc4d262038247e6777e204/wheezy/Dockerfile)
+- [`jessie`, `latest` (*jessie/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/c75f8bc5aac9e1f0c7bc4d262038247e6777e204/jessie/Dockerfile)
+- [`wheezy` (*wheezy/Dockerfile*)](https://github.com/docker-library/docker-buildpack-deps/blob/c75f8bc5aac9e1f0c7bc4d262038247e6777e204/wheezy/Dockerfile)
 
 # What is buildpack-deps?
 
diff --git a/clojure/README.md b/clojure/README.md
index 07241cd79..3f87f267a 100644
--- a/clojure/README.md
+++ b/clojure/README.md
@@ -1,6 +1,6 @@
 # Tags and `Dockerfile` links
 
-- [latest](https://github.com/Quantisan/docker-clojure/blob/30ed1b891ea059a33ca56f04ecf6f467bbbd2362/Dockerfile)
+- [`latest` (*Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/30ed1b891ea059a33ca56f04ecf6f467bbbd2362/Dockerfile)
 
 What is Clojure?
 
diff --git a/gcc/README.md b/gcc/README.md
index 06f41ec99..4b46ee05f 100644
--- a/gcc/README.md
+++ b/gcc/README.md
@@ -1,6 +1,6 @@
 # Tags and `Dockerfile` links
 
-- [latest, 4.9, 4.9.0](https://github.com/docker-library/gcc/blob/d01197b5d86db660263e13a659c86ce3531207a9/Dockerfile)
+- [`latest`, `4.9`, `4.9.0` (*Dockerfile*)](https://github.com/docker-library/gcc/blob/d01197b5d86db660263e13a659c86ce3531207a9/Dockerfile)
 
 # What is gcc?
 The GNU Compiler Collection (GCC) is a compiler system produced by the GNU Project supporting various programming languages. GCC is a key component of the GNU toolchain. The Free Software Foundation (FSF) distributes GCC under the GNU General Public License (GNU GPL). GCC has played an important role in the growth of free software, as both a tool and an example.
diff --git a/generate-dockerfile-links-partial.sh b/generate-dockerfile-links-partial.sh
index afce41152..86601fd1f 100755
--- a/generate-dockerfile-links-partial.sh
+++ b/generate-dockerfile-links-partial.sh
@@ -19,11 +19,11 @@ for line in "${lines[@]}"; do
 	tag="${line%%: *}"
 	repoDir="${line#*: }"
 	if [ -z "${repoDirTags[$repoDir]}" ]; then
-		repoDirTags["$repoDir"]="$tag"
 		repoDirs+=( "$repoDir" )
 	else
-		repoDirTags["$repoDir"]+=', '"$tag"
+		repoDirTags["$repoDir"]+=', '
 	fi
+	repoDirTags["$repoDir"]+='`'"$tag"'`'
 done
 
 echo '# Tags and `Dockerfile` links'
@@ -54,7 +54,7 @@ for repoDir in "${repoDirs[@]}"; do
 	
 	url="https://$gitUrl/blob/$commit/${dir}Dockerfile"
 	
-	echo '- ['"${repoDirTags["$repoDir"]}"']('"$url"')'
+	echo '- ['"${repoDirTags["$repoDir"]}"' (*'"${dir}Dockerfile"'*)]('"$url"')'
 done
 
 echo
diff --git a/golang/README.md b/golang/README.md
index 2577619ee..85f437928 100644
--- a/golang/README.md
+++ b/golang/README.md
@@ -1,20 +1,20 @@
 # Tags and `Dockerfile` links
 
-- [1.2](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.2/Dockerfile)
-- [1.2-onbuild](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2/onbuild/Dockerfile)
-- [1.2-cross](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2/cross/Dockerfile)
-- [1.2.1](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.2.1/Dockerfile)
-- [1.2.1-onbuild](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2.1/onbuild/Dockerfile)
-- [1.2.1-cross](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2.1/cross/Dockerfile)
-- [1.2.2](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.2.2/Dockerfile)
-- [1.2.2-onbuild](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2.2/onbuild/Dockerfile)
-- [1.2.2-cross](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2.2/cross/Dockerfile)
-- [1.3](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.3/Dockerfile)
-- [1.3-onbuild](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.3/onbuild/Dockerfile)
-- [1.3-cross](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.3/cross/Dockerfile)
-- [1.3.1, 1, latest](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.3.1/Dockerfile)
-- [1.3.1-onbuild, 1-onbuild, onbuild](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.3.1/onbuild/Dockerfile)
-- [1.3.1-cross, 1-cross, cross](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.3.1/cross/Dockerfile)
+- [`1.2` (*1.2/Dockerfile*)](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.2/Dockerfile)
+- [`1.2-onbuild` (*1.2/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2/onbuild/Dockerfile)
+- [`1.2-cross` (*1.2/cross/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2/cross/Dockerfile)
+- [`1.2.1` (*1.2.1/Dockerfile*)](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.2.1/Dockerfile)
+- [`1.2.1-onbuild` (*1.2.1/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2.1/onbuild/Dockerfile)
+- [`1.2.1-cross` (*1.2.1/cross/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2.1/cross/Dockerfile)
+- [`1.2.2` (*1.2.2/Dockerfile*)](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.2.2/Dockerfile)
+- [`1.2.2-onbuild` (*1.2.2/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2.2/onbuild/Dockerfile)
+- [`1.2.2-cross` (*1.2.2/cross/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.2.2/cross/Dockerfile)
+- [`1.3` (*1.3/Dockerfile*)](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.3/Dockerfile)
+- [`1.3-onbuild` (*1.3/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.3/onbuild/Dockerfile)
+- [`1.3-cross` (*1.3/cross/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.3/cross/Dockerfile)
+- [`1.3.1`, `1`, `latest` (*1.3.1/Dockerfile*)](https://github.com/docker-library/golang/blob/887b0816c9480f83eb715350a32b6a3b4d331b1b/1.3.1/Dockerfile)
+- [`1.3.1-onbuild`, `1-onbuild`, `onbuild` (*1.3.1/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.3.1/onbuild/Dockerfile)
+- [`1.3.1-cross`, `1-cross`, `cross` (*1.3.1/cross/Dockerfile*)](https://github.com/docker-library/golang/blob/40bd84e4bcc278281595174a60e7b4451d972dee/1.3.1/cross/Dockerfile)
 
 # What is Go?
 Go, also called golang, is a programming language initially developed at Google in 2007 by Robert Griesemer, Rob Pike, and Ken Thompson. It is a statically-typed language with syntax loosely derived from that of C, adding garbage collection, type safety, some dynamic-typing capabilities, additional built-in types such as variable-length arrays and key-value maps, and a large standard library.
diff --git a/hello-world/README.md b/hello-world/README.md
index 55846760f..399c10343 100644
--- a/hello-world/README.md
+++ b/hello-world/README.md
@@ -1,6 +1,6 @@
 # Tags and `Dockerfile` links
 
-- [latest](https://github.com/docker-library/hello-world/blob/b7a78b7ccca62cc478919b101f3ab1334899df2b/Dockerfile)
+- [`latest` (*Dockerfile*)](https://github.com/docker-library/hello-world/blob/b7a78b7ccca62cc478919b101f3ab1334899df2b/Dockerfile)
 
 # Example output
 
diff --git a/hylang/README.md b/hylang/README.md
index aa3e35511..3d0b45fd4 100644
--- a/hylang/README.md
+++ b/hylang/README.md
@@ -1,6 +1,6 @@
 # Tags and `Dockerfile` links
 
-- [latest, 0, 0.10, 0.10.0](https://github.com/hylang/hy/blob/1265f546d1fbcfa9c62b51f3e455c0709be7acc8/Dockerfile)
+- [`latest`, `0`, `0.10`, `0.10.0` (*Dockerfile*)](https://github.com/hylang/hy/blob/1265f546d1fbcfa9c62b51f3e455c0709be7acc8/Dockerfile)
 
 # What is hylang?
 
diff --git a/java/README.md b/java/README.md
index ba90abc29..3c3ea1dfd 100644
--- a/java/README.md
+++ b/java/README.md
@@ -1,8 +1,8 @@
 # Tags and `Dockerfile` links
 
-- [6b32, 6](https://github.com/docker-library/docker-java/blob/6cc25ee35281099423e521713f710d2549209600/6/Dockerfile)
-- [7u65, 7, latest](https://github.com/docker-library/docker-java/blob/6cc25ee35281099423e521713f710d2549209600/7/Dockerfile)
-- [8u20, 8](https://github.com/docker-library/docker-java/blob/6cc25ee35281099423e521713f710d2549209600/8/Dockerfile)
+- [`6b32`, `6` (*6/Dockerfile*)](https://github.com/docker-library/docker-java/blob/6cc25ee35281099423e521713f710d2549209600/6/Dockerfile)
+- [`7u65`, `7`, `latest` (*7/Dockerfile*)](https://github.com/docker-library/docker-java/blob/6cc25ee35281099423e521713f710d2549209600/7/Dockerfile)
+- [`8u20`, `8` (*8/Dockerfile*)](https://github.com/docker-library/docker-java/blob/6cc25ee35281099423e521713f710d2549209600/8/Dockerfile)
 
 # What is Java?
 
diff --git a/mongo/README.md b/mongo/README.md
index f6556ebaa..ed822396c 100644
--- a/mongo/README.md
+++ b/mongo/README.md
@@ -1,9 +1,9 @@
 # Tags and `Dockerfile` links
 
-- [2.2.7, 2.2](https://github.com/docker-library/mongo/blob/274cd39430c54babaec47225f5d2e77c8952d8d0/2.2/Dockerfile)
-- [2.4.10, 2.4](https://github.com/docker-library/mongo/blob/274cd39430c54babaec47225f5d2e77c8952d8d0/2.4/Dockerfile)
-- [2.6.4, 2.6, 2, latest](https://github.com/docker-library/mongo/blob/274cd39430c54babaec47225f5d2e77c8952d8d0/2.6/Dockerfile)
-- [2.7.5, 2.7](https://github.com/docker-library/mongo/blob/274cd39430c54babaec47225f5d2e77c8952d8d0/2.7/Dockerfile)
+- [`2.2.7`, `2.2` (*2.2/Dockerfile*)](https://github.com/docker-library/mongo/blob/274cd39430c54babaec47225f5d2e77c8952d8d0/2.2/Dockerfile)
+- [`2.4.10`, `2.4` (*2.4/Dockerfile*)](https://github.com/docker-library/mongo/blob/274cd39430c54babaec47225f5d2e77c8952d8d0/2.4/Dockerfile)
+- [`2.6.4`, `2.6`, `2`, `latest` (*2.6/Dockerfile*)](https://github.com/docker-library/mongo/blob/274cd39430c54babaec47225f5d2e77c8952d8d0/2.6/Dockerfile)
+- [`2.7.5`, `2.7` (*2.7/Dockerfile*)](https://github.com/docker-library/mongo/blob/274cd39430c54babaec47225f5d2e77c8952d8d0/2.7/Dockerfile)
 
 # What is MongoDB?
 
diff --git a/mysql/README.md b/mysql/README.md
index 1deaa0752..b42b85803 100644
--- a/mysql/README.md
+++ b/mysql/README.md
@@ -1,7 +1,7 @@
 # Tags and `Dockerfile` links
 
-- [5.6.20, 5.6, 5, latest](https://github.com/docker-library/docker-mysql/blob/8f83313be73c8c294109d038aa2f921f6886b21c/5.6/Dockerfile)
-- [5.7.4-m14, 5.7.4, 5.7](https://github.com/docker-library/docker-mysql/blob/8f83313be73c8c294109d038aa2f921f6886b21c/5.7/Dockerfile)
+- [`5.6.20`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/docker-mysql/blob/8f83313be73c8c294109d038aa2f921f6886b21c/5.6/Dockerfile)
+- [`5.7.4-m14`, `5.7.4`, `5.7` (*5.7/Dockerfile*)](https://github.com/docker-library/docker-mysql/blob/8f83313be73c8c294109d038aa2f921f6886b21c/5.7/Dockerfile)
 
 # What is MySQL?
 
diff --git a/nginx/README.md b/nginx/README.md
index 9e156565c..57c357350 100644
--- a/nginx/README.md
+++ b/nginx/README.md
@@ -1,6 +1,6 @@
 # Tags and `Dockerfile` links
 
-- [latest, 1, 1.7, 1.7.1](https://github.com/docker-library/nginx/blob/d2c7eee53b81ae70f4eb9e3348575b35df136c95/Dockerfile)
+- [`latest`, `1`, `1.7`, `1.7.1` (*Dockerfile*)](https://github.com/docker-library/nginx/blob/d2c7eee53b81ae70f4eb9e3348575b35df136c95/Dockerfile)
 
 # What is Nginx?
 
diff --git a/node/README.md b/node/README.md
index bea6467ec..bffdaca73 100644
--- a/node/README.md
+++ b/node/README.md
@@ -1,11 +1,11 @@
 # Tags and `Dockerfile` links
 
-- [0.10.31, 0.10, 0, latest](https://github.com/docker-library/node/blob/9cb7597ec2e5e4885e29bff9b2ab0a9cfb9c6b83/0.10/Dockerfile)
-- [0.10.31-onbuild, 0.10-onbuild, 0-onbuild, onbuild](https://github.com/docker-library/node/blob/9cb7597ec2e5e4885e29bff9b2ab0a9cfb9c6b83/0.10/onbuild/Dockerfile)
-- [0.11.13, 0.11](https://github.com/docker-library/node/blob/d017d679e92e84a810c580cdb29fcdbba23c2bb9/0.11/Dockerfile)
-- [0.11.13-onbuild, 0.11-onbuild](https://github.com/docker-library/node/blob/d017d679e92e84a810c580cdb29fcdbba23c2bb9/0.11/onbuild/Dockerfile)
-- [0.8.28, 0.8](https://github.com/docker-library/node/blob/d017d679e92e84a810c580cdb29fcdbba23c2bb9/0.8/Dockerfile)
-- [0.8.28-onbuild, 0.8-onbuild](https://github.com/docker-library/node/blob/d017d679e92e84a810c580cdb29fcdbba23c2bb9/0.8/onbuild/Dockerfile)
+- [`0.10.31`, `0.10`, `0`, `latest` (*0.10/Dockerfile*)](https://github.com/docker-library/node/blob/9cb7597ec2e5e4885e29bff9b2ab0a9cfb9c6b83/0.10/Dockerfile)
+- [`0.10.31-onbuild`, `0.10-onbuild`, `0-onbuild`, `onbuild` (*0.10/onbuild/Dockerfile*)](https://github.com/docker-library/node/blob/9cb7597ec2e5e4885e29bff9b2ab0a9cfb9c6b83/0.10/onbuild/Dockerfile)
+- [`0.11.13`, `0.11` (*0.11/Dockerfile*)](https://github.com/docker-library/node/blob/d017d679e92e84a810c580cdb29fcdbba23c2bb9/0.11/Dockerfile)
+- [`0.11.13-onbuild`, `0.11-onbuild` (*0.11/onbuild/Dockerfile*)](https://github.com/docker-library/node/blob/d017d679e92e84a810c580cdb29fcdbba23c2bb9/0.11/onbuild/Dockerfile)
+- [`0.8.28`, `0.8` (*0.8/Dockerfile*)](https://github.com/docker-library/node/blob/d017d679e92e84a810c580cdb29fcdbba23c2bb9/0.8/Dockerfile)
+- [`0.8.28-onbuild`, `0.8-onbuild` (*0.8/onbuild/Dockerfile*)](https://github.com/docker-library/node/blob/d017d679e92e84a810c580cdb29fcdbba23c2bb9/0.8/onbuild/Dockerfile)
 
 # What is Node.js?
 Node.js is a software platform for scalable server-side and networking applications. Node.js applications are written in JavaScript, and can be run within the Node.js runtime on Mac OS X, Windows and Linux with no changes.
diff --git a/perl/README.md b/perl/README.md
index 269562b4c..96c93b3b0 100644
--- a/perl/README.md
+++ b/perl/README.md
@@ -1,9 +1,9 @@
 # Tags and `Dockerfile` links
 
-- [latest, 5, 5.20, 5.20.0](https://github.com/perl/docker-perl/blob/r20140804.0/5.020.000-64bit/Dockerfile)
-- [5.18, 5.18.2](https://github.com/perl/docker-perl/blob/r20140804.0/5.018.002-64bit/Dockerfile)
-- [latest-threaded, 5-threaded, 5.20-threaded, 5.20.0-threaded](https://github.com/perl/docker-perl/blob/r20140804.0/5.020.000-64bit,threaded/Dockerfile)
-- [5.18-threaded, 5.18.2-threaded](https://github.com/perl/docker-perl/blob/r20140804.0/5.018.002-64bit,threaded/Dockerfile)
+- [`latest`, `5`, `5.20`, `5.20.0` (*5.020.000-64bit/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140804.0/5.020.000-64bit/Dockerfile)
+- [`5.18`, `5.18.2` (*5.018.002-64bit/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140804.0/5.018.002-64bit/Dockerfile)
+- [`latest-threaded`, `5-threaded`, `5.20-threaded`, `5.20.0-threaded` (*5.020.000-64bit,threaded/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140804.0/5.020.000-64bit,threaded/Dockerfile)
+- [`5.18-threaded`, `5.18.2-threaded` (*5.018.002-64bit,threaded/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140804.0/5.018.002-64bit,threaded/Dockerfile)
 
 # What is Perl?
 Perl is a family of high-level, general-purpose, interpreted, dynamic programming language. The Perl languages borrow freatures from other programming languages including C, shell scripting (sh), AWK, and sed.
diff --git a/php/README.md b/php/README.md
index 0a0979f2e..a039c6802 100644
--- a/php/README.md
+++ b/php/README.md
@@ -1,13 +1,13 @@
 # Tags and `Dockerfile` links
 
-- [5.3.29-cli, 5.3-cli](https://github.com/docker-library/php/blob/3904b176167a07c8828b9a1b5b9a3ea55bd9f21d/5.3/Dockerfile)
-- [5.3.29-apache, 5.3-apache](https://github.com/docker-library/php/blob/6b54c7fa3f42f0eaade30c1bbb05d5fc2c0b39c2/5.3/apache/Dockerfile)
-- [5.4.32-cli, 5.4-cli](https://github.com/docker-library/php/blob/3904b176167a07c8828b9a1b5b9a3ea55bd9f21d/5.4/Dockerfile)
-- [5.4.32-apache, 5.4-apache](https://github.com/docker-library/php/blob/6b54c7fa3f42f0eaade30c1bbb05d5fc2c0b39c2/5.4/apache/Dockerfile)
-- [5.5.16-cli, 5.5-cli](https://github.com/docker-library/php/blob/3904b176167a07c8828b9a1b5b9a3ea55bd9f21d/5.5/Dockerfile)
-- [5.5.16-apache, 5.5-apache](https://github.com/docker-library/php/blob/6b54c7fa3f42f0eaade30c1bbb05d5fc2c0b39c2/5.5/apache/Dockerfile)
-- [5.6.0-cli, 5.6-cli, 5-cli, latest](https://github.com/docker-library/php/blob/3904b176167a07c8828b9a1b5b9a3ea55bd9f21d/5.6/Dockerfile)
-- [5.6.0-apache, 5.6-apache, 5-apache, apache](https://github.com/docker-library/php/blob/6b54c7fa3f42f0eaade30c1bbb05d5fc2c0b39c2/5.6/apache/Dockerfile)
+- [`5.3.29-cli`, `5.3-cli` (*5.3/Dockerfile*)](https://github.com/docker-library/php/blob/3904b176167a07c8828b9a1b5b9a3ea55bd9f21d/5.3/Dockerfile)
+- [`5.3.29-apache`, `5.3-apache` (*5.3/apache/Dockerfile*)](https://github.com/docker-library/php/blob/6b54c7fa3f42f0eaade30c1bbb05d5fc2c0b39c2/5.3/apache/Dockerfile)
+- [`5.4.32-cli`, `5.4-cli` (*5.4/Dockerfile*)](https://github.com/docker-library/php/blob/3904b176167a07c8828b9a1b5b9a3ea55bd9f21d/5.4/Dockerfile)
+- [`5.4.32-apache`, `5.4-apache` (*5.4/apache/Dockerfile*)](https://github.com/docker-library/php/blob/6b54c7fa3f42f0eaade30c1bbb05d5fc2c0b39c2/5.4/apache/Dockerfile)
+- [`5.5.16-cli`, `5.5-cli` (*5.5/Dockerfile*)](https://github.com/docker-library/php/blob/3904b176167a07c8828b9a1b5b9a3ea55bd9f21d/5.5/Dockerfile)
+- [`5.5.16-apache`, `5.5-apache` (*5.5/apache/Dockerfile*)](https://github.com/docker-library/php/blob/6b54c7fa3f42f0eaade30c1bbb05d5fc2c0b39c2/5.5/apache/Dockerfile)
+- [`5.6.0-cli`, `5.6-cli`, `5-cli`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/php/blob/3904b176167a07c8828b9a1b5b9a3ea55bd9f21d/5.6/Dockerfile)
+- [`5.6.0-apache`, `5.6-apache`, `5-apache`, `apache` (*5.6/apache/Dockerfile*)](https://github.com/docker-library/php/blob/6b54c7fa3f42f0eaade30c1bbb05d5fc2c0b39c2/5.6/apache/Dockerfile)
 
 # What is PHP?
 PHP is a server-side scripting language designed for web development but also used as a general-purpose programming language. As of January 2013, PHP was installed on more than 240 million websites and 2.1 million web servers.
diff --git a/postgres/README.md b/postgres/README.md
index f9fe6f653..4f7f96f9d 100644
--- a/postgres/README.md
+++ b/postgres/README.md
@@ -1,11 +1,11 @@
 # Tags and `Dockerfile` links
 
-- [8.4.22, 8.4, 8](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/8.4/Dockerfile)
-- [9.0.18, 9.0](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.0/Dockerfile)
-- [9.1.14, 9.1](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.1/Dockerfile)
-- [9.2.9, 9.2](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.2/Dockerfile)
-- [9.3.5, 9.3, 9, latest](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.3/Dockerfile)
-- [9.4-beta2, 9.4](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.4/Dockerfile)
+- [`8.4.22`, `8.4`, `8` (*8.4/Dockerfile*)](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/8.4/Dockerfile)
+- [`9.0.18`, `9.0` (*9.0/Dockerfile*)](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.0/Dockerfile)
+- [`9.1.14`, `9.1` (*9.1/Dockerfile*)](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.1/Dockerfile)
+- [`9.2.9`, `9.2` (*9.2/Dockerfile*)](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.2/Dockerfile)
+- [`9.3.5`, `9.3`, `9`, `latest` (*9.3/Dockerfile*)](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.3/Dockerfile)
+- [`9.4-beta2`, `9.4` (*9.4/Dockerfile*)](https://github.com/docker-library/postgres/blob/d74b69598c835fe15eac39a26b5c61058f99c3db/9.4/Dockerfile)
 
 # What is PostgreSQL?
 PostgreSQL, often simply "Postgres", is an object-relational database management system (ORDBMS) with an emphasis on extensibility and standards-compliance. As a database server, its primary function is to store data, securely and supporting best practices, and retrieve it later, as requested by other software applications, be it those on the same computer or those running on another computer across a network (including the Internet). It can handle workloads ranging from small single-machine applications to large Internet-facing applications with many concurrent users. Recent versions also provide replication of the database itself for security and scalability.
diff --git a/python/README.md b/python/README.md
index d2564b714..99b12403a 100644
--- a/python/README.md
+++ b/python/README.md
@@ -1,7 +1,7 @@
 # Tags and `Dockerfile` links
 
-- [2.7.8, 2.7, 2](https://github.com/docker-library/docker-python/blob/2542eef0945385430d2b5b0899b01ca26bd40ef7/2/Dockerfile)
-- [3.4.1, 3.4, 3, latest](https://github.com/docker-library/docker-python/blob/2542eef0945385430d2b5b0899b01ca26bd40ef7/3/Dockerfile)
+- [`2.7.8`, `2.7`, `2` (*2/Dockerfile*)](https://github.com/docker-library/docker-python/blob/2542eef0945385430d2b5b0899b01ca26bd40ef7/2/Dockerfile)
+- [`3.4.1`, `3.4`, `3`, `latest` (*3/Dockerfile*)](https://github.com/docker-library/docker-python/blob/2542eef0945385430d2b5b0899b01ca26bd40ef7/3/Dockerfile)
 
 # What is Python?
 
diff --git a/rails/README.md b/rails/README.md
index 7cc6983b8..ef52a5149 100644
--- a/rails/README.md
+++ b/rails/README.md
@@ -1,7 +1,7 @@
 # Tags and `Dockerfile` links
 
-- [4.1.5, 4.1, 4, latest](https://github.com/docker-library/rails/blob/2f86b2e73f46be25d780575f0b6e9ad03b60880e/Dockerfile)
-- [onbuild](https://github.com/docker-library/rails/blob/7bb6ade7f97129cc58967d7d0ae17f4b62ae52eb/onbuild/Dockerfile)
+- [`4.1.5`, `4.1`, `4`, `latest` (*Dockerfile*)](https://github.com/docker-library/rails/blob/2f86b2e73f46be25d780575f0b6e9ad03b60880e/Dockerfile)
+- [`onbuild` (*onbuild/Dockerfile*)](https://github.com/docker-library/rails/blob/7bb6ade7f97129cc58967d7d0ae17f4b62ae52eb/onbuild/Dockerfile)
 
 # What is Ruby on Rails?
 
diff --git a/redis/README.md b/redis/README.md
index 42e733d53..5e412a5b6 100644
--- a/redis/README.md
+++ b/redis/README.md
@@ -1,14 +1,14 @@
 # Tags and `Dockerfile` links
 
-- [2.6.17, 2.6](https://github.com/docker-library/redis/blob/02d9cd887a4e0d50db4bb085eab7235115a6fe4a/2.6.17/Dockerfile)
-- [2.8.10](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.10/Dockerfile)
-- [2.8.11](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.11/Dockerfile)
-- [2.8.12](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.12/Dockerfile)
-- [2.8.13, 2.8, latest](https://github.com/docker-library/redis/blob/d0665bb1bbddd4cc035dbc1fc774695fa534d648/2.8.13/Dockerfile)
-- [2.8.6](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.6/Dockerfile)
-- [2.8.7](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.7/Dockerfile)
-- [2.8.8](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.8/Dockerfile)
-- [2.8.9](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.9/Dockerfile)
+- [`2.6.17`, `2.6` (*2.6.17/Dockerfile*)](https://github.com/docker-library/redis/blob/02d9cd887a4e0d50db4bb085eab7235115a6fe4a/2.6.17/Dockerfile)
+- [`2.8.10` (*2.8.10/Dockerfile*)](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.10/Dockerfile)
+- [`2.8.11` (*2.8.11/Dockerfile*)](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.11/Dockerfile)
+- [`2.8.12` (*2.8.12/Dockerfile*)](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.12/Dockerfile)
+- [`2.8.13`, `2.8`, `latest` (*2.8.13/Dockerfile*)](https://github.com/docker-library/redis/blob/d0665bb1bbddd4cc035dbc1fc774695fa534d648/2.8.13/Dockerfile)
+- [`2.8.6` (*2.8.6/Dockerfile*)](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.6/Dockerfile)
+- [`2.8.7` (*2.8.7/Dockerfile*)](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.7/Dockerfile)
+- [`2.8.8` (*2.8.8/Dockerfile*)](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.8/Dockerfile)
+- [`2.8.9` (*2.8.9/Dockerfile*)](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.9/Dockerfile)
 
 # What is Redis?
 Redis is an open-source, networked, in-memory, key-value data store with optional durability. It is written in ANSI C. The development of Redis has been sponsored by Pivotal since May 2013; before that, it was sponsored by VMware. According to the monthly ranking by DB-Engines.com, Redis is the most popular key-value store. The name Redis means REmote DIctionary Server.
diff --git a/ruby/README.md b/ruby/README.md
index 25a3abb44..9277bbefa 100644
--- a/ruby/README.md
+++ b/ruby/README.md
@@ -1,9 +1,9 @@
 # Tags and `Dockerfile` links
 
-- [1.9.3-p547, 1.9.3, 1.9, 1](https://github.com/docker-library/ruby/blob/4938a7b4b5b62c90b5d387c9c286fd7749d9499e/1.9/Dockerfile)
-- [1.9.3-p547-onbuild, 1.9.3-onbuild, 1.9-onbuild, 1-onbuild](https://github.com/docker-library/ruby/blob/4938a7b4b5b62c90b5d387c9c286fd7749d9499e/1.9/onbuild/Dockerfile)
-- [2.1.2, 2.1, 2, latest](https://github.com/docker-library/ruby/blob/950a673e59df846608f624ee55321d36ba1f89ba/2.1/Dockerfile)
-- [2.1.2-onbuild, 2.1-onbuild, 2-onbuild, onbuild](https://github.com/docker-library/ruby/blob/950a673e59df846608f624ee55321d36ba1f89ba/2.1/onbuild/Dockerfile)
+- [`1.9.3-p547`, `1.9.3`, `1.9`, `1` (*1.9/Dockerfile*)](https://github.com/docker-library/ruby/blob/4938a7b4b5b62c90b5d387c9c286fd7749d9499e/1.9/Dockerfile)
+- [`1.9.3-p547-onbuild`, `1.9.3-onbuild`, `1.9-onbuild`, `1-onbuild` (*1.9/onbuild/Dockerfile*)](https://github.com/docker-library/ruby/blob/4938a7b4b5b62c90b5d387c9c286fd7749d9499e/1.9/onbuild/Dockerfile)
+- [`2.1.2`, `2.1`, `2`, `latest` (*2.1/Dockerfile*)](https://github.com/docker-library/ruby/blob/950a673e59df846608f624ee55321d36ba1f89ba/2.1/Dockerfile)
+- [`2.1.2-onbuild`, `2.1-onbuild`, `2-onbuild`, `onbuild` (*2.1/onbuild/Dockerfile*)](https://github.com/docker-library/ruby/blob/950a673e59df846608f624ee55321d36ba1f89ba/2.1/onbuild/Dockerfile)
 
 # What is Ruby?
 
diff --git a/ubuntu/README.md b/ubuntu/README.md
index bdc9c125e..128cfa0d3 100644
--- a/ubuntu/README.md
+++ b/ubuntu/README.md
@@ -1,8 +1,8 @@
 # Tags and `Dockerfile` links
 
-- [12.04.5, 12.04, precise](https://github.com/tianon/docker-brew-ubuntu-core/blob/febe569d532a47c28da4a460eea5331b8dd5f564/precise/Dockerfile)
-- [14.04.1, 14.04, trusty, latest](https://github.com/tianon/docker-brew-ubuntu-core/blob/febe569d532a47c28da4a460eea5331b8dd5f564/trusty/Dockerfile)
-- [14.10, utopic](https://github.com/tianon/docker-brew-ubuntu-core/blob/febe569d532a47c28da4a460eea5331b8dd5f564/utopic/Dockerfile)
+- [`12.04.5`, `12.04`, `precise` (*precise/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/febe569d532a47c28da4a460eea5331b8dd5f564/precise/Dockerfile)
+- [`14.04.1`, `14.04`, `trusty`, `latest` (*trusty/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/febe569d532a47c28da4a460eea5331b8dd5f564/trusty/Dockerfile)
+- [`14.10`, `utopic` (*utopic/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/febe569d532a47c28da4a460eea5331b8dd5f564/utopic/Dockerfile)
 
 **Built with [Stackbrew](https://github.com/dotcloud/stackbrew/) from [github.com/dotcloud/stackbrew/blob/master/library/ubuntu](https://github.com/dotcloud/stackbrew/blob/master/library/ubuntu)**
 
diff --git a/wordpress/README.md b/wordpress/README.md
index d0df1a61e..2e959440a 100644
--- a/wordpress/README.md
+++ b/wordpress/README.md
@@ -1,6 +1,6 @@
 # Tags and `Dockerfile` links
 
-- [3.9.2, 3.9, 3, latest](https://github.com/docker-library/wordpress/blob/69c6d14ae81392b39d1ded401da617ece7c10c5b/Dockerfile)
+- [`3.9.2`, `3.9`, `3`, `latest` (*Dockerfile*)](https://github.com/docker-library/wordpress/blob/69c6d14ae81392b39d1ded401da617ece7c10c5b/Dockerfile)
 
 # What is WordPress?
 WordPress is a free and open source blogging tool and a content management system (CMS) based on PHP and MySQL, which runs on a web hosting service. Features include a plugin architecture and a template system. WordPress is used by more than 22.0% of the top 10 million websites as of August 2013. WordPress is the most popular blogging system in use on the Web, at more than 60 million websites. The most popular languages used are English, Spanish and Bahasa Indonesia.