From 440c48b014390b8aaaff10b743ab089452885bd2 Mon Sep 17 00:00:00 2001
From: Gwynne Raskind <gwynne@php.net>
Date: Wed, 9 Apr 2008 07:00:27 +0000
Subject: [PATCH] Use static modifier, fix some version numbers, add more info
 about counter

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@257015 c90b9560-bf6c-de11-be94-00142212c4b1
---
 internals2/counter.xml             |  3 ++-
 internals2/intro.xml               |  8 ++++----
 internals2/structure/modstruct.xml | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/internals2/counter.xml b/internals2/counter.xml
index c0aa120aea..e99973b3b4 100644
--- a/internals2/counter.xml
+++ b/internals2/counter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
  <part xml:id="internals2.counter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>The "counter" Extension - A Continuing Example</title>
   
@@ -636,6 +636,7 @@ $counter_four->printCounterInfo();
     <refsect1 role="description">
      &reftitle.description;
      <methodsynopsis>
+      <modifier>static</modifier>
       <type>Counter</type><methodname>Counter::getNamed</methodname>
       <methodparam><type>string</type><parameter>name</parameter></methodparam>
      </methodsynopsis>
diff --git a/internals2/intro.xml b/internals2/intro.xml
index 7b3a7c791c..e56b936249 100644
--- a/internals2/intro.xml
+++ b/internals2/intro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
 <!--
  &internals2.buildsys.index;   configure options, ext_skel, config.m4, config.w32, static vs. dynamic builds
@@ -41,7 +41,7 @@
   </warning>
   
   <simpara>
-   This section of the manual is devoted to ZE2. While PHP 4.3 is still in
+   This section of the manual is devoted to ZE2. While PHP 4.4 is still in
    widespread use, the differences in how extensions are written in ZE1 are
    small; a short reference to them is given in an appendix to this section.
    ZE3's API may yet change significantly, and is covered in another appendix.
@@ -49,9 +49,9 @@
   </simpara>
    
   <simpara>
-   The documentation in this section is current as of PHP 5.2.3, the most
+   The documentation in this section is current as of PHP 5.2.5, the most
    recent stable release at the time of this writing. Notable differences in
-   the minor PHP 5 releases (5.0, 5.1, and 5.2) are given as appropriate.
+   the minor PHP 5 releases (5.0 through 5.3) are given as appropriate.
   </simpara>
  </preface>
 
diff --git a/internals2/structure/modstruct.xml b/internals2/structure/modstruct.xml
index 7c0166cc6d..d3a3ea7e4d 100644
--- a/internals2/structure/modstruct.xml
+++ b/internals2/structure/modstruct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
  <sect1 xml:id="internals2.structure.modstruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>The zend_module structure</title>
   <para>
@@ -463,11 +463,7 @@ struct _zend_module_entry {
    <para>
     With all these fields to play with, it can be confusing to know which to use
     for what purpose. Here is the <literal>zend_module</literal> definition from
-    a &quot;real-world&quot; example extension. This extension provides a
-    counter that increases by one every time the function to get its current
-    value is called. The time at which the counter is reset is controlled by an
-    INI switch. This is useless in a practical sense, but serves to illustrate
-    many techniques for extension writing.
+    the "counter" example extension.
    </para>
    
    <example xml:id="internals2.structure.modstruct.filling-it-in.counter-mod-ex">
@@ -508,7 +504,10 @@ zend_module_entry counter_module_entry = {
     <listitem>
      <simpara>
       &quot;counter&quot; is the extension's name, and is used to define the
-      various callback functions the module passes to Zend.
+      various callback functions the module passes to Zend. "counter" uses
+      module, globals, and request functions at startup and shutdown times, and
+      provides information to <function>phpinfo</function>, so all seven
+      callbacks are defined.
      </simpara>
     </listitem>
     
@@ -530,6 +529,13 @@ zend_module_entry counter_module_entry = {
      </simpara>
     </listitem>
     
+    <listitem>
+     <simpara>
+      "counter" uses per-module globals, so
+      <constant>PHP_MODULE_GLOBALS</constant> is used
+     </simpara>
+    </listitem>
+    
     <listitem>
      <simpara>
       This module has no post-deactivate function, so &null; is used.