From 822636418b95c60108dec5acf12252ad5927ee17 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 27 Feb 2008 20:00:24 +0000
Subject: [PATCH] Merged revisions
 43211,43214-43219,43222-43225,43227-43238,43242,43244-43245,43249-43250,43257-43259,43261,43263,43265,43267-43268,43270-43271,43273,43275-43279,43284-43289,43291,43295,43297-43298,43304-43305,43307,43313,43315,43324,43326-43327,43331,43333,43339-43343,43345,43348,43350,43352-43353,43355-43356,43358,43360,43366-43367,43369-43370,43372-43376,43378-43389,43394,43396-43398,43400-43401,43403-43404,43406-43408,43413-43415,43417-43418,43420,43422-43423
 via svnmerge from https://svn.boost.org/svn/boost/trunk

........
  r43417 | danieljames | 2008-02-26 22:04:55 +0000 (Tue, 26 Feb 2008) | 2 lines

  Fix a link to Boost.Bimap.
........
  r43418 | danieljames | 2008-02-26 22:07:25 +0000 (Tue, 26 Feb 2008) | 2 lines

  Change another link that's no longer in the repository to link to the website.
........
  r43422 | danieljames | 2008-02-27 18:51:14 +0000 (Wed, 27 Feb 2008) | 1 line

  Fix broken copyright urls. Fixes #1573.
........
  r43423 | danieljames | 2008-02-27 19:22:01 +0000 (Wed, 27 Feb 2008) | 1 line

  Fix incorrect links to copyright of the form 'http:#www.boost.org
........


[SVN r43425]
---
 string/doc/concept.xml       | 2 +-
 string/doc/credits.xml       | 2 +-
 string/doc/design.xml        | 2 +-
 string/doc/environment.xml   | 2 +-
 string/doc/intro.xml         | 2 +-
 string/doc/quickref.xml      | 2 +-
 string/doc/rationale.xml     | 2 +-
 string/doc/release_notes.xml | 2 +-
 string/doc/string_algo.xml   | 2 +-
 string/doc/usage.xml         | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/string/doc/concept.xml b/string/doc/concept.xml
index 1f3c8d1..ed43108 100644
--- a/string/doc/concept.xml
+++ b/string/doc/concept.xml
@@ -4,7 +4,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <section id="string_algo.concept" last-revision="$Date$">
diff --git a/string/doc/credits.xml b/string/doc/credits.xml
index ff7996f..6acdf74 100644
--- a/string/doc/credits.xml
+++ b/string/doc/credits.xml
@@ -4,7 +4,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <section id="string_algo.credits" last-revision="$Date$">
diff --git a/string/doc/design.xml b/string/doc/design.xml
index 8701b45..980c722 100644
--- a/string/doc/design.xml
+++ b/string/doc/design.xml
@@ -5,7 +5,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <section id="string_algo.design" last-revision="$Date$">
diff --git a/string/doc/environment.xml b/string/doc/environment.xml
index 667b965..4fef5d9 100644
--- a/string/doc/environment.xml
+++ b/string/doc/environment.xml
@@ -4,7 +4,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <section id="string_algo.env" last-revision="$Date$">
diff --git a/string/doc/intro.xml b/string/doc/intro.xml
index 42e0923..47a7e18 100644
--- a/string/doc/intro.xml
+++ b/string/doc/intro.xml
@@ -5,7 +5,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <section id="string_algo.intro" last-revision="$Date$">
diff --git a/string/doc/quickref.xml b/string/doc/quickref.xml
index 3c65ae2..0290bd4 100644
--- a/string/doc/quickref.xml
+++ b/string/doc/quickref.xml
@@ -4,7 +4,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <section id="string_algo.quickref" last-revision="$Date$">
diff --git a/string/doc/rationale.xml b/string/doc/rationale.xml
index fbc65f2..e2d1ab1 100644
--- a/string/doc/rationale.xml
+++ b/string/doc/rationale.xml
@@ -4,7 +4,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <section id="string_algo.rationale" last-revision="$Date$">
diff --git a/string/doc/release_notes.xml b/string/doc/release_notes.xml
index b40504b..9314064 100644
--- a/string/doc/release_notes.xml
+++ b/string/doc/release_notes.xml
@@ -4,7 +4,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <section id="string_algo.release_notes" last-revision="$Date$">
diff --git a/string/doc/string_algo.xml b/string/doc/string_algo.xml
index 2313066..f803968 100644
--- a/string/doc/string_algo.xml
+++ b/string/doc/string_algo.xml
@@ -4,7 +4,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->
 
 <library name="String Algorithms" dirname="algorithm/string" xmlns:xi="http://www.w3.org/2001/XInclude" 
diff --git a/string/doc/usage.xml b/string/doc/usage.xml
index f6b8f58..ca100e0 100644
--- a/string/doc/usage.xml
+++ b/string/doc/usage.xml
@@ -5,7 +5,7 @@
 
 <!-- Copyright (c) 2002-2006 Pavol Droba.
      Subject to the Boost Software License, Version 1.0. 
-     (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
+     (See accompanying file LICENSE_1_0.txt or  http://www.boost.org/LICENSE_1_0.txt)
 -->