Index: general/genutils/asciidoc.xml
===================================================================
--- general/genutils/asciidoc.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
+++ general/genutils/asciidoc.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -0,0 +1,141 @@
+<?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 asciidoc-download-http "http://sourceforge.net/projects/asciidoc/files/asciidoc/&asciidoc-version;/asciidoc-&asciidoc-version;.tar.gz">
+  <!ENTITY asciidoc-download-ftp  " ">
+  <!ENTITY asciidoc-md5sum        "c59018f105be8d022714b826b0be130a">
+  <!ENTITY asciidoc-size          "888 KB">
+  <!ENTITY asciidoc-buildsize     "3.9 MB">
+  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
+  <?dbhtml filename="asciidoc.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Asciidoc-&asciidoc-version;</title>
+
+  <indexterm zone="asciidoc">
+    <primary sortas="a-asciidoc">asciidoc</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Asciidoc</title>
+
+    <para>The <application>Asciidoc</application> package is a text document
+    format for writing notes, documentation, articles, books, ebooks,
+    slideshows, web pages, man pages and blogs. AsciiDoc files can be
+    translated to many formats including HTML, PDF, EPUB, and man page.  </para>
+
+    &lfs79_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&asciidoc-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&asciidoc-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &asciidoc-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &asciidoc-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &asciidoc-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &asciidoc-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Asciidoc Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="python2"/> or
+      <xref linkend="python3"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/asciidoc"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Asciidoc</title>
+
+    <para>Install <application>Asciidoc</application> by running
+    the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          a2x (symlink to a2x.py), 
+          a2x.py, 
+          asciidoc (symlink to asciidoc.py), and 
+          asciidoc.py
+        </seg>
+        <seg>None</seg>
+        <seg>/etc/asciidoc</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="a2x">
+        <term><command>a2x</command></term>
+        <listitem>
+          <para>is a toolchain manager for AsciiDoc 
+          (converts Asciidoc text files to other file formats).</para>
+          <indexterm zone="asciidoc a2x">
+            <primary sortas="b-a2x">a2x</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="asciidoc-prog">
+        <term><command>asciidoc</command></term>
+        <listitem>
+          <para>converts an AsciiDoc text file to HTML or DocBook</para>
+          <indexterm zone="asciidoc asciidoc-prog">
+            <primary sortas="b-asciidoc-prog">asciidoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ general/genutils/genutils.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -21,6 +21,5 @@
   PIN numbers and pass-phrases, and a hash generator.</para>
 
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appdata-tools.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream-glib.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chrpath.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
@@ -29,6 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hicolor-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icon-naming-utils.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ general/graphlib/gegl.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -82,4 +82,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="asciidoc"/>,
       <xref linkend="cairo"/>,
       <xref linkend="enscript"/>,
@@ -99,5 +100,4 @@
       <xref linkend="vala"/>,
       <xref linkend="w3m"/>,
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>,
       <ulink url="http://lensfun.berlios.de/">lensfun</ulink>,
       <ulink url="http://libopenraw.freedesktop.org/wiki/">libopenraw</ulink>,
Index: general/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ general/graphlib/graphite2.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -100,5 +100,5 @@
 
     <para>To build the documentation:
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>,
+      <xref linkend="asciidoc"/>,
       <xref linkend="doxygen"/>,
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ general/prog/git.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -91,6 +91,7 @@
           <ulink url="&git-root;/git-manpages-&git-version;.tar.xz">
           &git-root;/git-manpages-&git-version;.tar.xz</ulink>
-          (if you prefer the original, not needed if you've installed asciidoc
-          and xmlto and prefer to build them).
+          (if you prefer the original, not needed if you've installed 
+          <xref linkend="asciidoc"/> and  <xref linkend="xmlto"/>
+          prefer to build them).
         </para>
       </listitem>
@@ -100,5 +101,5 @@
           &git-root;/git-htmldocs-&git-version;.tar.xz</ulink>
           and other docs (if you prefer the original, not needed if you've
-          installed asciidoc and prefer to build them).
+          installed <xref linkend="asciidoc"/> and prefer to build them).
         </para>
       </listitem>
@@ -128,5 +129,5 @@
     <para>
       <xref linkend="xmlto"/> and
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> or
+      <xref linkend="asciidoc"/> or
       <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>, and also
       <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>
@@ -159,6 +160,5 @@
 
     <para>
-      If you have installed <ulink
-      url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> you can
+      If you have installed <xref linkend="asciidoc"/> you can
       create the html version of the man pages and other docs:
     </para>
@@ -167,6 +167,5 @@
 
     <para>
-      If you have installed <ulink
-      url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> and
+      If you have installed <xref linkend="asciidoc"/>  and
       <xref linkend="xmlto"/> you can create the man pages:
     </para>
Index: general/sysutils/p7zip.xml
===================================================================
--- general/sysutils/p7zip.xml	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ general/sysutils/p7zip.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -7,5 +7,5 @@
   <!ENTITY p7zip-download-http "&sourceforge-repo;/projects/p7zip/files/p7zip/&p7zip-version;/p7zip_&p7zip-version;_src_all.tar.bz2">
   <!ENTITY p7zip-download-ftp  " ">
-  <!ENTITY p7zip-md5sum        "92cca093312b5a71a7be7dc7d1d32509">
+  <!ENTITY p7zip-md5sum        "7d80fff55855a72f024d0af0064b1707">
   <!ENTITY p7zip-size          "4,0 MB">
   <!ENTITY p7zip-buildsize     "33 MB">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ introduction/welcome/changelog.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -49,4 +49,7 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Added Asciidoc. </para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to feh-2.15.1. Fixes
           <ulink url="&blfs-ticket-root;7734">#7734</ulink>.</para>
Index: multimedia/libdriv/audiofile.xml
===================================================================
--- multimedia/libdriv/audiofile.xml	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ multimedia/libdriv/audiofile.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -86,5 +86,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> and
+      <xref linkend="asciidoc"/> and 
       <xref linkend="valgrind"/>
     </para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ packages.ent	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -192,4 +192,5 @@
 
 <!-- Chapter 11 -->
+<!ENTITY asciidoc-version             "8.6.9">
 <!ENTITY chrpath-version              "0.16">
 <!ENTITY compface-version             "1.5.2">
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision 2f184c9f9e59a65694584ef79a32a69841f305cd)
+++ x/installing/x7proto.xml	(revision 9faa23b6238485985fbe73ae5f6b90b3ac49eca5)
@@ -147,6 +147,5 @@
       <xref linkend="libxslt"/>,
       <xref linkend="xmlto"/> and
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> (to build
-    additional documentation)
+      <xref linkend="asciidoc"/> (to build additional documentation)
     </para>
 
