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

Modified Files:
        concept2docbook.xsl cpp-operators.xml unparser.xsl 
Log Message:
Cross merge HEAD and RC_1_34_0.

Index: concept2docbook.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/xsl/caramel/concept2docbook.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- concept2docbook.xsl 8 Dec 2003 01:24:08 -0000       1.3
+++ concept2docbook.xsl 13 Nov 2006 16:24:15 -0000      1.4
@@ -5,9 +5,10 @@
                         All rights reserved.
 Copyright (c) 2000-2001 University of Notre Dame. All rights reserved.
 
-The software included in this source file is licensed under the terms and
-conditions of the Software License, version 1.0, in the file LICENSE at the
-top level of the Caramel distribution. -->
+   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)
+-->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
   <xsl:strip-space elements="* xsl:*"/>

Index: cpp-operators.xml
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/xsl/caramel/cpp-operators.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cpp-operators.xml   23 Aug 2003 22:58:29 -0000      1.1
+++ cpp-operators.xml   13 Nov 2006 16:24:15 -0000      1.2
@@ -5,9 +5,9 @@
                         All rights reserved.
 Copyright (c) 2000-2001 University of Notre Dame. All rights reserved.
 
-The software included in this source file is licensed under the terms and
-conditions of the Software License, version 1.0, in the file LICENSE at the
-top level of the Caramel distribution. -->
+   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) -->
 
 <operator-list>
   <!-- This list is from Pohl's book, and needs to be checked for accuracy -->

Index: unparser.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/boostbook/xsl/caramel/unparser.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unparser.xsl        23 Aug 2003 22:58:29 -0000      1.1
+++ unparser.xsl        13 Nov 2006 16:24:15 -0000      1.2
@@ -5,9 +5,9 @@
                         All rights reserved.
 Copyright (c) 2000-2001 University of Notre Dame. All rights reserved.
 
-The software included in this source file is licensed under the terms and
-conditions of the Software License, version 1.0, in the file LICENSE at the
-top level of the Caramel distribution. -->
+   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) -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
   <xsl:template name="unparse-cpp">


-------------------------------------------------------------------------
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