From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:15:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E96D1065673; Sun, 7 Dec 2008 20:15:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 219E11065679 for ; Sun, 7 Dec 2008 20:15:46 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DDF38FC13 for ; Sun, 7 Dec 2008 20:15:46 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KFkfQ035803 for ; Sun, 7 Dec 2008 20:15:46 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KFjOj035798 for perforce@freebsd.org; Sun, 7 Dec 2008 20:15:45 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 7 Dec 2008 20:15:45 GMT Message-Id: <200812072015.mB7KFjOj035798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 20:15:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=154289 Change 154289 by rene@rene_self on 2008/12/07 20:14:54 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/www/en/multimedia/multimedia-input.xml#3 integrate .. //depot/projects/docproj_nl/www/en/multimedia/multimedia.pl#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#10 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 (text+ko) ==== @@ -20,7 +20,7 @@ Jens Schweikhardt - $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v 1.12 2008/12/03 21:59:51 schweikh Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v 1.14 2008/12/04 18:13:49 schweikh Exp $ &tm-attrib.freebsd; @@ -119,7 +119,7 @@ done from within the old system, up to the point where you can chroot to the new system. In other words, we go through three stages, where each stage consists of either running a shell - script or invoke make: + script or invoking make: @@ -176,8 +176,9 @@ not be used for its usual duties. If you run a production server you have to consider the downtime caused by stage two. The ports compiled by stage_2.conf.default below require - about 4 hours to build on an AMD1800+ SCSI system with 10krpm disks - and 1GB of RAM. If you prefer to install packages instead of ports, + about 8 hours (of which 4 hours are due to + OpenOffice.org) to build on a contemporary + system. If you prefer to install packages instead of ports, you can significantly reduce the downtime to about 10 minutes. @@ -524,9 +525,9 @@ appropriate answers to the installation command (e.g. yes | make install. For other ports you need to investigate where exactly the interactive command is located and deal with it - appropriately. The examples above for + appropriately. See the examples above for print/acroread8 and - java/jdk16 are examples. + java/jdk16. You should also be aware of upgrade issues for config files. In general you do not know when and if the format or contents of a ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.74 2006/04/28 12:39:55 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.76 2008/12/06 22:09:01 pgj Exp $ --> @@ -50,7 +50,7 @@ content, please post it to the &a.doc;. - Inline vs. block + Inline vs. Block In the remainder of this document, when describing elements, inline means that the element can occur within a @@ -64,7 +64,7 @@ HTML, the HyperText Markup Language, is the markup language of choice on the World Wide Web. More information can be found at - <URL:>. + . HTML is used to markup pages on the FreeBSD web site. It should not (generally) be used to mark up other documentation, @@ -77,7 +77,7 @@ latest, 4.0 (available in both strict and loose variants). - The HTML DTDs are available from the ports collection in the + The HTML DTDs are available from the Ports Collection in the textproc/html port. They are automatically installed as part of the textproc/docproj port. @@ -96,7 +96,7 @@ - Sectional elements + Sectional Elements An HTML document is normally split into two sections. The first section, called the head, contains @@ -110,11 +110,11 @@ contained within the top-level html element. - Normal HTML document structure + Normal HTML Document Structure <html> <head> - <title>The document's title</title> + <title>The Document's Title</title> </head> <body> @@ -127,7 +127,7 @@ - Block elements + Block Elements Headings @@ -204,7 +204,7 @@ - Block quotations + Block Quotations A block quotation is an extended quotation from another document that should not appear within the current paragraph. @@ -285,7 +285,7 @@ - Definition lists with <sgmltag>dl</sgmltag> + Definition Lists with <sgmltag>dl</sgmltag> Use: @@ -308,7 +308,7 @@ - Pre-formatted text + Pre-formatted Text You can indicate that text should be shown to the user exactly as it is in the file. Typically, this means that the text is shown @@ -370,7 +370,7 @@ p element. - Simple use of <sgmltag>table</sgmltag> + Simple Use of <sgmltag>table</sgmltag> Use: @@ -392,7 +392,7 @@ A cell can span multiple rows and columns. To indicate this, add the rowspan and/or colspan - attributes, with values indicating the number of rows of columns + attributes, with values indicating the number of rows or columns that should be spanned. @@ -473,10 +473,10 @@ - In-line elements + In-line Elements - Emphasizing information + Emphasizing Information You have two levels of emphasis available in HTML, em and strong. @@ -498,7 +498,7 @@ - Bold and italics + Bold and Italics Because HTML includes presentational markup, you can also indicate that particular content should be rendered in bold or @@ -514,7 +514,7 @@ - Indicating fixed pitch text + Indicating Fixed-Pitch Text If you have content that should be rendered in a fixed pitch (typewriter) typeface, use tt (for @@ -532,7 +532,7 @@ - Content size + Content Size You can indicate that content should be shown in a larger or smaller font. There are three ways of doing this. @@ -555,7 +555,7 @@ Use font with the size - attribute set to a number between 1 and 7. The default font size + attribute set to a number between 1 and 7. The default font size is 3. This approach is deprecated. @@ -570,7 +570,7 @@ this text is slightly bigger.

