cvs: peardoc /en/chapters standards.xml /en/chapters/rfcs header-comments.xml

cweiske		Mon May  4 20:16:20 2009 UTC

  Modified files:              
    /peardoc/en/chapters	standards.xml 
    /peardoc/en/chapters/rfcs	header-comments.xml 
  Log:
  they have been integrated, at least partly
  
  
http://cvs.php.net/viewvc.cgi/peardoc/en/chapters/standards.xml?r1=1.71&r2=1.72&diff_format=u
Index: peardoc/en/chapters/standards.xml
diff -u peardoc/en/chapters/standards.xml:1.71 peardoc/en/chapters/standards.xml:1.72
--- peardoc/en/chapters/standards.xml:1.71	Mon May  4 20:11:18 2009
+++ peardoc/en/chapters/standards.xml	Mon May  4 20:16:19 2009
@@ -26,13 +26,18 @@
    </listitem>
    <listitem>
     <para>
+     <link linkend="rfc.header-comments">Header Comment Blocks</link>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
      <link linkend="rfc.protected-members">Protected members</link>
     </para>
    </listitem>
   </itemizedlist>
   
   <para>
-   Those RFCs have not yet been integrated into this document.
+   Those RFCs have only partly been integrated into this document.
   </para>
   
   <note>
http://cvs.php.net/viewvc.cgi/peardoc/en/chapters/rfcs/header-comments.xml?r1=1.3&r2=1.4&diff_format=u
Index: peardoc/en/chapters/rfcs/header-comments.xml
diff -u peardoc/en/chapters/rfcs/header-comments.xml:1.3 peardoc/en/chapters/rfcs/header-comments.xml:1.4
--- peardoc/en/chapters/rfcs/header-comments.xml:1.3	Mon May  4 19:47:02 2009
+++ peardoc/en/chapters/rfcs/header-comments.xml	Mon May  4 20:16:19 2009
@@ -25,6 +25,11 @@
    This RFC has been ratified in PEPr as
    <link xlink:href="&url.pear.pepr.proposal;128">proposal #128</link>.
   </para>
+  
+  <para>
+   This RFC has been integrated into the Coding Standards under the
+   <link linkend="standards.header">Header Comment Blocks</link> section.
+  </para>
 
   <section xml:id="rfc.header-comments.base">
     <title>Base docblock</title>
@@ -56,7 +61,7 @@
  * @author     Another Author &lt;[email protected]&gt;
  * @copyright  1997-2005 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: header-comments.xml,v 1.3 2009/05/04 19:47:02 cweiske Exp $
+ * @version    CVS: $Id: header-comments.xml,v 1.4 2009/05/04 20:16:19 cweiske Exp $
  * @link       http://pear.php.net/package/PackageName
  * @see        NetOther, Net_Sample::Net_Sample()
  * @since      File available since Release 1.2.0
@@ -257,10 +262,10 @@
       docblocks will use <literal>@package_version@</literal>, which gets
       replaced with the release's version number by the PEAR installer.</para>
 
-      <para>This seems the best compromise because <literal>$Id: header-comments.xml,v 1.3 2009/05/04 19:47:02 cweiske Exp $</literal>'s
+      <para>This seems the best compromise because <literal>$Id: header-comments.xml,v 1.4 2009/05/04 20:16:19 cweiske Exp $</literal>'s
       talk about files while the release version numbers talk about the
-      classes. <literal>$Id: header-comments.xml,v 1.3 2009/05/04 19:47:02 cweiske Exp $</literal> is used rather than
-      <literal>$Revision: 1.3 $</literal> or other shorter tags because it is the
+      classes. <literal>$Id: header-comments.xml,v 1.4 2009/05/04 20:16:19 cweiske Exp $</literal> is used rather than
+      <literal>$Revision: 1.4 $</literal> or other shorter tags because it is the
       standard and provides all of the potentially desired information.</para>
     </section>