From b77b36639fea3ee7b7add12cf6b3139ecc1e4cc8 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Fri, 13 Nov 2009 14:50:25 +0000 Subject: GSG: merge trunk [SVN r57637] --- more/getting_started/index.html | 7 +- more/getting_started/index.rst | 9 -- more/getting_started/unix-variants.html | 195 ++++++++++++++++---------------- more/getting_started/unix-variants.rst | 20 ++-- more/getting_started/windows.html | 194 +++++++++++++++---------------- more/getting_started/windows.rst | 16 +-- 6 files changed, 215 insertions(+), 226 deletions(-) (limited to 'more') diff --git a/more/getting_started/index.html b/more/getting_started/index.html index c759f7aa3a..9a39aa61cd 100644 --- a/more/getting_started/index.html +++ b/more/getting_started/index.html @@ -3,7 +3,7 @@ - + Boost Getting Started @@ -48,11 +48,6 @@ provide. For example:

Here you're expected to imagine replacing the text “your name” with your actual name.

-
-

Alternate method: Boost.CMake

-

There is a cmake build for boost, supported and distributed -separately. See the Boost.CMake wiki page for more information.

-

Ready?

Let's go!

diff --git a/more/getting_started/index.rst b/more/getting_started/index.rst index b2789993f3..c3176146ca 100644 --- a/more/getting_started/index.rst +++ b/more/getting_started/index.rst @@ -54,15 +54,6 @@ provide. For example: Here you're expected to imagine replacing the text “your name” with your actual name. -Alternate method: Boost.CMake ------------------------------- - -There is a cmake build for boost, supported and distributed -separately. See the `Boost.CMake`_ wiki page for more information. - -.. _`Boost.CMake`: - https://svn.boost.org/trac/boost/wiki/CMake - Ready? ------ diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html index c2cc0d3a68..1172cac894 100644 --- a/more/getting_started/unix-variants.html +++ b/more/getting_started/unix-variants.html @@ -3,7 +3,7 @@ - + Boost Getting Started on Unix Variants @@ -40,10 +40,10 @@
  • 5   Prepare to Use a Boost Library Binary

    • It's important to note the following:

      -

    1. The path to the boost root directory (often /usr/local/boost_1_41_0) is -sometimes referred to as $BOOST_ROOT in documentation and +

    2. The path to the boost root directory (often /usr/local/boost_1_41_0) is +sometimes referred to as $BOOST_ROOT in documentation and mailing lists .

    3. To compile anything in Boost, you need a directory containing -the boost/ subdirectory in your #include path.

      +the boost/ subdirectory in your #include path.

      4. -

    4. Since all of Boost's header files have the .hpp extension, -and live in the boost/ subdirectory of the boost root, your -Boost #include directives will look like:

      +

    5. Since all of Boost's header files have the .hpp extension, +and live in the boost/ subdirectory of the boost root, your +Boost #include directives will look like:

       #include <boost/whatever.hpp>
      @@ -156,9 +156,9 @@ Boost #include direct

      depending on your preference regarding the use of angle bracket includes.

      6. -

    6. Don't be distracted by the doc/ subdirectory; it only +

    7. Don't be distracted by the doc/ subdirectory; it only contains a subset of the Boost documentation. Start with -libs/index.html if you're looking for the whole enchilada.

      +libs/index.html if you're looking for the whole enchilada.

    @@ -194,7 +194,7 @@ before building and installing it)

    A few libraries have optional separately-compiled binaries: