- -->
Modified: projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Aug 13 05:46:43 2013 (r42534)
+++ projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Aug 13 08:28:25 2013 (r42535)
@@ -379,7 +379,7 @@
Subversion can be installed from the &os; Ports
- Collection, by issuing the following commands:
+ Collection by issuing these commands:
&prompt.root; cd /usr/ports/devel/subversion
&prompt.root; make clean install
@@ -590,7 +590,7 @@
&os; Ports Tree Branches and LayoutIn svn+ssh://svn.freebsd.org/ports,
- ports refers repository root of the
+ ports refers to the repository root of the
ports tree.In general, most &os; port work will be done within
@@ -710,8 +710,8 @@
It is possible to anonymously check out the &os;
repository with Subversion. This will give access to a
- read-only tree that can be updated, but not committed
- to. To do this, use the following command:
+ read-only tree that can be updated, but not committed back
+ to the main repository. To do this, use the following command:&prompt.user; svn co https://svn0.us-west.FreeBSD.org/base/head /usr/src
@@ -801,8 +801,8 @@
Most new source files should include a
- $&os;$ string in the
- new file. On commit, svn will expand
+ $&os;$ string near the start of the
+ file. On commit, svn will expand
the $&os;$ string,
adding the file path, revision number, date and time of
commit, and the username of the committer. Files which
Modified: projects/db5/en_US.ISO8859-1/articles/releng/article.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/releng/article.xml Tue Aug 13 05:46:43 2013 (r42534)
+++ projects/db5/en_US.ISO8859-1/articles/releng/article.xml Tue Aug 13 08:28:25 2013 (r42535)
@@ -135,10 +135,10 @@
including HEAD, assuming that the system
management interfaces are not used.
- In the interim period between releases, monthly snapshots are
+ In the interim period between releases, weekly snapshots are
built automatically by the &os; Project build machines and made
available for download from ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/.
+ class="resource">ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/.
The widespread availability of binary release snapshots, and the
tendency of our user community to keep up with -STABLE development
with Subversion and make
@@ -153,6 +153,18 @@
quality assurance activities ramp up pending a major
release.
+ In addition to installation ISO snapshots, weekly virtual
+ machine images are also provided for use with
+ VirtualBox,
+ qemu, or other popular emulation
+ software. The virtual machine images can be downloaded from
+ ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/VM-IMAGES/.
+
+ The virtual machine images are approximately 150MB &man.xz.1;
+ compressed, and contain a 10GB sparse filesystem when attached to
+ a virtual machine.
+
Bug reports and feature requests are continuously submitted by
users throughout the release cycle. Problems reports are entered into our
GNATS database
@@ -173,7 +185,7 @@
security fixes and additions are merged onto the release branch.
In addition to source updates via Subversion, binary patchkits are
available to keep systems on the
- RELENG_X_Y
+ releng/X.Y
branches updated.
@@ -256,8 +268,8 @@
Sixty days before the anticipated release, the source
repository enters a code freeze. During this
- time, all commits to the -STABLE branch must be approved by the
- &a.re;, the approval process is technically enforced by the
+ time, all commits to the -STABLE branch must be approved by
+ &a.re;. The approval process is technically enforced by a
pre-commit hook. The kinds of changes that are allowed during
this period include:
@@ -324,7 +336,7 @@
In all examples below, $FSVN
refers to the location of the &os; Subversion repository,
- svn+ssh://svn.freebsd.org/base/.
+ svn+ssh://svn.FreeBSD.org/base/.The layout of &os; branches in Subversion is
Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Tue Aug 13 05:46:43 2013 (r42534)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Tue Aug 13 08:28:25 2013 (r42535)
@@ -2551,7 +2551,7 @@ IMAGES= chapter1/fig1.png
url="&url.books.handbook;/svn.html#svn-intro"SVN
introductionulink, then pick the nearest mirror from
the list of ulink
- url="&url.books.handbook;/subversion-mirrors.html"Subversion
+ url="&url.books.handbook;/svn-mirrors.html"Subversion
mirror sitesulink.paraAppearance:
@@ -2560,7 +2560,7 @@ IMAGES= chapter1/fig1.png
url="&url.books.handbook;/svn.html#svn-intro">SVN
introduction, then pick the nearest mirror from
the list of Subversion
+ url="&url.books.handbook;/svn-mirrors.html">Subversion
mirror sites.Usage for article links:
Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Tue Aug 13 05:46:43 2013 (r42534)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml Tue Aug 13 08:28:25 2013 (r42535)
@@ -276,7 +276,7 @@
<!doctype…>.
-
+ AcronymsAcronyms should be defined the first time they appear in a
@@ -291,7 +291,7 @@
acronym tags.
-
+ IndentationThe first line in each file starts with no indentation,
@@ -332,10 +332,10 @@
.
-
+ Tag Style
-
+ Tag SpacingTags that start at the same indent as a previous tag
@@ -371,7 +371,7 @@
-
+ Separating TagsTags like itemizedlist which will
@@ -401,7 +401,7 @@
-
+ Whitespace ChangesDo not commit changes
@@ -421,7 +421,7 @@
ignored by translators.
-
+ Non-Breaking SpaceAvoid line breaks in places where they look ugly or make
Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml Tue Aug 13 05:46:43 2013 (r42534)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml Tue Aug 13 08:28:25 2013 (r42535)
@@ -75,7 +75,7 @@
Consider this text:
- To remove /tmp/foo use
+ To remove /tmp/foo, use
&man.rm.1;.&prompt.user; rm /tmp/foo
@@ -108,9 +108,9 @@
The previous example is actually represented in this
document like this:
- paraTo remove filename/tmp/foofilename use &man.rm.1;.para
+ paraTo remove filename/tmp/foofilename, use &man.rm.1;.para
-screen&prompt.user; userinputrm /tmp/foouserinputscreen
+screen&prompt.user; userinputrm /tmp/foouserinputscreenThe markup is clearly separate from the content.
Modified: projects/db5/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/config/chapter.xml Tue Aug 13 05:46:43 2013 (r42534)
+++ projects/db5/en_US.ISO8859-1/books/handbook/config/chapter.xml Tue Aug 13 08:28:25 2013 (r42535)
@@ -270,7 +270,6 @@
sshd_enable="YES"
keyrate="fast"
defaultrouter="10.1.1.254"
-
@@ -278,7 +277,6 @@ defaultrouter="10.1.1.254"hostname="node1.example.org"
ifconfig_fxp0="inet 10.1.1.1/8"
-
@@ -608,9 +606,9 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
Users who wish to begin their own
crontab file from scratch, without the
- use of a template, can use crontab -e. This
- will invoke the default editor with an empty file. When this
- file is saved, it will be automatically installed by
+ use of a template, can use crontab -e.
+ This will invoke the default editor with an empty file. When
+ this file is saved, it will be automatically installed by
&man.crontab.1;.In order to remove a user &man.crontab.5; completely,
@@ -633,12 +631,13 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
Using &man.rc.8; Under &os;In 2002, &os; integrated the NetBSD &man.rc.8; system for
- system initialization. The files listed in /etc/rc.d provide basic services
- which can be controlled with the ,
- , and options
- to &man.service.8;. For instance, &man.sshd.8; can be restarted
- with the following command:
+ system initialization. The files listed in
+ /etc/rc.d provide basic
+ services which can be controlled with the
+ , , and
+ options to &man.service.8;. For
+ instance, &man.sshd.8; can be restarted with the following
+ command:&prompt.root; service sshd restart
@@ -682,7 +681,9 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
&prompt.root; service sshd rcvar
# sshd
-$sshd_enable=YES
+#
+sshd_enable="YES"
+# (default: "")
The # sshd line is output from the
@@ -1260,15 +1261,15 @@ round-trip min/avg/max/stddev = 0.700/0.
host. This can happen if no default route is specified or
if a cable is unplugged. Check the output of
netstat -rn and make sure there is a
- valid route to the host. If there is not, read .
+ valid route to the host. If there is not, read
+ .ping: sendto: Permission denied
error messages are often caused by a misconfigured firewall.
If a firewall is enabled on &os; but no rules have been
defined, the default policy is to deny all traffic, even
- &man.ping.8;. Refer to for more information.
+ &man.ping.8;. Refer to
+ for more information.
Sometimes performance of the card is poor or below
average. In these cases, try setting the media
@@ -1312,9 +1313,9 @@ round-trip min/avg/max/stddev = 0.700/0.
given interface, there must be one address which correctly
represents the network's netmask. Any other addresses which
fall within this network must have a netmask of all
- 1s, expressed as either 255.255.255.255 or 0xffffffff.
+ 1s, expressed as either
+ 255.255.255.255 or
+ 0xffffffff.
For example, consider the case where the
fxp0 interface is connected to two
@@ -1322,18 +1323,18 @@ round-trip min/avg/max/stddev = 0.700/0.
netmask of 255.255.255.0 and
202.0.75.16 with a netmask of
255.255.255.240. The system
- is to be configured to appear in the ranges 10.1.1.1 through 10.1.1.5 and 202.0.75.17 through 202.0.75.20. Only the first address
- in a given network range should have a real netmask. All the
- rest (10.1.1.2 through 10.1.1.5 and 202.0.75.18 through 202.0.75.20) must be configured with
- a netmask of 255.255.255.255.
+ is to be configured to appear in the ranges
+ 10.1.1.1 through
+ 10.1.1.5 and
+ 202.0.75.17 through
+ 202.0.75.20. Only the first
+ address in a given network range should have a real netmask.
+ All the rest (10.1.1.2 through
+ 10.1.1.5 and
+ 202.0.75.18 through
+ 202.0.75.20) must be configured
+ with a netmask of
+ 255.255.255.255.
The following /etc/rc.conf entries
configure the adapter correctly for this scenario:
@@ -1347,7 +1348,6 @@ ifconfig_fxp0_alias4="inet 202.0.75.17 n
ifconfig_fxp0_alias5="inet 202.0.75.18 netmask 255.255.255.255"
ifconfig_fxp0_alias6="inet 202.0.75.19 netmask 255.255.255.255"
ifconfig_fxp0_alias7="inet 202.0.75.20 netmask 255.255.255.255"
-
@@ -1394,8 +1394,8 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 n
syslogd_flags in
/etc/rc.conf. Refer to &man.syslogd.8;
for more information on the arguments, and &man.rc.conf.5;,
- and for more information about
+ and
+ for more information about
/etc/rc.conf and the &man.rc.8;
subsystem.
@@ -1535,8 +1535,8 @@ cron.*
facilities, refer to &man.syslog.3; and &man.syslogd.8;.
For more information about
/etc/syslog.conf, its syntax, and more
- advanced usage examples, see &man.syslog.conf.5; and .
+ advanced usage examples, see &man.syslog.conf.5; and
+ .
@@ -1630,14 +1630,14 @@ cron.*
&man.newsyslog.8; further instructions, such as how to
compress the rotated file or to create the log file if it
is missing. The last two fields are optional, and
- specify the PID file of a process
- and a signal number to send to that process when the file
- is rotated. For more information on all fields, valid
+ specify the
+ PID file of a
+ process and a signal number to send to that process when the
+ file is rotated. For more information on all fields, valid
flags, and how to specify the rotation time, refer to
- &man.newsyslog.conf.5;. Since &man.newsyslog.8; is run
- from &man.cron.8;, it can not rotate files more often than
- it is run from &man.cron.8;.
+ &man.newsyslog.conf.5;. Since &man.newsyslog.8; is run from
+ &man.cron.8;, it can not rotate files more often than it is
+ run from &man.cron.8;.
@@ -1733,9 +1733,8 @@ cron.*
resolv.conf
- How a
- &os; system accesses the Internet Domain Name System
- (DNS) is controlled by
+ How a &os; system accesses the Internet Domain Name
+ System (DNS) is controlled by
&man.resolv.conf.5;.The most common entries to
@@ -1889,13 +1888,13 @@ kern.maxproc: 1044
kern.maxfiles: 2088 -> 5000
Settings of sysctl variables are usually either strings,
- numbers, or booleans, where a a boolean is 1
+ numbers, or booleans, where a boolean is 1
for yes or 0 for no.To automatically set some variables each time the machine
boots, add them to /etc/sysctl.conf. For
- more information, refer to &man.sysctl.conf.5; and .
+ more information, refer to &man.sysctl.conf.5; and
+ .sysctl.conf
@@ -1921,7 +1920,6 @@ kern.logsigexit=0
# Prevent users from seeing information about processes that
# are being run under another UID.
security.bsd.see_other_uids=0
-
@@ -2187,16 +2185,16 @@ device_probe_and_attach: cbb0 attach ret
data blocks of a file did not find their way out of the
buffer cache onto the disk by the time of the crash,
&man.fsck.8; recognizes this and repairs the file system
- by setting the file length to
- 0. Additionally, the implementation is
- clear and simple. The disadvantage is that meta-data
- changes are slow. For example, rm -r
- touches all the files in a directory sequentially, but each
- directory change will be written synchronously to the
- disk. This includes updates to the directory itself, to
- the inode table, and possibly to indirect blocks allocated
- by the file. Similar considerations apply for unrolling
- large hierarchies using tar -x.
+ by setting the file length to 0.
+ Additionally, the implementation is clear and simple. The
+ disadvantage is that meta-data changes are slow. For
+ example, rm -r touches all the files in a
+ directory sequentially, but each directory change will be
+ written synchronously to the disk. This includes updates to
+ the directory itself, to the inode table, and possibly to
+ indirect blocks allocated by the file. Similar
+ considerations apply for unrolling large hierarchies using
+ tar -x.
The second approach is to use asynchronous meta-data
updates. This is the default for a UFS
@@ -2264,7 +2262,7 @@ device_probe_and_attach: cbb0 attach ret
in use are marked as such in their blocks and inodes.
After a crash, the only resource allocation error that
occurs is that resources are marked as used
- which are actually free. &man.fsck.8;
+ which are actually free. &man.fsck.8;
recognizes this situation, and frees the resources that
are no longer used. It is safe to ignore the dirty state
of the file system after a crash by forcibly mounting it
@@ -2379,7 +2377,7 @@ device_probe_and_attach: cbb0 attach ret
compile software. The most important table set by
maxusers is the maximum number of
processes, which is set to
- 20 + 16 * maxusers. If
+ 20 + 16 * maxusers. If
maxusers is set to 1,
there can only be
36 simultaneous processes, including
@@ -2491,12 +2489,11 @@ device_probe_and_attach: cbb0 attach ret
The net.inet.ip.portrange.*
- &man.sysctl.8;
- variables control the port number ranges automatically bound
- to TCP and UDP
- sockets. There are three ranges: a low range, a default
- range, and a high range. Most network programs use the
- default range which is controlled by
+ &man.sysctl.8; variables control the port number ranges
+ automatically bound to TCP and
+ UDP sockets. There are three ranges: a
+ low range, a default range, and a high range. Most network
+ programs use the default range which is controlled by
net.inet.ip.portrange.first and
net.inet.ip.portrange.last, which default
to 1024 and 5000,
@@ -2568,12 +2565,12 @@ device_probe_and_attach: cbb0 attach ret
conditions, but it can also result in higher &man.ping.8;
times over slow links, though still much lower than without
the inflight algorithm. In such cases, try reducing this
- parameter to 15,
- 10, or 5 and
- reducing net.inet.tcp.inflight.min
- to a value such as 3500 to get the
- desired effect. Reducing these parameters should be done
- as a last resort only.
+ parameter to 15, 10,
+ or 5 and reducing
+ net.inet.tcp.inflight.min to a value such
+ as 3500 to get the desired effect.
+ Reducing these parameters should be done as a last resort
+ only.
@@ -2632,9 +2629,9 @@ kern.maxvnodes: 100000
Adding a new hard drive for swap gives better performance
than adding a partition on an existing drive. Setting up
- partitions and hard drives is explained in while discusses partition
+ partitions and hard drives is explained in
+ while
+ discusses partition
layouts and swap partition size considerations.Use &man.swapon.8; to add a swap partition to the system.
@@ -2643,7 +2640,6 @@ kern.maxvnodes: 100000
&prompt.root; swapon /dev/ada1s1b
-
It is possible to use any partition not currently
mounted, even if it already contains data. Using
&man.swapon.8; on a partition that contains data will
@@ -2683,7 +2679,6 @@ kern.maxvnodes: 100000
-
The GENERIC kernel already
includes the memory disk driver (&man.md.4;) required
for this operation. When building a custom kernel,
@@ -2759,8 +2754,8 @@ kern.maxvnodes: 100000
temperature increases unexpectedly.This section provides comprehensive information about
- ACPI. References will be provided for further
- reading.
+ ACPI. References will be provided for
+ further reading.What Is ACPI?
@@ -2977,13 +2972,12 @@ kern.maxvnodes: 100000
Most &os; developers watch &a.current;, but one should
submit problems to &a.acpi.name; to be sure it is seen. Be
patient when waiting for a response. If the bug is not
- immediately apparent, submit a
- PR using &man.send-pr.1;. When entering a
- PR, include the same information as
- requested above. This helps developers to track the problem
- and resolve it. Do not send a PR without
- emailing &a.acpi.name; first as it is likely that the problem
- has been reported before.
+ immediately apparent, submit a PR using
+ &man.send-pr.1;. When entering a PR,
+ include the same information as requested above. This helps
+ developers to track the problem and resolve it. Do not send a
+ PR without emailing &a.acpi.name; first as
+ it is likely that the problem has been reported before.
@@ -3276,8 +3270,9 @@ hw.acpi.s4bios: 0
ASL, use &man.acpidump.8;. Include both
, to show the contents of the fixed tables,
and , to disassemble the
- AML. Refer to for an example syntax.
+ AML. Refer to
+ for an example
+ syntax.
The simplest first check is to recompile the
ASL to check for errors. Warnings can
Modified: projects/db5/en_US.ISO8859-1/books/handbook/geom/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/geom/chapter.xml Tue Aug 13 05:46:43 2013 (r42534)
+++ projects/db5/en_US.ISO8859-1/books/handbook/geom/chapter.xml Tue Aug 13 08:28:25 2013 (r42535)
@@ -824,6 +824,314 @@ mountroot>
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***