diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index eae31116d84..24427f60fed 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,94 @@
+2000-12-09 Phil Edwards
+
+ Move the HTML-containing subdirs from 'docs' to 'docs/html'.
+ * README: Update the locations of instructions.
+ * docs/doxygen/run_doxygen: New file, stub.
+
+ * docs/Makefile: Moved...
+ * docs/configopts.html: Likewise.
+ * docs/documentation.html: Likewise.
+ * docs/install.html: Likewise.
+ * docs/lib3styles.css: Likewise.
+ * docs/17_intro/BADNAMES: Likewise.
+ * docs/17_intro/BUGS: Likewise.
+ * docs/17_intro/C++STYLE: Likewise.
+ * docs/17_intro/CHECKLIST: Likewise.
+ * docs/17_intro/COPYING: Likewise.
+ * docs/17_intro/DESIGN: Likewise.
+ * docs/17_intro/HEADER_POLICY: Likewise.
+ * docs/17_intro/PROBLEMS: Likewise.
+ * docs/17_intro/RELEASE-NOTES: Likewise.
+ * docs/17_intro/TODO: Likewise.
+ * docs/17_intro/contribute.html: Likewise.
+ * docs/17_intro/headers_cc.txt: Likewise.
+ * docs/17_intro/howto.html: Likewise.
+ * docs/17_intro/libstdc++-assign.txt: Likewise.
+ * docs/17_intro/organization: Likewise.
+ * docs/17_intro/porting-howto.html: Likewise.
+ * docs/18_support/howto.html: Likewise.
+ * docs/19_diagnostics/howto.html: Likewise.
+ * docs/20_util/howto.html: Likewise.
+ * docs/21_strings/gotw29a.txt: Likewise.
+ * docs/21_strings/howto.html: Likewise.
+ * docs/21_strings/stringtok_h.txt: Likewise.
+ * docs/21_strings/stringtok_std_h.txt: Likewise.
+ * docs/22_locale/codecvt.html: Likewise.
+ * docs/22_locale/ctype.html: Likewise.
+ * docs/22_locale/howto.html: Likewise.
+ * docs/22_locale/locale.html: Likewise.
+ * docs/23_containers/howto.html: Likewise.
+ * docs/23_containers/wrappers_h.txt: Likewise.
+ * docs/24_iterators/howto.html: Likewise.
+ * docs/25_algorithms/howto.html: Likewise.
+ * docs/26_numerics/howto.html: Likewise.
+ * docs/27_io/howto.html: Likewise.
+ * docs/27_io/iostreams_hierarchy.pdf: Likewise.
+ * docs/ext/howto.html: Likewise.
+ * docs/faq/index.html: Likewise.
+ * docs/faq/index.txt: Likewise.
+ * docs/html/Makefile: ...to here.
+ * docs/html/configopts.html: Likewise.
+ * docs/html/documentation.html: Likewise.
+ * docs/html/install.html: Likewise.
+ * docs/html/lib3styles.css: Likewise.
+ * docs/html/17_intro/BADNAMES: Likewise.
+ * docs/html/17_intro/BUGS: Likewise.
+ * docs/html/17_intro/C++STYLE: Likewise.
+ * docs/html/17_intro/CHECKLIST: Likewise.
+ * docs/html/17_intro/COPYING: Likewise.
+ * docs/html/17_intro/DESIGN: Likewise.
+ * docs/html/17_intro/HEADER_POLICY: Likewise.
+ * docs/html/17_intro/PROBLEMS: Likewise.
+ * docs/html/17_intro/RELEASE-NOTES: Likewise.
+ * docs/html/17_intro/TODO: Likewise.
+ * docs/html/17_intro/contribute.html: Likewise.
+ * docs/html/17_intro/headers_cc.txt: Likewise.
+ * docs/html/17_intro/howto.html: Likewise.
+ * docs/html/17_intro/libstdc++-assign.txt: Likewise.
+ * docs/html/17_intro/organization: Likewise.
+ * docs/html/17_intro/porting-howto.html: Likewise.
+ * docs/html/18_support/howto.html: Likewise.
+ * docs/html/19_diagnostics/howto.html: Likewise.
+ * docs/html/20_util/howto.html: Likewise.
+ * docs/html/21_strings/gotw29a.txt: Likewise.
+ * docs/html/21_strings/howto.html: Likewise.
+ * docs/html/21_strings/stringtok_h.txt: Likewise.
+ * docs/html/21_strings/stringtok_std_h.txt: Likewise.
+ * docs/html/22_locale/codecvt.html: Likewise.
+ * docs/html/22_locale/ctype.html: Likewise.
+ * docs/html/22_locale/howto.html: Likewise.
+ * docs/html/22_locale/locale.html: Likewise.
+ * docs/html/23_containers/howto.html: Likewise.
+ * docs/html/23_containers/wrappers_h.txt: Likewise.
+ * docs/html/24_iterators/howto.html: Likewise.
+ * docs/html/25_algorithms/howto.html: Likewise.
+ * docs/html/26_numerics/howto.html: Likewise.
+ * docs/html/27_io/howto.html: Likewise.
+ * docs/html/27_io/iostreams_hierarchy.pdf: Likewise.
+ * docs/html/ext/howto.html: Likewise.
+ * docs/html/faq/index.html: Likewise.
+ * docs/html/faq/index.txt: Likewise.
+
2000-12-08 Phil Edwards
* acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): New conditional,
diff --git a/libstdc++-v3/README b/libstdc++-v3/README
index 7516e5c425e..d795882518c 100644
--- a/libstdc++-v3/README
+++ b/libstdc++-v3/README
@@ -1,12 +1,12 @@
file: libstdc++-v3/README
-New users may wish to point their web browsers to the file index.html
-in the 'docs' subdirectory. It contains brief building instructions
-and notes on how to configure the library in interesting ways.
+New users may wish to point their web browsers to the file documentation.html
+in the 'docs/html' subdirectory. It contains brief building instructions and
+notes on how to configure the library in interesting ways.
Instructions for configuring and building this snapshot appear
-in install.html.
+in docs/html/install.html.
This directory contains the files needed to create [a still broken
subset of] an ISO Standard C++ Library.
diff --git a/libstdc++-v3/docs/doxygen/run_doxygen b/libstdc++-v3/docs/doxygen/run_doxygen
new file mode 100644
index 00000000000..9585e04afd7
--- /dev/null
+++ b/libstdc++-v3/docs/doxygen/run_doxygen
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+
+# This file is a placeholder to keep the doxygen subdir in place. It
+# will be used to test for the presence of doxygen(1) and run it.
+
diff --git a/libstdc++-v3/docs/17_intro/BADNAMES b/libstdc++-v3/docs/html/17_intro/BADNAMES
similarity index 100%
rename from libstdc++-v3/docs/17_intro/BADNAMES
rename to libstdc++-v3/docs/html/17_intro/BADNAMES
diff --git a/libstdc++-v3/docs/17_intro/BUGS b/libstdc++-v3/docs/html/17_intro/BUGS
similarity index 100%
rename from libstdc++-v3/docs/17_intro/BUGS
rename to libstdc++-v3/docs/html/17_intro/BUGS
diff --git a/libstdc++-v3/docs/17_intro/C++STYLE b/libstdc++-v3/docs/html/17_intro/C++STYLE
similarity index 100%
rename from libstdc++-v3/docs/17_intro/C++STYLE
rename to libstdc++-v3/docs/html/17_intro/C++STYLE
diff --git a/libstdc++-v3/docs/17_intro/CHECKLIST b/libstdc++-v3/docs/html/17_intro/CHECKLIST
similarity index 100%
rename from libstdc++-v3/docs/17_intro/CHECKLIST
rename to libstdc++-v3/docs/html/17_intro/CHECKLIST
diff --git a/libstdc++-v3/docs/17_intro/COPYING b/libstdc++-v3/docs/html/17_intro/COPYING
similarity index 100%
rename from libstdc++-v3/docs/17_intro/COPYING
rename to libstdc++-v3/docs/html/17_intro/COPYING
diff --git a/libstdc++-v3/docs/17_intro/DESIGN b/libstdc++-v3/docs/html/17_intro/DESIGN
similarity index 100%
rename from libstdc++-v3/docs/17_intro/DESIGN
rename to libstdc++-v3/docs/html/17_intro/DESIGN
diff --git a/libstdc++-v3/docs/17_intro/HEADER_POLICY b/libstdc++-v3/docs/html/17_intro/HEADER_POLICY
similarity index 100%
rename from libstdc++-v3/docs/17_intro/HEADER_POLICY
rename to libstdc++-v3/docs/html/17_intro/HEADER_POLICY
diff --git a/libstdc++-v3/docs/17_intro/PROBLEMS b/libstdc++-v3/docs/html/17_intro/PROBLEMS
similarity index 100%
rename from libstdc++-v3/docs/17_intro/PROBLEMS
rename to libstdc++-v3/docs/html/17_intro/PROBLEMS
diff --git a/libstdc++-v3/docs/17_intro/RELEASE-NOTES b/libstdc++-v3/docs/html/17_intro/RELEASE-NOTES
similarity index 100%
rename from libstdc++-v3/docs/17_intro/RELEASE-NOTES
rename to libstdc++-v3/docs/html/17_intro/RELEASE-NOTES
diff --git a/libstdc++-v3/docs/17_intro/TODO b/libstdc++-v3/docs/html/17_intro/TODO
similarity index 100%
rename from libstdc++-v3/docs/17_intro/TODO
rename to libstdc++-v3/docs/html/17_intro/TODO
diff --git a/libstdc++-v3/docs/17_intro/contribute.html b/libstdc++-v3/docs/html/17_intro/contribute.html
similarity index 100%
rename from libstdc++-v3/docs/17_intro/contribute.html
rename to libstdc++-v3/docs/html/17_intro/contribute.html
diff --git a/libstdc++-v3/docs/17_intro/headers_cc.txt b/libstdc++-v3/docs/html/17_intro/headers_cc.txt
similarity index 100%
rename from libstdc++-v3/docs/17_intro/headers_cc.txt
rename to libstdc++-v3/docs/html/17_intro/headers_cc.txt
diff --git a/libstdc++-v3/docs/17_intro/howto.html b/libstdc++-v3/docs/html/17_intro/howto.html
similarity index 98%
rename from libstdc++-v3/docs/17_intro/howto.html
rename to libstdc++-v3/docs/html/17_intro/howto.html
index f52e867dceb..707d04ded47 100644
--- a/libstdc++-v3/docs/17_intro/howto.html
+++ b/libstdc++-v3/docs/html/17_intro/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 17
-
+
@@ -146,7 +146,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.5 2000/10/21 00:51:49 jsm28 Exp $
+ $Id: howto.html,v 1.6 2000/12/03 23:47:47 jsm28 Exp $
diff --git a/libstdc++-v3/docs/17_intro/libstdc++-assign.txt b/libstdc++-v3/docs/html/17_intro/libstdc++-assign.txt
similarity index 100%
rename from libstdc++-v3/docs/17_intro/libstdc++-assign.txt
rename to libstdc++-v3/docs/html/17_intro/libstdc++-assign.txt
diff --git a/libstdc++-v3/docs/17_intro/organization b/libstdc++-v3/docs/html/17_intro/organization
similarity index 100%
rename from libstdc++-v3/docs/17_intro/organization
rename to libstdc++-v3/docs/html/17_intro/organization
diff --git a/libstdc++-v3/docs/17_intro/porting-howto.html b/libstdc++-v3/docs/html/17_intro/porting-howto.html
similarity index 100%
rename from libstdc++-v3/docs/17_intro/porting-howto.html
rename to libstdc++-v3/docs/html/17_intro/porting-howto.html
diff --git a/libstdc++-v3/docs/18_support/howto.html b/libstdc++-v3/docs/html/18_support/howto.html
similarity index 98%
rename from libstdc++-v3/docs/18_support/howto.html
rename to libstdc++-v3/docs/html/18_support/howto.html
index 6b6be0209b4..8dbc96c38d7 100644
--- a/libstdc++-v3/docs/18_support/howto.html
+++ b/libstdc++-v3/docs/html/18_support/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 18
-
+
@@ -261,7 +261,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.6 2000/10/21 00:51:49 jsm28 Exp $
+ $Id: howto.html,v 1.7 2000/12/03 23:47:47 jsm28 Exp $
diff --git a/libstdc++-v3/docs/19_diagnostics/howto.html b/libstdc++-v3/docs/html/19_diagnostics/howto.html
similarity index 96%
rename from libstdc++-v3/docs/19_diagnostics/howto.html
rename to libstdc++-v3/docs/html/19_diagnostics/howto.html
index 3502ed3b8a4..7bfbcdf9bb4 100644
--- a/libstdc++-v3/docs/19_diagnostics/howto.html
+++ b/libstdc++-v3/docs/html/19_diagnostics/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 19
-
+
@@ -99,7 +99,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.4 2000/10/21 00:51:49 jsm28 Exp $
+ $Id: howto.html,v 1.5 2000/12/03 23:47:47 jsm28 Exp $
diff --git a/libstdc++-v3/docs/20_util/howto.html b/libstdc++-v3/docs/html/20_util/howto.html
similarity index 98%
rename from libstdc++-v3/docs/20_util/howto.html
rename to libstdc++-v3/docs/html/20_util/howto.html
index 1976e2ba3ef..98f2a277bae 100644
--- a/libstdc++-v3/docs/20_util/howto.html
+++ b/libstdc++-v3/docs/html/20_util/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 20
-
+
@@ -185,7 +185,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.3 2000/10/21 00:51:49 jsm28 Exp $
+ $Id: howto.html,v 1.4 2000/12/03 23:47:47 jsm28 Exp $
diff --git a/libstdc++-v3/docs/21_strings/gotw29a.txt b/libstdc++-v3/docs/html/21_strings/gotw29a.txt
similarity index 100%
rename from libstdc++-v3/docs/21_strings/gotw29a.txt
rename to libstdc++-v3/docs/html/21_strings/gotw29a.txt
diff --git a/libstdc++-v3/docs/21_strings/howto.html b/libstdc++-v3/docs/html/21_strings/howto.html
similarity index 99%
rename from libstdc++-v3/docs/21_strings/howto.html
rename to libstdc++-v3/docs/html/21_strings/howto.html
index 9ffd99d4deb..7318084f3ad 100644
--- a/libstdc++-v3/docs/21_strings/howto.html
+++ b/libstdc++-v3/docs/html/21_strings/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 21
-
+
@@ -324,7 +324,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.6 2000/10/21 00:51:49 jsm28 Exp $
+ $Id: howto.html,v 1.7 2000/12/03 23:47:47 jsm28 Exp $
diff --git a/libstdc++-v3/docs/21_strings/stringtok_h.txt b/libstdc++-v3/docs/html/21_strings/stringtok_h.txt
similarity index 100%
rename from libstdc++-v3/docs/21_strings/stringtok_h.txt
rename to libstdc++-v3/docs/html/21_strings/stringtok_h.txt
diff --git a/libstdc++-v3/docs/21_strings/stringtok_std_h.txt b/libstdc++-v3/docs/html/21_strings/stringtok_std_h.txt
similarity index 100%
rename from libstdc++-v3/docs/21_strings/stringtok_std_h.txt
rename to libstdc++-v3/docs/html/21_strings/stringtok_std_h.txt
diff --git a/libstdc++-v3/docs/22_locale/codecvt.html b/libstdc++-v3/docs/html/22_locale/codecvt.html
similarity index 100%
rename from libstdc++-v3/docs/22_locale/codecvt.html
rename to libstdc++-v3/docs/html/22_locale/codecvt.html
diff --git a/libstdc++-v3/docs/22_locale/ctype.html b/libstdc++-v3/docs/html/22_locale/ctype.html
similarity index 100%
rename from libstdc++-v3/docs/22_locale/ctype.html
rename to libstdc++-v3/docs/html/22_locale/ctype.html
diff --git a/libstdc++-v3/docs/22_locale/howto.html b/libstdc++-v3/docs/html/22_locale/howto.html
similarity index 98%
rename from libstdc++-v3/docs/22_locale/howto.html
rename to libstdc++-v3/docs/html/22_locale/howto.html
index 8f559e09322..6c76a5cef22 100644
--- a/libstdc++-v3/docs/22_locale/howto.html
+++ b/libstdc++-v3/docs/html/22_locale/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 22
-
+
@@ -227,7 +227,7 @@ functionality are given.
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.7 2000/10/21 00:51:50 jsm28 Exp $
+ $Id: howto.html,v 1.8 2000/12/03 23:47:47 jsm28 Exp $
diff --git a/libstdc++-v3/docs/22_locale/locale.html b/libstdc++-v3/docs/html/22_locale/locale.html
similarity index 100%
rename from libstdc++-v3/docs/22_locale/locale.html
rename to libstdc++-v3/docs/html/22_locale/locale.html
diff --git a/libstdc++-v3/docs/23_containers/howto.html b/libstdc++-v3/docs/html/23_containers/howto.html
similarity index 98%
rename from libstdc++-v3/docs/23_containers/howto.html
rename to libstdc++-v3/docs/html/23_containers/howto.html
index f254f923f7e..a6c0afc0d4b 100644
--- a/libstdc++-v3/docs/23_containers/howto.html
+++ b/libstdc++-v3/docs/html/23_containers/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 23
-
+
@@ -237,7 +237,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.3 2000/10/21 00:51:50 jsm28 Exp $
+ $Id: howto.html,v 1.4 2000/12/03 23:47:48 jsm28 Exp $
diff --git a/libstdc++-v3/docs/23_containers/wrappers_h.txt b/libstdc++-v3/docs/html/23_containers/wrappers_h.txt
similarity index 100%
rename from libstdc++-v3/docs/23_containers/wrappers_h.txt
rename to libstdc++-v3/docs/html/23_containers/wrappers_h.txt
diff --git a/libstdc++-v3/docs/24_iterators/howto.html b/libstdc++-v3/docs/html/24_iterators/howto.html
similarity index 96%
rename from libstdc++-v3/docs/24_iterators/howto.html
rename to libstdc++-v3/docs/html/24_iterators/howto.html
index de2fac5dd9d..a807cf3d8b9 100644
--- a/libstdc++-v3/docs/24_iterators/howto.html
+++ b/libstdc++-v3/docs/html/24_iterators/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 24
-
+
@@ -86,7 +86,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.4 2000/10/21 00:51:50 jsm28 Exp $
+ $Id: howto.html,v 1.5 2000/12/03 23:47:48 jsm28 Exp $
diff --git a/libstdc++-v3/docs/25_algorithms/howto.html b/libstdc++-v3/docs/html/25_algorithms/howto.html
similarity index 96%
rename from libstdc++-v3/docs/25_algorithms/howto.html
rename to libstdc++-v3/docs/html/25_algorithms/howto.html
index 118ccba865d..c161b1871a3 100644
--- a/libstdc++-v3/docs/25_algorithms/howto.html
+++ b/libstdc++-v3/docs/html/25_algorithms/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 25
-
+
@@ -88,7 +88,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.4 2000/10/21 00:51:50 jsm28 Exp $
+ $Id: howto.html,v 1.5 2000/12/03 23:47:48 jsm28 Exp $
diff --git a/libstdc++-v3/docs/26_numerics/howto.html b/libstdc++-v3/docs/html/26_numerics/howto.html
similarity index 97%
rename from libstdc++-v3/docs/26_numerics/howto.html
rename to libstdc++-v3/docs/html/26_numerics/howto.html
index 43670a9cc05..c69532dbfcd 100644
--- a/libstdc++-v3/docs/26_numerics/howto.html
+++ b/libstdc++-v3/docs/html/26_numerics/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 26
-
+
@@ -134,7 +134,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.6 2000/10/21 00:51:50 jsm28 Exp $
+ $Id: howto.html,v 1.7 2000/12/03 23:47:48 jsm28 Exp $
diff --git a/libstdc++-v3/docs/27_io/howto.html b/libstdc++-v3/docs/html/27_io/howto.html
similarity index 99%
rename from libstdc++-v3/docs/27_io/howto.html
rename to libstdc++-v3/docs/html/27_io/howto.html
index e31c787f421..c7eb7c05b15 100644
--- a/libstdc++-v3/docs/27_io/howto.html
+++ b/libstdc++-v3/docs/html/27_io/howto.html
@@ -8,7 +8,7 @@
libstdc++-v3 HOWTO: Chapter 27
-
+
@@ -335,7 +335,7 @@
Comments and suggestions are welcome, and may be sent to
Phil Edwards or
Gabriel Dos Reis.
- $Id: howto.html,v 1.4 2000/11/29 20:37:02 pme Exp $
+ $Id: howto.html,v 1.5 2000/12/03 23:47:49 jsm28 Exp $
diff --git a/libstdc++-v3/docs/27_io/iostreams_hierarchy.pdf b/libstdc++-v3/docs/html/27_io/iostreams_hierarchy.pdf
similarity index 100%
rename from libstdc++-v3/docs/27_io/iostreams_hierarchy.pdf
rename to libstdc++-v3/docs/html/27_io/iostreams_hierarchy.pdf
diff --git a/libstdc++-v3/docs/Makefile b/libstdc++-v3/docs/html/Makefile
similarity index 100%
rename from libstdc++-v3/docs/Makefile
rename to libstdc++-v3/docs/html/Makefile
diff --git a/libstdc++-v3/docs/configopts.html b/libstdc++-v3/docs/html/configopts.html
similarity index 92%
rename from libstdc++-v3/docs/configopts.html
rename to libstdc++-v3/docs/html/configopts.html
index e6ed73d884f..a4bdd5ef21c 100644
--- a/libstdc++-v3/docs/configopts.html
+++ b/libstdc++-v3/docs/html/configopts.html
@@ -7,7 +7,7 @@
libstdc++-v3 configure options
-
+
@@ -15,11 +15,11 @@
options
To the libstdc++-v3 homepage.
@@ -29,8 +29,8 @@ options
they
all have opposite forms as well
- (enable/disable and with/without). The defaults are for the latest
- snapshot, 2.90.8.
+ (enable/disable and with/without). The defaults are for current
+ development sources.
The canonical way to find out the configure options that are
available for a given set of libstdc++ sources is to go to the
@@ -159,7 +159,7 @@ options