From owner-svn-doc-all@FreeBSD.ORG Sun Jul 21 18:24:30 2013 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 610E2C65; Sun, 21 Jul 2013 18:24:30 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 43759C6A; Sun, 21 Jul 2013 18:24:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6LIOUWN021356; Sun, 21 Jul 2013 18:24:30 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6LIOUvl021355; Sun, 21 Jul 2013 18:24:30 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201307211824.r6LIOUvl021355@svn.freebsd.org> From: Warren Block Date: Sun, 21 Jul 2013 18:24:30 +0000 (UTC) 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 X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jul 2013 18:24:30 -0000 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 @@ &os; Entities - These tables show some of the most useful entities + This table shows some of the most useful entities available in the FDP. For a complete list, see the *.ent files in doc/share/xml. - - &os; Name Entities - - - - - Name - Expands To + + + + + + + + + &os; Name Entities + + - - &os; &os; + &os.stable; &os.stable; + &os.current; &os.current; + - - -
- - Manual Page Entities + + + - - - Name - Expands To - Notes + Manual Page Entities + + - - &man.ls.1; &man.ls.1; - - Usage: &man.ls.1; is the manual page for commandlscommand. + Usage: &man.ls.1; is the manual page for commandlscommand. &man.cp.1; &man.cp.1; - - Usage: The manual page for commandcpcommand is &man.cp.1;. + Usage: The manual page for commandcpcommand is &man.cp.1;. @@ -198,35 +194,27 @@ url="&url.base;/cgi/man.cgi">&os; manual pages. - - -
- - &os; Mailing List Entities + + + - - - Name - Expands To - Notes + &os; Mailing List Entities + + - - &a.doc; &a.doc; - - Usage: A link to the &a.doc;. + Usage: A link to the &a.doc;. &a.questions; &a.questions; - - Usage: A link to the &a.questions;. + Usage: A link to the &a.questions;. @@ -237,29 +225,25 @@ url="&url.books.handbook;/eresources.html#eresources-mail">&os; mailing lists. - - -
- - &os; Document Links + + + - - - Name - Expands To - Notes + &os; Document Link Entities + + - - &url.books.handbook; &url.books.handbook; - - Usage: A link to the ulink url="&url.books.handbook;/advanced-networking.html"Advanced - Networkingulink chapter of the Handbook. + Usage: A link to the ulink + url="&url.books.handbook;/advanced-networking.html"Advanced + Networkingulink + chapter of the Handbook. @@ -274,8 +258,11 @@ &url.articles.committers-guide; &url.articles.committers-guide; - - Usage: A link to the ulink url="&url.articles.committers-guide;"Committer's Guideulink article. + Usage: A link to the ulink + url="&url.articles.committers-guide;"Committer's + Guideulink + article. @@ -286,23 +273,17 @@ url="&url.doc.langbase;/articles/">&os; articles. - - -
- - Other Operating System Name Entities + + + - - - Name - Expands To - Notes + Other Operating System Name Entities + + - - &linux; &linux; @@ -320,23 +301,17 @@ &windows; The &windows; operating system. - - -
- - Miscellaneous Entities + + + - - - Name - Expands To - Notes + Miscellaneous Entities + + - - &prompt.root; &prompt.root; @@ -353,19 +328,19 @@ &postscript; &postscript; - The trademarked term to refer to the + The &postscript; programming language. &xorg; &xorg; - The term to refer to the &xorg; open source X + The &xorg; open source X Window System. -
+