From owner-svn-doc-head@FreeBSD.ORG Sun Dec 8 22:56:22 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8088C4C0; Sun, 8 Dec 2013 22:56:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 61F7E164E; Sun, 8 Dec 2013 22:56:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8MuMQ1089698; Sun, 8 Dec 2013 22:56:22 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8MuMG5089697; Sun, 8 Dec 2013 22:56:22 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201312082256.rB8MuMG5089697@svn.freebsd.org> From: Warren Block Date: Sun, 8 Dec 2013 22:56:22 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43311 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2013 22:56:22 -0000 Author: wblock Date: Sun Dec 8 22:56:21 2013 New Revision: 43311 URL: http://svnweb.freebsd.org/changeset/doc/43311 Log: Correct old hostid tag examples to show the new systemitem tag. Merge the username example into the same section. 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 Dec 8 22:25:41 2013 (r43310) +++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Dec 8 22:56:21 2013 (r43311) @@ -1688,7 +1688,8 @@ This is the file called 'foo2' - Hosts, Domains, IP Addresses, and So Forth + Hosts, Domains, IP Addresses, User Names, and Other + System Items &os; Extension @@ -1698,30 +1699,25 @@ This is the file called 'foo2' DTD. - Identification information for networked computers (hosts) - can be marked up in several ways, depending on the nature of - the information. All of them use hostid as - the element, with the role attribute - selecting the type of the marked up information. + Information for system items is marked up + with systemitem. The class + attribute is used to identify the particular type of + information shown. - No role attribute, or - role="hostname" + class="systemname" - With no role attribute (i.e., - hostid.../hostid) + With class="systemname" the marked up information is the simple hostname, such as freefall or - wcarchive. The hostname can be - explicitly specified with - role="hostname". + wcarchive. - role="domainname" + class="domainname" The text is a domain name, such as @@ -1732,7 +1728,7 @@ This is the file called 'foo2' - role="fqdn" + class="fqdomainname" The text is a Fully Qualified Domain Name, with @@ -1741,7 +1737,7 @@ This is the file called 'foo2' - role="ipaddr" + class="ipaddr" The text is an IP address, @@ -1750,16 +1746,7 @@ This is the file called 'foo2' - role="ip6addr" - - - The text is an IPv6 - address. - - - - - role="netmask" + class="netmask" The text is a network mask, which might be @@ -1770,7 +1757,7 @@ This is the file called 'foo2' - role="mac" + class="etheraddress" The text is an Ethernet MAC @@ -1781,30 +1768,33 @@ This is the file called 'foo2' - <tag>hostid</tag> and Roles + <tag>systemitem</tag> and Classes Usage: paraThe local machine can always be referred to by the - name hostidlocalhosthostid, which will have the IP - address hostid role="ipaddr"127.0.0.1hostid.para + name systemitem class="systemname"localhostsystemitem, which will have the IP + address systemitem class="ipaddr"127.0.0.1systemitem.para -paraThe hostid role="domainname"FreeBSD.orghostid +paraThe systemitem class="domainname"FreeBSD.orgsystemitem domain contains a number of different hosts, including - hostid role="fqdn"freefall.FreeBSD.orghostid and - hostid role="fqdn"bento.FreeBSD.orghostid.para + systemitem class="fqdomainname"freefall.FreeBSD.orgsystemitem and + systemitem class="fqdomainname"bento.FreeBSD.orgsystemitem.para paraWhen adding an acronymIPacronym alias to an interface (using commandifconfigcommand) emphasisalwaysemphasis use a netmask of - hostid role="netmask"255.255.255.255hostid (which can + systemitem class="netmask"255.255.255.255systemitem (which can also be expressed as - hostid role="netmask"0xffffffffhostid).para + systemitem class="netmask"0xffffffffsystemitem).para paraThe acronymMACacronym address uniquely identifies every network card in existence. A typical acronymMACacronym address looks like - hostid role="mac"08:00:20:87:ef:d0hostid.para + systemitem class="etheraddress"08:00:20:87:ef:d0systemitem.para + +paraTo carry out most system administration functions + requires logging in as systemitem class="username"rootsystemitem.para Appearance: @@ -1832,33 +1822,6 @@ This is the file called 'foo2' every network card in existence. A typical MAC address looks like 08:00:20:87:ef:d0. - - - - - Usernames - - - &os; Extension - - These elements are part of the &os; extension to - DocBook, and do not exist in the original DocBook - DTD. - - - To refer to a specific username, such as - root or bin, use - username. - - - <tag>username</tag> - - Usage: - - paraTo carry out most system administration functions - requires logging in as usernamerootusername.para - - Appearance: To carry out most system administration functions requires logging in as