Minor wordsmithing suggested by bjk and wblock.

Submitted by: bjk, wblock
Sponsored by: iXsystems
This commit is contained in:
Dru Lavigne 2014-04-03 12:58:12 +00:00
parent 8090cec7ea
commit 0283a40b37
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=44425

View file

@ -1543,25 +1543,25 @@ The deinstallation will free 229 kB
<para><application>Poudriere</application> is a
<acronym>BSD</acronym>-licensed utility for creating and testing
&os; packages. It uses &os; jails to set up isolated
compilation environments which can be used to build packages for
versions of &os; that are different from the box on which it is
compilation environments. These jails can be used to build packages for
versions of &os; that are different from the system on which it is
installed, and also to build packages for i386 if the host is an
&arch.amd64; system. Once the packages are built, they will be
in a layout identical to the official mirrors and are therefore
usable by &man.pkg.8; and other package management
&arch.amd64; system. Once the packages are built, they are
in a layout identical to the official mirrors. These packages
are usable by &man.pkg.8; and other package management
tools.</para>
<para><application>Poudriere</application> can be installed using
<para><application>Poudriere</application> is installed using
the <package role="port">ports-mgmt/poudriere</package> package
or port. The installation will include a sample configuration
or port. The installation includes a sample configuration
file <filename>/usr/local/etc/poudriere.conf.sample</filename>.
This file should be copied to
<filename>/usr/local/etc/poudriere.conf</filename> which can
then be edited to suit the local configuration.</para>
Copy this file to
<filename>/usr/local/etc/poudriere.conf</filename>. Edit the
copied file to suit the local configuration.</para>
<para>While <acronym>ZFS</acronym> is not required on the system
running <application>poudriere</application>, it is beneficial.
When <acronym>ZFS</acronym> is used, the
When <acronym>ZFS</acronym> is used,
<varname>ZPOOL</varname> must be specified in
<filename>/usr/local/etc/poudriere.conf</filename> and
<varname>FREEBSD_HOST</varname> should be set to a nearby
@ -1583,14 +1583,14 @@ The deinstallation will free 229 kB
<sect2 xml:id="poudriere-initialization">
<title>Initialize Jails and Port Trees</title>
<para>Once configured, initialize
<para>After configuration, initialize
<application>poudriere</application> so that it installs a
jail with the required &os; tree and a ports tree. Specify a
name for the jail using <option>-j</option> and the &os;
version with <option>-v</option>. On systems running
&os;/&arch.amd64;, the architecture can be set with
<option>-a</option> to either <literal>i386</literal> or
<literal>amd64</literal>. The default is to use the
<literal>amd64</literal>. The default is the
architecture shown by <command>uname</command>.</para>
<screen>&prompt.root; <userinput>poudriere jail -c -j <replaceable>10amd64</replaceable> -v <replaceable>10.0-RELEASE</replaceable></userinput>
@ -1666,13 +1666,13 @@ devel/git
ports-mgmt/pkg
...</programlisting>
<para>To configure the options and dependencies for the
specified ports:</para>
<para>Options and dependencies for the specified ports are
configured::</para>
<screen>&prompt.root; <userinput>poudriere options -j <replaceable>10amd64</replaceable> -p <replaceable>local</replaceable> -z <replaceable>workstation</replaceable> -f <replaceable>workstation-pkglist</replaceable></userinput></screen>
<para>Finally, to build the packages and create the package
repository:</para>
<para>Finally, packages are built and a package
repository is created:</para>
<screen>&prompt.root; <userinput>poudriere bulk -j <replaceable>10amd64</replaceable> -p <replaceable>local</replaceable> -z <replaceable>workstation</replaceable> -f <replaceable>workstation-pkglist</replaceable></userinput></screen>
@ -1684,7 +1684,7 @@ ports-mgmt/pkg
that can be used with a web server to display build
information.</para>
<para>Once the build is complete, packages are now available for
<para>Packages are now available for
installation from the <application>poudriere</application>
repository.</para>