From 6d1a6ccb6c771a2b26f704277040d9eb1fabea76 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sun, 22 Apr 2001 11:29:28 +0000
Subject: [PATCH] Fixed copyright in conversion_traits.hpp, updated
 acknowledgements in docs

[SVN r9859]
---
 .../boost/type_traits/conversion_traits.hpp   | 12 +--------
 index.htm                                     | 26 +++++++++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/boost/type_traits/conversion_traits.hpp b/include/boost/type_traits/conversion_traits.hpp
index 01a869a..e95560a 100644
--- a/include/boost/type_traits/conversion_traits.hpp
+++ b/include/boost/type_traits/conversion_traits.hpp
@@ -12,17 +12,6 @@
 // This software is provided "as is" without express or implied warranty, 
 // and with no claim as to its suitability for any purpose.
 //
-//
-// Partial copyright for partial specialization workarounds
-//
-// based on work in PartialSpecialization.cpp
-// Authors: Mat Marcus and Jesse Jones
-// Copyright 2000 Adobe Systems Incorporated and others. All rights reserved.
-// The original version of PartialSpecialization.cpp may be found at 
-// http://opensource.adobe.com.
-// The contents of PartialSpecialization.cpp are subject to the Adobe Open Source
-// License Version 1.0.
-//
 
 #ifndef BOOST_CONVERSION_TYPE_TRAITS_HPP
 #define BOOST_CONVERSION_TYPE_TRAITS_HPP
@@ -234,3 +223,4 @@ struct is_convertible<void, void>
 } // namespace boost
 
 #endif  // include guard
+
diff --git a/index.htm b/index.htm
index e07fc4a..8511b4e 100644
--- a/index.htm
+++ b/index.htm
@@ -1248,17 +1248,27 @@ inline void destroy_array(T* p1, T* p2)
 
 <hr>
 
-<p>Revised 01 Feb 2001</p>
+<p>Revised 22 April 2001</p>
 
-<p>© Copyright John Maddock 2001. Permission to copy, use,
-modify, sell and distribute this document is granted provided
-this copyright notice appears in all copies. This document is
-provided &quot;as is&quot; without express or implied warranty,
-and with no claim as to its suitability for any purpose.</p>
+<p>Documentation © Copyright John Maddock 2001. Permission to
+copy, use, modify, sell and distribute this document is granted
+provided this copyright notice appears in all copies. This
+document is provided &quot;as is&quot; without express or implied
+warranty, and with no claim as to its suitability for any purpose.</p>
 
 <p>The type traits library is based on contributions by Steve
-Cleary, Beman Dawes, Aleksey Gurtovoy, Howard Hinnant, John
-Maddock and Jeremy Siek.</p>
+Cleary, Beman Dawes, Aleksey Gurtovoy, Howard Hinnant, Jesse
+Jones, Mat Marcus, John Maddock and Jeremy Siek.</p>
+
+<p>Mat Marcus and Jesse Jones have worked on, and published a <a
+href="http://opensource.adobe.com/project4/project.shtml">paper</a>
+describing the partial specialisation workarounds used in this
+library.</p>
+
+<p>The is_convertible template is based on code originally
+devised by Andrei Alexandrescu, see &quot;<a
+href="http://www.cuj.com/experts/1810/alexandr.htm?topic=experts">Generic&lt;Programming&gt;:
+Mappings between Types and Values</a>&quot;.</p>
 
 <p>Maintained by <a href="../../../../people/john_maddock.htm">John
 Maddock</a>, the latest version of this file can be found at <a