merge GSG changes from trunk

[SVN r50345]

3 files changed, 6 insertions, 9 deletions

diff --git a/more/getting_started/detail/library-naming.rst b/more/getting_started/detail/library-naming.rst
index 76d99ed5c2..9797b772ad 100644
--- a/more/getting_started/detail/library-naming.rst
+++ b/more/getting_started/detail/library-naming.rst
@@ -67,8 +67,7 @@ following elements:
   convention.  On most unix-style platforms the extensions are
   ``.a`` and ``.so`` for static libraries (archives) and shared
   libraries, respectively.  On Windows, ``.dll`` indicates a shared
-  library and (except for static libraries built by the ``gcc``
-  toolset_, whose names always end in ``.a``) ``.lib`` indicates a
+  library and ``.lib`` indicates a
   static or import library.  Where supported by toolsets on unix
   variants, a full version extension is added (e.g. ".so.1.34") and
   a symbolic link to the library file, named without the trailing
diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html
index f3bd8b10a9..4d389f77c7 100644
--- a/more/getting_started/unix-variants.html
+++ b/more/getting_started/unix-variants.html
@@ -431,7 +431,7 @@ bjam <strong>--build-dir=</strong><a class="reference internal" href="#id10"><em
 $ cd ~/<tt class="docutils literal"><span class="pre">boost_1_38_0</span></tt>
 $ bjam <strong>--build-dir=</strong>/tmp/build-boost <strong>--toolset=</strong>gcc stage
 </pre>
-<p>That will build static and shared non-debug multi-threaded variants of the libraries. To build all variants, pass the additional option, “<tt class="docutils literal"><span class="pre">--build-type=complete</span></tt>”.</p>
+<p>That will build static and shared non-debug multi-threaded variants of the libraries. To build all variants, pass the additional option, “``--build-type=complete``”.</p>
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 <!-- Software License, Version 1.0. (See accompanying -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
@@ -461,7 +461,7 @@ be interested in:</p>
 <p class="last">Boost.Build can produce a great deal of output, which can
 make it easy to miss problems.  If you want to make sure
 everything is went well, you might redirect the output into a
-file by appending “<tt class="docutils literal"><span class="pre">&gt;build.log</span> <span class="pre">2&gt;&amp;1</span></tt>” to your command line.</p>
+file by appending “``&gt;build.log 2&gt;&amp;1``” to your command line.</p>
 </div>
 </div>
 </div>
@@ -646,8 +646,7 @@ tagged as &quot;-1_31_1&quot;.</dd>
 convention.  On most unix-style platforms the extensions are
 <tt class="docutils literal"><span class="pre">.a</span></tt> and <tt class="docutils literal"><span class="pre">.so</span></tt> for static libraries (archives) and shared
 libraries, respectively.  On Windows, <tt class="docutils literal"><span class="pre">.dll</span></tt> indicates a shared
-library and (except for static libraries built by the <tt class="docutils literal"><span class="pre">gcc</span></tt>
-<a class="reference internal" href="#toolset">toolset</a>, whose names always end in <tt class="docutils literal"><span class="pre">.a</span></tt>) <tt class="docutils literal"><span class="pre">.lib</span></tt> indicates a
+library and <tt class="docutils literal"><span class="pre">.lib</span></tt> indicates a
 static or import library.  Where supported by toolsets on unix
 variants, a full version extension is added (e.g. &quot;.so.1.34&quot;) and
 a symbolic link to the library file, named without the trailing
diff --git a/more/getting_started/windows.html b/more/getting_started/windows.html
index 1face1f891..41a2a7b3c0 100644
--- a/more/getting_started/windows.html
+++ b/more/getting_started/windows.html
@@ -537,7 +537,7 @@ be interested in:</p>
 <p class="last">Boost.Build can produce a great deal of output, which can
 make it easy to miss problems.  If you want to make sure
 everything is went well, you might redirect the output into a
-file by appending “<tt class="docutils literal"><span class="pre">&gt;build.log</span> <span class="pre">2&gt;&amp;1</span></tt>” to your command line.</p>
+file by appending “``&gt;build.log 2&gt;&amp;1``” to your command line.</p>
 </div>
 </div>
 </div>
@@ -741,8 +741,7 @@ tagged as &quot;-1_31_1&quot;.</dd>
 convention.  On most unix-style platforms the extensions are
 <tt class="docutils literal"><span class="pre">.a</span></tt> and <tt class="docutils literal"><span class="pre">.so</span></tt> for static libraries (archives) and shared
 libraries, respectively.  On Windows, <tt class="docutils literal"><span class="pre">.dll</span></tt> indicates a shared
-library and (except for static libraries built by the <tt class="docutils literal"><span class="pre">gcc</span></tt>
-<a class="reference internal" href="#toolset">toolset</a>, whose names always end in <tt class="docutils literal"><span class="pre">.a</span></tt>) <tt class="docutils literal"><span class="pre">.lib</span></tt> indicates a
+library and <tt class="docutils literal"><span class="pre">.lib</span></tt> indicates a
 static or import library.  Where supported by toolsets on unix
 variants, a full version extension is added (e.g. &quot;.so.1.34&quot;) and
 a symbolic link to the library file, named without the trailing