Use Asciidoctor instead of Asciidoc to render documentation

Asciidoctor seems to:

- Provide a nice left-hand side table of contents.
- Have nicer looking defaults.
- Be faster.
- Have less (but non-zero) quirks.

6 files changed, 4 insertions, 10 deletions

diff --git a/dockerfiles/centos-7/Dockerfile b/dockerfiles/centos-7/Dockerfile
index 9ff79880..d5c4e489 100644
--- a/dockerfiles/centos-7/Dockerfile
+++ b/dockerfiles/centos-7/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:7
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
  && yum install -y centos-release-scl \
  && yum install -y \
-        asciidoc \
+        asciidoctor \
         autoconf \
         bash \
         ccache \
@@ -16,8 +16,6 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
         libzstd-devel \
         make \
         python3 \
-# Remove superfluous dependencies brought in by asciidoc:
- && rpm -e --nodeps graphviz \
  && yum autoremove -y \
  && yum clean all \
  && cp /usr/bin/cmake3 /usr/bin/cmake \
diff --git a/dockerfiles/centos-8/Dockerfile b/dockerfiles/centos-8/Dockerfile
index 9ee7c68a..e61c576c 100644
--- a/dockerfiles/centos-8/Dockerfile
+++ b/dockerfiles/centos-8/Dockerfile
@@ -4,7 +4,7 @@ FROM centos:8
 RUN dnf install -y epel-release \
  && dnf update -y \
  && dnf install -y \
-        asciidoc \
+        asciidoctor \
         autoconf \
         bash \
         ccache \
diff --git a/dockerfiles/debian-10/Dockerfile b/dockerfiles/debian-10/Dockerfile
index 8f92ea9a..54bd4439 100644
--- a/dockerfiles/debian-10/Dockerfile
+++ b/dockerfiles/debian-10/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-get update \
         python3 \
         redis-server \
         redis-tools \
-        xsltproc \
  && rm -rf /var/lib/apt/lists/*
 
 # Redirect all compilers to ccache.
diff --git a/dockerfiles/debian-11/Dockerfile b/dockerfiles/debian-11/Dockerfile
index 322ab92c..7c73dd2d 100644
--- a/dockerfiles/debian-11/Dockerfile
+++ b/dockerfiles/debian-11/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-get update \
         python3 \
         redis-server \
         redis-tools \
-        xsltproc \
  && rm -rf /var/lib/apt/lists/*
 
 # Redirect all compilers to ccache.
diff --git a/dockerfiles/ubuntu-18.04/Dockerfile b/dockerfiles/ubuntu-18.04/Dockerfile
index 9d2a8187..409f6dc3 100644
--- a/dockerfiles/ubuntu-18.04/Dockerfile
+++ b/dockerfiles/ubuntu-18.04/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
-        asciidoc \
+        asciidoctor \
         bash \
         build-essential \
         ccache \
@@ -17,7 +17,6 @@ RUN apt-get update \
         python3 \
         redis-server \
         redis-tools \
-        xsltproc \
  && rm -rf /var/lib/apt/lists/*
 
 # Redirect all compilers to ccache.
diff --git a/dockerfiles/ubuntu-20.04/Dockerfile b/dockerfiles/ubuntu-20.04/Dockerfile
index 78ef79c2..46f4135e 100644
--- a/dockerfiles/ubuntu-20.04/Dockerfile
+++ b/dockerfiles/ubuntu-20.04/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:20.04
 # Non-interactive: do not set up timezone settings.
 RUN apt-get update \
  && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
-        asciidoc \
+        asciidoctor \
         bash \
         build-essential \
         ccache \
@@ -18,7 +18,6 @@ RUN apt-get update \
         python3 \
         redis-server \
         redis-tools \
-        xsltproc \
  && rm -rf /var/lib/apt/lists/*
 
 # Redirect all compilers to ccache.