Merged r158465 through r158660 into branch.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ifunc@158664 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 35 insertions, 5 deletions

diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
index 279e7038a9b..393b7f509c3 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
@@ -920,7 +920,7 @@ indicate a place that may require attention for multi-thread safety.
     <sect3 id="doxygen.prereq">
       <title>Prerequisites</title>
       <para>
-	Prerequisite tools are Bash 2.x,
+	Prerequisite tools are Bash 2.0 or later,
 	<ulink url="http://www.doxygen.org/">Doxygen</ulink>, and
 	the <ulink url="http://www.gnu.org/software/coreutils/">GNU
 	coreutils</ulink>. (GNU versions of find, xargs, and possibly
diff --git a/libstdc++-v3/doc/xml/manual/prerequisites.xml b/libstdc++-v3/doc/xml/manual/prerequisites.xml
index cdfe6ccccb1..d7a162c056a 100644
--- a/libstdc++-v3/doc/xml/manual/prerequisites.xml
+++ b/libstdc++-v3/doc/xml/manual/prerequisites.xml
@@ -41,6 +41,12 @@
    </para>
 
    <para>
+     To generate the API documentation from the sources you will need
+     Doxygen, see <link linkend="contrib.doc_style">Documentation
+     Style</link> in the appendix for full details.
+   </para>
+
+   <para>
    Finally, a few system-specific requirements:
    </para>
 
diff --git a/libstdc++-v3/doc/xml/manual/strings.xml b/libstdc++-v3/doc/xml/manual/strings.xml
index 412484e8ef2..8eb9b49a1be 100644
--- a/libstdc++-v3/doc/xml/manual/strings.xml
+++ b/libstdc++-v3/doc/xml/manual/strings.xml
@@ -366,6 +366,10 @@ stringtok(Container &amp;container, string const &amp;in,
       entry</link>) but the regular copy constructor cannot be used
       because libstdc++'s <code>string</code> is Copy-On-Write.
    </para>
+   <para>In <link linkend="status.iso.200x">C++0x</link> mode you can call
+      <code>s.shrink_to_fit()</code> to achieve the same effect as
+      <code>s.reserve(s.size())</code>.
+   </para>
 
 
   </sect2>
diff --git a/libstdc++-v3/doc/xml/manual/using.xml b/libstdc++-v3/doc/xml/manual/using.xml
index e4863c2e4dc..bb6077c4e19 100644
--- a/libstdc++-v3/doc/xml/manual/using.xml
+++ b/libstdc++-v3/doc/xml/manual/using.xml
@@ -1176,22 +1176,42 @@ A quick read of the relevant part of the GCC
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      GNU ld (default on Linux):<literal>-Wl,--rpath,<filename class="directory">destdir</filename>/lib</literal>
+	      GNU ld (default on Linux):
+              <literal>-Wl,-rpath,<filename class="directory">destdir</filename>/lib</literal>
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      IRIX ld:<literal>
-	      -Wl,-rpath,<filename class="directory">destdir</filename>/lib</literal>
+	      IRIX ld:
+              <literal>-Wl,-rpath,<filename class="directory">destdir</filename>/lib</literal>
 	    </para>
 	  </listitem>
 	  <listitem>
 	  <para>
-	  Solaris ld:<literal>-Wl,-R<filename class="directory">destdir</filename>/lib</literal>
+	    Solaris ld:
+            <literal>-Wl,-R<filename class="directory">destdir</filename>/lib</literal>
 	  </para>
 	  </listitem>
 	</itemizedlist>
       </listitem>
+      <listitem>
+	<para>
+	  Some linkers allow you to specify the path to the library by
+	  setting <literal>LD_RUN_PATH</literal> in your environment
+	  when linking.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  On some platforms the system administrator can configure the
+	  dynamic linker to always look for libraries in
+	  <filename class="directory">destdir/lib</filename>, for example
+	  by using the <command>ldconfig</command> utility on Linux
+	  or the <command>crle</command> utility on Solaris. This is a
+	  system-wide change which can make the system unusable so if you
+	  are unsure then use one of the other methods described above.
+	</para>
+      </listitem>
     </itemizedlist>
     <para>
       Use the <command>ldd</command> utility on the linked executable