diff --git a/Doc/Tdoc/Ref/Screen/calloutGraphicsEnabled.png b/Doc/Tdoc/Ref/Screen/calloutGraphicsEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a0545e8394b1f05146692812445ed7ff18ed218
Binary files /dev/null and b/Doc/Tdoc/Ref/Screen/calloutGraphicsEnabled.png differ
diff --git a/Doc/Tdoc/software.xml b/Doc/Tdoc/software.xml
index d9976f7c2ef15f8022aa8e373adb9cf6b49c04ba..674fb5e2263de78898be24b1baac0ebbc682cb38 100644
--- a/Doc/Tdoc/software.xml
+++ b/Doc/Tdoc/software.xml
@@ -232,56 +232,58 @@ also show up.
       <section xml:id="tdocSectDocbookComponents">
         <title>Components</title>
 
-        <itemizedlist>
-          <listitem>
-            <para>Schema</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Docbook 4.x: DTD</para>
-              </listitem>
-
-              <listitem>
-                <para>Docbook 5.x: RelaxNG</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-
-          <listitem>
-            <para>XSL style sheets</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>HTML</para>
-
-                <itemizedlist>
-                  <listitem>
-                    <para>(X)Html 5</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>Webhelp</para>
-                  </listitem>
-
-                  <listitem>
-                    <para><link
-                    xlink:href="http://help.eclipse.org/neon/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Fguide%2Fua_help_content.htm&amp;cp=2_0_19_1_1">Eclipse
-                    help</link></para>
-                  </listitem>
-
-                  <listitem>
-                    <para><link
-                    xlink:href="http://idpf.org/epub/30">Epub</link></para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-
-              <listitem>
-                <para>PDF using Formatting objects</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
+        <informaltable border="1">
+          <tr valign="top">
+            <td valign="top"><formalpara>
+                <title>Schema</title>
+
+                <para><itemizedlist>
+                    <listitem>
+                      <para>Docbook 4.x: DTD</para>
+                    </listitem>
+
+                    <listitem>
+                      <para>Docbook 5.x: RelaxNG</para>
+                    </listitem>
+                  </itemizedlist></para>
+              </formalpara></td>
+
+            <td valign="top"><formalpara>
+                <title>XSL style sheets</title>
+
+                <para><itemizedlist>
+                    <listitem>
+                      <para>HTML</para>
+
+                      <itemizedlist>
+                        <listitem>
+                          <para>(X)Html 5</para>
+                        </listitem>
+
+                        <listitem>
+                          <para>Webhelp</para>
+                        </listitem>
+
+                        <listitem>
+                          <para><link
+                          xlink:href="http://help.eclipse.org/neon/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Fguide%2Fua_help_content.htm&amp;cp=2_0_19_1_1">Eclipse
+                          help</link></para>
+                        </listitem>
+
+                        <listitem>
+                          <para><link
+                          xlink:href="http://idpf.org/epub/30">Epub</link></para>
+                        </listitem>
+                      </itemizedlist>
+                    </listitem>
+
+                    <listitem>
+                      <para>PDF using Formatting objects</para>
+                    </listitem>
+                  </itemizedlist></para>
+              </formalpara></td>
+          </tr>
+        </informaltable>
       </section>
 
       <section xml:id="tdocSectDocbookTargets">
@@ -305,7 +307,7 @@ also show up.
       </section>
 
       <section xml:id="tdocSectParamXsl">
-        <title>Config file <filename>param.xsl</filename>.</title>
+        <title><filename>param.xsl</filename>.</title>
 
         <itemizedlist>
           <listitem>
@@ -339,7 +341,136 @@ also show up.
               </listitem>
             </itemizedlist>
           </listitem>
+
+          <listitem>
+            <para>Tool support (Xmlmind,...)</para>
+          </listitem>
         </itemizedlist>
