From owner-svn-doc-head@FreeBSD.ORG Thu Jan 30 01:21:13 2014 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8192128; Thu, 30 Jan 2014 01:21:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A38BC114A; Thu, 30 Jan 2014 01:21: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 s0U1LDTJ048504; Thu, 30 Jan 2014 01:21:13 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0U1LDGX048503; Thu, 30 Jan 2014 01:21:13 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201401300121.s0U1LDGX048503@svn.freebsd.org> From: Warren Block Date: Thu, 30 Jan 2014 01:21:13 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43685 - head/en_US.ISO8859-1/books/handbook/cutting-edge X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2014 01:21:13 -0000 Author: wblock Date: Thu Jan 30 01:21:13 2014 New Revision: 43685 URL: http://svnweb.freebsd.org/changeset/doc/43685 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Wed Jan 29 20:16:53 2014 (r43684) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Thu Jan 30 01:21:13 2014 (r43685) @@ -4,28 +4,57 @@ $FreeBSD$ --> - - Updating and Upgrading &os; + + + + Updating and Upgrading &os; + - JimMockRestructured, reorganized, and parts updated - by + + + Jim + Mock + + Restructured, reorganized, and parts updated + by + - JordanHubbardOriginal work by - - Poul-HenningKamp - - JohnPolstra - - NikClayton + + + Jordan + Hubbard + + Original work by + + + + + Poul-Henning + Kamp + + + + + + John + Polstra + + + + + + Nik + Clayton + + - - - Synopsis @@ -80,7 +109,8 @@ - Properly set up the network connection (). + Properly set up the network connection + (). @@ -98,17 +128,33 @@ - &os; Update + + &os; Update + - TomRhodesWritten by + + + Tom + Rhodes + + Written by + + - ColinPercivalBased on notes provided by + + + Colin + Percival + + Based on notes provided by + - - Updating and Upgrading + + Updating and Upgrading + freebsd-update updating-upgrading @@ -133,7 +179,8 @@ releases currently supported by the security team. Before updating to a new release, its release announcement should be reviewed as it contains important information pertinent to the - release. Release announcements are available from http://www.FreeBSD.org/releases/. + release. Release announcements are available from http://www.FreeBSD.org/releases/. If a crontab utilizing the features @@ -253,8 +300,9 @@ MergeChanges /etc/ /var/named/etc/freebsd-update will only check if updates exist. If patches exist, they will automatically be downloaded to the local disk but will not be applied. The - root user will be sent an email so that - they may be reviewed and manually installed. + root user will be + sent an email so that they may be reviewed and manually + installed. If anything goes wrong, freebsd-update has the ability to roll back the last set of changes with @@ -353,7 +401,8 @@ MergeChanges /etc/ /var/named/etc/Custom Kernels with &os; 8.X A copy of the GENERIC kernel is - needed, and should be placed in /boot/GENERIC. If the + needed, and should be placed in + /boot/GENERIC. If the GENERIC kernel is not present in the system, it may be obtained using one of the following methods: @@ -363,7 +412,8 @@ MergeChanges /etc/ /var/named/etc/If a custom kernel has only been built once, the kernel in /boot/kernel.old is actually GENERIC. Rename this - directory to /boot/GENERIC. + directory to + /boot/GENERIC. @@ -413,10 +463,10 @@ MergeChanges /etc/ /var/named/etc/ If a custom kernel has only been built once, the - kernel in - /boot/kernel.old - is actually the GENERIC kernel. - Rename this directory to /boot/kernel. + kernel in /boot/kernel.old is + actually the GENERIC kernel. + Rename this directory to + /boot/kernel. @@ -581,7 +631,8 @@ before running "/usr/sbin/freebsd-update needs to be rebuilt and re-installed. This is required as installed software may depend on libraries which have been removed during the upgrade process. This process can be - automated using ports-mgmt/portmaster: + automated using + ports-mgmt/portmaster: &prompt.root; portmaster -af @@ -658,17 +709,33 @@ before running "/usr/sbin/freebsd-update - Portsnap: a Ports Collection Update Tool + + Portsnap: a Ports Collection Update Tool + - TomRhodesWritten by + + + Tom + Rhodes + + Written by + + - ColinPercivalBased on notes provided by + + + Colin + Percival + + Based on notes provided by + - - Updating and Upgrading + + Updating and Upgrading + Portsnap Updating and Upgrading @@ -751,10 +818,12 @@ Fetching 133 new ports or files... done. Documentation is an integral part of the &os; operating system. While an up-to-date version of the &os; Documentation - Set is always available on the &os; web site, - some users might have slow or no permanent network connectivity. - There are several ways to update the local copy of documentation - with the latest &os; Documentation Set. + Set is always available on the + &os; web + site, some users might have slow or no permanent + network connectivity. There are several ways to update the + local copy of documentation with the latest &os; Documentation + Set. Using <application>Subversion</application> to Update the @@ -779,7 +848,8 @@ Fetching 133 new ports or files... done. <listitem> <para>Rebuild the &os; documentation from its source, and - install it under <filename>/usr/share/doc</filename>.</para> + install it under + <filename>/usr/share/doc</filename>.</para> </listitem> <listitem> @@ -810,13 +880,14 @@ Fetching 133 new ports or files... done. <note> <para>When no &postscript; or PDF documentation required, one - might consider installing the <package>textproc/docproj-nojadetex</package> port - instead. This version of the documentation toolchain - includes everything except the - <application>teTeX</application> typesetting engine. - <application>teTeX</application> is a very large collection - of tools, so it may be quite sensible to omit its - installation if PDF output is not really necessary.</para> + might consider installing the + <package>textproc/docproj-nojadetex</package> port instead. + This version of the documentation toolchain includes + everything except the <application>teTeX</application> + typesetting engine. <application>teTeX</application> is a + very large collection of tools, so it may be quite sensible + to omit its installation if PDF output is not really + necessary.</para> </note> </sect2> @@ -829,7 +900,9 @@ Fetching 133 new ports or files... done. <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/doc/head /usr/doc</userinput></screen> - <para>Select the closest mirror from the available <link linkend="svn-mirrors">Subversion mirror sites</link>.</para> + <para>Select the closest mirror from the available + <link linkend="svn-mirrors">Subversion mirror + sites</link>.</para> <para>The initial download of the documentation sources may take a while. Let it run until it completes.</para> @@ -908,8 +981,8 @@ Fetching 133 new ports or files... done. <title>Installing the &os; Documentation from Source Once an up-to-date snapshot of the documentation sources - has been fetched to /usr/doc, everything is - ready for an update of the installed documentation. + has been fetched to /usr/doc, everything + is ready for an update of the installed documentation. A full update of all the languages defined in DOC_LANG may be performed by typing: @@ -932,20 +1005,29 @@ Fetching 133 new ports or files... done. &prompt.root; make FORMATS='html html-split' install clean For information on editing and submitting corrections to - the documentation, refer to the &os; Documentation + the documentation, refer to the + &os; Documentation Project Primer for New Contributors. - Using Documentation Ports + + Using Documentation Ports + - MarcFonvieilleBased on the work of + + + Marc + Fonvieille + + Based on the work of + - - - Updating and Upgrading + + Updating and Upgrading + documentation package @@ -977,10 +1059,11 @@ Fetching 133 new ports or files... done. These two methods of updating the &os; documentation are - supported by a set of documentation - ports, updated by the &a.doceng; on a monthly - basis. These are listed in the &os; Ports Collection, - under the docs + supported by a set of + documentation ports, updated by the + &a.doceng; on a monthly basis. These are listed in the &os; + Ports Collection, under the docs category. @@ -1006,28 +1089,31 @@ Fetching 133 new ports or files... done. - The master port, misc/freebsd-doc-en, - which installs all of the English documentation - ports. + The master port, + misc/freebsd-doc-en, which installs + all of the English documentation ports. - The all in one port, misc/freebsd-doc-all, - builds and installs all documentation in all available + The all in one port, + misc/freebsd-doc-all, builds and + installs all documentation in all available languages. There is a slave port for each - translation, such as misc/freebsd-doc-hu for the + translation, such as + misc/freebsd-doc-hu for the Hungarian-language documents. For example, to build and install the English documentation in split HTML format, - similar to the format used on http://www.FreeBSD.org, to - /usr/local/share/doc/freebsd, + similar to the format used on http://www.FreeBSD.org, + to /usr/local/share/doc/freebsd, install the following port &prompt.root; cd /usr/ports/misc/freebsd-doc-en @@ -1069,7 +1155,8 @@ Fetching 133 new ports or files... done. Specifies where to install the documentation. - It defaults to /usr/local/share/doc/freebsd. + It defaults to + /usr/local/share/doc/freebsd. The default target directory differs from the @@ -1272,8 +1359,9 @@ Fetching 133 new ports or files... done. - Use svn - Subversion + Use svn + + Subversion -CURRENT @@ -1284,24 +1372,27 @@ Fetching 133 new ports or files... done. branch. This is the recommended method, providing access to &os; development as it occurs. Checkout the -CURRENT code from the head - branch of one of the Subversion mirror + branch of one of the Subversion mirror sites. Due to the size of the repository, it is recommended that only desired subtrees be checked out. - Use the CTM + Use the + CTM + -CURRENT Syncing with CTM facility. If you have bad connectivity such as high price connections or only email access, CTM is an option, but it - is not as reliable as - Subversion. - For this reason, Subversion - is the recommended method for any system with - Internet connectivity. + is not as reliable as + Subversion. For this + reason, Subversion is the + recommended method for any system with Internet + connectivity. @@ -1315,7 +1406,8 @@ Fetching 133 new ports or files... done. problems. Before compiling - &os.current; + &os.current; + -CURRENT compiling , read @@ -1374,7 +1466,8 @@ Fetching 133 new ports or files... done. For a complete description of the current security - policy for old releases of FreeBSD, refer to http://www.FreeBSD.org/security/.. + policy for old releases of FreeBSD, refer to http://www.FreeBSD.org/security/.. While the &os.stable; branch should compile and run at all times, this cannot be guaranteed. While code is @@ -1430,11 +1523,13 @@ Fetching 133 new ports or files... done. - To install a new system running monthly - snapshots built from &os.stable;, refer to Snapshots for more - information. Alternatively, it is possible to install - the most recent &os.stable; release from the mirror sites and follow the - instructions below to upgrade the system to the most + To install a new system running monthly snapshots + built from &os.stable;, refer to Snapshots + for more information. Alternatively, it is possible to + install the most recent &os.stable; release from the + mirror sites and follow + the instructions below to upgrade the system to the most up-to-date &os.stable; source code. Several methods are available to upgrade from a &os; @@ -1443,9 +1538,9 @@ Fetching 133 new ports or files... done. - Use svn + Use svn + Subversion - to check out the desired development or release branch. This is the recommended method, providing access to &os; development as it occurs. @@ -1453,22 +1548,24 @@ Fetching 133 new ports or files... done. current development head, and branches identified in the release engineering page, such as - stable/9 + stable/9 + -STABLE syncing with Subversion or releng/9.2. URL prefixes for Subversion checkout of - the base system are shown in Subversion mirror - sites. - Because of the size of the repository, it is - recommended that only desired subtrees be checked - out. + the base system are shown in Subversion mirror + sites. Because of the size of the + repository, it is recommended that only desired + subtrees be checked out. - Consider using CTM + Consider using CTM + -STABLE syncing with CTM if you do not have a fast connection to @@ -1501,7 +1598,9 @@ Fetching 133 new ports or files... done. There are various ways of using an Internet or email connection to stay up-to-date with any given area, or all areas, - of the &os; project sources. The primary services are Subversion and CTM. + of the &os; project sources. The primary services are + Subversion and + CTM. While it is possible to update only parts of the source @@ -1750,9 +1849,9 @@ Fetching 133 new ports or files... done. password database. This is often necessary when new groups or special system-user accounts have been added since the last update, so that the - installworld step will be able to - use the newly installed system user or system group names - without problems. + installworld step will be able + to use the newly installed system user or system group + names without problems. @@ -1846,8 +1945,7 @@ Fetching 133 new ports or files... done. successfully, boot into single user mode using boot -s from the loader prompt. - If using UFS, run: - + If using UFS, run: &prompt.root; mount -u / &prompt.root; mount -a -t ufs @@ -1859,7 +1957,7 @@ Fetching 133 new ports or files... done. Then run: - &prompt.root; adjkerntz -i + &prompt.root; adjkerntz -i &prompt.root; mergemaster -p &prompt.root; cd /usr/src &prompt.root; make installworld @@ -2070,10 +2168,12 @@ Script started, output file is /var/tmp/ &prompt.root; exit Script done, … - Do not save the output in /tmp as this directory may be - cleared at next reboot. A better place to save the file is + Do not save the output in + /tmp as this directory may be cleared + at next reboot. A better place to save the file is /var/tmp or in - root's home directory. + root's home + directory. @@ -2084,7 +2184,9 @@ Script done, … &prompt.root; cd /usr/src - make + + make + To rebuild the world, use &man.make.1;. This command reads instructions from the Makefile, @@ -2135,36 +2237,39 @@ Script done, … build options. The first target should always be buildworld. - As the names imply, buildworld - builds a complete new tree under - /usr/obj and - installworld installs this tree on - the current machine. + As the names imply, + buildworld builds a complete new + tree under /usr/obj and + installworld installs this tree + on the current machine. Having separate options is useful for two reasons. First, it allows for a self hosted build that does not affect any components of a running system. Because - of this, buildworld can be run on a - machine running in multi-user mode with no fear of + of this, buildworld can be run on + a machine running in multi-user mode with no fear of ill-effects. It is still recommended that installworld be run in part in single user mode, though. Secondly, it allows NFS mounts to be used to upgrade multiple machines on a network. If order to upgrade three - machines, A, B and - C, run make buildworld - and make installworld on + machines, A, + B and C, + run make buildworld and + make installworld on A. B and C should then NFS mount /usr/src and - /usr/obj from A, and - run make installworld to install the - results of the build on B and + /usr/obj from + A, and run + make installworld to install the results + of the build on B and C. - Although the world target still - exists, users are strongly encouraged not to use it. + Although the world target + still exists, users are strongly encouraged not to use + it. Instead, run: @@ -2250,9 +2355,9 @@ Script done, … above 1 and noschg or similar flags have been set on the kernel binary, drop into single user mode to use - installkernel. Otherwise, both these - commands can be run from multi user mode without problems. - See &man.init.8; for details about + installkernel. Otherwise, both + these commands can be run from multi user mode without + problems. See &man.init.8; for details about kern.securelevel and &man.chflags.1; for details about the various file flags. @@ -2263,14 +2368,15 @@ Script done, … single-user mode Reboot into single user mode to test that the new kernel - works using the instructions in . + works using the instructions in + . Install the New System Binaries - Next, use installworld to install - the new system binaries: + Next, use installworld to + install the new system binaries: &prompt.root; cd /usr/src &prompt.root; make installworld @@ -2312,12 +2418,19 @@ Script done, … wrong. - <command>mergemaster</command> + + <command>mergemaster</command> + - TomRhodesContributed by + + + Tom + Rhodes + + Contributed by + - @@ -2327,10 +2440,9 @@ Script done, … &man.mergemaster.8; is a Bourne script to aid in determining the differences between the configuration files - in /etc, and the - configuration files in the source tree - /usr/src/etc. This - is the recommended solution for keeping the system + in /etc, and the configuration files in + the source tree /usr/src/etc. This is + the recommended solution for keeping the system configuration files up to date with those located in the source tree. @@ -2437,8 +2549,8 @@ Script done, … This will build the necessary directory structure and install the files. A lot of the subdirectories that have - been created under /var/tmp/root are empty and - should be deleted. The simplest way to do this is + been created under /var/tmp/root are + empty and should be deleted. The simplest way to do this is to: &prompt.root; cd /var/tmp/root @@ -2455,9 +2567,10 @@ Script done, … Go through each of these files, determining how they differ from the system's existing files. - Some of the files installed into /var/tmp/root have a - leading .. Make sure to use ls - -a in order to catch them. + Some of the files installed into + /var/tmp/root have a leading + .. Make sure to use + ls -a in order to catch them. The simplest way to compare files is to use &man.diff.1;: @@ -2521,11 +2634,11 @@ Script done, … &prompt.root; diff -r root-20130214 root-20130221 Typically, this will be a much smaller set of - differences than those between /var/tmp/root-20130221/etc - and /etc. - Because the set of differences is smaller, it is - easier to migrate those changes across into - /etc. + differences than those between + /var/tmp/root-20130221/etc and + /etc. Because the set of + differences is smaller, it is easier to migrate those + changes across into /etc. @@ -2551,12 +2664,19 @@ Script done, … - Deleting Obsolete Files and Directories + + Deleting Obsolete Files and Directories + - AntonShterenlikhtBased on notes provided by + + + Anton + Shterenlikht + + Based on notes provided by + - Deleting obsolete files and directories @@ -2668,8 +2788,8 @@ Script done, … If things went slightly wrong, it is easy to rebuild a particular piece of the system. For example, if /etc/magic was accidentally deleted as - part of the upgrade or merge of /etc, &man.file.1; will stop - working. To fix this, run: + part of the upgrade or merge of /etc, + &man.file.1; will stop working. To fix this, run: &prompt.root; cd /usr/src/usr.bin/file &prompt.root; make all install @@ -2866,20 +2986,22 @@ Building everything.. &prompt.root; mount -u -o noatime /usr/src - This example assumes /usr/src is on its - own file system. If it is part of - /usr, then - use that file system mount point instead. + This example assumes + /usr/src is on its own file + system. If it is part of + /usr, then use that file + system mount point instead. - The file system holding /usr/obj can be - mounted or remounted with - so that disk writes happen asynchronously. The - write completes immediately, and the data is written - to the disk a few seconds later. This allows writes - to be clustered together, and can provide a dramatic + The file system holding + /usr/obj can be mounted or + remounted with so that disk + writes happen asynchronously. The write completes + immediately, and the data is written to the disk a + few seconds later. This allows writes to be + clustered together, and can provide a dramatic performance boost. @@ -2941,14 +3063,20 @@ Building everything.. - Tracking for Multiple Machines + + Tracking for Multiple Machines + - MikeMeyerContributed by + + + Mike + Meyer + + Contributed by + - - NFS installing multiple machines @@ -3031,16 +3159,17 @@ Building everything.. Ports The same ideas can be used for the ports tree. The first - critical step is to mount /usr/ports from the same - machine to all the machines in the build set. Then, configure - /etc/make.conf properly to share - distfiles. Set DISTDIR to a common shared - directory that is writable by whichever user - root is mapped to by the NFS mounts. - Each machine should set WRKDIRPREFIX to a - local build directory. Finally, if the system is to build and - distribute packages, set PACKAGES to a - directory similar to DISTDIR. + critical step is to mount /usr/ports from + the same machine to all the machines in the build set. Then, + configure /etc/make.conf properly to + share distfiles. Set DISTDIR to a common + shared directory that is writable by whichever user + root is mapped to by + the NFS mounts. Each machine should set + WRKDIRPREFIX to a local build directory. + Finally, if the system is to build and distribute packages, + set PACKAGES to a directory similar to + DISTDIR.