Single-file HTML, PDF, and text renderings of the release
From owner-svn-doc-head@FreeBSD.ORG Sun Jun 23 19:45:14 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id EFBB0BB8;
Sun, 23 Jun 2013 19:45:13 +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 DF48A1AB1;
Sun, 23 Jun 2013 19:45:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5NJjDwh055483;
Sun, 23 Jun 2013 19:45:13 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5NJjDxK055478;
Sun, 23 Jun 2013 19:45:13 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201306231945.r5NJjDxK055478@svn.freebsd.org>
From: Warren Block
Date: Sun, 23 Jun 2013 19:45:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42005 - in head/en_US.ISO8859-1/books/fdp-primer: .
docbook-markup overview sgml-markup xhtml-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.14
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, 23 Jun 2013 19:45:14 -0000
Author: wblock
Date: Sun Jun 23 19:45:12 2013
New Revision: 42005
URL: http://svnweb.freebsd.org/changeset/doc/42005
Log:
Split the old sgml-markup chapter into two chapters, one for XHTML and
one for DocBook. Both are edited and expanded versions of the content
from the old chapter.
Added:
head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/
head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
- copied, changed from r41997, head/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
head/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/
head/en_US.ISO8859-1/books/fdp-primer/xhtml-markup/chapter.xml
- copied, changed from r41997, head/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
Deleted:
head/en_US.ISO8859-1/books/fdp-primer/sgml-markup/
Modified:
head/en_US.ISO8859-1/books/fdp-primer/Makefile
head/en_US.ISO8859-1/books/fdp-primer/book.xml
head/en_US.ISO8859-1/books/fdp-primer/chapters.ent
head/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
Modified: head/en_US.ISO8859-1/books/fdp-primer/Makefile
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/Makefile Sun Jun 23 17:59:58 2013 (r42004)
+++ head/en_US.ISO8859-1/books/fdp-primer/Makefile Sun Jun 23 19:45:12 2013 (r42005)
@@ -23,7 +23,8 @@ SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
SRCS+= see-also/chapter.xml
-SRCS+= sgml-markup/chapter.xml
+SRCS+= xhtml-markup/chapter.xml
+SRCS+= docbook-markup/chapter.xml
SRCS+= sgml-primer/chapter.xml
SRCS+= stylesheets/chapter.xml
SRCS+= structure/chapter.xml
Modified: head/en_US.ISO8859-1/books/fdp-primer/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/book.xml Sun Jun 23 17:59:58 2013 (r42004)
+++ head/en_US.ISO8859-1/books/fdp-primer/book.xml Sun Jun 23 19:45:12 2013 (r42005)
@@ -248,7 +248,8 @@ Password:
&chap.overview;
&chap.tools;
&chap.xml-primer;
- &chap.xml-markup;
+ &chap.xhtml-markup;
+ &chap.docbook-markup;
&chap.stylesheets;
&chap.structure;
&chap.doc-build;
Modified: head/en_US.ISO8859-1/books/fdp-primer/chapters.ent
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/chapters.ent Sun Jun 23 17:59:58 2013 (r42004)
+++ head/en_US.ISO8859-1/books/fdp-primer/chapters.ent Sun Jun 23 19:45:12 2013 (r42005)
@@ -13,7 +13,8 @@
-
+
+
Copied and modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml (from r41997, head/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml)
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml Fri Jun 21 17:57:26 2013 (r41997, copy source)
+++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Sun Jun 23 19:45:12 2013 (r42005)
@@ -31,620 +31,40 @@
$FreeBSD$
-->
-
- XML Markup
+
+ DocBook Markup
- This chapter describes the two markup languages you will
- encounter when you contribute to the FreeBSD documentation
- project. Each section describes the markup language, and details
- the markup that you are likely to want to use, or that is already
- in use.
-
- These markup languages contain a large number of elements, and
- it can be confusing sometimes to know which element to use for a
- particular situation. This section goes through the elements you
- are most likely to need, and gives examples of how you would use
- them.
-
- This is not an exhaustive list of
- elements, since that would just reiterate the documentation for
- each language. The aim of this section is to list those elements
- more likely to be useful to you. If you have a question about how
- best to markup a particular piece of content, please post it to
- the &a.doc;.
-
-
- Inline Versus Block
-
- In the remainder of this document, when describing elements,
- inline means that the element can occur
- within a block element, and does not cause a line break. A
- block element, by comparison, will cause a
- line break (and other processing) when it is encountered.
-
-
-
- XHTML
-
- XHTML is the XML version of the HyperText Markup Language,
- which is the markup language
- of choice on the World Wide Web. More information can be found
- at .
-
- XHTML is used to markup pages on the FreeBSD web site. It
- should not (generally) be used to mark up other documentation,
- since DocBook offers a far richer set of elements to choose
- from. Consequently, you will normally only encounter XHTML pages
- if you are writing for the web site.
-
- HTML has gone through a number of versions, 1, 2, 3.0, 3.2,
- 4.0 and then an XML-compliant version has also been created, which
- is called XHTML and the latest widespread version of it is
- XHTML 1.0(available in both
- strict and transitional
- variants).
-
- The XHTML DTDs are available from the Ports Collection
- in the textproc/xhtml port.
- They are automatically installed as part of the textproc/docproj port.
+
+ Introduction
-
- Formal Public Identifier (FPI)
-
- There are a number of XHTML FPIs, depending upon the
- version (also known as the level) of XHTML that you want to
- declare your document to be compliant with.
-
- The majority of XHTML documents on the FreeBSD web site
- comply with the transitional version of XHTML 1.0.
-
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-
-
- Sectional Elements
-
- An XHTML document is normally split into two sections. The
- first section, called the head, contains
- meta-information about the document, such as its title, the
- name of the author, the parent document, and so on. The
- second section, the body, contains the
- content that will be displayed to the user.
-
- These sections are indicated with head
- and body elements respectively. These
- elements are contained within the top-level
- html element.
-
-
- Normal XHTML Document Structure
-
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>The Document's Title</title>
- </head>
-
- <body>
-
- …
-
- </body>
-</html>
-
-
-
-
- Block Elements
-
-
- Headings
-
- XHTML allows you to denote headings in your document, at
- up to six different levels.
-
- The largest and most prominent heading is
- h1, then h2,
- continuing down to h6.
-
- The element's content is the text of the heading.
-
-
- h1, h2,
- and Other Header Tags
-
- Use:
-
- First section
-
-
-
-
This is the heading for the first section
-
-
-
-
This is the heading for the first sub-section
-
-
-
-
This is the heading for the second section
-
-]]>
-
-
- Generally, an XHTML page should have one first level
- heading (h1). This can contain many
- second level headings (h2), which can in
- turn contain many third level headings. Each
- hn element
- should have the same element, but one further up the
- hierarchy, preceding it. Leaving gaps in the numbering is
- to be avoided.
-
-
- Bad Ordering of
- hn
- Elements
-
- Use:
-
- First section
-
-
-
-
Sub-section
-
-]]>
-
-
-
-
- Paragraphs
-
- XHTML supports a single paragraph element,
- p.
-
-
- p
-
- Use:
-
- This is a paragraph. It can contain just about any
- other element.
]]>
-
-
-
-
- Block Quotations
-
- A block quotation is an extended quotation from another
- document that should not appear within the current
- paragraph.
-
-
- blockquote
-
- Use:
-
- A small excerpt from the US Constitution:
-
-
We the People of the United States, in Order to form
- a more perfect Union, establish Justice, insure domestic
- Tranquility, provide for the common defence, promote the general
- Welfare, and secure the Blessings of Liberty to ourselves and our
- Posterity, do ordain and establish this Constitution for the
- United States of America.
]]>
-
-
-
-
- Lists
-
- You can present the user with three types of lists,
- ordered, unordered, and definition.
-
- Typically, each entry in an ordered list will be
- numbered, while each entry in an unordered list will be
- preceded by a bullet point. Definition lists are composed
- of two sections for each entry. The first section is the
- term being defined, and the second section is the definition
- of the term.
-
- Ordered lists are indicated by the ol
- element, unordered lists by the ul
- element, and definition lists by the dl
- element.
-
- Ordered and unordered lists contain listitems, indicated
- by the li element. A listitem can
- contain textual content, or it may be further wrapped in one
- or more p elements.
-
- Definition lists contain definition terms
- (dt) and definition descriptions
- (dd). A definition term can only contain
- inline elements. A definition description can contain other
- block elements.
-
-
- ul and
- ol
-
- Use:
-
- An unordered list. Listitems will probably be
- preceded by bullets.
-
-
-
First item
-
-
Second item
-
-
Third item
-
-
-
An ordered list, with list items consisting of multiple
- paragraphs. Each item (note: not each paragraph) will be
- numbered.
-
-
-
This is the first item. It only has one paragraph.
-
-
This is the first paragraph of the second item.
-
-
This is the second paragraph of the second item.
-
-
This is the first and only paragraph of the third
- item.
-]]>
-
-
-
-
- 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 in a fixed font, multiple spaces are not
- merged into one, and line breaks in the text are
- significant.
-
- In order to do this, wrap the content in the
- pre element.
-
-
- pre
-
- You could use pre to mark up an
- email message:
-
- From: nik@FreeBSD.org
- To: freebsd-doc@FreeBSD.org
- Subject: New documentation available
-
- There is a new copy of my primer for contributors to the FreeBSD
- Documentation Project available at
-
- <URL:http://people.FreeBSD.org/~nik/primer/index.html>
-
- Comments appreciated.
-
- N]]>
-
- Keep in mind that < and
- & still are recognized as special
- characters in pre-formatted text. This is why the example
- shown had to use < instead of
- <. For consistency,
- > was used in place of
- >, too. Watch out for the special
- characters that may appear in text copied from a
- plain-text source, e.g., an email message or program
- code.
-
-
-
-
- Tables
-
-
- Most text-mode browsers (such as Lynx) do not render
- tables particularly effectively. If you are relying on
- the tabular display of your content, you should consider
- using alternative markup to prevent confusion.
-
-
- Mark up tabular information using the
- table element. A table consists of one
- or more table rows (tr), each containing
- one or more cells of table data (td).
- Each cell can contain other block elements, such as
- paragraphs or lists. It can also contain another table
- (this nesting can repeat indefinitely). If the cell only
- contains one paragraph then you do not need to include the
- p element.
-
-
- Simple Use of table
-
- Use:
-
- This is a simple 2x2 table.
-
-
-
-
Top left cell
-
-
Top right cell
-
-
-
-
Bottom left cell
-
-
Bottom right cell
-
-
]]>
-
- 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 or columns that should be
- spanned.
-
-
- Using rowspan
-
- Use:
-
- One tall thin cell on the left, two short cells next to
- it on the right.
-
-
-
-
Long and thin
-
-
-
-
Top cell
-
-
Bottom cell
-
-
]]>
-
-
-
- Using colspan
-
- Use:
-
- One long cell on top, two short cells below it.
-
-
-
-
Top cell
-
-
-
-
Bottom left cell
-
-
Bottom right cell
-
-
]]>
-
-
-
- Using rowspan and
- colspan Together
-
- Use:
-
- On a 3x3 grid, the top left block is a 2x2 set of
- cells merged into one. The other cells are normal.
-
-
-
-
Top left large cell
-
-
Top right cell
-
-
-
-
-
-
Middle right cell
-
-
-
-
Bottom left cell
-
-
Bottom middle cell
-
-
Bottom right cell
-
-
]]>
-
-
-
-
-
- In-line Elements
-
-
- Emphasizing Information
-
- You have two levels of emphasis available in XHTML,
- em and strong.
- em is for a normal level of emphasis and
- strong indicates stronger
- emphasis.
-
- Typically, em is rendered in italic
- and strong is rendered in bold. This is
- not always the case, however, and you should not rely on
- it. According to best practices, webpages only hold
- structural and semantical information and stylesheets are
- later applied to use these two so you should think of
- semantics not formatting when using these tags.
-
-
- em and
- strong
-
- Use:
-
- This has been emphasized, while
- this has been strongly emphasized.]]>
-
-
-
-
- Indicating Fixed-Pitch Text
-
- If you have content that should be rendered in a fixed
- pitch (typewriter) typeface, use tt (for
- teletype).
-
-
- tt
-
- Use:
-
- This document was originally written by
- Nik Clayton, who can be reached by email as
- nik@FreeBSD.org.]]>
-
-
-
-
-
- Links
-
-
- Links are also inline elements.
-
-
-
- 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.
-
- The link is indicated with a, and the
- href attribute contains the URL of the
- target document. The content of the element becomes the
- link, and is normally indicated to the user in some way
- (underlining, change of color, different mouse cursor when
- over the link, and so on).
-
-
- Using <a href="...">
-
- Use:
-
- More information is available at the
- FreeBSD web site.]]>
-
-
- These links will take the user to the top of the chosen
- document.
-
-
-
- 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 can link to.
-
- Anchors are indicated with a and the
- id attribute instead of
- href.
-
-
- Using <a id="...">
-
- Use:
-
- This paragraph can be referenced
- in other links with the name para1.]]>
-
-
- To link to a named part of a document, write a normal
- link to that document, but include the id of the anchor
- after a # symbol.
-
-
- Linking to a Named Part of Another Document
-
- Assume that the para1 example
- resides in a document called
- foo.html.
-
- More information can be found in the
- first paragraph of
- foo.html.]]>
-
-
- If you are linking to a named anchor within the same
- document then you can omit the document's URL, and just
- include the name of the anchor (with the preceding
- #).
-
-
- Linking to a Named Part of the Same Document
-
- Assume that the para1 example
- resides in this document:
-
- More information can be found in the
- first paragraph of this
- document.]]>
-
-
-
-
-
-
- DocBook
+ This chapter is an introduction to DocBook as it is used for
+ &os; documentation. DocBook is a large and complex markup
+ system, but the subset described here covers the parts that are
+ most widely used for &os; documentation. While a moderate
+ subset is covered, it is impossible to anticipate every
+ situation. Please post questions that this document does
+ not answer to the &a.doc;.DocBook was originally developed by HaL Computer Systems and
- O'Reilly & Associates to be a DTD for writing technical
- documentation A short history can be found under
- DTD for
+ writing technical documentation A short history
+ can be found under
http://www.oasis-open.org/docbook/intro.shtml#d0e41..
Since 1998 it is maintained by the
DocBook Technical Committee. As such, and unlike
- LinuxDoc and XHTML, DocBook is very heavily oriented towards
- markup that describes what something is,
- rather than describing how it should be
- presented.
+ LinuxDoc and XHTML, DocBook is very heavily
+ oriented towards markup that describes what
+ something is, rather than describing how it
+ should be presented.
+
+ The DocBook DTD is available from the
+ Ports Collection in the
+ textproc/docbook-xml-450
+ port. It is automatically installed as part of the
+ textproc/docproj
+ port.Formal Versus Informal
@@ -656,209 +76,217 @@
informal version will not have a title.
- The DocBook DTD is available from the Ports Collection
- in the textproc/docbook-xml-450
- port. It is automatically installed as part of the textproc/docproj port.
-
-
- &os; Extensions
-
- The FreeBSD Documentation Project has extended the DocBook
- DTD by adding some new elements. These elements serve to make
- some of the markup more precise.
-
- Where a FreeBSD specific element is listed below it is
- clearly marked.
-
- Throughout the rest of this document, the term
- DocBook is used to mean the FreeBSD extended
- DocBook DTD.
-
-
- There is nothing about these extensions that is FreeBSD
- specific, it was just felt that they were useful
- enhancements for this particular project. Should anyone
- from any of the other *nix camps (NetBSD, OpenBSD, Linux,
- …) be interested in collaborating on a standard
- DocBook extension set, please get in touch with
- &a.doceng;.
-
+
+ Inline Versus Block
- The &os; extensions are not (currently) in the
- Ports Collection. They are stored in the &os; Subversion
- tree, as head/share/xml/freebsd.dtd.
-
+ In the remainder of this document, when describing
+ elements, inline means that the element
+ can occur within a block element, and does not cause a line
+ break. A block element, by comparison,
+ will cause a line break (and other processing) when it is
+ encountered.
+
+
-
- Formal Public Identifier (FPI)
+
+ &os; Extensions
- In compliance with the DocBook guidelines for writing FPIs
- for DocBook customizations, the FPI for the FreeBSD extended
- DocBook DTD is:
+ The &os; Documentation Project has extended the
+ DocBook DTD by adding some new elements.
+ These elements serve to make some of the markup more
+ precise.
+
+ Where a &os;-specific element is listed below, it is
+ clearly marked.
+
+ Throughout the rest of this document, the term
+ DocBook is used to mean the &os;-extended
+ DocBook DTD.
- PUBLIC "-//FreeBSD//DTD DocBook V4.2-Based Extension//EN"
-
+
+ There is nothing about these extensions that is &os;
+ specific, it was just felt that they were useful
+ enhancements for this particular project. Should anyone
+ from any of the other *nix camps (NetBSD, OpenBSD, Linux,
+ …) be interested in collaborating on a standard
+ DocBook extension set, please get in touch with
+ &a.doceng;.
+
-
- Document Structure
+ The &os; extensions are not (currently) in the
+ Ports Collection. They are stored in the &os; Subversion
+ tree, as head/share/xml/freebsd.dtd.
+
- DocBook allows you to structure your documentation in
- several ways. In the FreeBSD Documentation Project we are
- using two primary types of DocBook document: the book and the
- article.
-
- 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. 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 contains another section then use the
- sect2 element, and so on, up to
- sect5.
+
+ Formal Public Identifier (FPI)
- Chapters and sections contain the remainder of the
- content.
+ In compliance with the DocBook guidelines for writing
+ FPIs for DocBook customizations, the
+ FPI for the &os; extended DocBook
+ DTD is:
- An article is simpler than a book, and does not use
- chapters. Instead, the content of an article is organized
- into one or more sections, using the same
- sect1 (and sect2 and so
- on) elements that are used in books.
-
- Obviously, you should consider the nature of the
- documentation you are writing in order to decide whether it is
- best marked up as a book or an article. Articles are well
- suited to information that does not need to be broken down
- into several chapters, and that is, relatively speaking, quite
- short, at up to 20-25 pages of content. Books are best suited
- to information that can be broken up into several chapters,
- possibly with appendices and similar content as well.
-
- The FreeBSD
- tutorials are all marked up as articles, while this
- document, the
- FreeBSD FAQ,
- and the FreeBSD
- Handbook are all marked up as books, for
- example.
+ PUBLIC "-//FreeBSD//DTD DocBook V4.2-Based Extension//EN"
+
-
- Starting a Book
+
+ Document Structure
- The content of the book is contained within the
- book element. As well as containing
- structural markup, this element can contain elements that
- include additional information about the book. This is
- either meta-information, used for reference purposes, or
- additional content used to produce a title page.
+ DocBook allows structuring documentation in several ways.
+ The &os; Documentation Project uses two primary types of DocBook
+ document: the book and the article.
+
+ Books are organized into chapters.
+ This is a mandatory requirement. There may be
+ parts between the book and the chapter to
+ provide another layer of organization. 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 contains another section then use the
+ sect2 element, and so on, up to
+ sect5.
+
+ Chapters and sections contain the remainder of the
+ content.
+
+ An article is simpler than a book, and does not use
+ chapters. Instead, the content of an article is organized into
+ one or more sections, using the same sect1
+ (and sect2 and so on) elements that are used
+ in books.
+
+ The nature of the document being written should be used to
+ determine whether it is best marked up as a book or an article.
+ Articles are well suited to information that does not need to be
+ broken down into several chapters, and that is, relatively
+ speaking, quite short, at up to 20-25 pages of content. Books
+ are best suited to information that can be broken up into
+ several chapters, possibly with appendices and similar content
+ as well.
+
+ The &os; tutorials
+ are all marked up as articles, while this
+ document, the
+ FreeBSD FAQ,
+ and the FreeBSD
+ Handbook are all marked up as books, for
+ example.
+
+
+ Starting a Book
+
+ The content of a book is contained within the
+ book element. As well as containing
+ structural markup, this element can contain elements that
+ include additional information about the book. This is either
+ meta-information, used for reference purposes, or additional
+ content used to produce a title page.
- This additional information should be contained within
- bookinfo.
+ This additional information is contained within
+ bookinfo.
-
- Boilerplate book with
- bookinfo
+
+ Boilerplate book with
+ bookinfo
-
+
- <book>
- <bookinfo>
- <title>Your Title Here</title>
-
- <author>
- <firstname>Your first name</firstname>
- <surname>Your surname</surname>
- <affiliation>
- <address><email>Your email address</email></address>
- </affiliation>
- </author>
-
- <copyright>
- <year>1998</year>
- <holder role="mailto:your email address">Your name</holder>
- </copyright>
-
- <releaseinfo>$FreeBSD$</releaseinfo>
-
- <abstract>
- <para>Include an abstract of the book's contents here.</para>
- </abstract>
- </bookinfo>
+ <book>
+ <bookinfo>
+ <title>Your Title Here</title>
+
+ <author>
+ <firstname>Your first name</firstname>
+ <surname>Your surname</surname>
+ <affiliation>
+ <address><email>Your email address</email></address>
+ </affiliation>
+ </author>
+
+ <copyright>
+ <year>1998</year>
+ <holder role="mailto:your email address">Your name</holder>
+ </copyright>
+
+ <releaseinfo>$FreeBSD$</releaseinfo>
+
+ <abstract>
+ <para>Include an abstract of the book's contents here.</para>
+ </abstract>
+ </bookinfo>
…
-</book>
-
-
+</book>
+
+
-
- Starting an Article
+
+ Starting an Article
- The content of the article is contained within the
- article element. As well as containing
- structural markup, this element can contain elements that
- include additional information about the article. This is
- either meta-information, used for reference purposes, or
- additional content used to produce a title page.
+ The content of the article is contained within the
+ article element. As well as containing
+ structural markup, this element can contain elements that
+ include additional information about the article. This is
+ either meta-information, used for reference purposes, or
+ additional content used to produce a title page.
- This additional information should be contained within
- articleinfo.
+ This additional information is contained within
+ articleinfo.
-
- Boilerplate article with
- articleinfo
+
+ Boilerplate article with
+ articleinfo
-
+
- <article>
- <articleinfo>
- <title>Your title here</title>
-
- <author>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-doc-head@FreeBSD.ORG Sun Jun 23 20:14:59 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id A329A58D;
Sun, 23 Jun 2013 20:14:59 +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 938E91BA7;
Sun, 23 Jun 2013 20:14:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5NKEx9K064331;
Sun, 23 Jun 2013 20:14:59 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5NKEx0T064330;
Sun, 23 Jun 2013 20:14:59 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201306232014.r5NKEx0T064330@svn.freebsd.org>
From: Warren Block
Date: Sun, 23 Jun 2013 20:14:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42006 -
head/en_US.ISO8859-1/books/fdp-primer/writing-style
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.14
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, 23 Jun 2013 20:14:59 -0000
Author: wblock
Date: Sun Jun 23 20:14:59 2013
New Revision: 42006
URL: http://svnweb.freebsd.org/changeset/doc/42006
Log:
Add a tip about examples.
Modified:
head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
Modified: head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Sun Jun 23 19:45:12 2013 (r42005)
+++ head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Sun Jun 23 20:14:59 2013 (r42006)
@@ -71,6 +71,15 @@
rather than you can copy the file to
/tmp.
+ Give clear, correct examples. A trivial example is better
+ than no example, but a good example is better yet. Do not
+ give bad examples, identifiable by apologies or sentences like
+ but really it should never be done that way.
+ Bad examples are worse than no examples. Give good examples,
+ because even when warned not to use the example
+ as shown, the reader will usually just use the
+ example as shown.
+
Avoid weasel words like
should, might,
try, or could. These words
@@ -89,7 +98,8 @@
skill level. Tell them what they need to know. Give links to
other documents to provide background information without
having to recreate it. Put yourself in the reader's place,
- and answer the questions they will ask.
+ anticipate the questions they will ask, and answer
+ them.
From owner-svn-doc-head@FreeBSD.ORG Sun Jun 23 20:28:38 2013
Return-Path:
Delivered-To: svn-doc-head@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 D471B63A;
Sun, 23 Jun 2013 20:28:38 +0000 (UTC)
(envelope-from gabor@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 C73411C40;
Sun, 23 Jun 2013 20:28:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5NKScd6067957;
Sun, 23 Jun 2013 20:28:38 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5NKScE6067955;
Sun, 23 Jun 2013 20:28:38 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306232028.r5NKScE6067955@svn.freebsd.org>
From: Gabor Kovesdan
Date: Sun, 23 Jun 2013 20:28:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42009 - head/share/misc
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.14
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, 23 Jun 2013 20:28:38 -0000
Author: gabor
Date: Sun Jun 23 20:28:38 2013
New Revision: 42009
URL: http://svnweb.freebsd.org/changeset/doc/42009
Log:
- Example has a title not just a label so the content can start in the
second line. This fixes some rendering issues in the fdp-primer. [1]
Reported by: wblock [1]
Modified:
head/share/misc/docbook.css
Modified: head/share/misc/docbook.css
==============================================================================
--- head/share/misc/docbook.css Sun Jun 23 20:28:03 2013 (r42008)
+++ head/share/misc/docbook.css Sun Jun 23 20:28:38 2013 (r42009)
@@ -321,7 +321,7 @@ div.programlisting {
margin-right: 0;
}
-.note p, .tip p, .important p, .warning p, .caution p, .example p {
+.note p, .tip p, .important p, .warning p, .caution p, {
display: inline;
}
From owner-svn-doc-head@FreeBSD.ORG Sun Jun 23 21:54:51 2013
Return-Path:
Delivered-To: svn-doc-head@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 B9049E1;
Sun, 23 Jun 2013 21:54:51 +0000 (UTC) (envelope-from gjb@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 A5E421F7C;
Sun, 23 Jun 2013 21:54:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5NLspkM096874;
Sun, 23 Jun 2013 21:54:51 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5NLspef096873;
Sun, 23 Jun 2013 21:54:51 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306232154.r5NLspef096873@svn.freebsd.org>
From: Glen Barber
Date: Sun, 23 Jun 2013 21:54:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42012 - head/share/xml
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.14
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, 23 Jun 2013 21:54:51 -0000
Author: gjb
Date: Sun Jun 23 21:54:51 2013
New Revision: 42012
URL: http://svnweb.freebsd.org/changeset/doc/42012
Log:
MF ISBN:
Merged /projects/ISBN_1-57176-407-0/share:r40727-42011
Merged /projects/print2013/share:r40693-40726
Approved by: doceng (implicit)
Modified:
head/share/xml/man-refs.ent
Directory Properties:
head/share/ (props changed)
Modified: head/share/xml/man-refs.ent
==============================================================================
--- head/share/xml/man-refs.ent Sun Jun 23 21:08:11 2013 (r42011)
+++ head/share/xml/man-refs.ent Sun Jun 23 21:54:51 2013 (r42012)
@@ -292,6 +292,7 @@
kbdcontrol1">
kbdmap1">
kcon1">
+kdestroy1">
kdump1">
kenv1">
kerberos1">
@@ -303,6 +304,8 @@
kgdb1">
kill1">
killall1">
+kinit1">
+klist1">
ksu1">
ktrace1">
lam1">
@@ -4416,6 +4419,7 @@
jls8">
joy8">
k5su8">
+kadmin8">
kadmind8">
kernbb8">
keyserv8">
@@ -4427,6 +4431,7 @@
kldstat8">
kldunload8">
kldxref8">
+kstash8">
ktrdump8">
kzip8">
l2control8">
From owner-svn-doc-head@FreeBSD.ORG Sun Jun 23 21:55:53 2013
Return-Path:
Delivered-To: svn-doc-head@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 5D71B14B;
Sun, 23 Jun 2013 21:55:53 +0000 (UTC) (envelope-from gjb@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 346AF1F87;
Sun, 23 Jun 2013 21:55:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5NLtrk3097069;
Sun, 23 Jun 2013 21:55:53 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5NLtqMb097067;
Sun, 23 Jun 2013 21:55:52 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306232155.r5NLtqMb097067@svn.freebsd.org>
From: Glen Barber
Date: Sun, 23 Jun 2013 21:55:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42013 - in head/nl_NL.ISO8859-1:
books/handbook/firewalls books/handbook/linuxemu share/xml
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.14
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, 23 Jun 2013 21:55:53 -0000
Author: gjb
Date: Sun Jun 23 21:55:52 2013
New Revision: 42013
URL: http://svnweb.freebsd.org/changeset/doc/42013
Log:
MF ISBN:
Merged /projects/print2013/nl_NL.ISO8859-1:r40693-40726
Merged /projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1:r40727-42011
Approved by: doceng (implicit)
Modified:
head/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
head/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
Directory Properties:
head/nl_NL.ISO8859-1/ (props changed)
head/nl_NL.ISO8859-1/share/xml/entities.ent (props changed)
Modified: head/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml Sun Jun 23 21:54:51 2013 (r42012)
+++ head/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml Sun Jun 23 21:55:52 2013 (r42013)
@@ -5,7 +5,7 @@
$FreeBSD$
%SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
- %SRCID% 40792
+ %SRCID% 40732
-->
@@ -901,7 +901,12 @@ LOG_ERR – gelogde pakketten die ee
/etc/syslog.conf actief te maken kan er opnieuw
opgestart worden of is het mogelijk de daemon &man.syslogd.8; een schop
te geven zodat /etc/syslog.conf opnieuw
- wordt ingelezen met service syslogd reload.
+ wordt ingelezen met /etc/rc.d/syslogd
+ reload. Het PID (procesnummer) is te achterhalen
+ door een overzicht van taken te tonen met
+ ps -ax. Het PID is het nummer in de
+ linker kolom voor de regel waarop syslog
+ staat.
Vaak wordt vergeten
/etc/newsyslog.conf te wijzigen om het
Modified: head/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml Sun Jun 23 21:54:51 2013 (r42012)
+++ head/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml Sun Jun 23 21:55:52 2013 (r42013)
@@ -5,7 +5,7 @@
$FreeBSD$
%SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
- %SRCID% 40792
+ %SRCID% 40735
-->
From owner-svn-doc-head@FreeBSD.ORG Sun Jun 23 22:37:08 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id C110BB2A;
Sun, 23 Jun 2013 22:37:08 +0000 (UTC) (envelope-from gjb@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 B0B3A10AA;
Sun, 23 Jun 2013 22:37:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5NMb80K010381;
Sun, 23 Jun 2013 22:37:08 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5NMb8wI010379;
Sun, 23 Jun 2013 22:37:08 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306232237.r5NMb8wI010379@svn.freebsd.org>
From: Glen Barber
Date: Sun, 23 Jun 2013 22:37:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42014 - in head/en_US.ISO8859-1/books/handbook:
advanced-networking audit basics boot config disks eresources install
kernelconfig mac mail multimedia network-servers ports security users
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.14
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, 23 Jun 2013 22:37:08 -0000
Author: gjb
Date: Sun Jun 23 22:37:08 2013
New Revision: 42014
URL: http://svnweb.freebsd.org/changeset/doc/42014
Log:
MF ISBN:
Merged /projects/print2013/en_US.ISO8859-1:r40693-40726
Merged /projects/ISBN_1-57176-407-0/en_US.ISO8859-1:r40727-41455,
41457-41469,41472-41477,41479-41513,41515-41521,41523-41577,
41579-41581,41583-42013
Notes: This merge entirely excludes the en_US/books/handbook/ppp-and-slip/
changes. They will need to be looked at a bit more closely.
Note to translators: I am very, very sorry. There was no *clean* way
to merge this as separate commits. Trust me, I tried.
The revision logs for the ISBN branch should provide some insight to what
content has changed. I am more than happy to help out here. Sorry :(
Approved by: doceng (implicit)
Modified:
head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
head/en_US.ISO8859-1/books/handbook/audit/chapter.xml
head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
head/en_US.ISO8859-1/books/handbook/boot/chapter.xml
head/en_US.ISO8859-1/books/handbook/config/chapter.xml
head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
head/en_US.ISO8859-1/books/handbook/install/chapter.xml
head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
head/en_US.ISO8859-1/books/handbook/mac/chapter.xml
head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
head/en_US.ISO8859-1/books/handbook/security/chapter.xml
head/en_US.ISO8859-1/books/handbook/users/chapter.xml
Directory Properties:
head/en_US.ISO8859-1/ (props changed)
Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Sun Jun 23 21:55:52 2013 (r42013)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Sun Jun 23 22:37:08 2013 (r42014)
@@ -11,7 +11,7 @@
Synopsis
- This chapter will cover a number of advanced networking
+ This chapter covers a number of advanced networking
topics.After reading this chapter, you will know:
@@ -27,7 +27,7 @@
- How to make FreeBSD act as a bridge.
+ How to make &os; act as a bridge.
@@ -36,8 +36,9 @@
- How to set up network PXE booting with an NFS root file
- system.
+ How to set up network PXE booting
+ with an
+ NFS root file system.
@@ -45,16 +46,18 @@
- How to set up IPv6 on a FreeBSD machine.
+ How to set up IPv6 on a &os;
+ machine.
- How to configure ATM.
+ How to configure ATM.
- How to enable and utilize the features of CARP, the
- Common Address Redundancy Protocol in &os;
+ How to enable and utilize the features of the Common
+ Address Redundancy Protocol (CARP) in
+ &os;.
@@ -71,13 +74,13 @@
- Know how to configure and install a new FreeBSD kernel
+ Know how to configure and install a new &os; kernel
().
- Know how to install additional third-party
- software ().
+ Know how to install additional third-party software
+ ().
@@ -105,22 +108,21 @@
one to the other. This is called
routing. A route is a
defined pair of addresses: a destination and a
- gateway. The pair indicates that if you are
- trying to get to this destination,
- communicate through this gateway. There
- are three types of destinations: individual hosts, subnets, and
+ gateway. The pair indicates that when trying
+ to get to this destination, communicate
+ through this gateway. There are three
+ types of destinations: individual hosts, subnets, and
default. The default route is
- used if none of the other routes apply. We will talk a little
- bit more about default routes later on. There are also three
+ used if none of the other routes apply. There are also three
types of gateways: individual hosts, interfaces (also called
- links), and Ethernet hardware addresses (MAC
- addresses).
+ links), and Ethernet hardware
+ (MAC) addresses.An Example
- To illustrate different aspects of routing, we will use
- the following example from netstat:
+ This example &man.netstat.1; output illustrates several
+ aspects of routing:&prompt.user; netstat -r
Routing tables
@@ -138,9 +140,8 @@ host2.example.com link#1 UC
224 link#1 UC 0 0default route
- The first two lines specify the default route (which we
- will cover in the
- next section)
+ The first two lines specify the default route, described
+ in more detail in ,
and the localhost route.loopback device
@@ -149,66 +150,60 @@ host2.example.com link#1 UC
localhost is lo0,
also known as the loopback device. This says to keep all
traffic for this destination internal, rather than sending it
- out over the LAN, since it will only end up back where it
- started.
+ out over the network.
EthernetMAC address
- The next thing that stands out are the addresses beginning
- with 0:e0:. These are Ethernet
- hardware addresses, which are also known as MAC addresses.
- FreeBSD will automatically identify any hosts
- (test0 in the example) on the local Ethernet
- and add a route for that host, directly to it over the
- Ethernet interface, ed0. There is
- also a timeout (Expire column) associated
- with this type of route, which is used if we fail to hear from
- the host in a specific amount of time. When this happens, the
- route to this host will be automatically deleted. These hosts
- are identified using a mechanism known as RIP (Routing
- Information Protocol), which figures out routes to local hosts
- based upon a shortest path determination.
+ The addresses beginning with 0:e0: are Ethernet hardware addresses,
+ also known as MAC addresses. &os; will
+ automatically identify any hosts, test0 in
+ the example, on the local Ethernet and add a route for that
+ host over the Ethernet interface,
+ ed0. This type of route has a
+ timeout, seen in the Expire column, which
+ is used if the host does not respond in a specific amount of
+ time. When this happens, the route to this host will be
+ automatically deleted. These hosts are identified using the
+ Routing Information Protocol (RIP), which
+ calculates routes to local hosts based upon a shortest path
+ determination.subnet
- FreeBSD will also add subnet routes for the local subnet
- (10.20.30.255 is the broadcast
- address for the subnet
- 10.20.30, and
- example.com is the domain
- name associated with that subnet). The designation
+ &os; will add subnet routes for the local subnet.
+ 10.20.30.255 is the broadcast
+ address for the subnet 10.20.30
+ and example.com is the
+ domain name associated with that subnet. The designation
link#1 refers to the first Ethernet card in
- the machine. You will notice no additional interface is
- specified for those.
+ the machine.
+
+ Local network hosts and local subnets have their routes
+ automatically configured by a daemon called &man.routed.8;.
+ If it is not running, only routes which are statically defined
+ by the administrator will exist.
+
+ The host1 line refers to the host
+ by its Ethernet address. Since it is the sending host, &os;
+ knows to use the loopback interface
+ (lo0) rather than the Ethernet
+ interface.
- Both of these groups (local network hosts and local
- subnets) have their routes automatically configured by a
- daemon called routed. If this is
- not run, then only routes which are statically defined (i.e.,
- entered explicitly) will exist.
-
- The host1 line refers to our host,
- which it knows by Ethernet address. Since we are the sending
- host, FreeBSD knows to use the loopback interface
- (lo0) rather than sending it out over
- the Ethernet interface.
-
- The two host2 lines are an example of
- what happens when we use an &man.ifconfig.8; alias (see the
- section on Ethernet for reasons why we would do this). The
+ The two host2 lines represent aliases
+ which were created using &man.ifconfig.8;. The
=> symbol after the
- lo0 interface says that not only are
- we using the loopback (since this address also refers to the
- local host), but specifically it is an alias. Such routes
+ lo0 interface says that an alias
+ has been set in addition to the loopback address. Such routes
only show up on the host that supports the alias; all other
- hosts on the local network will simply have a
+ hosts on the local network will have a
link#1 line for such routes.
- The final line (destination subnet
- 224) deals with multicasting,
- which will be covered in another section.
+ The final line (destination subnet 224) deals with
+ multicasting.Finally, various attributes of each route can be seen in
the Flags column. Below is a short table
@@ -247,7 +242,7 @@ host2.example.com link#1 UC
CClone: Generates a new route based upon this
- route for machines we connect to. This type of route
+ route for machines to connect to. This type of route
is normally used for local networks.
@@ -276,25 +271,24 @@ host2.example.com link#1 UC
When the local system needs to make a connection to a
remote host, it checks the routing table to determine if a
known path exists. If the remote host falls into a subnet
- that we know how to reach (Cloned routes), then the system
- checks to see if it can connect along that interface.
+ that it knows how to reach, the system checks to see if it
+ can connect using that interface.If all known paths fail, the system has one last option:
the default route. This route is a special
type of gateway route (usually the only one present in the
system), and is always marked with a c in
the flags field. For hosts on a local area network, this
- gateway is set to whatever machine has a direct connection to
- the outside world (whether via PPP link, DSL, cable modem, T1,
- or another network interface).
-
- If you are configuring the default route for a machine
- which itself is functioning as the gateway to the outside
- world, then the default route will be the gateway machine at
- your Internet Service Provider's (ISP) site.
+ gateway is set to the system which has a direct connection to
+ the Internet.
- Let us look at an example of default routes. This is a
- common configuration:
+ The default route for a machine which itself is
+ functioning as the gateway to the outside world, will be the
+ gateway machine at the Internet Service Provider
+ (ISP).
+
+ This example is a common configuration for a default
+ route:
@@ -308,14 +302,15 @@ host2.example.com link#1 UC
The hosts Local1 and
- Local2 are at your site.
- Local1 is connected to an ISP via a dial up
- PPP connection. This PPP server computer is connected through
- a local area network to another gateway computer through an
- external interface to the ISPs Internet feed.
+ Local2 are on the local network.
+ Local1 is connected to an
+ ISP using a
+ PPP connection. This
+ PPP server is connected through a local
+ area network to another gateway computer through an external
+ interface to the ISP.
- The default routes for each of your machines will
- be:
+ The default routes for each machine will be:
@@ -343,26 +338,28 @@ host2.example.com link#1 UC
- A common question is Why (or how) would we set
- the T1-GW to be the default gateway for
- Local1, rather than the ISP server it is
- connected to?.
-
- Remember, since the PPP interface is using an address on
- the ISP's local network for your side of the connection,
- routes for any other machines on the ISP's local network will
- be automatically generated. Hence, you will already know how
+ A common question is Why is
+ T1-GW configured as the default gateway for
+ Local1, rather than the
+ ISP server it is connected
+ to?.
+
+ Since the PPP interface is using an
+ address on the ISP's local network for
+ the local side of the connection, routes for any other
+ machines on the ISP's local network will
+ be automatically generated. The system already knows how
to reach the T1-GW machine, so there is no
- need for the intermediate step of sending traffic to the ISP
- server.
+ need for the intermediate step of sending traffic to the
+ ISP's server.
- It is common to use the address
- X.X.X.1 as the gateway address
- for your local network. So (using the same example), if your
- local class-C address space was
- 10.20.30 and your ISP was using
- 10.9.9 then the default routes
- would be:
+ It is common to use the address X.X.X.1 as the gateway address for
+ the local network. So, if the local class C address space is
+ 10.20.30 and the
+ ISP is using 10.9.9, the default routes would
+ be:
@@ -387,19 +384,19 @@ host2.example.com link#1 UC
The default route can be easily defined in
- /etc/rc.conf. In our example, on
- the Local2 machine, we added the following
- line in /etc/rc.conf:
+ /etc/rc.conf. In this example, on
+ Local2, add the following line to
+ /etc/rc.conf:
defaultrouter="10.20.30.1"
- It is also possible to do it directly from the command
- line with the &man.route.8; command:
+ It is also possible to add the route directly using
+ &man.route.8;:&prompt.root; route add default 10.20.30.1For more information on manual manipulation of network
- routing tables, consult the &man.route.8; manual page.
+ routing tables, refer to &man.route.8;.
@@ -407,32 +404,27 @@ host2.example.com link#1 UC
dual homed hosts
- There is one other type of configuration that we should
- cover, and that is a host that sits on two different networks.
- Technically, any machine functioning as a gateway (in the
- example above, using a PPP connection) counts as a dual-homed
- host. But the term is really only used to refer to a machine
- that sits on two local-area networks.
-
- In one case, the machine has two Ethernet cards, each
- having an address on the separate subnets. Alternately, the
- machine may only have one Ethernet card, and be using
- &man.ifconfig.8; aliasing. The former is used if two
- physically separate Ethernet networks are in use, the latter
- if there is one physical network segment, but two logically
- separate subnets.
+ A a dual-homed system is a host which resides on two
+ different networks.
+
+ The dual-homed machine might have two Ethernet cards, each
+ having an address on a separate subnet. Alternately, the
+ machine can have one Ethernet card and uses &man.ifconfig.8;
+ aliasing. The former is used if two physically separate
+ Ethernet networks are in use and the latter if there is one
+ physical network segment, but two logically separate
+ subnets.Either way, routing tables are set up so that each subnet
knows that this machine is the defined gateway (inbound route)
to the other subnet. This configuration, with the machine
- acting as a router between the two subnets, is often used when
- we need to implement packet filtering or firewall security in
+ acting as a router between the two subnets, is often used
+ to implement packet filtering or firewall security in
either or both directions.
- If you want this machine to actually forward packets
- between the two interfaces, you need to tell FreeBSD to enable
- this ability. See the next section for more details on how
- to do this.
+ For this machine to forward packets between the two
+ interfaces, &os; must be configured as a router, as
+ demonstrated in the next section.
@@ -440,10 +432,10 @@ host2.example.com link#1 UC
router
- A network router is simply a system that forwards packets
- from one interface to another. Internet standards and good
- engineering practice prevent the FreeBSD Project from enabling
- this by default in FreeBSD. You can enable this feature by
+ A network router is a system that forwards packets from
+ one interface to another. Internet standards and good
+ engineering practice prevent the &os; Project from enabling
+ this by default in &os;. This feature can be enabled by
changing the following variable to YES in
&man.rc.conf.5;:
@@ -451,23 +443,21 @@ host2.example.com link#1 UC
This option will set the &man.sysctl.8; variable
net.inet.ip.forwarding to
- 1. If you should need to stop routing
- temporarily, you can reset this to 0
- temporarily.
+ 1. To stop routing, reset this to
+ 0.BGPRIPOSPF
- Your new router will need routes to know where to send the
- traffic. If your network is simple enough you can use static
- routes. FreeBSD also comes with the standard BSD routing
- daemon &man.routed.8;, which speaks RIP (both version 1 and
- version 2) and IRDP. Support for BGP v4, OSPF v2, and other
+ The new router will need routes to know where to send the
+ traffic. If the network is simple enough, static routes can
+ be used. &os; comes with the standard BSD routing daemon
+ &man.routed.8;, which speaks RIP versions
+ 1 and 2, and IRDP. Support for
+ BGPv4, OSPFv2, and other
sophisticated routing protocols is available with the
- net/zebra package.
- Commercial products such as &gated;
- are also available for more complex network routing
- solutions.
+ net/zebra package or
+ port.
@@ -486,7 +476,7 @@ host2.example.com link#1 UC
Manual Configuration
- Let us assume we have a network as follows:
+ Consider the following network:
@@ -520,21 +510,16 @@ host2.example.com link#1 UC
- In this scenario, RouterA is our &os;
+ In this scenario, RouterA is a &os;
machine that is acting as a router to the rest of the
- Internet. It has a default route set to
- 10.0.0.1 which allows it to
- connect with the outside world. We will assume that
- RouterB is already configured properly and
- knows how to get wherever it needs to go. (This is simple
- in this picture. Just add a default route on
- RouterB using
- 192.168.1.1 as the
- gateway.)
+ Internet. It has a default route set to 10.0.0.1 which allows it to
+ connect with the outside world. RouterB is
+ already configured properly as it uses 192.168.1.1 as the gateway.
- If we look at the routing table for
- RouterA we would see something like the
- following:
+ The routing table on RouterA looks
+ something like this:&prompt.user; netstat -nr
Routing tables
@@ -546,14 +531,12 @@ default 10.0.0.1 UG
10.0.0.0/24 link#1 UC 0 0 xl0
192.168.1.0/24 link#2 UC 0 0 xl1
- With the current routing table RouterA
- will not be able to reach our Internal Net 2. It does not
- have a route for
- 192.168.2.0/24. One way to
- alleviate this is to manually add the route. The following
- command would add the Internal Net 2 network to
- RouterA's routing table using
- 192.168.1.2 as the next
+ With the current routing table, RouterA
+ cannot reach Internal Net 2 as it does not have a route for
+ 192.168.2.0/24. The
+ following command adds the Internal Net 2 network to
+ RouterA's routing table using 192.168.1.2 as the next
hop:&prompt.root; route add -net 192.168.2.0/24 192.168.1.2
@@ -566,39 +549,34 @@ default 10.0.0.1 UG
Persistent Configuration
- The above example is perfect for configuring a static
- route on a running system. However, one problem is that the
- routing information will not persist if you reboot your &os;
- machine. Additional static routes can be
- entered in /etc/rc.conf:
+ The above example configures a static route on a
+ running system. However, the routing information will not
+ persist if the &os; system reboots. Persistent static
+ routes can be entered in
+ /etc/rc.conf:# Add Internal Net 2 as a static route
static_routes="internalnet2"
route_internalnet2="-net 192.168.2.0/24 192.168.1.2"The static_routes configuration
- variable is a list of strings separated by a space. Each
- string references to a route name. In our above example we
- only have one string in static_routes.
- This string is internalnet2. We
- then add a configuration variable called
+ variable is a list of strings separated by a space, where
+ each string references a route name. This example only
+ has one string in static_routes,
+ internalnet2. The variable
route_internalnet2
- where we put all of the configuration parameters we would
- give to the &man.route.8; command. For our example above we
- would have used the command:
+ contains all of the configuration parameters to
+ &man.route.8;. This example is equivalent to the
+ command:&prompt.root; route add -net 192.168.2.0/24 192.168.1.2
- so we need "-net 192.168.2.0/24
- 192.168.1.2".
-
- As said above, we can have more than one string in
- static_routes. This allows us to create
- multiple static routes. The following lines shows an
- example of adding static routes for the
- 192.168.0.0/24 and
- 192.168.1.0/24 networks on an
- imaginary router:
+ Using more than one string in
+ static_routes creates multiple static
+ routes. The following shows an example of adding static
+ routes for the 192.168.0.0/24
+ and 192.168.1.0/24
+ networks:static_routes="net1 net2"
route_net1="-net 192.168.0.0/24 192.168.0.1"
@@ -609,36 +587,24 @@ route_net2="-net 192.168.1.0/24 192.168.
Routing Propagation
- routing propagation
- We have already talked about how we define our routes to
- the outside world, but not about how the outside world finds
- us.
-
- We already know that routing tables can be set up so that
- all traffic for a particular address space (in our examples, a
- class-C subnet) can be sent to a particular host on that
- network, which will forward the packets inbound.
-
- When you get an address space assigned to your site, your
- service provider will set up their routing tables so that all
- traffic for your subnet will be sent down your PPP link to
- your site. But how do sites across the country know to send
- to your ISP?
-
- There is a system (much like the distributed DNS
- information) that keeps track of all assigned address-spaces,
- and defines their point of connection to the Internet
- Backbone. The Backbone are the main trunk
- lines that carry Internet traffic across the country, and
- around the world. Each backbone machine has a copy of a
- master set of tables, which direct traffic for a particular
- network to a specific backbone carrier, and from there down
- the chain of service providers until it reaches your
- network.
-
- It is the task of your service provider to advertise to
- the backbone sites that they are the point of connection (and
- thus the path inward) for your site. This is known as route
+ When an address space is assigned to a network, the
+ service provider configures their routing tables so that all
+ traffic for the network will be sent to the link for the
+ site. But how do external sites know to send their packets
+ to the network's ISP?
+
+ There is a system that keeps track of all assigned
+ address spaces and defines their point of connection to the
+ Internet backbone, or the main trunk lines that carry Internet
+ traffic across the country and around the world. Each
+ backbone machine has a copy of a master set of tables, which
+ direct traffic for a particular network to a specific
+ backbone carrier, and from there down the chain of service
+ providers until it reaches your network.
+
+ It is the task of the service provider to advertise to
+ the backbone sites that they are the point of connection, and
+ thus the path inward, for a site. This is known as route
propagation.
@@ -646,24 +612,22 @@ route_net2="-net 192.168.1.0/24 192.168.
Troubleshooting
- traceroute
+ &man.traceroute.8;
- Sometimes, there is a problem with routing propagation,
- and some sites are unable to connect to you. Perhaps the most
+ Sometimes, there is a problem with routing propagation
+ and some sites are unable to connect. Perhaps the most
useful command for trying to figure out where routing is
- breaking down is the &man.traceroute.8; command. It is
- equally useful if you cannot seem to make a connection to a
- remote machine (i.e., &man.ping.8; fails).
-
- The &man.traceroute.8; command is run with the name of the
- remote host you are trying to connect to. It will show the
- gateway hosts along the path of the attempt, eventually either
+ breaking down is &man.traceroute.8;. It is useful when
+ &man.ping.8; fails.
+
+ When using &man.traceroute.8;, include the name of the
+ remote host to connect to. The output will show the gateway
+ hosts along the path of the attempt, eventually either
reaching the target host, or terminating because of a lack of
connection.
- For more information, see the manual page for
- &man.traceroute.8;.
+ For more information, refer to &man.traceroute.8;.
@@ -676,19 +640,18 @@ route_net2="-net 192.168.1.0/24 192.168.
kernel optionsMROUTING
- FreeBSD supports both multicast applications and multicast
- routing natively. Multicast applications do not require any
- special configuration of FreeBSD; applications will generally
- run out of the box. Multicast routing
- requires that support be compiled into the kernel:
+ &os; natively supports both multicast applications and
+ multicast routing. Multicast applications do not require any
+ special configuration of &os;; as applications will generally
+ run out of the box. Multicast routing requires that support
+ be compiled into a custom kernel:options MROUTING
- In addition, the multicast routing daemon, &man.mrouted.8;
- must be configured to set up tunnels and
- DVMRP via
+ The multicast routing daemon, &man.mrouted.8;, must be
+ configured to set up tunnels and DVMRP via
/etc/mrouted.conf. More details on
- multicast configuration may be found in the manual page for
+ multicast configuration may be found in
&man.mrouted.8;.
@@ -697,8 +660,8 @@ route_net2="-net 192.168.1.0/24 192.168.
which has largely been replaced by &man.pim.4; in many
multicast installations. &man.mrouted.8; and the related
&man.map-mbone.8; and &man.mrinfo.8; utilities are available
- in the &os; Ports Collection as
- net/mrouted.
+ in the &os; Ports Collection as net/mrouted.
@@ -735,83 +698,92 @@ route_net2="-net 192.168.1.0/24 192.168.
Most wireless networks are based on the &ieee; 802.11
standards. A basic wireless network consists of multiple
stations communicating with radios that broadcast in either
- the 2.4GHz or 5GHz band (though this varies according to the
+ the 2.4GHz or 5GHz band, though this varies according to the
locale and is also changing to enable communication in the
- 2.3GHz and 4.9GHz ranges).
+ 2.3GHz and 4.9GHz ranges.
- 802.11 networks are organized in two ways: in
- infrastructure mode one station acts as a
- master with all the other stations associating to it; the
- network is known as a BSS and the master station is termed an
- access point (AP). In a BSS all communication passes through
- the AP; even when one station wants to communicate with
- another wireless station messages must go through the AP. In
- the second form of network there is no master and stations
- communicate directly. This form of network is termed an IBSS
- and is commonly known as an
- ad-hoc network.
+ 802.11 networks are organized in two ways. In
+ infrastructure mode, one station acts as
+ a
+ master with all the other stations associating to it, the
+ network is known as a BSS, and the master
+ station is termed an access point (AP).
+ In a BSS, all communication passes through
+ the AP; even when one station wants to
+ communicate with another wireless station, messages must go
+ through the AP. In the second form of
+ network, there is no master and stations communicate directly.
+ This form of network is termed an IBSS
+ and is commonly known as an ad-hoc
+ network.802.11 networks were first deployed in the 2.4GHz band
using protocols defined by the &ieee; 802.11 and 802.11b
standard. These specifications include the operating
- frequencies, MAC layer characteristics including framing and
- transmission rates (communication can be done at various
- rates). Later the 802.11a standard defined operation in the
- 5GHz band, including different signalling mechanisms and
- higher transmission rates. Still later the 802.11g standard
- was defined to enable use of 802.11a signalling and
- transmission mechanisms in the 2.4GHz band in such a way as to
- be backwards compatible with 802.11b networks.
+ frequencies and the MAC layer
+ characteristics, including framing and transmission rates,
+ as communication can occur at various rates. Later, the
+ 802.11a standard defined operation in the 5GHz band, including
+ different signaling mechanisms and higher transmission rates.
+ Still later, the 802.11g standard defined the use of 802.11a
+ signaling and transmission mechanisms in the 2.4GHz band in
+ such a way as to be backwards compatible with 802.11b
+ networks.
- Separate from the underlying transmission techniques
+ Separate from the underlying transmission techniques,
802.11 networks have a variety of security mechanisms. The
original 802.11 specifications defined a simple security
- protocol called WEP. This protocol uses a fixed pre-shared key
- and the RC4 cryptographic cipher to encode data transmitted on
- a network. Stations must all agree on the fixed key in order
- to communicate. This scheme was shown to be easily broken and
- is now rarely used except to discourage transient users from
- joining networks. Current security practice is given by the
- &ieee; 802.11i specification that defines new cryptographic
- ciphers and an additional protocol to authenticate stations to
- an access point and exchange keys for doing data
- communication. Further, cryptographic keys are periodically
- refreshed and there are mechanisms for detecting intrusion
- attempts (and for countering intrusion attempts). Another
+ protocol called WEP. This protocol uses a
+ fixed pre-shared key and the RC4 cryptographic cipher to
+ encode data transmitted on a network. Stations must all
+ agree on the fixed key in order to communicate. This scheme
+ was shown to be easily broken and is now rarely used except
+ to discourage transient users from joining networks. Current
+ security practice is given by the &ieee; 802.11i specification
+ that defines new cryptographic ciphers and an additional
+ protocol to authenticate stations to an access point and
+ exchange keys for data communication. Cryptographic keys
+ are periodically refreshed and there are mechanisms for
+ detecting and countering intrusion attempts. Another
security protocol specification commonly used in wireless
- networks is termed WPA. This was a precursor to 802.11i
- defined by an industry group as an interim measure while
- waiting for 802.11i to be ratified. WPA specifies a subset of
- the requirements found in 802.11i and is designed for
- implementation on legacy hardware. Specifically WPA requires
- only the TKIP cipher that is derived from the original WEP
- cipher. 802.11i permits use of TKIP but also requires support
- for a stronger cipher, AES-CCM, for encrypting data. (The AES
- cipher was not required in WPA because it was deemed too
+ networks is termed WPA, which was a
+ precursor to 802.11i. WPA specifies a
+ subset of the requirements found in 802.11i and is designed
+ for implementation on legacy hardware. Specifically,
+ WPA requires only the
+ TKIP cipher that is derived from the
+ original WEP cipher. 802.11i permits use
+ of TKIP but also requires support for a
+ stronger cipher, AES-CCM, for encrypting data. The
+ AES cipher was not required in
+ WPA because it was deemed too
computationally costly to be implemented on legacy
- hardware.)
+ hardware.
- Other than the above protocol standards the other
- important standard to be aware of is 802.11e. This defines
- protocols for deploying multi-media applications such as
- streaming video and voice over IP (VoIP) in an 802.11 network.
- Like 802.11i, 802.11e also has a precursor specification
- termed WME (later renamed WMM) that has been defined by an
+ The other standard to be aware of is 802.11e. It defines
+ protocols for deploying multimedia applications, such as
+ streaming video and voice over IP (VoIP),
+ in an 802.11 network. Like 802.11i, 802.11e also has a
+ precursor specification termed WME (later
+ renamed WMM) that has been defined by an
industry group as a subset of 802.11e that can be deployed now
- to enable multi-media applications while waiting for the final
+ to enable multimedia applications while waiting for the final
ratification of 802.11e. The most important thing to know
- about 802.11e and WME/WMM is that it enables prioritized
- traffic use of a wireless network through Quality of Service
- (QoS) protocols and enhanced media access protocols. Proper
- implementation of these protocols enable high speed bursting
- of data and prioritized traffic flow.
+ about 802.11e and
+ WME/WMM is that it
+ enables prioritized traffic over a wireless network through
+ Quality of Service (QoS) protocols and
+ enhanced media access protocols. Proper implementation of
+ these protocols enables high speed bursting of data and
+ prioritized traffic flow.
- &os; supports networks that operate
- using 802.11a, 802.11b, and 802.11g. The WPA and 802.11i
+ &os; supports networks that operate using 802.11a,
+ 802.11b, and 802.11g. The WPA and 802.11i
security protocols are likewise supported (in conjunction with
- any of 11a, 11b, and 11g) and QoS and traffic prioritization
- required by the WME/WMM protocols are supported for a limited
- set of wireless devices.
+ any of 11a, 11b, and 11g) and QoS and
+ traffic prioritization required by the
+ WME/WMM protocols are
+ supported for a limited set of wireless devices.
@@ -820,63 +792,59 @@ route_net2="-net 192.168.1.0/24 192.168.
Kernel Configuration
- To use wireless networking, you need a wireless
- networking card and to configure the kernel with the
- appropriate wireless networking support. The latter is
- separated into multiple modules so that you only need to
- configure the software you are actually going to use.
-
- The first thing you need is a wireless device. The most
- commonly used devices are those that use parts made by
- Atheros. These devices are supported by the &man.ath.4;
- driver and require the following line to be added to
+ To use wireless networking, a wireless networking card
+ is needed and the kernel needs to be configured with the
+ appropriate wireless networking support. The kernel is
+ separated into multiple modules so that only the required
+ support needs to be configured.
+
+ The most
+ commonly used wireless devices are those that use parts made
+ by Atheros. These devices are supported by &man.ath.4;
+ and require the following line to be added to
/boot/loader.conf:if_ath_load="YES"The Atheros driver is split up into three separate
- pieces: the proper driver (&man.ath.4;), the hardware
- support layer that handles chip-specific functions
- (&man.ath.hal.4;), and an algorithm for selecting which of
- several possible rates for transmitting frames
- (ath_rate_sample here). When this support is loaded as
- kernel modules, these dependencies are automatically handled
- for you. If, instead of an Atheros device, you had another
- device you would select the module for that device;
- e.g.:
+ pieces: the driver (&man.ath.4;), the hardware support
+ layer that handles chip-specific functions
+ (&man.ath.hal.4;), and an algorithm for selecting the
+ rate for transmitting frames. When this support is loaded
+ as kernel modules, any dependencies are automatically
+ handled. To load support for a different type of wireless
+ device, specify the module for that device. This example
+ is for devices based on the Intersil Prism parts
+ (&man.wi.4;) driver:if_wi_load="YES"
- for devices based on the Intersil Prism parts
- (&man.wi.4; driver).
-
- In the rest of this document, we will use an
- &man.ath.4; device, the device name in the examples must
- be changed according to your configuration. A list of
+ The examples in this section use an &man.ath.4;
+ device and the device name in the examples must be
+ changed according to the configuration. A list of
available wireless drivers and supported adapters can be
- found in the &os; Hardware Notes. Copies of these notes
- for various releases and architectures are available on
+ found in the &os; Hardware Notes, available on
the Release
- Information page of the &os; Web site. If a
- native &os; driver for your wireless device does not
- exist, it may be possible to directly use the &windows;
- driver with the help of the
- NDIS driver
+ Information page of the &os; website. If a
+ native &os; driver for the wireless device does not
+ exist, it may be possible to use the &windows; driver
+ with the help of the NDIS driver
wrapper.
- With that, you will need the modules that implement
- cryptographic support for the security protocols you intend
- to use. These are intended to be dynamically loaded on
- demand by the &man.wlan.4; module but for now they must be
- manually configured. The following modules are available:
- &man.wlan.wep.4;, &man.wlan.ccmp.4; and &man.wlan.tkip.4;.
- Both &man.wlan.ccmp.4; and &man.wlan.tkip.4; drivers are
- only needed if you intend to use the WPA and/or 802.11i
- security protocols. If your network does not use
- encryption, you will not need &man.wlan.wep.4; support. To
+ In addition, the modules that implement cryptographic
+ support for the security protocols to use must be loaded.
+ These are intended to be dynamically loaded on demand by
+ the &man.wlan.4; module, but for now they must be manually
+ configured. The following modules are available:
+ &man.wlan.wep.4;, &man.wlan.ccmp.4;, and &man.wlan.tkip.4;.
+ The &man.wlan.ccmp.4; and &man.wlan.tkip.4; drivers are
+ only needed when using the WPA or
+ 802.11i security protocols. If the network does not use
+ encryption, &man.wlan.wep.4; support is not needed. To
load these modules at boot time, add the following lines to
/boot/loader.conf:
@@ -884,17 +852,16 @@ route_net2="-net 192.168.1.0/24 192.168.
wlan_ccmp_load="YES"
wlan_tkip_load="YES"
- With this information in the system bootstrap
- configuration file (i.e.,
- /boot/loader.conf), you have to reboot
- your &os; box. If you do not want to reboot your machine
- for the moment, you can load the modules by hand using
+ Once this information has been added to
+ /boot/loader.conf, reboot the &os;
+ box. Alternately, load the modules by hand using
&man.kldload.8;.
- If you do not want to use modules, it is possible to
- compile these drivers into the kernel by adding the
- following lines to your kernel configuration file:
+ For users who do not want to use modules, it is
+ possible to compile these drivers into the kernel by
+ adding the following lines to a custom kernel
+ configuration file:device wlan # 802.11 support
device wlan_wep # 802.11 WEP support
@@ -907,13 +874,12 @@ options AH_SUPPORT_AR5416 # enable AR541
device ath_rate_sample # SampleRate tx rate control for athWith this information in the kernel configuration
- file, recompile the kernel and reboot your &os;
+ file, recompile the kernel and reboot the &os;
machine.
- When the system is up, we could find some information
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 00:14:04 2013
Return-Path:
Delivered-To: svn-doc-head@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 3FA33967;
Mon, 24 Jun 2013 00:14:04 +0000 (UTC) (envelope-from gjb@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 307D6133D;
Mon, 24 Jun 2013 00:14:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O0E4dC041190;
Mon, 24 Jun 2013 00:14:04 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O0E3sX041186;
Mon, 24 Jun 2013 00:14:03 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306240014.r5O0E3sX041186@svn.freebsd.org>
From: Glen Barber
Date: Mon, 24 Jun 2013 00:14:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42015 - head/en_US.ISO8859-1/htdocs/releases/9.2R
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.14
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: Mon, 24 Jun 2013 00:14:04 -0000
Author: gjb
Date: Mon Jun 24 00:14:03 2013
New Revision: 42015
URL: http://svnweb.freebsd.org/changeset/doc/42015
Log:
- Add the 9.2-RELEASE schedule, not yet linked to the build.
- Comment the 9.2TODO wiki links, they do not exist yet.
Approved by: re (implicit)
Added:
head/en_US.ISO8859-1/htdocs/releases/9.2R/
head/en_US.ISO8859-1/htdocs/releases/9.2R/Makefile (contents, props changed)
head/en_US.ISO8859-1/htdocs/releases/9.2R/docbook.css (contents, props changed)
head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml (contents, props changed)
Added: head/en_US.ISO8859-1/htdocs/releases/9.2R/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/9.2R/Makefile Mon Jun 24 00:14:03 2013 (r42015)
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+DOCS= schedule.xml
+
+DATA= docbook.css
+
+.include "${DOC_PREFIX}/share/mk/web.site.mk"
Added: head/en_US.ISO8859-1/htdocs/releases/9.2R/docbook.css
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/9.2R/docbook.css Mon Jun 24 00:14:03 2013 (r42015)
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2001, 2003, 2010 The FreeBSD Documentation Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+BODY ADDRESS {
+ line-height: 1.3;
+ margin: .6em 0;
+}
+
+BODY BLOCKQUOTE {
+ margin-top: .75em;
+ line-height: 1.5;
+ margin-bottom: .75em;
+}
+
+HTML BODY {
+ margin: 1em 8% 1em 10%;
+ line-height: 1.2;
+}
+
+.LEGALNOTICE {
+ font-size: small;
+ font-variant: small-caps;
+}
+
+BODY DIV {
+ margin: 0;
+}
+
+DL {
+ margin: .8em 0;
+ line-height: 1.2;
+}
+
+BODY FORM {
+ margin: .6em 0;
+}
+
+H1, H2, H3, H4, H5, H6,
+DIV.EXAMPLE P B,
+.QUESTION,
+DIV.TABLE P B,
+DIV.PROCEDURE P B {
+ color: #990000;
+}
+
+BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 {
+ line-height: 1.3;
+ margin-left: 0;
+}
+
+BODY H1, BODY H2 {
+ margin: .8em 0 0 -4%;
+}
+
+BODY H3, BODY H4 {
+ margin: .8em 0 0 -3%;
+}
+
+BODY H5 {
+ margin: .8em 0 0 -2%;
+}
+
+BODY H6 {
+ margin: .8em 0 0 -1%;
+}
+
+BODY HR {
+ margin: .6em;
+ border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: #cecece;
+}
+
+BODY IMG.NAVHEADER {
+ margin: 0 0 0 -4%;
+}
+
+OL {
+ margin: 0 0 0 5%;
+ line-height: 1.2;
+}
+
+BODY PRE {
+ margin: .75em 0;
+ line-height: 1.0;
+ font-family: monospace;
+}
+
+BODY TD, BODY TH {
+ line-height: 1.2;
+}
+
+UL, BODY DIR, BODY MENU {
+ margin: 0 0 0 5%;
+ line-height: 1.2;
+}
+
+HTML {
+ margin: 0;
+ padding: 0;
+}
+
+BODY P B.APPLICATION {
+ color: #000000;
+}
+
+.FILENAME {
+ color: #007a00;
+}
+
+.GUIMENU, .GUIMENUITEM, .GUISUBMENU,
+.GUILABEL, .INTERFACE,
+.SHORTCUT, .SHORTCUT .KEYCAP {
+ font-weight: bold;
+}
+
+.GUIBUTTON {
+ background-color: #CFCFCF;
+ padding: 2px;
+}
+
+.ACCEL {
+ background-color: #F0F0F0;
+ text-decoration: underline;
+}
+
+.SCREEN {
+ padding: 1ex;
+}
+
+.PROGRAMLISTING {
+ padding: 1ex;
+ background-color: #eee;
+ border: 1px solid #ccc;
+}
+
+@media screen { /* hide from IE3 */
+ a[href]:hover { background: #ffa }
+}
+
+BLOCKQUOTE.NOTE {
+ color: #222;
+ background: #eee;
+ border: 1px solid #ccc;
+ padding: 0.4em 0.4em;
+ width: 85%;
+}
+
+BLOCKQUOTE.TIP {
+ color: #004F00;
+ background: #d8ecd6;
+ border: 1px solid green;
+ padding: 0.2em 2em;
+ width: 85%;
+}
+
+BLOCKQUOTE.IMPORTANT {
+ font-style:italic;
+ border: 1px solid #a00;
+ border-left: 12px solid #c00;
+ padding: 0.1em 1em;
+}
+
+BLOCKQUOTE.WARNING {
+ color: #9F1313;
+ background: #f8e8e8;
+ border: 1px solid #e59595;
+ padding: 0.2em 2em;
+ width: 85%;
+}
+
+.EXAMPLE {
+ background: #fefde6;
+ border: 1px solid #f1bb16;
+ margin: 1em 0;
+ padding: 0.2em 2em;
+ width: 90%;
+}
+
+.INFORMALTABLE TABLE.CALSTABLE TR TD {
+ padding-left: 1em;
+ padding-right: 1em;
+}
Added: head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml Mon Jun 24 00:14:03 2013 (r42015)
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+]>
+
+
+
+ &title;
+
+ $FreeBSD$
+
+
+
+
+
Introduction
+
+
This is the release schedule for FreeBSD &local.rel;. For more
+ information about the release engineering process, please see the Release Engineering section of the
+ web site.
+
+
General discussions about the pending release and known issues should be
+ sent to the public
+ freebsd-stable mailing list.
+ MFC
+ requests should be sent to
+ re@FreeBSD.org.
+
+
Schedule
+
+
+
+
Action
+
Expected
+
Actual
+
Description
+
+
+
+
Initial release schedule announcement
+
-
+
23 June 2013
+
Release Engineers send announcement email to developers with a
+ rough schedule.
+
+
+
+
Release schedule reminder
+
1 July 2013
+
-
+
Release Engineers send reminder announcement e-mail to developers
+ with updated schedule.
+
+
+
+
Code freeze begins
+
6 July 2013
+
-
+
Release Engineers announce that all further commits to the
+ &local.branch.stable; branch will require explicit approval.
+ Certain blanket approvals will be granted for narrow areas of
+ development, documentation improvements, etc.
+
+
+
+
BETA1 builds begin
+
19 July 2013
+
-
+
First beta test snapshot.
+
+
+
+
BETA2 builds begin
+
26 July 2013
+
-
+
Second beta test snapshot.
+
+
+
+
&local.branch.releng; branch
+
1 August 2013
+
-
+
Subversion branch created; future release engineering
+ proceeds on this branch.
+
+
+
+
RC1 builds begin
+
2 August 2013
+
-
+
First release candidate.
+
+
+
+
RC2 builds begin
+
9 August 2013
+
-
+
Second release candidate.
+
+
+
+
RC3 builds begin
+
16 August 2013
+
-
+
Third release candidate.
+
+
+
+
RELEASE builds begin
+
23 August 2013
+
-
+
9.2-RELEASE built.
+
+
+
+
RELEASE announcement
+
31 August 2013
+
-
+
9.2-RELEASE press release.
+
+
+
+
Turn over to the secteam
+
-
+
-
+
&local.branch.releng; branch is handed over to the FreeBSD
+ Security Officer Team in one or two weeks after the
+ announcement.
+
+
+
+
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 00:40:08 2013
Return-Path:
Delivered-To: svn-doc-head@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 BC8FBEB2;
Mon, 24 Jun 2013 00:40:08 +0000 (UTC) (envelope-from gjb@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 AEF411472;
Mon, 24 Jun 2013 00:40:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O0e8Pr048330;
Mon, 24 Jun 2013 00:40:08 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O0e8FY048329;
Mon, 24 Jun 2013 00:40:08 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306240040.r5O0e8FY048329@svn.freebsd.org>
From: Glen Barber
Date: Mon, 24 Jun 2013 00:40:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42016 - head/en_US.ISO8859-1/htdocs/releases
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.14
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: Mon, 24 Jun 2013 00:40:08 -0000
Author: gjb
Date: Mon Jun 24 00:40:08 2013
New Revision: 42016
URL: http://svnweb.freebsd.org/changeset/doc/42016
Log:
Link 9.2-RELEASE schedule to the build.
Approved by: re (implicit)
Modified:
head/en_US.ISO8859-1/htdocs/releases/Makefile
Modified: head/en_US.ISO8859-1/htdocs/releases/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/Makefile Mon Jun 24 00:14:03 2013 (r42015)
+++ head/en_US.ISO8859-1/htdocs/releases/Makefile Mon Jun 24 00:40:08 2013 (r42016)
@@ -17,7 +17,7 @@ SUBDIR+= 5.0R 5.1R 5.2R 5.2.1R 5.3R 5.4R
SUBDIR+= 6.0R 6.1R 6.2R 6.3R 6.4R
SUBDIR+= 7.0R 7.1R 7.2R 7.3R 7.4R
SUBDIR+= 8.0R 8.1R 8.2R 8.3R 8.4R
-SUBDIR+= 9.0R 9.1R
+SUBDIR+= 9.0R 9.1R 9.2R
.if defined(NEW_BUILD)
SUBDIR=
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 00:46:27 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id 699F6F24;
Mon, 24 Jun 2013 00:46:27 +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 59FA61484;
Mon, 24 Jun 2013 00:46:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O0kRqX051195;
Mon, 24 Jun 2013 00:46:27 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O0kRX7051194;
Mon, 24 Jun 2013 00:46:27 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201306240046.r5O0kRX7051194@svn.freebsd.org>
From: Warren Block
Date: Mon, 24 Jun 2013 00:46:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42017 -
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.14
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: Mon, 24 Jun 2013 00:46:27 -0000
Author: wblock
Date: Mon Jun 24 00:46:26 2013
New Revision: 42017
URL: http://svnweb.freebsd.org/changeset/doc/42017
Log:
Improve some xref and link examples and make them consistent.
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 Mon Jun 24 00:40:08 2013 (r42016)
+++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Mon Jun 24 00:46:26 2013 (r42017)
@@ -2011,14 +2011,14 @@ IMAGES= chapter1/fig1.png
id on Chapters and
Sections
-
+ IntroductionThis is the introduction. It contains a subsection,
which is identified as well.
-
- Sub-sect 1
+
+ More DetailsThis is a subsection.
@@ -2064,13 +2064,13 @@ IMAGES= chapter1/fig1.png
Assume that this fragment appears somewhere in a
document that includes the id
- example:
+ example shown above:More information can be found
- in .
+ in .More specific information can be found
- in .]]>
+ in .]]>
The link text will be generated automatically, looking
like (emphasized text indicates the
@@ -2078,11 +2078,11 @@ IMAGES= chapter1/fig1.png
More information can be found in Chapter
- 1, The Sample Chapter.
+ 1, Introduction.
More specific information can be found in
Section 1.1,
- Sample Sub-Sect.
+ More Details.
@@ -2130,10 +2130,10 @@ IMAGES= chapter1/fig1.png
example.
More information can be found in the
- sample chapter.
+ sample introduction.
More specific information can be found in the
- even more samples section.]]>
+ sample introduction with more details section.]]>
This output will be generated
(emphasized text is used to show the
@@ -2141,10 +2141,10 @@ IMAGES= chapter1/fig1.png
More information can be found in the
- sample chapter.
+ sample introduction.
More specific information can be found in the
- even more samples section.
+ sample introduction with more details section.
@@ -2237,6 +2237,8 @@ IMAGES= chapter1/fig1.png
url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
Partition Tables.]]>
+ Appearance:
+
Wikipedia has an excellent reference on
GUID
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 01:00:42 2013
Return-Path:
Delivered-To: svn-doc-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id 1845C1E4;
Mon, 24 Jun 2013 01:00:42 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from mail.allbsd.org (gatekeeper.allbsd.org
[IPv6:2001:2f0:104:e001::32])
by mx1.freebsd.org (Postfix) with ESMTP id F305F15FD;
Mon, 24 Jun 2013 01:00:40 +0000 (UTC)
Received: from alph.d.allbsd.org (p3086-ipbf906funabasi.chiba.ocn.ne.jp
[122.26.46.86]) (authenticated bits=128)
by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r5O10MlE049901
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
Mon, 24 Jun 2013 10:00:32 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0)
by alph.d.allbsd.org (8.14.5/8.14.5) with ESMTP id r5O10LWj045511;
Mon, 24 Jun 2013 10:00:22 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Date: Mon, 24 Jun 2013 10:00:18 +0900 (JST)
Message-Id: <20130624.100018.1908369837183849691.hrs@allbsd.org>
To: wblock@FreeBSD.org
Subject: Re: svn commit: r41999 -
head/en_US.ISO8859-1/books/fdp-primer/writing-style
From: Hiroki Sato
In-Reply-To: <201306220227.r5M2RYNg041141@svn.freebsd.org>
References: <201306220227.r5M2RYNg041141@svn.freebsd.org>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
micalg=pgp-sha1;
boundary="--Security_Multipart(Mon_Jun_24_10_00_18_2013_775)--"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org
X-Virus-Status: Clean
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
(mail.allbsd.org [133.31.130.32]); Mon, 24 Jun 2013 10:00:33 +0900 (JST)
X-Spam-Status: No, score=-89.5 required=13.0 tests=CONTENT_TYPE_PRESENT,
DIRECTOCNDYN,DYN_PBL,ONLY1HOPDIRECT,RCVD_IN_PBL,SAMEHELOBY2HOP,
USER_IN_WHITELIST autolearn=no version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
gatekeeper.allbsd.org
Cc: svn-doc-head@FreeBSD.org, svn-doc-all@FreeBSD.org,
doc-committers@FreeBSD.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
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: Mon, 24 Jun 2013 01:00:42 -0000
----Security_Multipart(Mon_Jun_24_10_00_18_2013_775)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Warren Block wrote
in <201306220227.r5M2RYNg041141@svn.freebsd.org>:
wb> Author: wblock
wb> Date: Sat Jun 22 02:27:34 2013
wb> New Revision: 41999
wb> URL: http://svnweb.freebsd.org/changeset/doc/41999
wb>
wb> Log:
wb> Improve the word list markup with brackets instead of CDATA, and add a
wb> non-breaking space to the Ports Collection example.
wb>
wb> Modified:
wb> head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
wb>
wb> Modified: head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
wb> ==============================================================================
wb> --- head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Fri Jun 21 21:41:48 2013 (r41998)
wb> +++ head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Sat Jun 22 02:27:34 2013 (r41999)
wb> @@ -496,12 +496,12 @@ GB. Hardware compression …
wb>
wb> CD-ROM
wb> - CD-ROM]]>
wb> + <acronym>CD-ROM</acronym>
Please use acronym here like the following. It
will be replaced with after DocBook 5.0 migration, but
<foo> should be avoided.
- <acronym>CD-ROM</acronym>
+ acronymCD-ROMacronym
It is good to avoid CDATA section whenever possible.
-- Hiroki
----Security_Multipart(Mon_Jun_24_10_00_18_2013_775)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (FreeBSD)
iEYEABECAAYFAlHHmiIACgkQTyzT2CeTzy3q9wCeNStNsWRG3KyTFwJi1rMhlp5u
F2wAoIMvGYj2Xq5OyQ7Joef8kljrWRel
=bNmH
-----END PGP SIGNATURE-----
----Security_Multipart(Mon_Jun_24_10_00_18_2013_775)----
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 01:00:56 2013
Return-Path:
Delivered-To: svn-doc-head@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 84F6D245;
Mon, 24 Jun 2013 01:00:56 +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 763D61601;
Mon, 24 Jun 2013 01:00:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O10uGl056817;
Mon, 24 Jun 2013 01:00:56 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O10ul6056816;
Mon, 24 Jun 2013 01:00:56 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201306240100.r5O10ul6056816@svn.freebsd.org>
From: Warren Block
Date: Mon, 24 Jun 2013 01:00:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42018 - head/en_US.ISO8859-1/books/handbook/disks
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.14
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: Mon, 24 Jun 2013 01:00:56 -0000
Author: wblock
Date: Mon Jun 24 01:00:56 2013
New Revision: 42018
URL: http://svnweb.freebsd.org/changeset/doc/42018
Log:
Suppress some ugly memories in the Storage chapter:
* Remove "RAID" section that only covers ccd(4) and ataraid(4). These
may still work, but there are better solutions for new users.
* Remove Backups to Floppies section.
* Add SATA drive names.
* Change CDROM to CD-ROM to match the FDP Primer word list.
About ccd(4):
Once new and useful, thrice ousted from its niche, time's arrow
evicts ccd from the Handbook, to live forever in the archives.
Modified:
head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml Mon Jun 24 00:46:26 2013 (r42017)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml Mon Jun 24 01:00:56 2013 (r42018)
@@ -52,19 +52,11 @@
- The various storage media options for backups.
-
-
- How to use the backup programs available under
&os;.
- How to backup to floppy disks.
-
-
- What file system snapshots are and how to use them
efficiently.
@@ -84,7 +76,7 @@
Device NamesThe following is a list of physical storage devices
- supported in &os;, and their associated device names.
+ supported in &os; and their associated device names.
Physical Disk Naming Conventions
@@ -100,27 +92,40 @@
IDE hard drives
- ad
+ ad or
+ ada
- IDE CDROM drives
- acd
+ IDE CD-ROM drives
+ acd or
+ cd
+ SATA hard drives
+ ad or
+ ada
+
+
+
+ SATA CD-ROM drives
+ acd or
+ cd
+
+ SCSI hard drives and USB Mass storage
devicesda
- SCSI CDROM drives
+ SCSI CD-ROM drivescd
- Assorted non-standard CDROM drives
+ Assorted non-standard CD-ROM drivesmcd for Mitsumi CD-ROM and
scd for Sony CD-ROM devices
@@ -242,362 +247,6 @@
&prompt.root; mount /newdisk
-
- RAID
-
-
- Software RAID
-
-
-
-
-
- Christopher
- Shumway
- Original work by
-
-
-
-
-
- Jim
- Brown
- Revised by
-
-
-
-
- Concatenated Disk Driver (CCD) Configuration
-
- RAIDsoftware
- RAIDCCD
-
- When choosing a mass storage solution, the most
- important factors to consider are speed, reliability, and
- cost. It is rare to have all three in balance. Normally a
- fast, reliable mass storage device is expensive, and to cut
- back on cost either speed or reliability must be
- sacrificed.
-
- In designing the system described below, cost was
- chosen as the most important factor, followed by speed,
- then reliability. Data transfer speed for this system is
- ultimately constrained by the network. While reliability is
- very important, the CCD drive described below serves online
- data that is already fully backed up and which can easily be
- replaced.
-
- Defining the requirements is the first step in choosing
- a mass storage solution. If the requirements prefer speed
- or reliability over cost, the solution will differ from the
- system described in this section.
-
-
- Installing the Hardware
-
- In addition to the IDE system disk, three Western
- Digital 30GB, 5400 RPM IDE disks form the core of the CCD
- disk described below, providing approximately 90GB of
- online storage. Ideally, each IDE disk would have its own
- IDE controller and cable, but to minimize cost, additional
- IDE controllers were not used. Instead, the disks were
- configured with jumpers so that each IDE controller has
- one master, and one slave.
-
- Upon reboot, the system BIOS was configured to
- automatically detect the disks attached. More
- importantly, &os; detected them on reboot:
-
- ad0: 19574MB <WDC WD205BA> [39770/16/63] at ata0-master UDMA33
-ad1: 29333MB <WDC WD307AA> [59598/16/63] at ata0-slave UDMA33
-ad2: 29333MB <WDC WD307AA> [59598/16/63] at ata1-master UDMA33
-ad3: 29333MB <WDC WD307AA> [59598/16/63] at ata1-slave UDMA33
-
- If &os; does not detect all the disks, consult
- the drive documentation for proper setup and verify
- that the controller is supported by &os;.
-
-
-
- Setting Up the CCD
-
- The &man.ccd.4; driver takes several identical disks
- and concatenates them into one logical file system. In
- order to use &man.ccd.4;, its kernel module must be
- loaded using &man.ccd.4;. When using a custom kernel,
- ensure that this line is compiled in:
-
- device ccd
-
- Before configuring &man.ccd.4;, use &man.bsdlabel.8;
- to label the disks:
-
- bsdlabel -w ad1 auto
-bsdlabel -w ad2 auto
-bsdlabel -w ad3 auto
-
- This example creates a bsdlabel for
- ad1c,
- ad2c and
- ad3c that spans the entire
- disk.
-
- The next step is to change the disk label type. Use
- &man.bsdlabel.8; to edit the disks:
-
- bsdlabel -e ad1
-bsdlabel -e ad2
-bsdlabel -e ad3
-
- This opens up the current disk label on each disk with
- the editor specified by the EDITOR
- environment variable, typically &man.vi.1;.
-
- An unmodified disk label will look something like
- this:
-
- 8 partitions:
-# size offset fstype [fsize bsize bps/cpg]
- c: 60074784 0 unused 0 0 0 # (Cyl. 0 - 59597)
-
- Add a new e partition for
- &man.ccd.4; to use. This can usually be copied from the
- c partition, but the
- must be
- 4.2BSD. The disk label should now
- look something like this:
-
- 8 partitions:
-# size offset fstype [fsize bsize bps/cpg]
- c: 60074784 0 unused 0 0 0 # (Cyl. 0 - 59597)
- e: 60074784 0 4.2BSD 0 0 0 # (Cyl. 0 - 59597)
-
-
-
- Building the File System
-
- Now that all the disks are labeled, build the
- &man.ccd.4; using &man.ccdconfig.8;, with options similar
- to the following:
-
- ccdconfig ccd0 32 0 /dev/ad1e /dev/ad2e /dev/ad3e
-
- The use and meaning of each option is described
- below:
-
-
-
- The first argument is the device to configure, in
- this case, /dev/ccd0c. The
- /dev/ portion is optional.
-
-
-
- The interleave for the file system, which defines
- the size of a stripe in disk blocks, each normally 512
- bytes. So, an interleave of 32 would be 16,384
- bytes.
-
-
-
- Flags for &man.ccdconfig.8;. For example, to
- enable drive mirroring, specify a flag. This
- configuration does not provide mirroring for
- &man.ccd.4;, so it is set at 0 (zero).
-
-
-
- The final arguments to &man.ccdconfig.8; are the
- devices to place into the array. Use the complete
- path name for each device.
-
-
-
- After running &man.ccdconfig.8; the &man.ccd.4; is
- configured and a file system can be installed. Refer to
- &man.newfs.8; for options, or run:
-
- newfs /dev/ccd0c
-
-
-
- Making it All Automatic
-
- Generally, &man.ccd.4; should be configured to
- automount upon each reboot. To do this, write out the
- current configuration to
- /etc/ccd.conf using the following
- command:
-
- ccdconfig -g > /etc/ccd.conf
-
- During reboot, the script /etc/rc
- runs ccdconfig -C if
- /etc/ccd.conf exists. This
- automatically configures the &man.ccd.4; so it can be
- mounted.
-
-
- When booting into single user mode, the following
- command must be issued to configure the array before
- the &man.ccd.4; can be mounted:
-
- ccdconfig -C
-
-
- To automatically mount the &man.ccd.4;, place an entry
- for the &man.ccd.4; in /etc/fstab so
- it will be mounted at boot time:
-
- /dev/ccd0c /media ufs rw 2 2
-
-
-
-
- The Vinum Volume Manager
-
-
- RAID
- software
-
-
- RAID
- Vinum
-
-
- The Vinum Volume Manager is a block device driver which
- implements virtual disk drives. It isolates disk hardware
- from the block device interface and maps data in ways which
- result in an increase in flexibility, performance and
- reliability compared to the traditional slice view of disk
- storage. &man.vinum.4; implements the RAID-0, RAID-1 and
- RAID-5 models, both individually and in combination.
-
- Refer to for more
- information about &man.vinum.4;.
-
-
-
-
- Hardware RAID
-
-
- RAID
- hardware
-
-
- &os; also supports a variety of hardware
- RAID controllers. These devices control a
- RAID subsystem without the need for &os;
- specific software to manage the array.
-
- Using an on-card BIOS, the card
- controls most of the disk operations. The following is a
- brief setup description using a Promise
- IDE RAID controller.
- When this card is installed and the system is started up, it
- displays a prompt requesting information. Follow the
- instructions to enter the card's setup screen and to combine
- all the attached drives. After doing so, the disks will
- look like a single drive to &os;. Other
- RAID levels can be set up
- accordingly.
-
-
-
- Rebuilding ATA RAID1 Arrays
-
- &os; supports the ability to hot-replace a failed disk in
- an array.
-
- An error indicating a failed disk will appear in
- /var/log/messages or in the &man.dmesg.8;
- output:
-
- ad6 on monster1 suffered a hard error.
-ad6: READ command timeout tag=0 serv=0 - resetting
-ad6: trying fallback to PIO mode
-ata3: resetting devices .. done
-ad6: hard error reading fsbn 1116119 of 0-7 (ad6 bn 1116119; cn 1107 tn 4 sn 11)\\
-status=59 error=40
-ar0: WARNING - mirror lost
-
- Use &man.atacontrol.8; to check for further
- information:
-
- &prompt.root; atacontrol list
-ATA channel 0:
- Master: no device present
- Slave: acd0 <HL-DT-ST CD-ROM GCR-8520B/1.00> ATA/ATAPI rev 0
-
-ATA channel 1:
- Master: no device present
- Slave: no device present
-
-ATA channel 2:
- Master: ad4 <MAXTOR 6L080J4/A93.0500> ATA/ATAPI rev 5
- Slave: no device present
-
-ATA channel 3:
- Master: ad6 <MAXTOR 6L080J4/A93.0500> ATA/ATAPI rev 5
- Slave: no device present
-
-&prompt.root; atacontrol status ar0
-ar0: ATA RAID1 subdisks: ad4 ad6 status: DEGRADED
-
-
-
- First, detach the ata channel with the failed disk
- so that it can be safely removed:
-
- &prompt.root; atacontrol detach ata3
-
-
-
- Replace the disk.
-
-
-
- Reattach the ata channel:
-
- &prompt.root; atacontrol attach ata3
-Master: ad6 <MAXTOR 6L080J4/A93.0500> ATA/ATAPI rev 5
-Slave: no device present
-
-
-
- Add the new disk to the array as a spare:
-
- &prompt.root; atacontrol addspare ar0 ad6
-
-
-
- Rebuild the array:
-
- &prompt.root; atacontrol rebuild ar0
-
-
-
- It is possible to check on the progress by issuing the
- following command:
-
- &prompt.root; dmesg | tail -10
-[output removed]
-ad6: removed from configuration
-ad6: deleted from ar0 disk1
-ad6: inserted into ar0 disk1 as spare
-
-&prompt.root; atacontrol status ar0
-ar0: ATA RAID1 subdisks: ad4 ad6 status: REBUILDING 0% completed
-
-
-
- Wait until this operation completes.
-
-
-
-
-
@@ -794,7 +443,7 @@ umass0: detached
Creating and Using CD Media
- CDROMs
+ CD-ROMscreating
@@ -912,7 +561,7 @@ umass0: detached
of ways.
- CDROMs
+ CD-ROMscreating bootableThe last option of general use is .
@@ -955,7 +604,7 @@ umass0: detached
burncd
- CDROMs
+ CD-ROMsburningFor an ATAPI CD burner, burncd can be
@@ -1001,7 +650,7 @@ umass0: detached
results like this:
- CDROMs
+ CD-ROMsburning&prompt.root; cdrecord -scanbus
@@ -1122,8 +771,8 @@ scsibus1:
It is possible to copy a data CD to an image file that is
functionally equivalent to the image file created with
&man.mkisofs.8;, and then use it to duplicate any data CD.
- The example given here assumes that the CDROM device is
- acd0. Substitute the correct CDROM
+ The example given here assumes that the CD-ROM device is
+ acd0. Substitute the correct CD-ROM
device.&prompt.root; dd if=/dev/acd0 of=file.iso bs=2048
@@ -1149,7 +798,7 @@ scsibus1:
&man.mount.8; that the file system is of type
ISO9660 by specifying
to &man.mount.8;. For example,
- to mount the CDROM device, /dev/cd0,
+ to mount the CD-ROM device, /dev/cd0,
under /mnt,
use:
@@ -1162,7 +811,7 @@ scsibus1:
&prompt.root; mount_cd9660 /dev/cd0 /mnt
- While data CDROMs from any vendor can be mounted this way,
+ While data CD-ROMs from any vendor can be mounted this way,
disks with certain ISO 9660 extensions might behave oddly.
For example, Joliet disks store all filenames in two-byte
Unicode characters. The &os; kernel does not speak Unicode,
@@ -1186,13 +835,13 @@ scsibus1:
Occasionally, Device not configured
- will be displayed when trying to mount a CDROM. This
- usually means that the CDROM drive thinks that there is no
+ will be displayed when trying to mount a CD-ROM. This
+ usually means that the CD-ROM drive thinks that there is no
disk in the tray, or that the drive is not visible on the bus.
- It can take a couple of seconds for a CDROM drive to realize
+ It can take a couple of seconds for a CD-ROM drive to realize
that a media is present, so be patient.
- Sometimes, a SCSI CDROM may be missed because it did not
+ Sometimes, a SCSI CD-ROM may be missed because it did not
have enough time to answer the bus reset. To resolve this,add
the following option to the kernel configuration and rebuild the
@@ -1201,7 +850,7 @@ scsibus1:
options SCSI_DELAY=15000This tells the SCSI bus to pause 15 seconds during boot,
- to give the CDROM drive every possible chance to answer the
+ to give the CD-ROM drive every possible chance to answer the
bus reset.
@@ -1220,7 +869,7 @@ scsibus1:
&prompt.root; tar xzvf /dev/acd1
- This type of disk can not be mounted as a normal CDROM and
+ This type of disk can not be mounted as a normal CD-ROM and
the data cannot be read under any operating system except
&os;. In order to mount the CD, or to share the data with
another operating system, &man.mkisofs.8; must be used as
@@ -1968,105 +1617,6 @@ cd0: Attempt to query device size failed
-
- Backups to Floppies
-
-
- Can I Use Floppies for Backing Up My Data?
-
- backup floppies
- floppy disks
-
- Floppy disks are not a suitable media for making backups
- as:
-
-
-
- The media is unreliable, especially over long periods
- of time.
-
-
-
- Backing up and restoring is very slow.
-
-
-
- They have a very limited capacity.
-
-
-
- However, if no other method of backing up data is
- available, floppy disks are better than no backup at
- all.
-
- When backing up to floppy disks, ensure the floppies are
- of good quality. Floppies that have been lying around the
- office for a couple of years are a bad choice. Ideally,
- use new ones from a reputable manufacturer.
-
-
-
- So How Do I Backup My Data to Floppies?
-
- The best way to backup to floppy disk is to use
- &man.tar.1; with (multi-volume), which
- allows backups to span multiple floppies.
-
- To backup all the files in the current directory and
- sub-directory, use this as root:
-
- &prompt.root; tar Mcvf /dev/fd0 *
-
- When the first floppy is full, &man.tar.1; will prompt
- to insert the next volume, which in this case is the next
- floppy disk:
-
- Prepare volume #2 for /dev/fd0 and hit return:
-
- This is repeated, with the volume number incrementing,
- until all the specified files have been archived.
-
-
-
- Can I Compress My Backups?
-
-
- tar
-
-
- gzip
-
- compression
-
- Unfortunately, &man.tar.1; does not support
- for multi-volume archives. Instead,
- &man.gzip.1; all the files, &man.tar.1; them to the floppies,
- then &man.gunzip.1; the files.
-
-
-
- How Do I Restore My Backups?
-
- To restore the entire archive use:
-
- &prompt.root; tar Mxvf /dev/fd0
-
- There are two methods to restore only specific files. The
- first is to insert the first floppy and use:
-
- &prompt.root; tar Mxvf /dev/fd0 filename
-
- &man.tar.1; will prompt to insert subsequent floppies
- until it finds the required file.
-
- Alternatively, if the floppy containing the file is known,
- insert that floppy and use the same command. If the first
- file on the floppy is a continuation from the previous one,
- &man.tar.1; will warn that it cannot restore it, even if you
- have not asked it to.
-
-
-
@@ -2476,7 +2026,7 @@ cd0: Attempt to query device size failed
Livefs CD images are not available for
&os; &rel.current;-RELEASE and later. In addition to
- the CDROM installation images, flash drive installation
+ the CD-ROM installation images, flash drive installation
images may be used to recover a system. The
memstick image for
&os;/&arch.i386; &rel.current;-RELEASE is available
@@ -2517,10 +2067,10 @@ cd0: Attempt to query device size failed
livefs CD and boot the computer. The
original install menu will be displayed on the screen.
Select the correct country, then choose
- Fixit -- Repair mode with CDROM/DVD/floppy or
+ Fixit -- Repair mode with CD-ROM/DVD/floppy or
start a shell. then select
- CDROM/DVD -- Use the live filesystem
- CDROM/DVD.
+ CD-ROM/DVD -- Use the live filesystem
+ CD-ROM/DVD.
restore and the other needed programs
are located in /mnt2/rescue.
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 01:09:02 2013
Return-Path:
Delivered-To: svn-doc-head@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 120885D7;
Mon, 24 Jun 2013 01:09:02 +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 04499163D;
Mon, 24 Jun 2013 01:09:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O1919C058472;
Mon, 24 Jun 2013 01:09:01 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O191sh058471;
Mon, 24 Jun 2013 01:09:01 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201306240109.r5O191sh058471@svn.freebsd.org>
From: Warren Block
Date: Mon, 24 Jun 2013 01:09:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42019 -
head/en_US.ISO8859-1/books/fdp-primer/writing-style
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.14
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: Mon, 24 Jun 2013 01:09:02 -0000
Author: wblock
Date: Mon Jun 24 01:09:01 2013
New Revision: 42019
URL: http://svnweb.freebsd.org/changeset/doc/42019
Log:
Use instead of faking it.
Submitted by: Hiroki Sato
Modified:
head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
Modified: head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Mon Jun 24 01:00:56 2013 (r42018)
+++ head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Mon Jun 24 01:09:01 2013 (r42019)
@@ -506,12 +506,12 @@ GB. Hardware compression …
CD-ROM
- <acronym>CD-ROM</acronym>
+ acronymCD-ROMacronymDoS (Denial of Service)
- <acronym>DoS</acronym>
+ acronymDoSacronym
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 02:17:31 2013
Return-Path:
Delivered-To: svn-doc-head@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 BA1FCFAD;
Mon, 24 Jun 2013 02:17:31 +0000 (UTC) (envelope-from gjb@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 AC6C417E7;
Mon, 24 Jun 2013 02:17:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O2HVxp082228;
Mon, 24 Jun 2013 02:17:31 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O2HVco082227;
Mon, 24 Jun 2013 02:17:31 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306240217.r5O2HVco082227@svn.freebsd.org>
From: Glen Barber
Date: Mon, 24 Jun 2013 02:17:31 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42020 - head/share/xml
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.14
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: Mon, 24 Jun 2013 02:17:31 -0000
Author: gjb
Date: Mon Jun 24 02:17:30 2013
New Revision: 42020
URL: http://svnweb.freebsd.org/changeset/doc/42020
Log:
Add link on Phoronix announcing customized FreeBSD 9 powers PS4.
Submitted by: Sugianto Yonatha (via -doc@)
Modified:
head/share/xml/press.xml
Modified: head/share/xml/press.xml
==============================================================================
--- head/share/xml/press.xml Mon Jun 24 01:09:01 2013 (r42019)
+++ head/share/xml/press.xml Mon Jun 24 02:17:30 2013 (r42020)
@@ -15,6 +15,24 @@
2013
+ 6
+
+
+ Sony's PlayStation&tm; 4 Is Running Modified &os; 9
+ http://www.phoronix.com/scan.php?page=news_item&px=MTM5NDI
+ Phoronix
+ http://www.phoronix.com/
+ 23 June 2013
+ Michael Larabel
+
It's been exposed that the operating system powering the
+ PlayStation 4 is Orbis OS, which is a Sony spin of
+ &os; 9.0. It's not a huge surprise FreeBSD is being
+ used over Linux, in part due to the more liberal
+ licensing.
+
+
+
+ 2
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 02:56:44 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id 2B9A96F4;
Mon, 24 Jun 2013 02:56:44 +0000 (UTC) (envelope-from gjb@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 1E77F18A8;
Mon, 24 Jun 2013 02:56:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O2ui56094141;
Mon, 24 Jun 2013 02:56:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O2uhdH094140;
Mon, 24 Jun 2013 02:56:43 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306240256.r5O2uhdH094140@svn.freebsd.org>
From: Glen Barber
Date: Mon, 24 Jun 2013 02:56:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42021 - head/share/xml
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.14
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: Mon, 24 Jun 2013 02:56:44 -0000
Author: gjb
Date: Mon Jun 24 02:56:43 2013
New Revision: 42021
URL: http://svnweb.freebsd.org/changeset/doc/42021
Log:
Remove previous addition.
Phoronix does not appear to have original content is this area, and the
site that is sourced contains nothing more than screenshots.
Modified:
head/share/xml/press.xml
Modified: head/share/xml/press.xml
==============================================================================
--- head/share/xml/press.xml Mon Jun 24 02:17:30 2013 (r42020)
+++ head/share/xml/press.xml Mon Jun 24 02:56:43 2013 (r42021)
@@ -15,24 +15,6 @@
2013
- 6
-
-
- Sony's PlayStation&tm; 4 Is Running Modified &os; 9
- http://www.phoronix.com/scan.php?page=news_item&px=MTM5NDI
- Phoronix
- http://www.phoronix.com/
- 23 June 2013
- Michael Larabel
-
It's been exposed that the operating system powering the
- PlayStation 4 is Orbis OS, which is a Sony spin of
- &os; 9.0. It's not a huge surprise FreeBSD is being
- used over Linux, in part due to the more liberal
- licensing.
-
-
-
- 2
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 08:23:30 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id D976F7DB;
Mon, 24 Jun 2013 08:23:30 +0000 (UTC)
(envelope-from blackend@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 CAD9C1649;
Mon, 24 Jun 2013 08:23: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 r5O8NUB6094142;
Mon, 24 Jun 2013 08:23:30 GMT
(envelope-from blackend@svn.freebsd.org)
Received: (from blackend@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O8NUuY094141;
Mon, 24 Jun 2013 08:23:30 GMT
(envelope-from blackend@svn.freebsd.org)
Message-Id: <201306240823.r5O8NUuY094141@svn.freebsd.org>
From: Marc Fonvieille
Date: Mon, 24 Jun 2013 08:23:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42023 - head/share/mk
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.14
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: Mon, 24 Jun 2013 08:23:30 -0000
Author: blackend
Date: Mon Jun 24 08:23:29 2013
New Revision: 42023
URL: http://svnweb.freebsd.org/changeset/doc/42023
Log:
Fix install-html-split target:
With the current code running "make install" will build the files but
will install only 2 files (docbook.css and tramemark.html). Another
"make install" is required to get the missing files. This is not the
expected behavior. A quick workaround is to run "make && make
install", but let's fix the code to get a working "make install".
Discussed with: gabor
Modified:
head/share/mk/doc.docbook.mk
Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk Mon Jun 24 07:49:03 2013 (r42022)
+++ head/share/mk/doc.docbook.mk Mon Jun 24 08:23:29 2013 (r42023)
@@ -705,11 +705,7 @@ install-${_curformat}: ${DOC}.${_curform
.endif
@[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
.if ${_cf} == "html-split"
-.for f in ${_html_docs}
-.if exists(${f})
- ${INSTALL_DOCS} ${f} ${DESTDIR}
-.endif
-.endfor
+ ${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR}
.else
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.endif
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 09:44:18 2013
Return-Path:
Delivered-To: svn-doc-head@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 81E30C31;
Mon, 24 Jun 2013 09:44:18 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from mail.allbsd.org (gatekeeper.allbsd.org
[IPv6:2001:2f0:104:e001::32])
by mx1.freebsd.org (Postfix) with ESMTP id ED5031970;
Mon, 24 Jun 2013 09:44:17 +0000 (UTC)
Received: from alph.d.allbsd.org (p3086-ipbf906funabasi.chiba.ocn.ne.jp
[122.26.46.86]) (authenticated bits=128)
by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r5O9hxHI002950
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
Mon, 24 Jun 2013 18:44:10 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0)
by alph.d.allbsd.org (8.14.5/8.14.5) with ESMTP id r5O9hwO3051339;
Mon, 24 Jun 2013 18:43:59 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Date: Mon, 24 Jun 2013 18:43:38 +0900 (JST)
Message-Id: <20130624.184338.107294327376337317.hrs@allbsd.org>
To: wblock@FreeBSD.org
Subject: Re: svn commit: r42018 - head/en_US.ISO8859-1/books/handbook/disks
From: Hiroki Sato
In-Reply-To: <201306240100.r5O10ul6056816@svn.freebsd.org>
References: <201306240100.r5O10ul6056816@svn.freebsd.org>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
micalg=pgp-sha1;
boundary="--Security_Multipart(Mon_Jun_24_18_43_38_2013_559)--"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org
X-Virus-Status: Clean
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
(mail.allbsd.org [133.31.130.32]); Mon, 24 Jun 2013 18:44:10 +0900 (JST)
X-Spam-Status: No, score=-89.5 required=13.0 tests=CONTENT_TYPE_PRESENT,
DIRECTOCNDYN,DYN_PBL,ONLY1HOPDIRECT,RCVD_IN_PBL,SAMEHELOBY2HOP,
USER_IN_WHITELIST autolearn=no version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
gatekeeper.allbsd.org
Cc: svn-doc-head@FreeBSD.org, svn-doc-all@FreeBSD.org,
doc-committers@FreeBSD.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
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: Mon, 24 Jun 2013 09:44:18 -0000
----Security_Multipart(Mon_Jun_24_18_43_38_2013_559)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Warren Block wrote
in <201306240100.r5O10ul6056816@svn.freebsd.org>:
wb> Author: wblock
wb> Date: Mon Jun 24 01:00:56 2013
wb> New Revision: 42018
wb> URL: http://svnweb.freebsd.org/changeset/doc/42018
wb>
wb> Log:
wb> Suppress some ugly memories in the Storage chapter:
wb> * Remove "RAID" section that only covers ccd(4) and ataraid(4). These
wb> may still work, but there are better solutions for new users.
If possible, please convert ataraid(4) section to graid(8). This
feature is still widely used and people need information about the
support. Several parts in the section can be reused, I think.
-- Hiroki
----Security_Multipart(Mon_Jun_24_18_43_38_2013_559)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (FreeBSD)
iEYEABECAAYFAlHIFMoACgkQTyzT2CeTzy0xSwCgt3WTFU1SQLJlO8anxJg/pIQj
aRcAn0kYokKM6MS/GNgNxaZ0SyiO5V3a
=lSIu
-----END PGP SIGNATURE-----
----Security_Multipart(Mon_Jun_24_18_43_38_2013_559)----
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 18:46:58 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id 2F506879;
Mon, 24 Jun 2013 18:46:58 +0000 (UTC)
(envelope-from eadler@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 21D1C18AB;
Mon, 24 Jun 2013 18:46:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OIkwem094894;
Mon, 24 Jun 2013 18:46:58 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5OIkw9l094893;
Mon, 24 Jun 2013 18:46:58 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306241846.r5OIkw9l094893@svn.freebsd.org>
From: Eitan Adler
Date: Mon, 24 Jun 2013 18:46:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42024 - head/share/xml
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.14
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: Mon, 24 Jun 2013 18:46:58 -0000
Author: eadler
Date: Mon Jun 24 18:46:57 2013
New Revision: 42024
URL: http://svnweb.freebsd.org/changeset/doc/42024
Log:
Add Ben Laurie's boing boing post to the "in the media section.
Reviewed by: Allan Jude
Modified:
head/share/xml/press.xml
Modified: head/share/xml/press.xml
==============================================================================
--- head/share/xml/press.xml Mon Jun 24 08:23:29 2013 (r42023)
+++ head/share/xml/press.xml Mon Jun 24 18:46:57 2013 (r42024)
@@ -15,6 +15,22 @@
2013
+ 6
+
+
+ Fixing Network Attached Storage with commodity hardware
+ and BSD
+ http://boingboing.net/2013/06/23/fixing-network-attached-storag.html
+ Boing Boing
+ http://boingboing.net/
+ 23 June 2013
+ Ben Laurie
+
Ben Laurie discusses how and why he replaced a proprietary
+ NAS with one based on &os; and commodity hardware.
+
+
+
+ 2
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 20:43:00 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id 58754D26;
Mon, 24 Jun 2013 20:43:00 +0000 (UTC)
(envelope-from eadler@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 4AD231EEB;
Mon, 24 Jun 2013 20:43:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OKh0gr029708;
Mon, 24 Jun 2013 20:43:00 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5OKgxtY029705;
Mon, 24 Jun 2013 20:42:59 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306242042.r5OKgxtY029705@svn.freebsd.org>
From: Eitan Adler
Date: Mon, 24 Jun 2013 20:42:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42025 - head/en_US.ISO8859-1/htdocs/java/dists
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.14
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: Mon, 24 Jun 2013 20:43:00 -0000
Author: eadler
Date: Mon Jun 24 20:42:59 2013
New Revision: 42025
URL: http://svnweb.freebsd.org/changeset/doc/42025
Log:
Step one of cleaning up this directory: Java 1.5 is not supported or existing in the ports tree at all.
Discussed with: Allan Jude
Deleted:
head/en_US.ISO8859-1/htdocs/java/dists/15.xml
Modified:
head/en_US.ISO8859-1/htdocs/java/dists/Makefile
head/en_US.ISO8859-1/htdocs/java/dists/index.xml
Modified: head/en_US.ISO8859-1/htdocs/java/dists/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/java/dists/Makefile Mon Jun 24 18:46:57 2013 (r42024)
+++ head/en_US.ISO8859-1/htdocs/java/dists/Makefile Mon Jun 24 20:42:59 2013 (r42025)
@@ -7,7 +7,6 @@
.include "../Makefile.inc"
.endif
-DOCS= 15.xml
DOCS+= 16.xml
DOCS+= 17.xml
DOCS+= index.xml
Modified: head/en_US.ISO8859-1/htdocs/java/dists/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/java/dists/index.xml Mon Jun 24 18:46:57 2013 (r42024)
+++ head/en_US.ISO8859-1/htdocs/java/dists/index.xml Mon Jun 24 20:42:59 2013 (r42025)
@@ -26,9 +26,6 @@ This is the official port of Sun's &java
Supported
-
&jdk; 1.5.x
-
JDK 1.5 support is available. Currently supported
-versions are FreeBSD 4.8 and later (for i386 and amd64 architectures).
&jdk; 1.6.x
JDK 1.6 support is available. Currently supported
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 20:44:40 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id A43B3D95;
Mon, 24 Jun 2013 20:44:40 +0000 (UTC)
(envelope-from eadler@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 7C7121EF9;
Mon, 24 Jun 2013 20:44:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OKiemq029946;
Mon, 24 Jun 2013 20:44:40 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5OKieGO029945;
Mon, 24 Jun 2013 20:44:40 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306242044.r5OKieGO029945@svn.freebsd.org>
From: Eitan Adler
Date: Mon, 24 Jun 2013 20:44:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42026 - head/en_US.ISO8859-1/htdocs/java/dists
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.14
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: Mon, 24 Jun 2013 20:44:40 -0000
Author: eadler
Date: Mon Jun 24 20:44:39 2013
New Revision: 42026
URL: http://svnweb.freebsd.org/changeset/doc/42026
Log:
Remove unsupported releases from this page: they offer almost no value and clutter the page.
Discussed with: Allan Jude
Modified:
head/en_US.ISO8859-1/htdocs/java/dists/index.xml
Modified: head/en_US.ISO8859-1/htdocs/java/dists/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/java/dists/index.xml Mon Jun 24 20:42:59 2013 (r42025)
+++ head/en_US.ISO8859-1/htdocs/java/dists/index.xml Mon Jun 24 20:44:39 2013 (r42026)
@@ -25,7 +25,6 @@ This is the official port of Sun's &java
-
Supported
&jdk; 1.6.x
JDK 1.6 support is available. Currently supported
@@ -34,32 +33,6 @@ versions are FreeBSD 6.2 and later (for
&jdk; 1.7.x
JDK 1.7 support is available. Currently supported
versions are FreeBSD 7.0 and later (for i386 and amd64 architectures).
-
-
Unsupported
-
-
Anything prior to FreeBSD 2.2 (such as FreeBSD 2.1.7.1) was never supported in any way.
-
-
&jdk; 1.0.x
-
JDK 1.0.2 is unsupported. It was a.out, and would only run on older FreeBSD systems (up to 4.x).
-
-
&jdk; 1.1.x
-
JDK 1.1.8 is unsupported. It would also only run on older FreeBSD systems (up to 4.x). Two separate binaries were provided for both X and non-X systems.
-
-
&jdk; 1.2.x
-
JDK2 (aka 1.2) is unsupported. The history is
-preserved in the former jdk12 port that can be found in the
-CVS ports repository Attic.
-
-
&jdk; 1.3.x
-
JDK 1.3 is unsupported. The history is
-preserved in the former jdk13 port that can be found in the
-CVS ports repository Attic.
-
-
&jdk; 1.4.x
-
JDK 1.4 is unsupported. The history is
-preserved in the former jdk14 port that can be found in the
-CVS ports repository Attic.
-
From owner-svn-doc-head@FreeBSD.ORG Mon Jun 24 20:47:41 2013
Return-Path:
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id D2FA9E23;
Mon, 24 Jun 2013 20:47:41 +0000 (UTC)
(envelope-from eadler@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 C41701F13;
Mon, 24 Jun 2013 20:47:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OKlf4K030323;
Mon, 24 Jun 2013 20:47:41 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5OKlfM2030321;
Mon, 24 Jun 2013 20:47:41 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306242047.r5OKlfM2030321@svn.freebsd.org>
From: Eitan Adler
Date: Mon, 24 Jun 2013 20:47:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
svn-doc-head@freebsd.org
Subject: svn commit: r42027 - in head/en_US.ISO8859-1/htdocs/java: . docs
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.14
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: Mon, 24 Jun 2013 20:47:41 -0000
Author: eadler
Date: Mon Jun 24 20:47:41 2013
New Revision: 42027
URL: http://svnweb.freebsd.org/changeset/doc/42027
Log:
There has not been a tutorial submitted since this page was created. Remove clutter.
Discussed with: Allan Jude
Deleted:
head/en_US.ISO8859-1/htdocs/java/docs/tutorials.xml
Modified:
head/en_US.ISO8859-1/htdocs/java/docs/Makefile
head/en_US.ISO8859-1/htdocs/java/index.xml
Modified: head/en_US.ISO8859-1/htdocs/java/docs/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/java/docs/Makefile Mon Jun 24 20:44:39 2013 (r42026)
+++ head/en_US.ISO8859-1/htdocs/java/docs/Makefile Mon Jun 24 20:47:41 2013 (r42027)
@@ -10,7 +10,6 @@
DOCS = faq.xml
DOCS+= howtoports.xml
DOCS+= newbies.xml
-DOCS+= tutorials.xml
DOCS+= performance.xml
.include "${DOC_PREFIX}/share/mk/web.site.mk"
Modified: head/en_US.ISO8859-1/htdocs/java/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/java/index.xml Mon Jun 24 20:44:39 2013 (r42026)
+++ head/en_US.ISO8859-1/htdocs/java/index.xml Mon Jun 24 20:47:41 2013 (r42027)
@@ -57,7 +57,6 @@