cvs: peardoc /en/chapters standards.xml

danielc Wed May 12 18:01:34 2004 EDT Modified files: /peardoc/en/chapters standards.xml Log: Update examples to use three places in release numbers. http://cvs.php.net/diff.php/peardoc/en/chapters/standards.xml?r1=1.13&r2=1.14&ty=u Index: peardoc/en/chapters/standards.xml diff -u peardoc/en/chapters/standards.xml:1.13 peardoc/en/chapters/standards.xml:1.14 --- peardoc/en/chapters/standards.xml:1.13 Wed May 12 17:58:21 2004 +++ peardoc/en/chapters/standards.xml Wed May 12 18:01:31 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1" ?> -<!-- $Revision: 1.13 $ --> +<!-- $Revision: 1.14 $ --> <chapter id="standards"> <title>Coding Standards</title> @@ -280,7 +280,7 @@ <variablelist> <varlistentry> - <term>RELEASE_<replaceable>n_n</replaceable></term> + <term>RELEASE_<replaceable>n_n_n</replaceable></term> <listitem> <simpara> (required) Used for tagging a release. If you don't use it, @@ -290,7 +290,7 @@ </listitem> </varlistentry> <varlistentry> - <term>QA_<replaceable>n_n</replaceable></term> + <term>QA_<replaceable>n_n_n</replaceable></term> <listitem> <simpara> (branch, optional) If you feel you need to roll out a @@ -302,11 +302,11 @@ </listitem> </varlistentry> <varlistentry> - <term>MAINT_<replaceable>n_n</replaceable></term> + <term>MAINT_<replaceable>n_n_n</replaceable></term> <listitem> <simpara> (branch, optional) If you need to make "micro-releases" (for - example 1.2.1 and so on after 1.2), you can use a branch for + example 1.2.1 and so on after 1.2.0), you can use a branch for that too, if your main trunk is very active and you want only minor changes between your micro-releases. </simpara> @@ -334,16 +334,16 @@ <para> Here's an example of how to create a QA branch: <informalexample> - <screen><prompt>$ </prompt><command>cvs tag QA_2_0_BP</command> + <screen><prompt>$ </prompt><command>cvs tag QA_2_0_0_BP</command> ... -<prompt>$ </prompt><command>cvs rtag -b -r QA_2_0_BP QA_2_0</command> -<prompt>$ </prompt><command>cvs update -r QA_2_0</command> -<prompt>$ </prompt><command>cvs tag RELEASE_2_0RC1</command> +<prompt>$ </prompt><command>cvs rtag -b -r QA_2_0_0_BP QA_2_0_0</command> +<prompt>$ </prompt><command>cvs update -r QA_2_0_0</command> +<prompt>$ </prompt><command>cvs tag RELEASE_2_0_0RC1</command> ...and then the actual release, from the same branch: -<prompt>$ </prompt><command>cvs tag RELEASE_2_0</command> +<prompt>$ </prompt><command>cvs tag RELEASE_2_0_0</command> </screen> </informalexample> - The "QA_2_0_BP" tag is a "branch point" tag, which is the start + The "QA_2_0_0_BP" tag is a "branch point" tag, which is the start point of the tag. It's always a good idea to start a CVS branch from such branch points. MAINT branches may use the RELEASE tag as their branch point. @@ -494,7 +494,7 @@ // | Your Name <you@example.com> | // +----------------------------------------------------------------------+ // -// $Id: standards.xml,v 1.13 2004/05/12 21:58:21 danielc Exp $ +// $Id: standards.xml,v 1.14 2004/05/12 22:01:31 danielc Exp $ require_once 'PEAR.php'; @@ -546,7 +546,7 @@ * @category categoryname * @package packagename * @author Original Author <author@example.com> - * @version $Id: standards.xml,v 1.13 2004/05/12 21:58:21 danielc Exp $ + * @version $Id: standards.xml,v 1.14 2004/05/12 22:01:31 danielc Exp $ * @access public * @see NetOther, Net_Sample::Net_Sample() * @since Class available since Release 1.2.0