diff --git a/appendix.htm b/appendix.htm
index e5bcadf8..ba0b3bdf 100644
--- a/appendix.htm
+++ b/appendix.htm
@@ -754,6 +754,14 @@ catalogue. The messages and their id's are as follows:
@@ -1159,84 +1167,34 @@ directory private to your application, and not in the PC's
directory path. Note that if you link to a static version of your
run time library, then you will also link to a static version of
regex++ and no dll's will need to be distributed. The possible
-regex++ dll's are as follows:
-
- | Development Tool | -Run Time Library | -Regex++ Dll | -- |
- | Microsoft Visual C++ 6 | -Msvcp60.dll and msvcrt.dll | -Mre200l.dll | -- |
- | Microsoft Visual C++ 6 | -Msvcp60d.dll and msvcrtd.dll - | -Mre300dl.dll | -- |
- | Borland C++ Builder 4 | -Cw3245.dll | -bcb4re300l.dll | -- |
- | Borland C++ Builder 4 | -Cw3245mt.dll | -bcb4re300lm.dll | -- |
- | Borland C++ Builder 4 | -Cp3245mt.dll and vcl40.bpl | -bcb4re300lv.dll | -- |
- | Borland C++ - Builder 5 - |
- cp3250.dll - |
- bcb5re300l.dll | -- |
- | Borland C++ - Builder 5 - |
- cp3250mt.dll - |
- bcb5re300lm.dll | -- |
- | Borland C++ - Builder 5 - |
- cw3250mt.dll - |
- bcb5re300lv.dll | -- |
"boost_regex_"
++ BOOST_LIB_TOOLSET
++ "_"
++ BOOST_LIB_THREAD_OPT
++ BOOST_LIB_RT_OPT
++ BOOST_LIB_LINK_OPT
++ BOOST_LIB_DEBUG_OPT
+
+These are defined as:
+
+BOOST_LIB_TOOLSET: The compiler toolset name (vc6, vc7, bcb5 etc).
+
+BOOST_LIB_THREAD_OPT: "s" for single thread builds,
+"m" for multithread builds.
+
+BOOST_LIB_RT_OPT: "s" for static runtime,
+"d" for dynamic runtime.
+
+BOOST_LIB_LINK_OPT: "s" for static link,
+"i" for dynamic link.
+
+BOOST_LIB_DEBUG_OPT: nothing for release builds,
+"d" for debug builds,
+"dd" for debug-diagnostic builds (_STLP_DEBUG).
Note: you can disable automatic library selection by defining
the symbol BOOST_REGEX_NO_LIB when compiling, this is useful if
diff --git a/test/Jamfile b/test/Jamfile
index 0aefbcf7..42ad9f20 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -8,7 +8,7 @@ local test-files = $(test-dir)tests.txt
;
unit-test regress : regress/parse.cpp regress/regress.cpp regress/tests.cpp
-