Date: Sun, 18 Nov 2012 21:10:33 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40083 - head/en_US.ISO8859-1/articles/portbuild Message-ID: <201211182110.qAILAXoC011990@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Sun Nov 18 21:10:33 2012 New Revision: 40083 URL: http://svnweb.freebsd.org/changeset/doc/40083 Log: Per suggestions from pgj, start cleaning up the bad markup. Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/portbuild/article.xml Sun Nov 18 17:57:31 2012 (r40082) +++ head/en_US.ISO8859-1/articles/portbuild/article.xml Sun Nov 18 21:10:33 2012 (r40083) @@ -209,13 +209,13 @@ be updated first unless <literal>-novcs</literal> is specified. It should be run as <username>root</username>:</para> - <screen>/var/portbuild&prompt.root; <userinput>scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-novcs]</userinput></screen> + <screen>&prompt.root; <userinput>/var/portbuild/scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-novcs]</userinput></screen> <para>The <filename>bindist.tar</filename> tarball is created from the previously installed world by the <command>mkbindist</command> script. It should be also be run as <username>root</username>:</para> - <screen>/var/portbuild&prompt.root; <userinput>scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen> + <screen>&prompt.root; <userinput>/var/portbuild/scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen> <para>The per-machine tarballs are located in <filename><replaceable>${arch}</replaceable>/clients</filename>.</para> @@ -282,7 +282,7 @@ <para>(For this case, the contents are identical for both server and client.)</para> - <screen>RUBY_DEFAULT_VER= 1.9</screen> + <programlisting>RUBY_DEFAULT_VER= 1.9</programlisting> </example> <example> @@ -293,7 +293,7 @@ <para>(For this case, the contents are also identical for both server and client.)</para> - <screen> + <programlisting> .if !defined(CC) || ${CC} == "cc" CC=clang .endif @@ -306,29 +306,29 @@ CPP=clang-cpp # Don't die on warnings NO_WERROR= WERROR= -</screen> +</programlisting> </example> <example> <title>Sample <filename>make.conf.server</filename> for <application>pkgng</application></title> - <screen>WITH_PKGNG=yes -PKG_BIN=/usr/local/sbin/pkg</screen> + <programlisting>WITH_PKGNG=yes +PKG_BIN=/usr/local/sbin/pkg</programlisting> </example> <example> <title>Sample <filename>make.conf.client</filename> for <application>pkgng</application></title> - <screen>WITH_PKGNG=yes</screen> + <programlisting>WITH_PKGNG=yes</programlisting> </example> <example> <title>Sample <filename>src.conf.server</filename> to test new <application>sort</application> codebase</title> - <screen>WITH_BSD_SORT=yes</screen> + <programlisting>WITH_BSD_SORT=yes</programlisting> </example> </sect1> @@ -427,7 +427,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen> <para>The symlinks go away, and you just use <command>dopackages.wrapper</command> directly. For example:</para> - <screen><command>dopackages.wrapper <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> <literal>[-options]</literal></command></screen> + <screen>&prompt.root; <userinput>dopackages.wrapper <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> <literal>[-options]</literal></userinput></screen> </sect3> @@ -630,7 +630,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen> <literal>-nocleanup</literal>, you need to clean up clients by running </para> - <para><command>build cleanup <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> -full</command></para> + <para>&prompt.user; <userinput>build cleanup <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> -full</userinput></para> <para><filename>errors/</filename>, <filename>logs/</filename>, <filename>packages/</filename>, and so @@ -669,7 +669,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen> <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/make.[0|1]</filename>: </para> - <screen><literal>don't know how to make dns-all(continuing)</literal></screen> + <programlisting><literal>don't know how to make dns-all(continuing)</literal></programlisting> <para>To correct this problem, simply comment out or remove the <literal>SUBDIR</literal> entries that point to empty @@ -687,22 +687,22 @@ PKG_BIN=/usr/local/sbin/pkg</screen> <example> <title>Update the i386-7 tree and do a complete build</title> - <para><command>dopackages.7 i386 -nosrc -norestr -nofinish</command></para> - <para><command>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</command></para> + <screen>&prompt.user; <userinput>dopackages.7 i386 -nosrc -norestr -nofinish</userinput> +&prompt.user; <userinput>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</userinput></screen> </example> <example> <title>Restart an interrupted amd64-8 build without updating</title> - <para><command>dopackages.8 amd64 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</command></para> - <para><command>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</command></para> + <screen>&prompt.user; <userinput>dopackages.8 amd64 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput> +&prompt.user; <userinput>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen> </example> <example> <title>Post-process a completed sparc64-7 tree</title> - <para><command>dopackages.7 sparc64 -finish</command></para> - <para><command>dopackages.wrapper sparc64 7 -finish</command></para> + <screen>&prompt.user; <userinput>dopackages.7 sparc64 -finish</userinput> +&prompt.user; <userinput>dopackages.wrapper sparc64 7 -finish</userinput></screen> </example> <para>Hint: it is usually best to run the <command>dopackages</command>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211182110.qAILAXoC011990>