Merge lp:~dpb/ubuntu-manpage-repository/highlight-current-series into lp:ubuntu-manpage-repository

[David Britton]

new additions:

1) Easy microsite create with makefile target using LXD and a checked-in mini archive.

2) fixed width fonts

3) highlight current series in bold

4) cache invalidate generated manpages once per month (on average)

5) limit generated manpage to 100 columns.

[Joshua Powers (powersj)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2018-06-03 17:10:52 +0000
+++ Makefile	2018-06-05 23:57:15 +0000
@@ -5,21 +5,23 @@
 deps:
 	sudo apt -y install w3m shellcheck flake8 < /dev/null
 
-# Note, this is destructive, you could have just wasted hours of
-# manpage building by running it.  Try not to make this the default
-# action or make it a dependency of another operation.
 clean:
 	rm -rf www/manpages www/manpages.gz
-
-manpage-repo:
-	@echo "The first time this runs, it could take many hours"
-	@sleep 2
-	(cd bin && ./make-manpage-repo.sh)
-	@echo "If running locally: file://$(pwd)/www"
-	@echo "If running in container: http://<IP_ADDR>:8080/"
-
-setup-and-mirror:
-	@echo "This will be downloading >8GB of data, it could take a while..."
-	@sleep 2
-	./tools/setup-in-server.sh
-	apt-mirror
+	[ -L config ] && rm config
+
+config:
+	ln -s examples/config config
+
+manpage-repo: config
+	bin/make-manpage-repo.sh
+
+create-microsite-container:
+	tools/create-microsite-container.sh
+
+update-microsite-container:
+	tools/update-microsite-container.sh
+
+setup-microsite-in-server: config
+	tools/setup-archive-fixture-in-server.sh
+	tools/setup-in-server.sh
+

=== modified file 'README.md'
--- README.md	2018-05-24 20:36:29 +0000
+++ README.md	2018-06-05 23:57:15 +0000
@@ -1,73 +1,24 @@
-See: https://launchpad.net/ubuntu-manpage-repository for developing
-information.
-
-# Hacking locally, without setting up a micro site
-
-Make changes, then...
-
-    make deps
-    cd bin; ./make-manpage-repo.sh
-
-And then, wait, you can typically kill this after a couple minutes as
-you will have some data available then.  After that, you can check
-things out by pulling up:
-
-  * file:///home/<user>/<path_to_source>/www/ in chrome...
-
-Note, for most bugs, you do not need to wait for everything to
-download/create.  Instead, you can just generate a few pages and check
-what happened there.
-
-To start over:
-
-    make clean
+See also: https://launchpad.net/ubuntu-manpage-repository
 
 # Setting up a micro site for dev/test in a container
 
-To get the search form to work and debug more complex issues, you need
-to set up a real microsite.  The quickest way I have is to create a
-container, checkout the code there, and setup.  These instructions
-should help.  Once in the container, this should all be run as root.
-
-After this has been done one time, updates should be fast.  Some sample
-times:
-
-    # create container / install bzr
-    lxc launch ubuntu:xenial manpages-test
-    lxc exec manpages-test bash
-    apt update
-    apt install bzr make
-
-    # Checkout source (Remember, you can checkout your branch too)
-    cd /srv
-    bzr checkout lp:ubuntu-manpage-repository manpages.ubuntu.com
-    cd manpages.ubuntu.com
-
-    # Setup the container, and start the mirror process (>8GB d/l ahead)
-    # Also, do the actually conversion from debs into manpages
-    make deps setup-and-mirror manpage-repo
-
-You can then reach the page at:
-
- * http://<ip>:8080/index_real.html
- * http://<ip>:8080/cgi-bin/search.py?q=aalib-config (one of the first pages that
-   should be downloaded)
- 
-# Dev notes
-
- * Don't erase the apt-mirror (/srv/manpages.ubuntu.com/ubuntu/), it can
-   just be updated by the 'setup-and-mirror' make target each time.
- * Manpage generation takes about 40m on my computer.  It also doesn't
-   usually need to be repeated
- * The config files limit the archive to bionic/main by default, just to
-   help speed up development, you can expand those as necessary.
+To help ease the testing of this there is tooling in place to create a
+small  "microsite".  This just puts out a Packages files with a small
+set of packages for testing pursposes in a container.  It also copies
+the current branch (.bzr file and all) out to the container in the
+/srv/manpages.ubuntu.com directory, making it super easy to test out
+your changes.
+
+    make create-microsite-container
+
+You can also override the default container name
+(default=**manpages-microsite**), if you want to deploy
+two sites to compare, for instance:
+
+    MICROSITE_CONTAINER=name2 make create-microsite-container
 
 # TODO
  
