Merged for Boost 1.48

[SVN r74162]

doc/Jamfile.v2

@@ -7,6 +7,7 @@
 #
 # See http://www.boost.org/libs/intrusive for documentation.
 
+using auto-index ;
 
 import doxygen ;
 import quickbook ;
@@ -44,7 +45,10 @@ doxygen autodoc
                   "treap_impl=treap""
    ;
 
-xml intrusive : intrusive.qbk ;
+xml intrusive : intrusive.qbk
+              : 
+                 <include>../../../tools/auto_index/include
+              ;   
 
 boostbook standalone
    :
@@ -55,4 +59,33 @@ boostbook standalone
         <xsl:param>generate.section.toc.level=3
         <xsl:param>chunk.first.sections=1
         <dependency>autodoc
+
+        # Build requirements go here:
+        
+        # <auto-index>on (or off) one turns on (or off) indexing:
+        <auto-index>on
+        
+        # Turns on (or off) auto-index-verbose for diagnostic info.
+        # This is highly recommended until you have got all the many details correct!
+        <auto-index-verbose>on 
+        
+        # Choose the indexing method (separately for html and PDF) - see manual.
+        # Choose indexing method for PDFs:
+        <format>pdf:<auto-index-internal>off
+        
+        # Choose indexing method for html:
+        <format>html:<auto-index-internal>on
+        
+        # Set the name of the script file to use (index.idx is popular):
+        <auto-index-script>index.idx
+        # Commands in the script file should all use RELATIVE PATHS
+        # otherwise the script will not be portable to other machines.
+        # Relative paths are normally taken as relative to the location 
+        # of the script file, but we can add a prefix to all
+        # those relative paths using the <auto-index-prefix> feature.
+        # The path specified by <auto-index-prefix> may be either relative or
+        # absolute, for example the following will get us up to the boost root
+        # directory for most Boost libraries:
+        <auto-index-prefix>"../../.."
+
    ;

doc/html/boostbook.css

@@ -1,6 +1,5 @@
 /*=============================================================================
     Copyright (c) 2004 Joel de Guzman
-    http://spirit.sourceforge.net/
 
     Use, modification and distribution is subject to the Boost Software
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at

doc/html/reference.css

@@ -1,6 +1,5 @@
 /*=============================================================================
     Copyright (c) 2004 Joel de Guzman
-    http://spirit.sourceforge.net/
 
     Use, modification and distribution is subject to the Boost Software
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at

doc/index.idx

@@ -0,0 +1 @@
+!scan-path "boost/intrusive" ".*.hpp" false 

doc/intrusive.qbk

@@ -3831,7 +3831,7 @@ all the objects to be inserted in intrusive containers in containers like `std::
 
 [section:release_notes Release Notes]
 
-[section:release_notes_boost_1_47_00 Boost 1.47 Release]
+[section:release_notes_boost_1_48_00 Boost 1.48 Release]
 
 *  Fixed bugs
   [@https://svn.boost.org/trac/boost/ticket/4797 #4797],
@@ -3995,4 +3995,16 @@ helpful discussions.
 
 [endsect]
 
+[include auto_index_helpers.qbk]
+
+[section:index Indexes]
+
+[named_index class_name Class Index]
+[named_index typedef_name Typedef Index]
+[named_index function_name Function Index]
+[named_index macro_name Macro Index]
+[/index]
+
+[endsect]
+
 [xinclude autodoc.xml]

proj/vc7ide/_intrusivelib/_intrusivelib.vcproj

@@ -93,14 +93,6 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Jamfile"
-			Filter=""
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\..\..\test\Jamfile.v2">
-			</File>
-		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
@@ -291,16 +283,6 @@
 				<File
 					RelativePath="..\..\..\..\..\boost\intrusive\detail\workaround.hpp">
 				</File>
-				<Filter
-					Name="doc"
-					Filter="">
-					<File
-						RelativePath="..\..\..\doc\intrusive.qbk">
-					</File>
-					<File
-						RelativePath="..\..\..\doc\Jamfile.v2">
-					</File>
-				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
@@ -321,6 +303,9 @@
 			<File
 				RelativePath="..\..\..\test\itestvalue.hpp">
 			</File>
+			<File
+				RelativePath="..\..\..\test\Jamfile.v2">
+			</File>
 			<File
 				RelativePath="..\..\..\test\smart_ptr.hpp">
 			</File>
@@ -465,6 +450,19 @@
 				RelativePath="..\..\..\perf\perf_list.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="doc"
+			Filter="">
+			<File
+				RelativePath="..\..\..\doc\index.idx">
+			</File>
+			<File
+				RelativePath="..\..\..\doc\intrusive.qbk">
+			</File>
+			<File
+				RelativePath="..\..\..\doc\Jamfile.v2">
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\to-do.txt">
 		</File>