cvs: phpdoc(REF_STRUCT_DEV) /en/reference/objaggregation reference.xml /en/reference/var reference.xml

bjori Sat Oct 27 16:40:04 2007 UTC Modified files: (Branch: REF_STRUCT_DEV) /phpdoc/en/reference/objaggregation reference.xml /phpdoc/en/reference/var reference.xml Log: Upgrade markup http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/objaggregation/reference.xml?r1=1.18.2.1&r2=1.18.2.2&diff_format=u Index: phpdoc/en/reference/objaggregation/reference.xml diff -u phpdoc/en/reference/objaggregation/reference.xml:1.18.2.1 phpdoc/en/reference/objaggregation/reference.xml:1.18.2.2 --- phpdoc/en/reference/objaggregation/reference.xml:1.18.2.1 Wed Oct 3 11:41:13 2007 +++ phpdoc/en/reference/objaggregation/reference.xml Sat Oct 27 16:40:04 2007 @@ -1,27 +1,32 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18.2.1 $ --> +<!-- $Revision: 1.18.2.2 $ --> <!-- Purpose: basic.vartype --> <!-- Membership: bundled --> <!-- State: experimental --> - <reference xml:id="ref.objaggregation" xmlns="http://docbook.org/ns/docbook"> - <title>Object Aggregation/Composition Functions</title> - <titleabbrev>Object Aggregation</titleabbrev> - - <partintro> - &warn.experimental; - <section xml:id="objaggregation.intro"> - &reftitle.intro; - <para> - In Object Oriented Programming, it is common to see the composition of - simple classes (and/or instances) into a more complex one. This is a - flexible strategy for building complicated objects and object - hierarchies and can function as a dynamic alternative to multiple - inheritance. There are two ways to perform class (and/or object) - composition depending on the relationship between the composed - elements: <emphasis>Association</emphasis> and - <emphasis>Aggregation</emphasis>. - </para> +<book xml:id="ref.objaggregation" xmlns="http://docbook.org/ns/docbook"> + <title>Object Aggregation/Composition Functions</title> + <titleabbrev>Object Aggregation</titleabbrev> + + <preface xml:id="objaggregation.intro"> + &reftitle.intro; + &warn.experimental; + <para> + In Object Oriented Programming, it is common to see the composition of + simple classes (and/or instances) into a more complex one. This is a + flexible strategy for building complicated objects and object + hierarchies and can function as a dynamic alternative to multiple + inheritance. There are two ways to perform class (and/or object) + composition depending on the relationship between the composed + elements: <emphasis>Association</emphasis> and + <emphasis>Aggregation</emphasis>. + </para> + </preface> + + <appendix xml:id="objaggregation.examples"> + &reftitle.examples; + <section xml:id="objaggregation.examples.association"> + <title>Object Aggregation examples</title> <para> An <emphasis>Association</emphasis> is a composition of independently constructed and externally visible parts. When we associate classes or objects, each @@ -160,7 +165,7 @@ object. </para> </section> - <section xml:id="objaggregation.examples"> + <section xml:id="objaggregation.examples2"> &reftitle.examples; <para> We define 3 classes, each implementing a different storage method: @@ -443,10 +448,13 @@ instantiation from the class <classname>FileStorage</classname>. </para> </section> - </partintro> + </appendix> + <reference xml:id="objaggregation.functions" xmlns="http://docbook.org/ns/docbook"> + <title>Object Aggregation/Composition Functions</title> &reference.objaggregation.functions.entities; </reference> +</book> <!-- Keep this comment at the end of the file Local variables: mode: sgml http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/var/reference.xml?r1=1.9.2.1&r2=1.9.2.2&diff_format=u Index: phpdoc/en/reference/var/reference.xml diff -u phpdoc/en/reference/var/reference.xml:1.9.2.1 phpdoc/en/reference/var/reference.xml:1.9.2.2 --- phpdoc/en/reference/var/reference.xml:1.9.2.1 Wed Oct 3 11:41:16 2007 +++ phpdoc/en/reference/var/reference.xml Sat Oct 27 16:40:04 2007 @@ -1,49 +1,52 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9.2.1 $ --> +<!-- $Revision: 1.9.2.2 $ --> <!-- Purpose: basic.vartype --> <!-- Membership: core --> - <reference xml:id="ref.var" xmlns="http://docbook.org/ns/docbook"> - <title>Variable Handling Functions</title> - <titleabbrev>Variables handling</titleabbrev> - - <partintro> - <section xml:id="var.intro"> - &reftitle.intro; - <para> - For information on how variables behave, see - the <link linkend="language.variables">Variables</link> entry in - the <link linkend="langref">Language Reference</link> section of the manual. - </para> - </section> - - <section xml:id="var.requirements"> - &reftitle.required; - &no.requirement; - </section> - - <section xml:id="var.installation"> - &reftitle.install; - &no.install; - </section> - - &reference.var.ini; - - <section xml:id="var.resources"> - &reftitle.resources; - &no.resource; - </section> - - <section xml:id="var.constants"> - &reftitle.constants; - &no.constants; - </section> +<book xml:id="ref.var" xmlns="http://docbook.org/ns/docbook"> + <title>Variable Handling Functions</title> + <titleabbrev>Variables handling</titleabbrev> - </partintro> + <preface xml:id="var.intro"> + &reftitle.intro; + <para> + For information on how variables behave, see + the <link linkend="language.variables">Variables</link> entry in + the <link linkend="langref">Language Reference</link> section of the manual. + </para> + </preface> -&reference.var.functions.entities; + <chapter xml:id="var.setup"> + <title>Installing/Configuring</title> + + <section xml:id="var.requirements"> + &reftitle.required; + &no.requirement; + </section> + + <section xml:id="var.installation"> + &reftitle.install; + &no.install; + </section> + + &reference.var.ini; + + <section xml:id="var.resources"> + &reftitle.resources; + &no.resource; + </section> + + </chapter> + + + + <reference xml:id="var.functions" xmlns="http://docbook.org/ns/docbook"> + <title>Variable handling Functions</title> + + &reference.var.functions.entities; </reference> +</book> <!-- Keep this comment at the end of the file Local variables: mode: sgml