Date: Sun, 21 Jul 2013 18:24:30 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42353 - head/en_US.ISO8859-1/books/fdp-primer/docbook-markup Message-ID: <201307211824.r6LIOUvl021355@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Sun Jul 21 18:24:29 2013 New Revision: 42353 URL: http://svnweb.freebsd.org/changeset/doc/42353 Log: Combine multiple entity tables into one table. Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Jul 21 17:13:29 2013 (r42352) +++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Jul 21 18:24:29 2013 (r42353) @@ -126,66 +126,62 @@ <sect2 id="docbook-markup-freebsd-extensions-entities"> <title>&os; Entities</title> - <para>These tables show some of the most useful entities + <para>This table shows some of the most useful entities available in the <acronym>FDP</acronym>. For a complete list, see the <filename>*.ent</filename> files in <filename class="directory">doc/share/xml</filename>.</para> - <table frame="none" pgwide="0"> - <title>&os; Name Entities</title> - - <tgroup cols="2"> - <thead> - <row> - <entry>Name</entry> - <entry>Expands To</entry> + <informaltable frame="none" pgwide="1"> + <tgroup cols="3"> + <colspec colname="entity"/> + <colspec colname="expandsto"/> + <colspec colname="notes"/> + + <tbody valign="top"> + <row> + <entry namest="entity" nameend="notes">&os; Name Entities</entry> + <entry></entry> + <entry></entry> </row> - </thead> - <tbody> <row> <entry><literal>&os;</literal></entry> <entry><literal>&os;</literal></entry> + <entry></entry> </row> <row> <entry><literal>&os.stable;</literal></entry> <entry><literal>&os.stable;</literal></entry> + <entry></entry> </row> <row> <entry><literal>&os.current;</literal></entry> <entry><literal>&os.current;</literal></entry> + <entry></entry> </row> - </tbody> - </tgroup> - </table> - <table frame="none" pgwide="0"> - <title>Manual Page Entities</title> + <row> + <entry></entry> + </row> - <tgroup cols="3"> - <thead> <row> - <entry>Name</entry> - <entry>Expands To</entry> - <entry>Notes</entry> + <entry namest="entity" nameend="notes">Manual Page Entities</entry> + <entry></entry> + <entry></entry> </row> - </thead> - <tbody> <row> <entry><literal>&man.ls.1;</literal></entry> <entry>&man.ls.1;</entry> - <entry> - <programlisting>Usage: &man.ls.1; is the manual page for <sgmltag class="starttag">command</sgmltag>ls<sgmltag class="endtag">command</sgmltag>.</programlisting></entry> + <entry>Usage: <literal>&man.ls.1; is the manual page for <sgmltag class="starttag">command</sgmltag>ls<sgmltag class="endtag">command</sgmltag>.</literal></entry> </row> <row> <entry><literal>&man.cp.1;</literal></entry> <entry>&man.cp.1;</entry> - <entry> - <programlisting>Usage: The manual page for <sgmltag class="starttag">command</sgmltag>cp<sgmltag class="endtag">command</sgmltag> is &man.cp.1;.</programlisting></entry> + <entry>Usage: <literal>The manual page for <sgmltag class="starttag">command</sgmltag>cp<sgmltag class="endtag">command</sgmltag> is &man.cp.1;.</literal></entry> </row> <row> @@ -198,35 +194,27 @@ url="&url.base;/cgi/man.cgi">&os; manual pages</ulink>.</entry> </row> - </tbody> - </tgroup> - </table> - <table frame="none" pgwide="0"> - <title>&os; Mailing List Entities</title> + <row> + <entry></entry> + </row> - <tgroup cols="3"> - <thead> <row> - <entry>Name</entry> - <entry>Expands To</entry> - <entry>Notes</entry> + <entry namest="entity" nameend="notes">&os; Mailing List Entities</entry> + <entry></entry> + <entry></entry> </row> - </thead> - <tbody> <row> <entry><literal>&a.doc;</literal></entry> <entry><literal>&a.doc;</literal></entry> - <entry> - <programlisting>Usage: A link to the &a.doc;.</programlisting></entry> + <entry>Usage: <literal>A link to the &a.doc;.</literal></entry> </row> <row> <entry><literal>&a.questions;</literal></entry> <entry><literal>&a.questions;</literal></entry> - <entry> - <programlisting>Usage: A link to the &a.questions;.</programlisting></entry> + <entry>Usage: <literal>A link to the &a.questions;.</literal></entry> </row> <row> @@ -237,29 +225,25 @@ url="&url.books.handbook;/eresources.html#eresources-mail">&os; mailing lists</ulink>.</entry> </row> - </tbody> - </tgroup> - </table> - <table frame="none" pgwide="0"> - <title>&os; Document Links</title> + <row> + <entry></entry> + </row> - <tgroup cols="3"> - <thead> <row> - <entry>Name</entry> - <entry>Expands To</entry> - <entry>Notes</entry> + <entry namest="entity" nameend="notes">&os; Document Link Entities</entry> + <entry></entry> + <entry></entry> </row> - </thead> - <tbody> <row> <entry><literal>&url.books.handbook;</literal></entry> <entry><literal>&url.books.handbook;</literal></entry> - <entry> - <programlisting>Usage: A link to the <sgmltag class="starttag">ulink url="&url.books.handbook;/advanced-networking.html"</sgmltag>Advanced - Networking<sgmltag class="endtag">ulink</sgmltag> chapter of the Handbook.</programlisting></entry> + <entry>Usage: <literal>A link to the <sgmltag + class="starttag">ulink + url="&url.books.handbook;/advanced-networking.html"</sgmltag>Advanced + Networking<sgmltag class="endtag">ulink</sgmltag> + chapter of the Handbook.</literal></entry> </row> <row> @@ -274,8 +258,11 @@ <row> <entry><literal>&url.articles.committers-guide;</literal></entry> <entry><literal>&url.articles.committers-guide;</literal></entry> - <entry> - <programlisting>Usage: A link to the <sgmltag class="starttag">ulink url="&url.articles.committers-guide;"</sgmltag>Committer's Guide<sgmltag class="endtag">ulink</sgmltag> article.</programlisting></entry> + <entry>Usage: <literal>A link to the <sgmltag + class="starttag">ulink + url="&url.articles.committers-guide;"</sgmltag>Committer's + Guide<sgmltag class="endtag">ulink</sgmltag> + article.</literal></entry> </row> <row> @@ -286,23 +273,17 @@ url="&url.doc.langbase;/articles/">&os; articles</ulink>.</entry> </row> - </tbody> - </tgroup> - </table> - <table frame="none" pgwide="0"> - <title>Other Operating System Name Entities</title> + <row> + <entry></entry> + </row> - <tgroup cols="3"> - <thead> <row> - <entry>Name</entry> - <entry>Expands To</entry> - <entry>Notes</entry> + <entry namest="entity" nameend="notes">Other Operating System Name Entities</entry> + <entry></entry> + <entry></entry> </row> - </thead> - <tbody> <row> <entry><literal>&linux;</literal></entry> <entry>&linux;</entry> @@ -320,23 +301,17 @@ <entry>&windows;</entry> <entry>The &windows; operating system.</entry> </row> - </tbody> - </tgroup> - </table> - <table frame="none" pgwide="0"> - <title>Miscellaneous Entities</title> + <row> + <entry></entry> + </row> - <tgroup cols="3"> - <thead> <row> - <entry>Name</entry> - <entry>Expands To</entry> - <entry>Notes</entry> + <entry namest="entity" nameend="notes">Miscellaneous Entities</entry> + <entry></entry> + <entry></entry> </row> - </thead> - <tbody> <row> <entry><literal>&prompt.root;</literal></entry> <entry><literal>&prompt.root;</literal></entry> @@ -353,19 +328,19 @@ <row> <entry><literal>&postscript;</literal></entry> <entry>&postscript;</entry> - <entry>The trademarked term to refer to the + <entry>The &postscript; programming language.</entry> </row> <row> <entry><literal>&xorg;</literal></entry> <entry>&xorg;</entry> - <entry>The term to refer to the &xorg; open source X + <entry>The &xorg; open source X Window System.</entry> </row> </tbody> </tgroup> - </table> + </informaltable> </sect2> </sect1>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307211824.r6LIOUvl021355>