+
+        <section xml:id="tdocSectUseIdAsFilenameZero">
+          <title>Link stability</title>
+
+          <informaltable border="1">
+            <colgroup width="64%"/>
+
+            <colgroup width="36%"/>
+
+            <tr>
+              <td><programlisting language="xml">&lt;book ...&gt;
+  &lt;title&gt;XML for Newbies&lt;/title&gt;
+  &lt;chapter xml:id="<emphasis role="bold">intro</emphasis>"&gt;
+    &lt;title&gt;Introduction&lt;/title&gt;
+    &lt;para&gt;...&lt;/para&gt;
+  &lt;/chapter xml:id="<emphasis role="bold">general</emphasis>"&gt;
+  &lt;chapter&gt;
+    &lt;title&gt;General remarks&lt;/title&gt;
+    &lt;para&gt;...&lt;/para&gt;
+  &lt;/chapter&gt;
+&lt;/book&gt;</programlisting></td>
+
+              <td><formalpara>
+                  <title>Navigation structure</title>
+
+                  <para><itemizedlist>
+                      <listitem>
+                        <para>Index.html</para>
+                      </listitem>
+
+                      <listitem>
+                        <para>Per chapter:</para>
+
+                        <itemizedlist>
+                          <listitem>
+                            <para><emphasis
+                            role="bold">ch01</emphasis>.html</para>
+                          </listitem>
+
+                          <listitem>
+                            <para><emphasis
+                            role="bold">ch02</emphasis>.html</para>
+                          </listitem>
+                        </itemizedlist>
+                      </listitem>
+                    </itemizedlist></para>
+                </formalpara></td>
+            </tr>
+          </informaltable>
+
+          <para>Provides link stability</para>
+        </section>
+
+        <section xml:id="tdocSectUseIdAsFilename">
+          <title><parameter>use.id.as.filename</parameter></title>
+
+          <informaltable border="1">
+            <colgroup width="64%"/>
+
+            <colgroup width="36%"/>
+
+            <tr>
+              <td><programlisting language="xml">&lt;book ...&gt;
+  &lt;title&gt;XML for Newbies&lt;/title&gt;
+  &lt;chapter xml:id="<emphasis role="bold">intro</emphasis>"&gt;
+    &lt;title&gt;Introduction&lt;/title&gt;
+    &lt;para&gt;...&lt;/para&gt;
+  &lt;/chapter&gt;
+  &lt;chapter xml:id="<emphasis role="bold">general</emphasis>"&gt;
+    &lt;title&gt;General remarks&lt;/title&gt;
+    &lt;para&gt;...&lt;/para&gt;
+  &lt;/chapter&gt;
+&lt;/book&gt;</programlisting></td>
+
+              <td><formalpara>
+                  <title>Navigation structure</title>
+
+                  <para><itemizedlist>
+                      <listitem>
+                        <para>Index.html</para>
+                      </listitem>
+
+                      <listitem>
+                        <para>Per chapter:</para>
+
+                        <itemizedlist>
+                          <listitem>
+                            <para><emphasis
+                            role="bold">intro</emphasis>.html</para>
+                          </listitem>
+
+                          <listitem>
+                            <para><emphasis
+                            role="bold">general</emphasis>.html</para>
+                          </listitem>
+                        </itemizedlist>
+                      </listitem>
+                    </itemizedlist></para>
+                </formalpara></td>
+            </tr>
+          </informaltable>
+
+          <para>Provides link stability</para>
+        </section>
+
+        <section xml:id="tdocSectDocbookCalloutUnicode">
+          <title><parameter>callout.unicode</parameter> /
+          <parameter>callout.graphics</parameter></title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="Ref/Screen/calloutGraphicsEnabled.png"/>
+            </imageobject>
+          </mediaobject>
+
+          <para>See <link
+          xlink:href="/webhelp/sda1SectFunctionalBasics.html">Functional
+          Basiscs</link></para>
+        </section>
+      </section>
+
+      <section xml:id="tdocSectDocbookSchematron">
+        <title>Schematron</title>
+
+        <para/>
       </section>
     </section>
   </section>