This text is slightly smaller. But - this text is slightly bigger + this text is slightly bigger.

This text is slightly smaller. But this text is slightly bigger.

]]> @@ -586,7 +586,7 @@ - Linking to other documents on the WWW + Linking to Other Documents on the WWW In order to include a link to another document on the WWW you must know the URL of the document you want to link to. @@ -612,7 +612,7 @@ - Linking to other parts of documents + Linking to Other Parts of Documents Linking to a point within another document (or within the same document) requires that the document author include anchors that you @@ -636,7 +636,7 @@ # symbol. - Linking to a named part of another document + Linking to A Named Part of Another Document Assume that the para1 example resides in a document called foo.html. @@ -651,7 +651,7 @@ the anchor (with the preceding #). - Linking to a named part of the same document + Linking to A Named Part of the Same Document Assume that the para1 example resides in this document: @@ -680,7 +680,7 @@ how it should be presented. - <literal>formal</literal> vs. <literal>informal</literal> + Formal vs. Informal Some elements may exist in two forms, formal and informal. Typically, the formal version of @@ -689,13 +689,13 @@ title. - The DocBook DTD is available from the ports collection in the + The DocBook DTD is available from the Ports Collection in the textproc/docbook port. It is automatically installed as part of the textproc/docproj port. - FreeBSD extensions + &os; Extensions The FreeBSD Documentation Project has extended the DocBook DTD by adding some new elements. These elements serve to make some of the @@ -717,8 +717,8 @@ touch with &a.doceng;. - The FreeBSD extensions are not (currently) in the ports - collection. They are stored in the FreeBSD CVS tree, as The &os; extensions are not (currently) in the Ports Collection. + They are stored in the &os; CVS tree, as doc/share/sgml/freebsd.dtd. @@ -733,7 +733,7 @@ - Document structure + Document Structure DocBook allows you to structure your documentation in several ways. In the FreeBSD Documentation Project we are using two primary @@ -742,7 +742,7 @@ A book is organized into chapters. This is a mandatory requirement. There may be parts between the book and the chapter to provide another layer of organization. - The Handbook is arranged in this way. + For example, the Handbook is arranged in this way. A chapter may (or may not) contain one or more sections. These are indicated with the sect1 element. If a section @@ -770,10 +770,10 @@ document, the FreeBSD FAQ, and the FreeBSD Handbook are - all marked up as books. + all marked up as books, for example. - Starting a book + Starting a Book The content of the book is contained within the book element. As well as containing structural @@ -793,7 +793,7 @@ replaceable elements --> <book> <bookinfo> - <title>Your title here</title> + <title>Your Title Here</title> <author> <firstname>Your first name</firstname> @@ -822,7 +822,7 @@ - Starting an article + Starting an Article The content of the article is contained within the article element. As well as containing @@ -870,17 +870,17 @@ - Indicating chapters + Indicating Chapters Use chapter to mark up your chapters. Each chapter has a mandatory title. Articles do not contain chapters, they are reserved for books. - A simple chapter + A Simple Chapter - The chapter's title + The Chapter's Title ... ]]> @@ -891,10 +891,10 @@ chapter then just use an empty paragraph. - Empty chapters + Empty Ehapters - This is an empty chapter + This is An Empty Chapter ]]> @@ -902,7 +902,7 @@ - Sections below chapters + Sections Below Chapters In books, chapters may (but do not need to) be broken up into sections, subsections, and so on. In articles, sections are the @@ -918,34 +918,34 @@ elements, and so on, down to sect5. - Sections in chapters + Sections in Chapters - A sample chapter + A Sample Chapter Some text in the chapter. - First section (1.1) + First Section (1.1) … - Second section (1.2) + Second Section (1.2) - First sub-section (1.2.1) + First Sub-Section (1.2.1) - First sub-sub-section (1.2.1.1) + First Sub-Sub-Section (1.2.1.1) … - Second sub-section (1.2.2) + Second Sub-Section (1.2.2) … @@ -962,7 +962,7 @@ - Subdividing using <sgmltag>part</sgmltag>s + Subdividing Using <sgmltag>part</sgmltag> Elements You can introduce another layer of organization between book and chapter with one or @@ -994,7 +994,7 @@ - Block elements + Block Elements Paragraphs @@ -1025,7 +1025,7 @@ - Block quotations + Block Quotations A block quotation is an extended quotation from another document that should not appear within the current paragraph. You will @@ -1055,6 +1055,8 @@ Appearance: + A small excerpt from the US Constitution: +
Preamble to the Constitution of the United States @@ -1071,8 +1073,8 @@ - Tips, notes, warnings, cautions, important information and - sidebars. + Tips, Notes, Warnings, Cautions, Important Information and + Sidebars You may need to include extra information separate from the main body of the text. Typically this is meta @@ -1120,6 +1122,7 @@ ]]> + Appearance: Installing FreeBSD may make you want to delete Windows from @@ -1128,7 +1131,7 @@ - Lists and procedures + Lists and Procedures You will often need to list pieces of information to the user, or present them with a number of steps that must be carried out in @@ -1238,7 +1241,7 @@ - Showing file samples + Showing File Samples If you want to show a fragment of a file (or perhaps a complete file) to the user, wrap it in the programlisting @@ -1390,12 +1393,12 @@ Use: - + - This is column head 1 - This is column head 2 + This is Column Head 1 + This is Column Head 2 @@ -1415,12 +1418,12 @@ Appearance: - + - This is column head 1 - This is column head 2 + This is Column Head 1 + This is Column Head 2 @@ -1452,7 +1455,7 @@ frame="none">). - Tables where <literal>frame="none"</literal> + Tables Where <literal>frame="none"</literal> Appearance: @@ -1460,8 +1463,8 @@ - This is column head 1 - This is column head 2 + This is Column Head 1 + This is Column Head 2 @@ -1482,7 +1485,7 @@ - Examples for the user to follow + Examples for the User to Follow A lot of the time you need to show examples for the user to follow. Typically, these will consist of dialogs with the computer; @@ -1586,10 +1589,10 @@ - In-line elements + In-line Elements - Emphasizing information + Emphasizing Information When you want to emphasize a particular word or phrase, use emphasis. This may be presented as italic, or @@ -1644,7 +1647,7 @@ - Keys, mouse buttons, and combinations + Keys, Mouse Buttons, and Combinations To refer to a specific key on the keyboard, use keycap. To refer to a mouse button, use @@ -1665,7 +1668,7 @@ keycombo. - Keys, mouse buttons, and combinations + Keys, Mouse Buttons, and Combinations Use: @@ -1700,10 +1703,10 @@ - Applications, commands, options, and cites + Applications, Commands, Options, and Cites You will frequently want to refer to both applications and - commands when writing for the Handbook. The distinction between + commands when writing documentation. The distinction between them is simple: an application is the name for a suite (or possibly just 1) of programs that fulfil a particular task. A command is the name of a program that the user can run. @@ -1769,7 +1772,7 @@ clear. Hopefully this example makes it clearer. - Applications, commands, and options. + Applications, Commands, and Options Use: @@ -1780,7 +1783,7 @@ sendmail 8 - , &man.mailq.8;, and &man.newaliases.8; + , &man.mailq.1;, and &man.newaliases.1; programs. One of the command line parameters to @@ -1799,13 +1802,7 @@ sendmail 8 - , - mailq - 8 - , and - newaliases - 8 - programs. + , &man.mailq.1;, and &man.newaliases.1; programs. One of the command line parameters to sendmail @@ -1822,7 +1819,7 @@ - Files, directories, extensions + Files, Directories, Extensions Whenever you wish to refer to the name of a file, a directory, or a file extension, use filename. @@ -1833,8 +1830,8 @@ Use: The SGML source for the Handbook in English can be - found in /usr/doc/en/handbook/. The first - file is called handbook.sgml in that + found in /usr/doc/en_US.ISO8859-1/books/handbook/. The first + file is called book.sgml in that directory. You should also see a Makefile and a number of files with a .ent extension.]]> @@ -1850,10 +1847,10 @@ - The name of ports + The Name of Ports - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -1887,7 +1884,7 @@ Devices - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -1938,10 +1935,10 @@ - Hosts, domains, IP addresses, and so forth + Hosts, Domains, IP Addresses, and So Forth - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -1955,11 +1952,11 @@ - No role attribute, or + No role attribute, or role="hostname" - With no role attribute (i.e., + With no role attribute (i.e., hostid.../hostid) the marked up information is the simple hostname, such as freefall or wcarchive. @@ -2037,13 +2034,13 @@ The FreeBSD.org domain contains a number of different hosts, including freefall.FreeBSD.org and - bento.FreeBSD.org. + pointyhat.FreeBSD.org. When adding an IP alias to an interface (using ifconfig) always use a netmask of 255.255.255.255 (which can also be expressed as 0xffffffff. + role="netmask">0xffffffff). The MAC address uniquely identifies every network card in existence. A typical MAC address looks like ifconfig) always use a netmask of 255.255.255.255 (which can also be expressed as 0xffffffff. + role="netmask">0xffffffff). The MAC address uniquely identifies every network card in existence. A typical MAC address looks like Usernames - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -2105,7 +2102,7 @@ Describing <filename>Makefile</filename>s - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -2158,11 +2155,11 @@ - Literal text + Literal Text You will often need to include literal text in the - Handbook. This is text that is excerpted from another file, or - which should be copied from the Handbook into another file + documentation. This is text that is excerpted from another file, or + which should be copied from the documentation into another file verbatim. Some of the time, programlisting will be @@ -2210,9 +2207,7 @@ Use: - - &prompt.user; man command -]]> + &prompt.user; man command]]> Appearance: @@ -2249,7 +2244,7 @@ - Quoting system errors + Quoting System Errors You might want to show errors generated by FreeBSD. Mark these with errorname. This @@ -2279,7 +2274,7 @@ Image support in the documentation is currently extremely - experimental. I think the mechanisms described here are unlikely to + experimental. The mechanisms described here are unlikely to change, but that is not guaranteed. You will also need to install the @@ -2301,7 +2296,7 @@ - Image formats + Image Formats We currently support two formats for images. The format you should use will depend on the nature of your image. @@ -2423,7 +2418,7 @@ - <filename>Makefile</filename> entries + <filename>Makefile</filename> Entries Your images must be listed in the Makefile in the IMAGES @@ -2453,7 +2448,7 @@ - Images and chapters in subdirectories + Images and Chapters in Subdirectories You must be careful when you separate your documentation into smaller files (see ) in @@ -2464,7 +2459,7 @@ chapter1/chapter.sgml, chapter2/chapter.sgml, and chapter3/chapter.sgml. If each chapter has - images associated with it, I suggest you place those images in each + images associated with it, it is suggested to place those images in each chapter's subdirectory (chapter1/, chapter2/, and chapter3/). @@ -2513,7 +2508,7 @@ - Linking to other parts of the same document + Linking to Other Parts of the Same Document Linking within the same document requires you to specify where you are linking from (i.e., the text the user will click, or @@ -2532,7 +2527,7 @@ elements. - <literal>id on chapters and sections</literal> + Attribute <literal>id</literal> on Chapters and Sections Introduction @@ -2603,7 +2598,7 @@ One. More specific information can be found in the - section called Sub-sect 1. + section called Sub-Sect 1.
@@ -2665,7 +2660,7 @@ - Linking to documents on the WWW + Linking to Documents on the WWW Linking to external documents is much simpler, as long as you know the URL of the document you want to link to. Use ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 (text+ko) ==== @@ -27,11 +27,11 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.17 2005/09/12 16:47:35 yar Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.18 2008/12/07 02:05:09 pgj Exp $ --> - Structuring documents under <filename>doc/</filename> + Structuring Documents Under <filename>doc/</filename> The doc/ tree is organized in a particular fashion, and the documents that are part of the FDP are in turn organized @@ -40,17 +40,17 @@ - make it easy to automate converting the document to other formats; + Make it easy to automate converting the document to other formats. - promote consistency between the different documentation + Promote consistency between the different documentation organizations, to make it easier to switch between working on - different documents; + different documents. - make it easy to decide where in the tree new documentation should + Make it easy to decide where in the tree new documentation should be placed. @@ -61,7 +61,7 @@ does not enforce any particular defaults or cultural preferences. - The top level, <filename>doc/</filename> + The Top Level, <filename>doc/</filename> There are two types of directory under doc/, each with very specific directory names and meanings. @@ -101,7 +101,7 @@ The - <filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable>/</filename> directories + lang.encoding/ Directories These directories contain the documents themselves. The documentation is split into up to three more categories at this @@ -147,7 +147,7 @@ - Document specific information + Document Specific Information This section contains specific notes about particular documents managed by the FDP. @@ -168,7 +168,7 @@ sect3) and so on. - Physical organization + Physical Organization There are a number of files and directories within the handbook directory. @@ -221,17 +221,17 @@ For example, if one of the chapter files contains: + ... ]]> - then it will be called chapter.sgml in - the kernelconfiguration directory. In + Then it will be called chapter.sgml in + the kernelconfig directory. In general, the entire contents of the chapter will be held in this file. When the HTML version of the Handbook is produced, this will - yield kernelconfiguration.html. This is + yield kernelconfig.html. This is because of the id value, and is not related to the name of the directory. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -507,6 +507,187 @@ + + + + + + Joseph J. >>> TRUNCATED FOR MAIL (1000 lines) <<<