- * remove creation of the needed symlink for the real dev site testing,
-   this requires modification of search.py
- * create a series/branch for production since the configuration needs
-   to be modified for devel/production.  Or solve in some other way.
  * search.py really needs someone to make functions and simplify it.
- * switch container setup instructions to use 'manpages' user account
-   instead of root as they do now
+ * switch container setup script to use a 'manpages' user account
+   instead of root as it does now

=== modified file 'bin/fetch-man-pages.sh'
--- bin/fetch-man-pages.sh	2018-06-03 18:27:44 +0000
+++ bin/fetch-man-pages.sh	2018-06-05 23:57:15 +0000
@@ -29,7 +29,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # shellcheck disable=SC1090
-. "$DIR/config"
+. "$DIR/../config"
 
 TEMPDIR=$(mktemp -d -t manpages-fetch-XXXXXX)
 trap 'rm -rf $TEMPDIR 2>/dev/null || true' EXIT HUP INT QUIT TERM
@@ -60,7 +60,7 @@
 if [ -z "$man" ]; then
 	echo "INFO: No manpages: [$DIST] [$PKG]"
 	# Touch the cache file so we don't look again until package updated
-	sha1sum "$DEB" | awk '{ print $1 }' >> "$DESTDIR/.cache/$NAME"
+	sha1sum "$DEB" | awk '{ print $1 }' > "$DESTDIR/.cache/$NAME"
 	exit 0
 fi
 
@@ -81,7 +81,8 @@
 	manpage="$TEMPDIR/$i"
 	i=$(printf "%s" "$i" | sed -e "s/usr\/share.*\/man\///i" -e "s/\.gz$//")
 	#printf "%s\n" "INFO: Considering manpage [$i]"
-	if [ ! -s "$manpage" -o  -z "$i" -a  "$SYMLINK" = "0" ]; then
+	# shellcheck disable=SC2166
+	if [ ! -s "$manpage" -o  -z "$i" ] && [ "$SYMLINK" = "0" ]; then
 		#printf "%s\n" "INFO: Skipping empty manpage [$manpage]"
 		continue
 	fi
@@ -97,7 +98,7 @@
 			ln -f -s "$LN" "$out"
 			printf "INFO: Created symlink [%s]" "$out"
                 else
