From owner-svn-doc-all@FreeBSD.ORG Fri Jan 31 23:51:01 2014 Return-Path: Delivered-To: svn-doc-all@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 C0C74A5C; Fri, 31 Jan 2014 23:51:01 +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 AC10A1670; Fri, 31 Jan 2014 23:51:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0VNp1K9067875; Fri, 31 Jan 2014 23:51:01 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0VNp1Sv067874; Fri, 31 Jan 2014 23:51:01 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201401312351.s0VNp1Sv067874@svn.freebsd.org> From: Warren Block Date: Fri, 31 Jan 2014 23:51:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43715 - 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.17 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: Fri, 31 Jan 2014 23:51:01 -0000 Author: wblock Date: Fri Jan 31 23:51:01 2014 New Revision: 43715 URL: http://svnweb.freebsd.org/changeset/doc/43715 Log: Replace lost replaceable tags. Fix some examples with &os;, show device markup under filenames, and remove the obsolete devicename 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 Fri Jan 31 23:29:13 2014 (r43714) +++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Fri Jan 31 23:51:01 2014 (r43715) @@ -146,8 +146,8 @@ - &os; Name - Entities + &os; + Name Entities @@ -808,7 +808,7 @@ Usage: warning - paraInstalling FreeBSD may make you want to delete Windows from your + paraInstalling &os; may make you want to delete Windows from your hard disk.para warning @@ -1304,7 +1304,7 @@ This is the file called 'foo2' Usage: - paraFreeBSD is without doubt emphasistheemphasis + para&os; is without doubt emphasistheemphasis premiere &unix;-like operating system for the Intel architecture.para @@ -1555,10 +1555,10 @@ This is the file called 'foo2' - Files, Directories, Extensions + Files, Directories, Extensions, Device Names - To refer to the name of a file, a directory, or a file - extension, use filename. For directory names, set + To refer to the name of a file, a directory, a file + extension, or a device name, use filename. For directory names, set the class attribute to directory. @@ -1572,16 +1572,25 @@ This is the file called 'foo2' class="directory"/usr/doc/en_US.ISO8859-1/books/handbook/filename. The main file is called filenamebook.xmlfilename. There is also a filenameMakefilefilename and a - number of files with a filename.entfilename extension.para + number of files with a filename.entfilename extension.para + +parafilenamekbd0filename is the first keyboard detected + by the system, and appears in + filename/devfilename.para + Appearance: The source for the Handbook in English is found in usr/doc/en_US.ISO8859-1/books/handbook/. + class="directory">/usr/doc/en_US.ISO8859-1/books/handbook/. The main file is called book.xml. There is also a Makefile and a number of files with a .ent extension. + + kbd0 is the first keyboard detected + by the system, and appears in + /dev. @@ -1630,63 +1639,6 @@ This is the file called 'foo2' - - Devices - - - &os; Extension - - These elements are part of the &os; extension to - DocBook, and do not exist in the original DocBook - DTD. - - - There are two names for devices: the device name as it - appears in /dev, or the name of the - device as it appears in the kernel. For this latter course, - use devicename. - - Sometimes there is no choice. Some devices, such as - network cards, do not have entries in - /dev, or the entries are markedly - different from their kernel device names. - - - <tag>devicename</tag> - - Usage: - - paradevicenamesiodevicename is used for serial - communication in FreeBSD. devicenamesiodevicename manifests - through a number of entries in filename/devfilename, including - filename/dev/ttyd0filename and filename/dev/cuaa0filename.para - -paraBy contrast, network devices such as - devicenameed0devicename do not appear in filename/devfilename.para - -paraIn MS-DOS, the first floppy drive is referred to as - devicenamea:devicename. In FreeBSD it is - filename/dev/fd0filename.para - - Appearance: - - sio is used for serial - communication in FreeBSD. sio - manifests through a number of entries in - /dev, including - /dev/ttyd0 and - /dev/cuaa0. - - By contrast, network devices such as - ed0 do not appear in - /dev. - - In MS-DOS, the first floppy drive is referred to as - a:. In FreeBSD it is - /dev/fd0. - - - Hosts, Domains, IP Addresses, User Names, and Other System Items @@ -1999,7 +1951,7 @@ This is the file called 'foo2' Appearance: - &prompt.user; man command + &prompt.user; man command replaceable can be used in many