|
|
Boost-Commit : |
From: fmhess_at_[hidden]
Date: 2007-10-22 14:31:51
Author: fmhess
Date: 2007-10-22 14:31:51 EDT (Mon, 22 Oct 2007)
New Revision: 40296
URL: http://svn.boost.org/trac/boost/changeset/40296
Log:
Updated reference for access, to remove function and related as allowable children
Text files modified:
sandbox/boost_docs/trunk/tools/boostbook/doc/reference.dtdxml | 20 +++++++++++---------
sandbox/boost_docs/trunk/tools/boostbook/doc/reference.xml | 4 ++--
2 files changed, 13 insertions(+), 11 deletions(-)
Modified: sandbox/boost_docs/trunk/tools/boostbook/doc/reference.dtdxml
==============================================================================
--- sandbox/boost_docs/trunk/tools/boostbook/doc/reference.dtdxml (original)
+++ sandbox/boost_docs/trunk/tools/boostbook/doc/reference.dtdxml 2007-10-22 14:31:51 EDT (Mon, 22 Oct 2007)
@@ -94,21 +94,26 @@
id CDATA #IMPLIED</text>
</entity>
-<entity name="boost.class.mix"
+<entity name="boost.class.members"
type="param"
>
<text-expanded>static-constant|typedef|enum|
copy-assignment|constructor|destructor|method-group|
- free-function-group|function|method|overloaded-function|
- overloaded-method|data-member|class|class-specialization|struct|
+ method|overloaded-method|data-member|class|class-specialization|struct|
struct-specialization|union|union-specialization</text-expanded>
<text>static-constant|typedef|enum|
copy-assignment|constructor|destructor|method-group|
- free-function-group|function|method|overloaded-function|
- overloaded-method|data-member|class|class-specialization|struct|
+ |method|overloaded-method|data-member|class|class-specialization|struct|
struct-specialization|union|union-specialization</text>
</entity>
+<entity name="boost.class.mix"
+ type="param"
+>
+<text-expanded>free-function-group|function|overloaded-function|%boost.class.members;</text-expanded>
+<text>free-function-group|function|overloaded-function|%boost.class.members;</text>
+</entity>
+
<entity name="boost.testsuite.tests"
type="param"
>
@@ -2281,10 +2286,7 @@
<element-name name="constructor"/>
<element-name name="destructor"/>
<element-name name="method-group"/>
- <element-name name="free-function-group"/>
- <element-name name="function"/>
<element-name name="method"/>
- <element-name name="overloaded-function"/>
<element-name name="overloaded-method"/>
<element-name name="data-member"/>
<element-name name="class"/>
@@ -2297,7 +2299,7 @@
</content-model-expanded>
<content-model>
<sequence-group occurrence="+">
- <parament-name name="boost.class.mix"/>
+ <parament-name name="boost.class.members"/>
</sequence-group>
</content-model>
<purpose>Declares an access specification for class members</purpose>
Modified: sandbox/boost_docs/trunk/tools/boostbook/doc/reference.xml
==============================================================================
--- sandbox/boost_docs/trunk/tools/boostbook/doc/reference.xml (original)
+++ sandbox/boost_docs/trunk/tools/boostbook/doc/reference.xml 2007-10-22 14:31:51 EDT (Mon, 22 Oct 2007)
@@ -1909,10 +1909,10 @@
<refpurpose>Declares an access specification for class members</refpurpose>
</refnamediv>
<refsynopsisdiv>access ::=
- (<link linkend="boostbook.dtd.static-constant">static-constant</link>| <link linkend="boostbook.dtd.typedef">typedef</link>| <link linkend="boostbook.dtd.enum">enum</link>| <link linkend="boostbook.dtd.copy-assignment">copy-assignment</link>| <link linkend="boostbook.dtd.constructor">constructor</link>| <link linkend="boostbook.dtd.destructor">destructor</link>| <link linkend="boostbook.dtd.method-group">method-group</link>| <link linkend="boostbook.dtd.free-function-group">free-function-group</link>| <link linkend="boostbook.dtd.function">function</link>| <link linkend="boostbook.dtd.method">method</link>| <link linkend="boostbook.dtd.overloaded-function">overloaded-function</link>| <link linkend="boostbook.dtd.overloaded-method">overloaded-method</link>| <link linkend="boostbook.dtd.data-member">data-member</link>| <link linkend="boostbook.dtd.class">class</link>| <link linkend="boostbook.dtd.class-specialization">class-specialization</link>| <link linkend="boostbook.dtd.struct">struct</link>| <link l
inkend="boostbook.dtd.struct-specialization">struct-specialization</link>| <link linkend="boostbook.dtd.union">union</link>| <link linkend="boostbook.dtd.union-specialization">union-specialization</link>)+
+ (<link linkend="boostbook.dtd.static-constant">static-constant</link>| <link linkend="boostbook.dtd.typedef">typedef</link>| <link linkend="boostbook.dtd.enum">enum</link>| <link linkend="boostbook.dtd.copy-assignment">copy-assignment</link>| <link linkend="boostbook.dtd.constructor">constructor</link>| <link linkend="boostbook.dtd.destructor">destructor</link>| <link linkend="boostbook.dtd.method-group">method-group</link>| <link linkend="boostbook.dtd.method">method</link>| <link linkend="boostbook.dtd.overloaded-method">overloaded-method</link>| <link linkend="boostbook.dtd.data-member">data-member</link>| <link linkend="boostbook.dtd.class">class</link>| <link linkend="boostbook.dtd.class-specialization">class-specialization</link>| <link linkend="boostbook.dtd.struct">struct</link>| <link linkend="boostbook.dtd.struct-specialization">struct-specialization</link>| <link linkend="boostbook.dtd.union">union</link>| <link linkend="boostbook.dtd.union-specialization">union-specialization</link>)+
</refsynopsisdiv>
<refsection><title>Description</title>
- <para>The access specifications of class members (public, private, or protected) may be determined by making them children of an <access> element.</para>
+ <para>The access specifications of class members (public, private, or protected) may be determined by enclosing them in an <access> element.</para>
</refsection>
<refsection>
<title>Attributes</title>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk