From d33631d15a9bda2cd6a7c3540e85cf9939134431 Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Sun, 28 Nov 2004 04:44:21 +0000 Subject: [PATCH] merge RC_1_32_0 fixes [SVN r26333] --- bibliography.html | 7 ++++--- bugs.htm | 8 ++++++-- discussion_policy.htm | 8 ++++---- generic_programming.html | 2 +- int_const_guidelines.htm | 5 ++++- lib_guide.htm | 8 ++++---- license_info.html | 8 ++++---- requesting_new_features.htm | 7 ++++--- test_policy.htm | 2 +- 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/bibliography.html b/bibliography.html index dd2df61..2838d5a 100644 --- a/bibliography.html +++ b/bibliography.html @@ -448,8 +448,9 @@ 16 October, 2004

© Copyright Beman Dawes 2003

-

Use, modification, and distribution are subject to the Boost Software License, - Version 1.0. (See accompanying file LICENSE_1_0.txt - or copy at www.boost.org/LICENSE_1_0.txt)

+

Distributed under the Boost Software License, Version 1.0. + (See accompanying file LICENSE_1_0.txt or + copy at www.boost.org/LICENSE_1_0.txt) +

diff --git a/bugs.htm b/bugs.htm index b8b85cf..7d66f3c 100644 --- a/bugs.htm +++ b/bugs.htm @@ -102,11 +102,15 @@ in the subject if you're submitting to the Aleksey Gurtovoy

-

Revised 18 January, 2002

+

© Copyright Aleksey Gurtovoy +2002

+

Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or +copy at www.boost.org/LICENSE_1_0.txt) +


diff --git a/discussion_policy.htm b/discussion_policy.htm index a0e4e32..e5fa984 100644 --- a/discussion_policy.htm +++ b/discussion_policy.htm @@ -207,10 +207,10 @@ understood the issues and felt comfortable discussing them. 

© Beman Dawes 2000

-

Use, modification, and distribution are subject to the Boost Software -License, Version 1.0. (See accompanying file -LICENSE_1_0.txt or copy at -www.boost.org/LICENSE_1_0.txt)

+

Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or +copy at www.boost.org/LICENSE_1_0.txt) +

diff --git a/generic_programming.html b/generic_programming.html index cb5180c..ea71a89 100644 --- a/generic_programming.html +++ b/generic_programming.html @@ -308,7 +308,7 @@ namespace std {

Note: The type generator concept has largely been superseded by the more refined notion of a metafunction. See + "../libs/mpl/doc/refmanual/metafunction.html">metafunction. See C++ Template Metaprogramming for an in-depth discussion of metafunctions.

diff --git a/int_const_guidelines.htm b/int_const_guidelines.htm index ef3cf14..06f9dae 100644 --- a/int_const_guidelines.htm +++ b/int_const_guidelines.htm @@ -314,7 +314,10 @@ compiler (depending upon the template arguments used).

-

Copyright Dr John Maddock 2001, all rights reserved.

+

© Copyright Dr John Maddock 2001

+

Use, modification and distribution are subject to 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)

 

diff --git a/lib_guide.htm b/lib_guide.htm index c358292..d5d95f6 100644 --- a/lib_guide.htm +++ b/lib_guide.htm @@ -605,9 +605,9 @@ Automatic redirection failed, please go to 04 November, 2003

© Copyright Beman Dawes 2003.

-

- Use, modification, and distribution are subject to the Boost Software License, - Version 1.0. (See accompanying file LICENSE_1_0.txt - or copy at www.boost.org/LICENSE_1_0.txt)

+

Distributed under the Boost Software License, Version 1.0. + (See accompanying file LICENSE_1_0.txt or + copy at www.boost.org/LICENSE_1_0.txt) +

diff --git a/license_info.html b/license_info.html index 0d6c563..5eff1ee 100644 --- a/license_info.html +++ b/license_info.html @@ -252,10 +252,10 @@ Boost members reviewed drafts of the license. Beman Dawes wrote this web page.27 August, 2004

© Copyright 2003-2004 Beman Dawes, Daniel Frey, David Abrahams.

-

Use, modification, and distribution are subject to the Boost Software -License, Version 1.0. (See accompanying file -LICENSE_1_0.txt or copy at -www.boost.org/LICENSE_1_0.txt)

+

Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or +copy at www.boost.org/LICENSE_1_0.txt) +

diff --git a/requesting_new_features.htm b/requesting_new_features.htm index f0a7df3..5787ca4 100644 --- a/requesting_new_features.htm +++ b/requesting_new_features.htm @@ -46,9 +46,10 @@ Acknowledgements section!

© Copyright Aleksey Gurtovoy 2002

-

Use, modification, and distribution are subject to the Boost Software License, -Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -www.boost.org/LICENSE_1_0.txt)

+

Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or +copy at www.boost.org/LICENSE_1_0.txt) +

diff --git a/test_policy.htm b/test_policy.htm index 11dc4ac..30cd9f3 100644 --- a/test_policy.htm +++ b/test_policy.htm @@ -67,7 +67,7 @@ useful components which ease the construction of test programs.

Test Tools for the construction of simple test programs that do not need much structure.
  • Use the library's - Unit Test + Unit Test Framework for the construction of more complex test programs that need to be structured into individual tests and test suites.