-			BODY=$(/usr/lib/w3m/cgi-bin/w3mman2html.cgi "local=$manpage" | grep -A 1000000 "^<b>" | sed -e '/<\/body>/,+100 d' -e 's:^<b>\(.*\)</b>$:</pre><h4><b>\1</b></h4><pre>:g' -e 's:<a href="file\:///[^?]*?\([^(]*\)(\([^)]*\))">:<a href="../man\2/\1.\2.html">:g')
+			BODY=$(COLUMNS=100 /usr/lib/w3m/cgi-bin/w3mman2html.cgi "local=$manpage" | grep -A 1000000 "^<b>" | sed -e '/<\/body>/,+100 d' -e 's:^<b>\(.*\)</b>$:</pre><h4><b>\1</b></h4><pre>:g' -e 's:<a href="file\:///[^?]*?\([^(]*\)(\([^)]*\))">:<a href="../man\2/\1.\2.html">:g')
 			TITLE=$(printf "%s" "$BODY" | head -n2 | tail -n1 | sed "s/<[^>]\+>//g")
 			BIN_PKG=$(printf "%s" "$NAME_AND_VER" | sed s/_.*$//g)
 			PKG_LINK="https://launchpad.net/ubuntu/$DIST/+package/$BIN_PKG"
@@ -121,7 +122,7 @@
 
 # After extracting all manpages, cache the sha1sum, so we don't
 # repeat the downloads 
-sha1sum "$DEB" | awk '{ print $1 }' >> "$DESTDIR/.cache/$NAME"
+sha1sum "$DEB" | awk '{ print $1 }' > "$DESTDIR/.cache/$NAME"
 
 # In the case of freakish package permissions, fix them on rm failure.
 rm -rf "$TEMPDIR" 2>/dev/null || ( chmod -R 700 "$TEMPDIR" && rm -rf "$TEMPDIR" ) || true

=== modified file 'bin/make-manpage-repo.sh'
--- bin/make-manpage-repo.sh	2018-06-03 17:15:58 +0000
+++ bin/make-manpage-repo.sh	2018-06-05 23:57:15 +0000
@@ -1,8 +1,6 @@
 #!/bin/bash -e
 
 ###############################################################################
-# This is the Ubuntu manpage repository generator and interface.
-# 
 # Copyright (C) 2008 Canonical Ltd.
 # 
 # This code was originally written by Dustin Kirkland <[e-mail]>,
@@ -27,8 +25,11 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+# keeps shellcheck happy.
+ARCH=""
+
 # shellcheck disable=SC1090
-. "$DIR/config"
+. "$DIR/../config"
 
 # Establish some locking, to keep multiple updates from running
 mkdir -p "$PUBLIC_HTML_DIR/manpages"
@@ -47,10 +48,11 @@
 get_packages_url() {
 	dist=$1
 	repo=$2
-	if [ -e "$DEBDIR/dists/$dist/$repo/binary-$ARCH/Packages.gz" ]; then
-		echo "file://$DEBDIR/dists/$dist/$repo/binary-$ARCH/Packages.gz"
+	arch=$3
+	if [ -e "$DEBDIR/dists/$dist/$repo/binary-$arch/Packages.gz" ]; then
+		echo "file://$DEBDIR/dists/$dist/$repo/binary-$arch/Packages.gz"
 	else
-		echo "$ARCHIVE/dists/$dist/$repo/binary-$ARCH/Packages.gz"
+		echo "$ARCHIVE/dists/$dist/$repo/binary-$arch/Packages.gz"
 	fi
 }
 
@@ -73,10 +75,25 @@
 	sum="$2"
 	name=$(basename "$deb" | awk -F_ '{print $1}')
 	existing_sum=$(cat "$PUBLIC_HTML_DIR/manpages/$dist/.cache/$name" 2>/dev/null)
+
+	# Take the first two digits of the existing_sum modulo 28 to
+	# compare to the current day of month.
+	# 
+	# Reasoning: this will invalidate the cache for everything ~
+	# once per month (days: 1-28)
+	day_mod=$((0x$(echo "$existing_sum" | cut -b 1-2)%27 + 1))
+	if [ "$day_mod" -eq "$(date +%d)" ]; then
+		echo "INFO: date_mod match, regnerating: $deb ($day_mod)"
+		return 0
+	fi
+
+	# Of course, if the sum found in the packages file for this
+	# package does not equal the sum I have on disk, regenerate.
 	if [ "$existing_sum" = "$sum" ]; then
 	        echo "INFO: cksum skip: $deb"
 		return 1
 	else
+	        echo "INFO: cksum mismatch: $deb"
 		return 0
 	fi
 }
@@ -88,7 +105,7 @@
 	deburl=$(get_deb_url "$deb")
 	# FIXME: the || true needs to bubble up to a list of things wrong obviously.
 	# shellcheck disable=SC2015
