Update of /cvsroot/boost/boost/tools/boostbook/doc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5421/tools/boostbook/doc

Modified Files:
        Jamfile.v2 boostbook.xml documenting.xml reference.xml 
        together.xml 
Log Message:
Cross merge HEAD and RC_1_34_0.

Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/doc/Jamfile.v2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Jamfile.v2  19 Mar 2003 20:23:14 -0000      1.1
+++ Jamfile.v2  13 Nov 2006 16:24:14 -0000      1.2
@@ -1,3 +1,9 @@
+#   Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
+# 
+#   Distributed under the Boost Software License, Version 1.0.
+#   (See accompanying file LICENSE_1_0.txt or copy at
+#   http://www.boost.org/LICENSE_1_0.txt)
+
 project boost/doc ;
 import boostbook : boostbook ;
 

Index: boostbook.xml
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/doc/boostbook.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- boostbook.xml       8 Dec 2005 03:02:48 -0000       1.21
+++ boostbook.xml       13 Nov 2006 16:24:14 -0000      1.22
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
+  
+   Distributed under the Boost Software License, Version 1.0.
+   (See accompanying file LICENSE_1_0.txt or copy at
+   http://www.boost.org/LICENSE_1_0.txt)
+  -->
 <!DOCTYPE part PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd";>
 <part xmlns:xi="http://www.w3.org/2001/XInclude"; id="boostbook"

Index: documenting.xml
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/doc/documenting.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- documenting.xml     5 Jul 2004 16:26:11 -0000       1.3
+++ documenting.xml     13 Nov 2006 16:24:14 -0000      1.4
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
+  
+   Distributed under the Boost Software License, Version 1.0.
+   (See accompanying file LICENSE_1_0.txt or copy at
+   http://www.boost.org/LICENSE_1_0.txt)
+  -->
 <!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd";>
 <chapter xmlns:xi="http://www.w3.org/2001/XInclude"; id="boostbook.documenting"

Index: reference.xml
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/doc/reference.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- reference.xml       5 Jul 2004 16:26:11 -0000       1.2
+++ reference.xml       13 Nov 2006 16:24:14 -0000      1.3
@@ -1,4 +1,11 @@
 <?xml version="1.0" standalone="yes"?>
+<!--
+   Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
+  
+   Distributed under the Boost Software License, Version 1.0.
+   (See accompanying file LICENSE_1_0.txt or copy at
+   http://www.boost.org/LICENSE_1_0.txt)
+  -->
 <chapter id="reference">
   <title>Reference</title>
   <para>Elements:<itemizedlist spacing="compact"><listitem><simpara><link 
linkend="boostbook.dtd.boostbook">Element <sgmltag>boostbook</sgmltag> - 
Defines a BoostBook book</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.class">Element <sgmltag>class</sgmltag> - Declares a 
class or class template</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.class-specialization">Element 
<sgmltag>class-specialization</sgmltag> - A specialization (partial or full) of 
a class template</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.code">Element <sgmltag>code</sgmltag> - Mimics the 
<sgmltag>code</sgmltag> tag in 
HTML</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.compile-fail-test">Element 
<sgmltag>compile-fail-test</sgmltag> - A testcase that should fail to 
compile</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.compile-test">Element <sgmltag>compile-test</s
 gmltag> - A testcase that should compile 
correctly</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.complexity">Element <sgmltag>complexity</sgmltag> - The 
time/space/etc. complexity of a 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.constructor">Element <sgmltag>constructor</sgmltag> - 
Declares a constructor of the enclosing 
class</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.copy-assignment">Element 
<sgmltag>copy-assignment</sgmltag> - Declares a copy-assignment 
operator</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.data-member">Element <sgmltag>data-member</sgmltag> - 
Declares a data member of a 
class</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.default">Element <sgmltag>default</sgmltag> - The 
default value of a function or template 
parameter</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.descr
 iption">Element <sgmltag>description</sgmltag> - Detailed description of a 
construct</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.destructor">Element <sgmltag>destructor</sgmltag> - 
Declares a destructor for the enclosing 
class</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.effects">Element <sgmltag>effects</sgmltag> - Declares 
the side effects of a 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.enum">Element <sgmltag>enum</sgmltag> - Declares an 
enumeration type</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.enumvalue">Element <sgmltag>enumvalue</sgmltag> - A 
single value of an 
enumeration</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.free-function-group">Element 
<sgmltag>free-function-group</sgmltag> - A set of functions that are grouped 
together under one name</link></simpara></listitem><listitem><simpara><link 
linkend="bo
 ostbook.dtd.function">Element <sgmltag>function</sgmltag> - Declares a 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.functionname">Element <sgmltag>functionname</sgmltag> - 
References a function with the given 
name</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.header">Element <sgmltag>header</sgmltag> - Declares a 
C++ header with the given 
name</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.if-fails">Element <sgmltag>if-fails</sgmltag> - What it 
means when a testcase fails</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.inherit">Element <sgmltag>inherit</sgmltag> - Declares a 
base class of the enclosing class or 
struct</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.lib">Element <sgmltag>lib</sgmltag> - A library 
dependency</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.library">Element <sgmltag>libra
 ry</sgmltag> - Top-level element for a 
library</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.library-reference">Element 
<sgmltag>library-reference</sgmltag> - Declares the reference material for a 
library</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.librarycategory">Element 
<sgmltag>librarycategory</sgmltag> - Declares that the enclosing library is in 
this category</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.librarycategorydef">Element 
<sgmltag>librarycategorydef</sgmltag> - Defines a new library 
category</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.librarycategorylist">Element 
<sgmltag>librarycategorylist</sgmltag> - Categorized listing of 
libraries</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.libraryinfo">Element <sgmltag>libraryinfo</sgmltag> - 
Provides information about a 
library</link></simpara></listitem><listitem><simpar
 a><link linkend="boostbook.dtd.librarylist">Element 
<sgmltag>librarylist</sgmltag> - Placeholder for an alphabetical list of 
libraries</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.libraryname">Element <sgmltag>libraryname</sgmltag> - 
References a library of the given 
name</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.librarypurpose">Element 
<sgmltag>librarypurpose</sgmltag> - Describes in one short sentence or phrase 
the purpose of a library</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.link-fail-test">Element 
<sgmltag>link-fail-test</sgmltag> - Declares a test that should compile but 
fail to link</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.link-test">Element <sgmltag>link-test</sgmltag> - 
Declares a test that should compile and 
link</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.method">Element <sgmltag>method</sgmltag> - Declare
 s a method, i.e., a member 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.method-group">Element <sgmltag>method-group</sgmltag> - 
A set of methods that are grouped together under one 
name</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.namespace">Element <sgmltag>namespace</sgmltag> - 
Declares a namespace</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.notes">Element <sgmltag>notes</sgmltag> - Non-normative 
notes about a function's 
semantics</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.overloaded-function">Element 
<sgmltag>overloaded-function</sgmltag> - An overloaded 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.overloaded-method">Element 
<sgmltag>overloaded-method</sgmltag> - An overloaded 
method</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.parameter">Element <sgmltag>parameter</sgmltag>
  - A function parameter</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.paramtype">Element <sgmltag>paramtype</sgmltag> - The 
type of a function 
parameter</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.postconditions">Element 
<sgmltag>postconditions</sgmltag> - Conditions that must hold after the 
function returns</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.precondition">Element <sgmltag>precondition</sgmltag> - 
Conditions that must be met prior to executing a 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.programlisting">Element 
<sgmltag>programlisting</sgmltag> - A sample of program 
code</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.purpose">Element <sgmltag>purpose</sgmltag> - A short 
description of an entity's 
use</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.rationale">Element <sgmltag>rationa
 le</sgmltag> - Describes the rationale for a particular function's 
design</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.requirement">Element <sgmltag>requirement</sgmltag> - A 
requirement/property in the Jamfile for a testcase</link></simpara></list
item><listitem><simpara><link linkend="boostbook.dtd.requires">Element 
<sgmltag>requires</sgmltag> - Declares the requirements of a 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.returns">Element <sgmltag>returns</sgmltag> - 
Description of the return value of a 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.run-fail-test">Element <sgmltag>run-fail-test</sgmltag> 
- A testcase that should compile and link, but fail on 
execution</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.run-test">Element <sgmltag>run-test</sgmltag> - A 
testcase that should compile, link, and 
execute</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.signature">Element <sgmltag>signature</sgmltag> - One 
signature of an overloaded function or 
method</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.snippet">Element <sgmltag>snippet</sgmltag> - Pulls in a 
code s
 nippet from a <sgmltag>programlisting</sgmltag> 
element</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.source">Element <sgmltag>source</sgmltag> - Defines 
source code for a test</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.specialization">Element 
<sgmltag>specialization</sgmltag> - Defines the specialization arguments for a 
class specialization</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.static-constant">Element 
<sgmltag>static-constant</sgmltag> - Declares a static constant, e.g., 
<code>const int foo = 
5;</code>.</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.struct">Element <sgmltag>struct</sgmltag> - Declares a 
C++ struct</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.struct-specialization">Element 
<sgmltag>struct-specialization</sgmltag> - A specialization (full or partial) 
of a struct template</link></simpara></listitem><listit
 em><simpara><link linkend="boostbook.dtd.template">Element 
<sgmltag>template</sgmltag> - Declares the template parameters of a class or 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.template-arg">Element <sgmltag>template-arg</sgmltag> - 
A template argument in a 
specialization</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.template-nontype-parameter">Element 
<sgmltag>template-nontype-parameter</sgmltag> - A nontype template 
parameter</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.template-type-parameter">Element 
<sgmltag>template-type-parameter</sgmltag> - Declares a template type 
parameter</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.template-varargs">Element 
<sgmltag>template-varargs</sgmltag> - Declares a variable-length list of 
template parameters</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.testsuite">Element <sgmltag>
 testsuite</sgmltag> - Describes a library 
testsuite</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.throws">Element <sgmltag>throws</sgmltag> - Description 
of the exceptions thrown by a 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.type">Element <sgmltag>type</sgmltag> - The type of an 
element or return type of a 
function</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.typedef">Element <sgmltag>typedef</sgmltag> - Declares a 
typedef</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.union">Element <sgmltag>union</sgmltag> - Declares a C++ 
union or union template</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.union-specialization">Element 
<sgmltag>union-specialization</sgmltag> - A specialization (full or partial) of 
a union template</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.using-class">Element <sgmlt
 ag>using-class</sgmltag> - Injects the method and function names of a class 
into the local scope</link></simpara></listitem><listitem><simpara><link 
linkend="boostbook.dtd.using-namespace">Element 
<sgmltag>using-namespace</sgmltag> - Injects the declared names from a 
namespace into the local scope</link></simpara></listitem></itemizedlist></para>

Index: together.xml
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/doc/together.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- together.xml        5 Jul 2004 16:26:11 -0000       1.4
+++ together.xml        13 Nov 2006 16:24:14 -0000      1.5
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
+  
+   Distributed under the Boost Software License, Version 1.0.
+   (See accompanying file LICENSE_1_0.txt or copy at
+   http://www.boost.org/LICENSE_1_0.txt)
+  -->
 <!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd";>
 <chapter xmlns:xi="http://www.w3.org/2001/XInclude"; id="boostbook.together"


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to