diff --git a/Doc/Tdoc/Ref/Screen/docmenta.png b/Doc/Tdoc/Ref/Screen/docmenta.png
new file mode 100644
index 0000000000000000000000000000000000000000..16c8b2cd6be900a4904cbdcc031daf899b9cabd2
Binary files /dev/null and b/Doc/Tdoc/Ref/Screen/docmenta.png differ
diff --git a/Doc/Tdoc/general.xml b/Doc/Tdoc/general.xml
index e6ecc7deb3e9b852657b2c435c238c6dde3fd224..32f8fd53e57160fde5509febe92b2b57f9766a82 100644
--- a/Doc/Tdoc/general.xml
+++ b/Doc/Tdoc/general.xml
@@ -153,6 +153,73 @@
     </informaltable>
   </section>
 
+  <section xml:id="sectTdocBlocksInternref">
+    <title>Internal References</title>
+
+    <informaltable border="1">
+      <colgroup width="5%"/>
+
+      <colgroup width="40%"/>
+
+      <colgroup width="10%"/>
+
+      <colgroup width="5%"/>
+
+      <colgroup width="40%"/>
+
+      <tr>
+        <th>HTML</th>
+
+        <td><programlisting language="none"><code>    &lt;p id="fun"&gt;Have fun!&lt;/p&gt;
+    ...
+    &lt;p&gt;Find a &lt;a href="fun"&gt;distraction&lt;/a&gt;.&lt;/p&gt;
+</code></programlisting></td>
+
+        <td/>
+
+        <th>Docbook</th>
+
+        <td><programlisting language="none"><code>&lt;informaltable&gt;
+  &lt;tr&gt;
+    &lt;td&gt;a1&lt;/td&gt;
+    &lt;td&gt;a2&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+    &lt;td&gt;b1&lt;/td&gt;
+    &lt;td&gt;b2&lt;/td&gt;
+  &lt;/tr&gt;
+&lt;/informaltable&gt;</code></programlisting></td>
+      </tr>
+
+      <tr>
+        <th>LaTeX</th>
+
+        <td><programlisting language="none"><code>\begin{tabular}{ll}
+   a1 &amp; a2 \\
+   b1 &amp; b2 \\
+\end{tabular}</code></programlisting></td>
+
+        <td/>
+
+        <th>Rendering</th>
+
+        <td><informaltable border="1">
+            <tr>
+              <td valign="top">a1</td>
+
+              <td>a1</td>
+            </tr>
+
+            <tr>
+              <td>b1</td>
+
+              <td>b2</td>
+            </tr>
+          </informaltable></td>
+      </tr>
+    </informaltable>
+  </section>
+
   <section xml:id="sectTdocMath">
     <title>Mathematical formulas</title>
 
@@ -245,48 +312,6 @@
     </informaltable>
   </section>
 
-  <section xml:id="sectTdocModularDocs">
-    <title>Modular document sources</title>
-
-    <informaltable border="1">
-      <colgroup width="10%"/>
-
-      <colgroup width="90%"/>
-
-      <tr>
-        <th>HTML</th>
-
-        <td><programlisting language="none"><code>  &lt;body&gt;
-   ...
-    &lt;object name="foo" type="text/html" data="table.html"/&gt;
-   ...
-  &lt;/body&gt;</code></programlisting></td>
-      </tr>
-
-      <tr>
-        <th>Docbook</th>
-
-        <td><programlisting language="none"><code>  &lt;part xml:id="sd1"&gt;
-    &lt;title&gt;Software development 1&lt;/title&gt;
-    &lt;xi:include href="Sd1/gettingStarted.xml" xpointer="element(/1)"/&gt;
-    &lt;xi:include href="Sd1/languageFundamentals.xml" xpointer="element(/1)"/&gt;
-...</code></programlisting></td>
-      </tr>
-
-      <tr>
-        <th>LaTeX</th>
-
-        <td><programlisting language="none"><code>\documentclass{article}
-\input{mydefs.tex}
-\begin{document}
-...
-\include{math.tex}
-...
-\end{document}</code></programlisting></td>
-      </tr>
-    </informaltable>
-  </section>
-
   <section xml:id="sectTdocSectioning">
     <title>Document sectioning</title>
 