-	is_pkg_cache_invalid "$deb" "$sum" && ./fetch-man-pages.sh "$dist" "$deburl" || true
+	is_pkg_cache_invalid "$deb" "$sum" && "$DIR/fetch-man-pages.sh" "$dist" "$deburl" || true
 }
 
 link_en_locale() {
@@ -122,18 +139,20 @@
 	mkdir -p "$PUBLIC_HTML_DIR/manpages/$dist/.cache" "$PUBLIC_HTML_DIR/manpages.gz/$dist" || true
 	link_en_locale "$dist"
 	for repo in $REPOS; do
-		file=$(get_packages_url "$dist" "$repo")
-		echo "INFO: Packages.gz: $file"
-		curl -s "$file" \
-			| gunzip -c \
-			| grep -E "(^Filename: |^SHA1: )" \
-			| awk '{print $2}' \
-			| sed 'N;s/\n/ /' \
-			| sort -u \
-			| while read -r deb sum; do
-				handle_deb "$dist" "$deb" "$sum"
-			done
+		for arch in $ARCH; do
+			file=$(get_packages_url "$dist" "$repo" "$arch")
+			echo "INFO: Packages.gz: $file"
+			curl -s "$file" \
+				| gunzip -c \
+				| grep -E "(^Filename: |^SHA1: )" \
+				| awk '{print $2}' \
+				| sed 'N;s/\n/ /' \
+				| sort -u \
+				| while read -r deb sum; do
+					handle_deb "$dist" "$deb" "$sum"
+				done
+		done
 	done
 done
 
-./make-sitemaps.sh
+"$DIR/make-sitemaps.sh"

=== modified file 'bin/make-sitemaps.sh'
--- bin/make-sitemaps.sh	2018-06-03 17:15:58 +0000
+++ bin/make-sitemaps.sh	2018-06-05 23:57:15 +0000
@@ -30,7 +30,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # shellcheck disable=SC1090
-. "$DIR/config"
+. "$DIR/../config"
 
 printf "%s\n" "INFO: Making sitemaps"
 

=== renamed file 'bin/config' => 'examples/config'
--- bin/config	2018-05-23 19:48:06 +0000
+++ examples/config	2018-06-05 23:57:15 +0000
@@ -1,5 +1,9 @@
 
 # Customize this file and rename it to 'config'
+# It should be in the root of the directory structure, like
+#   - bin/
+#   - www/
+#   - config
 
 # What archive are you wanting to pull Packages.gz and .deb files from?
 ARCHIVE="http://archive.ubuntu.com/ubuntu"
@@ -9,13 +13,15 @@
 
 # Point this at the location where you want the manpages
 # and manpages.gz directories generated.
-PUBLIC_HTML_DIR="$(pwd)/../www"
+PUBLIC_HTML_DIR="/srv/manpages.ubuntu.com/www"
 
 # For generating the sitemap.xml, everything else in the scripts
 # uses relative links
 SITE="http://manpages.ubuntu.com"
 
 # These form a combinatorial download matrix
-DISTROS="bionic"
-REPOS="main"
+DISTROS="bionic artful xenial trusty precise"
+REPOS="main restricted universe multiverse"
+
+# For now, stick to a single arch
 ARCH="amd64"

=== added file 'tools/create-microsite-container.sh'
--- tools/create-microsite-container.sh	1970-01-01 00:00:00 +0000
+++ tools/create-microsite-container.sh	2018-06-05 23:57:15 +0000
@@ -0,0 +1,42 @@
+#!/bin/bash -e
+# 
+# Goal: create a small microsite in a container from this branch
+# 
+# Notes:
+# 
+# - A new container will be created each time.
+# - This script should be run as root
+# - Your code will be copied into the microsite
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+NAME=${MICROSITE_CONTAINER:-manpages-microsite}
+SITE_PATH=/srv/manpages.ubuntu.com
+
+if ! lxc info "$NAME" 2>/dev/null; then
+	lxc launch ubuntu:xenial "$NAME"
+	sleep 5
+	lxc exec "$NAME" -- apt update
+else
+	echo "-------------------------------------------"
+	echo "Found existing container: $NAME"
+	echo "Hit [CTRL]-c to avoid wiping out $NAME:$SITE_PATH"
+	read -p "Press enter to continue"
+	echo "-------------------------------------------"
+fi
+
+lxc exec "$NAME" -- apt install -y apache2 bzr make < /dev/null
+lxc exec "$NAME" -- rm -rf "$SITE_PATH"
+lxc exec "$NAME" -- mkdir -p "$SITE_PATH"
+tar cf - "$DIR/../" | lxc exec "$NAME" -- tar xvf - -C "$SITE_PATH"
+lxc exec "$NAME" -- sh -c "cd $SITE_PATH; make deps setup-microsite-in-server manpage-repo"
+
+echo "--------"
+echo "Summary:"
+echo "--------"
+echo ""
+lxc list "$NAME"
+
+IP=$(lxc info "$NAME" |grep eth0: |grep -v inet6 | awk '{ print $3 }')
+echo ""
+echo "Site URL: http://$IP:8080"
+echo " * Try searching for 'ac'"

=== added directory 'tools/fixtures'
=== added directory 'tools/fixtures/mirror'
=== added directory 'tools/fixtures/mirror/dists'
=== added directory 'tools/fixtures/mirror/dists/artful'
=== added directory 'tools/fixtures/mirror/dists/artful/main'
=== added directory 'tools/fixtures/mirror/dists/artful/main/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/artful/main/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/artful/main/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/artful/main/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/artful/main/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/artful/main/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/artful/main/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/artful/main/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/artful/multiverse'
=== added directory 'tools/fixtures/mirror/dists/artful/multiverse/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/artful/multiverse/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/artful/multiverse/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/artful/multiverse/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/artful/multiverse/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/artful/multiverse/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/artful/multiverse/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/artful/multiverse/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/artful/restricted'
=== added directory 'tools/fixtures/mirror/dists/artful/restricted/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/artful/restricted/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/artful/restricted/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/artful/restricted/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/artful/restricted/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/artful/restricted/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/artful/restricted/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/artful/restricted/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/artful/universe'
=== added directory 'tools/fixtures/mirror/dists/artful/universe/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/artful/universe/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/artful/universe/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/artful/universe/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/artful/universe/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/artful/universe/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/artful/universe/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/artful/universe/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/bionic'
=== added directory 'tools/fixtures/mirror/dists/bionic/main'
=== added directory 'tools/fixtures/mirror/dists/bionic/main/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/bionic/main/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/bionic/main/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/bionic/main/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/bionic/main/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/bionic/main/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/bionic/main/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/bionic/main/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/bionic/multiverse'
=== added directory 'tools/fixtures/mirror/dists/bionic/multiverse/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/bionic/multiverse/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/bionic/multiverse/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/bionic/multiverse/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/bionic/multiverse/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/bionic/multiverse/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/bionic/multiverse/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/bionic/multiverse/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/bionic/restricted'
=== added directory 'tools/fixtures/mirror/dists/bionic/restricted/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/bionic/restricted/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/bionic/restricted/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/bionic/restricted/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/bionic/restricted/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/bionic/restricted/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/bionic/restricted/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/bionic/restricted/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/bionic/universe'
=== added directory 'tools/fixtures/mirror/dists/bionic/universe/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/bionic/universe/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/bionic/universe/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/bionic/universe/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/bionic/universe/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/bionic/universe/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/bionic/universe/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/bionic/universe/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/precise'
=== added directory 'tools/fixtures/mirror/dists/precise/main'
=== added directory 'tools/fixtures/mirror/dists/precise/main/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/precise/main/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/precise/main/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/precise/main/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/precise/main/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/precise/main/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/precise/main/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/precise/main/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/precise/multiverse'
=== added directory 'tools/fixtures/mirror/dists/precise/multiverse/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/precise/multiverse/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/precise/multiverse/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/precise/multiverse/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/precise/multiverse/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/precise/multiverse/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/precise/multiverse/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/precise/multiverse/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/precise/restricted'
=== added directory 'tools/fixtures/mirror/dists/precise/restricted/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/precise/restricted/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/precise/restricted/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/precise/restricted/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/precise/restricted/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/precise/restricted/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/precise/restricted/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/precise/restricted/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/precise/universe'
=== added directory 'tools/fixtures/mirror/dists/precise/universe/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/precise/universe/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/precise/universe/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/precise/universe/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/precise/universe/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/precise/universe/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/precise/universe/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/precise/universe/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/trusty'
=== added directory 'tools/fixtures/mirror/dists/trusty/main'
=== added directory 'tools/fixtures/mirror/dists/trusty/main/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/trusty/main/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/trusty/main/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/trusty/main/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/trusty/main/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/trusty/main/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/trusty/main/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/trusty/main/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/trusty/multiverse'
=== added directory 'tools/fixtures/mirror/dists/trusty/multiverse/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/trusty/multiverse/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/trusty/multiverse/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/trusty/multiverse/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/trusty/multiverse/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/trusty/multiverse/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/trusty/multiverse/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/trusty/multiverse/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/trusty/restricted'
=== added directory 'tools/fixtures/mirror/dists/trusty/restricted/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/trusty/restricted/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/trusty/restricted/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/trusty/restricted/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/trusty/restricted/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/trusty/restricted/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/trusty/restricted/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/trusty/restricted/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/trusty/universe'
=== added directory 'tools/fixtures/mirror/dists/trusty/universe/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/trusty/universe/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/trusty/universe/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/trusty/universe/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/trusty/universe/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/trusty/universe/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/trusty/universe/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/trusty/universe/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/xenial'
=== added directory 'tools/fixtures/mirror/dists/xenial/main'
=== added directory 'tools/fixtures/mirror/dists/xenial/main/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/xenial/main/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/xenial/main/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/xenial/main/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/xenial/main/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/xenial/main/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/xenial/main/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/xenial/main/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/xenial/multiverse'
=== added directory 'tools/fixtures/mirror/dists/xenial/multiverse/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/xenial/multiverse/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/xenial/multiverse/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/xenial/multiverse/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/xenial/multiverse/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/xenial/multiverse/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/xenial/multiverse/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/xenial/multiverse/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/xenial/restricted'
=== added directory 'tools/fixtures/mirror/dists/xenial/restricted/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/xenial/restricted/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/xenial/restricted/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/xenial/restricted/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/xenial/restricted/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/xenial/restricted/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/xenial/restricted/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/xenial/restricted/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/xenial/universe'
=== added directory 'tools/fixtures/mirror/dists/xenial/universe/binary-amd64'
=== added file 'tools/fixtures/mirror/dists/xenial/universe/binary-amd64/Packages.gz'
Binary files tools/fixtures/mirror/dists/xenial/universe/binary-amd64/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/xenial/universe/binary-amd64/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/dists/xenial/universe/binary-s390x'
=== added file 'tools/fixtures/mirror/dists/xenial/universe/binary-s390x/Packages.gz'
Binary files tools/fixtures/mirror/dists/xenial/universe/binary-s390x/Packages.gz	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/dists/xenial/universe/binary-s390x/Packages.gz	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/pool'
=== added directory 'tools/fixtures/mirror/pool/main'
=== added directory 'tools/fixtures/mirror/pool/main/a'
=== added directory 'tools/fixtures/mirror/pool/main/a/acct'
=== added file 'tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-1ubuntu1_amd64.deb'
Binary files tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-1ubuntu1_amd64.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-1ubuntu1_amd64.deb	2018-06-05 23:57:15 +0000 differ
=== added file 'tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-1ubuntu5_amd64.deb'
Binary files tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-1ubuntu5_amd64.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-1ubuntu5_amd64.deb	2018-06-05 23:57:15 +0000 differ
=== added file 'tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-2.1ubuntu1_amd64.deb'
Binary files tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-2.1ubuntu1_amd64.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-2.1ubuntu1_amd64.deb	2018-06-05 23:57:15 +0000 differ
=== added file 'tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-2.1ubuntu1_s390x.deb'
Binary files tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-2.1ubuntu1_s390x.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/a/acct/acct_6.5.5-2.1ubuntu1_s390x.deb	2018-06-05 23:57:15 +0000 differ
=== added file 'tools/fixtures/mirror/pool/main/a/acct/acct_6.6.4-1_amd64.deb'
Binary files tools/fixtures/mirror/pool/main/a/acct/acct_6.6.4-1_amd64.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/a/acct/acct_6.6.4-1_amd64.deb	2018-06-05 23:57:15 +0000 differ
=== added file 'tools/fixtures/mirror/pool/main/a/acct/acct_6.6.4-1_s390x.deb'
Binary files tools/fixtures/mirror/pool/main/a/acct/acct_6.6.4-1_s390x.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/a/acct/acct_6.6.4-1_s390x.deb	2018-06-05 23:57:15 +0000 differ
=== added directory 'tools/fixtures/mirror/pool/main/s'
=== added directory 'tools/fixtures/mirror/pool/main/s/s390-tools'
=== added file 'tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_1.34.0-0ubuntu8_s390x.deb'
Binary files tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_1.34.0-0ubuntu8_s390x.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_1.34.0-0ubuntu8_s390x.deb	2018-06-05 23:57:15 +0000 differ
=== added file 'tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_1.39.0-0ubuntu4_s390x.deb'
Binary files tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_1.39.0-0ubuntu4_s390x.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_1.39.0-0ubuntu4_s390x.deb	2018-06-05 23:57:15 +0000 differ
=== added file 'tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_2.3.0-0ubuntu3_s390x.deb'
Binary files tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_2.3.0-0ubuntu3_s390x.deb	1970-01-01 00:00:00 +0000 and tools/fixtures/mirror/pool/main/s/s390-tools/s390-tools_2.3.0-0ubuntu3_s390x.deb	2018-06-05 23:57:15 +0000 differ
=== added file 'tools/setup-archive-fixture-in-server.sh'
--- tools/setup-archive-fixture-in-server.sh	1970-01-01 00:00:00 +0000
+++ tools/setup-archive-fixture-in-server.sh	2018-06-05 23:57:15 +0000
@@ -0,0 +1,30 @@
+#!/bin/bash -e
+# 
+# Goal: idempotent script to setup this server with an archive
+# built from the test fixture.  That is, a reduced set of manpages
+# to just test the functionality of the tool.
+# 
+# Notes:
+# 
+# - This script should be run as root
+# - This script should be created/structured so that
+#   it's idempotent
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Defining arch avoids shellcheck lint
+ARCH=""
+
+source "$DIR/../config"
+mkdir -p "$DEBDIR"
+
+# do this to avoid having to rm -rf whatever was in the mirror before I
+# start.  This seems the safest to avoid mistakingly blowing away
+# someones mirror if they run this script accidently.  It would instead
+# just blow away the packages.gz files, which are fast to re-download.
+cd -- "$DIR/fixtures/mirror" && find . -type f -exec sh -c '
+	for x do
+		mkdir -p "$0/${x%/*}"
+		mv "$x" "$0/$x"
+	done
+' "$DEBDIR" {} +

=== modified file 'tools/setup-in-server.sh'
--- tools/setup-in-server.sh	2018-05-23 19:48:06 +0000
+++ tools/setup-in-server.sh	2018-06-05 23:57:15 +0000
@@ -12,15 +12,7 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-apt update
-
-# use apt-mirror to setup a "small" archive mirro for testing the local
-# archive case, as this is how production is run.
-apt install -y apache2 apt-mirror < /dev/null
-
-cp -v "$DIR/../examples/mirror.list" /etc/apt/mirror.list
 cp -v "$DIR/../examples/manpages-site.conf" /etc/apache2/sites-available/
-ln -sf /var/spool/apt-mirror/mirror/archive.ubuntu.com/ubuntu/ ../ubuntu
 
 a2ensite manpages-site
 a2enmod cgi

=== added file 'tools/update-fixtures.sh'
--- tools/update-fixtures.sh	1970-01-01 00:00:00 +0000
+++ tools/update-fixtures.sh	2018-06-05 23:57:15 +0000
@@ -0,0 +1,68 @@
+#!/bin/bash -e
+# 
+#TODO: CLEANUP
+# Goal: idempotent script to setup this server with an archive
+# built from the test fixture.  That is, a reduced set of manpages
+# to just test the functionality of the tool.
+# 
+# Notes:
+# 
+# - This script should be run as root
+# - This script should be created/structured so that
+#   it's idempotent
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+MIRROR="$DIR/fixtures/mirror"
+PORTS="http://ports.ubuntu.com"
+
+# Keeps shellcheck happy
+ARCH=""
+source "$DIR/../config"
+
+# - multi-arch (s390-tools) - TODO: this makes a lot of manpages, maybe
+#   slim down?
+# - something in main (acct)
+PACKAGES="powerpc-ibm-utils acct s390-tools"
+
+# Download packages for all combinations.  Note, some packages are not
+# in all pockets, so don't fail on download errors.
+for distro in $DISTROS; do
+	for repo in $REPOS; do
+		for arch in $ARCH; do
+
+			path="dists/$distro/$repo/binary-$arch"
+			packagesgz="$path/Packages.gz"
+			mkdir -p "$MIRROR/$path"
+			if [ "$arch" == "amd64" ]; then
+				site="$ARCHIVE"
+			else
+				site="$PORTS"
+			fi
+			echo "$site/$packagesgz"
+			curl -s "$site/$packagesgz" -o "$MIRROR/$packagesgz"
+
+			for package in $PACKAGES; do
+				filename=$(gunzip -c "$MIRROR/$packagesgz" \
+					| egrep "(^Filename: |^Package: )" \
+					| sed 'N;s/\n/ /' \
+					| grep "Package: $package " \
+					| awk '{ print $4 }')
+				if [ -n "$filename" ]; then
+					echo " - [$package]: $site/$filename"
+					curl -fs "$site/$filename" \
+						-o "$MIRROR/$path/$filename" \
+						--create-dirs
+				fi
+			done
+			(cd "$MIRROR/$path"; dpkg-scanpackages . | gzip -cn > Packages.gz)
+			(cd -- "$MIRROR/$path" &&
+				find . -type f -name '*.deb' -exec sh -c '
+					for x do
+						mkdir -p "$0/${x%/*}"
+						mv "$x" "$0/$x"
+					done
+					' "$MIRROR" {} +)
+			rm -rf "$MIRROR/$path/pool"
+		done
+	done
+done

=== added file 'tools/update-microsite-container.sh'
--- tools/update-microsite-container.sh	1970-01-01 00:00:00 +0000
+++ tools/update-microsite-container.sh	2018-06-05 23:57:15 +0000
@@ -0,0 +1,35 @@
+#!/bin/bash -e
+# 
+# Goal: create a small microsite in a container from this branch
+# 
+# Notes:
+# 
+# - A new container will be created each time.
+# - This script should be run as root
+# - Your code will be copied into the microsite
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+NAME=${MICROSITE_CONTAINER:-manpages-microsite}
+SITE_PATH=/srv/manpages.ubuntu.com
+
+if ! lxc info "$NAME" 2>/dev/null; then
+	echo "-------------------------------------------"
+	echo "Error: Existing container not found: $NAME"
+	echo "Run 'make microsite-container' first"
+	echo "-------------------------------------------"
+	exit 1
+fi
+
+tar cf - "$DIR/../" | lxc exec "$NAME" -- tar xvf - -C "$SITE_PATH"
+lxc exec "$NAME" -- sh -c "cd $SITE_PATH; make deps manpage-repo"
+
+echo "--------"
+echo "Summary:"
+echo "--------"
+echo ""
+lxc list "$NAME"
+
+IP=$(lxc info "$NAME" |grep eth0: |grep -v inet6 | awk '{ print $3 }')
+echo ""
+echo "Site URL: http://$IP:8080"
+echo " * Try searching for 'ac'"

=== modified file 'www/assets/light/css/styles.css'
--- www/assets/light/css/styles.css	2012-12-28 19:54:23 +0000
+++ www/assets/light/css/styles.css	2018-06-05 23:57:15 +0000
@@ -7,6 +7,9 @@
     margin: 0px;
     padding: 0px;
 }
+pre {
+    font-family: "Ubuntu Mono", "Andale Mono", "DejaVu Sans Mono", monospace;
+}
 #container {
     background: #f7f6f5;
     margin: 0px auto 20px;
@@ -260,6 +263,9 @@
 #subheader ul li a:hover {
     color: #772953;
 }
