Index: general/genutils/asciidoctor.xml
===================================================================
--- general/genutils/asciidoctor.xml	(revision b1c3841af512ede5388ec7fc5de318f688dbb120)
+++ general/genutils/asciidoctor.xml	(revision b1c3841af512ede5388ec7fc5de318f688dbb120)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY asciidoctor-download-http "https://github.com/asciidoctor/asciidoctor/releases/download/&asciidoctor-version;/asciidoctor-&asciidoctor-version;.tar.gz">
+  <!ENTITY asciidoctor-download-ftp  " ">
+  <!ENTITY asciidoctor-md5sum        "e3ebbf64cf4014bae0e467befce92db2">
+  <!ENTITY asciidoctor-size          "1.6 MB">
+  <!ENTITY asciidoctor-buildsize     "5.1 MB">
+  <!ENTITY asciidoctor-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="asciidoctor" xreflabel="asciidoctor-&asciidoctor-version;">
+  <?dbhtml filename="asciidoctor.html"?>
+
+  <sect1info>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Asciidoctor-&asciidoctor-version;</title>
+
+  <indexterm zone="asciidoctor">
+    <primary sortas="a-asciidoctor">asciidoctor</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Asciidoctor</title>
+
+    <para>
+      Asciidoctor is a fast, open source text processor and publishing
+      toolchain for converting AsciiDoc content to HTML5, DocBook, PDF, and
+      other formats.
+    </para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&asciidoctor-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&asciidoctor-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &asciidoctor-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &asciidoctor-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &asciidoctor-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &asciidoctor-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Asciidoctor Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="ruby"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/asciidoctor"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Asciidoctor</title>
+
+    <para>
+      Build the Ruby gem:
+    </para>
+
+<screen><userinput>gem build asciidoctor.gemspec</userinput></screen>
+
+    <para>
+      The test suite needs many Ruby gems beyond the scope of BLFS.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>gem install asciidoctor-&asciidoctor-version;.gem &amp;&amp;
+install -vm644 man/asciidoctor.1 /usr/share/man/man1</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          asciidoctor
+        </seg>
+        <seg>None</seg>
+        <seg>
+          &ruby-gemdir;/gems/asciidoctor-&asciidoctor-version; and
+          &ruby-gemdir;/doc/asciidoctor-&asciidoctor-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="asciidoctor-prog">
+        <term><command>asciidoctor</command></term>
+        <listitem>
+          <para>
+            converts AsciiDoc source files to HTML, DocBook, and other formats
+          </para>
+          <indexterm zone="asciidoctor asciidoctor-prog">
+            <primary sortas="b-asciidoctor-prog">asciidoctor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 20e9b21b63f719189e096c5b3025e034410c21e4)
+++ general/genutils/genutils.xml	(revision b1c3841af512ede5388ec7fc5de318f688dbb120)
@@ -20,4 +20,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoctor.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bogofilter.xml"/>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 20e9b21b63f719189e096c5b3025e034410c21e4)
+++ general/prog/git.xml	(revision b1c3841af512ede5388ec7fc5de318f688dbb120)
@@ -136,6 +136,7 @@
     <para role="optional">
       <xref linkend="xmlto"/> and
-      <xref linkend="asciidoc"/> or
-      <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>, and also
+      <xref linkend="asciidoc"/>
+      <!-- or xref linkend="asciidoctor", doesn't work now because it needs docbook-xsl-ns -->,
+      and also
       <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>
       (for the PDF version of the user manual), and
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 20e9b21b63f719189e096c5b3025e034410c21e4)
+++ introduction/welcome/changelog.xml	(revision b1c3841af512ede5388ec7fc5de318f688dbb120)
@@ -43,4 +43,14 @@
     -->
     <listitem>
+      <para>June 1st, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Add asciidoctor, to build man page for
+          util-linux (in LFS).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 31st, 2021</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 20e9b21b63f719189e096c5b3025e034410c21e4)
+++ packages.ent	(revision b1c3841af512ede5388ec7fc5de318f688dbb120)
@@ -247,4 +247,5 @@
 <!-- Chapter 11 -->
 <!ENTITY asciidoc-version             "9.1.0">
+<!ENTITY asciidoctor-version          "2.0.15">
 <!ENTITY bogofilter-version           "1.2.5">
 <!ENTITY chrpath-version              "0.16">
@@ -374,4 +375,5 @@
 <!ENTITY ruby-patch-version           "1">
 <!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
+<!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
 <!ENTITY rust-version                 "1.52.0">
 <!ENTITY scons-version                "4.1.0">