@@ -351,4 +376,46 @@
     <para>Additional support for Html5 and
     <productname>Docbook</productname>.</para>
   </section>
+
+  <section xml:id="sectTdocModularDocs">
+    <title>Modular document components</title>
+
+    <informaltable border="1">
+      <colgroup width="10%"/>
+
+      <colgroup width="90%"/>
+
+      <tr>
+        <th>HTML</th>
+
+        <td><programlisting language="none"><code>  &lt;body&gt;
+   ...
+    &lt;object name="foo" type="text/html" data="table.html"/&gt;
+   ...
+  &lt;/body&gt;</code></programlisting></td>
+      </tr>
+
+      <tr>
+        <th>Docbook</th>
+
+        <td><programlisting language="none"><code>  &lt;part xml:id="sd1"&gt;
+    &lt;title&gt;Software development 1&lt;/title&gt;
+    &lt;xi:include href="Sd1/gettingStarted.xml" xpointer="element(/1)"/&gt;
+    &lt;xi:include href="Sd1/languageFundamentals.xml" xpointer="element(/1)"/&gt;
+...</code></programlisting></td>
+      </tr>
+
+      <tr>
+        <th>LaTeX</th>
+
+        <td><programlisting language="none"><code>\documentclass{article}
+\input{mydefs.tex}
+\begin{document}
+...
+\include{math.tex}
+...
+\end{document}</code></programlisting></td>
+      </tr>
+    </informaltable>
+  </section>
 </chapter>
diff --git a/Doc/Tdoc/software.xml b/Doc/Tdoc/software.xml
new file mode 100644
index 0000000000000000000000000000000000000000..30b802e0e722a2da3cff6793013f02ee1b780270
--- /dev/null
+++ b/Doc/Tdoc/software.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="tdocSoftware"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xila="http://www.w3.org/2001/XInclude/local-attributes"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:trans="http://docbook.org/ns/transclusion"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Software</title>
+
+  <annotation role="slide">
+    <para>This section and its children will appear as slides as well.</para>
+  </annotation>
+
+  <section xml:id="chapTdocSoftwareDocmenta">
+    <title>Docmenta</title>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="Ref/Screen/docmenta.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xml:id="chapTdocSoftwareDocmentaDetail">
+    <title>Docmenta details</title>
+
+    <informaltable border="1">
+      <colgroup width="16%"/>
+
+      <colgroup width="84%"/>
+
+      <tr>
+        <th align="right">User Interface</th>
+
+        <td>Browser</td>
+      </tr>
+
+      <tr>
+        <th align="right">Output formats</th>
+
+        <td>Webhelp, <xref linkend="glo_HTML"/>, <xref linkend="glo_PDF"/>,
+        <xref linkend="glo_EPUB"/>, Docbook</td>
+      </tr>
+
+      <tr>
+        <th align="right">Pros</th>
+
+        <td>Easy installation + tutorial, translation + versioning support,
+        collaborative editing</td>
+      </tr>
+
+      <tr>
+        <th align="right">Cons</th>
+
+        <td>No link consistency checks</td>
+      </tr>
+    </informaltable>
+  </section>
+</chapter>
diff --git a/Doc/lectures.xml b/Doc/lectures.xml
index 0ce60f6ff182f8fc12c8282dd379fd858f16d69e..a019e639935866d49695a24e79e6b223b079b168 100644
--- a/Doc/lectures.xml
+++ b/Doc/lectures.xml
@@ -3,6 +3,7 @@
       xmlns:xlink="http://www.w3.org/1999/xlink"
       xmlns:xila="http://www.w3.org/2001/XInclude/local-attributes"
       xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:trans="http://docbook.org/ns/transclusion"
       xmlns:svg="http://www.w3.org/2000/svg"
       xmlns:m="http://www.w3.org/1998/Math/MathML"
       xmlns:html="http://www.w3.org/1999/xhtml"
@@ -207,13 +208,13 @@
   </part>
 
   <part xml:id="tdoc">
-    <title>Technical documentation</title>
+    <title>Technical Documentation</title>
 
     <xi:include href="Tdoc/general.xml" xpointer="element(/1)"/>
 
+    <xi:include href="Tdoc/software.xml" xpointer="element(/1)"/>
   </part>
 
-
   <part xml:id="sda2">
     <title>Structured Data and Applications 2</title>