+#subheader ul li.current {
+    font-weight: bold;
+}
 #subheader ul li a, #subheader ul li span, #subheader ul li input {
     padding: 12px 8px 0;
     display: block;

=== modified file 'www/functions.js'
--- www/functions.js	2018-05-24 20:05:50 +0000
+++ www/functions.js	2018-06-05 23:57:15 +0000
@@ -99,13 +99,13 @@
         versions.push({"name":"artful", "number":"17.10"});
         versions.push({"name":"bionic", "number":"18.04 LTS"});
         for (var i=0; i<versions.length; i++) {
-            if (location.href.match("\.html$")) {
-            href = location.href;
-            href = href.replace(/\/manpages\/[^\/]*/, "/manpages/" + versions[i]["name"]);
-                document.write("<li class=\"active\" id=\"" + highlight(versions[i]["name"]) + "\"><a href=\"" + href + "\">" + versions[i]["number"] + "</a></li>");
-        } else {
-                    document.write("<li id=\"" + highlight(versions[i]["name"]) + "\"><a href=\"/manpages/" + versions[i]["name"] + "\">" + versions[i]["number"] + "</a></li>");
-        }
+		if (location.href.match("\.html$")) {
+			href = location.href;
+			href = href.replace(/\/manpages\/[^\/]*/, "/manpages/" + versions[i]["name"]);
+			document.write("<li class=\"active " + highlight(versions[i]["name"]) + "\"><a href=\"" + href + "\">" + versions[i]["number"] + "</a></li>");
+		} else {
+                    document.write("<li class=\"" + highlight(versions[i]["name"]) + "\"><a href=\"/manpages/" + versions[i]["name"] + "\">" + versions[i]["number"] + "</a></li>");
+		}
         }
         document.write("<li><a href=\"javascript:printManpage()\"><img src=/img/printer.png></a></li>");
         document.write("</ul>");