diff options
author | Daniel James <daniel@calamity.org.uk> | 2011-04-03 11:03:05 +0000 |
---|---|---|
committer | Daniel James <daniel@calamity.org.uk> | 2011-04-03 11:03:05 +0000 |
commit | fd4cd611fd3843fc6ad260bd686eea7ca6ecf883 (patch) | |
tree | 93f0494bbdce047d34409bc71bd350056f260b60 /doc/html | |
parent | 171c4ae2115a42de67e999709aebeb97122d5d62 (diff) | |
parent | ea3d06f67131d3dbeee14652b03f2473389a586a (diff) | |
download | boost-fd4cd611fd3843fc6ad260bd686eea7ca6ecf883.tar.gz |
Merge `/doc` from trunk.
[SVN r70928]
Diffstat (limited to 'doc/html')
-rw-r--r-- | doc/html/chrono.html (renamed from doc/html/jam/building.html) | 6 | ||||
-rw-r--r-- | doc/html/ratio.html (renamed from doc/html/jam.html) | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/doc/html/jam/building.html b/doc/html/chrono.html index 31e2139e3f..68dd242345 100644 --- a/doc/html/jam/building.html +++ b/doc/html/chrono.html @@ -7,12 +7,10 @@ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) --> <title>Redirect to generated documentation</title> - <meta http-equiv="refresh" content="0; URL=http://boost-sandbox.sourceforge.net/doc/html/jam/building.html"> + <meta http-equiv="refresh" content="0; URL=http://boost-sandbox.sourceforge.net/doc/html/chrono.html"> </head> <body> Automatic redirection failed, please go to - <a href="http://boost-sandbox.sourceforge.net/doc/html/jam/building.html">http://boost-sandbox.sourceforge.net/doc/html/jam/building.html</a> + <a href="http://boost-sandbox.sourceforge.net/doc/html/chrono.html">http://boost-sandbox.sourceforge.net/doc/html/chrono.html</a> </body> </html> - - diff --git a/doc/html/jam.html b/doc/html/ratio.html index d6a181b701..f9977c7e58 100644 --- a/doc/html/jam.html +++ b/doc/html/ratio.html @@ -7,10 +7,10 @@ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) --> <title>Redirect to generated documentation</title> - <meta http-equiv="refresh" content="0; URL=http://boost-sandbox.sourceforge.net/doc/html/jam.html"> + <meta http-equiv="refresh" content="0; URL=http://boost-sandbox.sourceforge.net/doc/html/ratio.html"> </head> <body> Automatic redirection failed, please go to - <a href="http://boost-sandbox.sourceforge.net/doc/html/jam.html">http://boost-sandbox.sourceforge.net/doc/html/jam.html</a> + <a href="http://boost-sandbox.sourceforge.net/doc/html/ratio.html">http://boost-sandbox.sourceforge.net/doc/html/ratio.html</a> </body> </html> |