On 19/01/20 20:06 -0700, Sandra Loosemore wrote:
On 1/13/20 9:12 AM, Joseph Myers wrote:
On Mon, 13 Jan 2020, Sandra Loosemore wrote:
On 1/13/20 7:02 AM, Eric S. Raymond wrote:
Clean up references to SVN in in the GCC docs, redirecting to Git
documentation as appropriate.
This is OK, although the set of changes for the libstdc++ manual like this
gave me pause:
I think you'll need to commit this for Eric (using --author= to set the
git author, whenever you commit a patch for someone else). The libstdc++
maintainers can probably handle regenerating the HTML version of the
libstdc++ documentation.
I've pushed this patch to mainline and the gcc8 and gcc9 branches now.
This fixes the broken grammar in the patch. Committed to trunk so far,
I'll backport it too.
commit c784f1620498f78cfb9075a4696f2813722eb547
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Mon Jan 20 20:37:52 2020 +0000
libstdc++: Fix recent documentation changes
* doc/xml/faq.xml: Fix grammar.
* doc/xml/manual/appendix_contributing.xml: Improve instructions.
* doc/xml/manual/spine.xml: Update copyright years.
* doc/html/*: Regenerate.
diff --git a/libstdc++-v3/doc/xml/faq.xml b/libstdc++-v3/doc/xml/faq.xml
index 21c312dce35..aff6c8d6004 100644
--- a/libstdc++-v3/doc/xml/faq.xml
+++ b/libstdc++-v3/doc/xml/faq.xml
@@ -34,8 +34,8 @@
clauses 20 through 33 and annex D (prior to the 2017 standard
the library clauses started with 17). For those who want to see
exactly how far the project has come, or just want the latest
- bleeding-edge code, the up-to-date source , and can be cloned via Git: see
- <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://gcc.gnu.org/git.html";>web</link>.
+ bleeding-edge code, the up-to-date source can be cloned via
+ <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://gcc.gnu.org/git.html";>Git</link>.
</para>
<para>
@@ -295,15 +295,11 @@
download sites</link> is provided on the main GCC site.
</para>
<para>
- Current libstdc++ sources can always be checked out of the main
- GCC source repository using the appropriate version control
- tool. At this time, that tool
- is <application>Git</application>.
- </para>
- <para>
- For more information
- see <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://gcc.gnu.org/git.html";>
- details</link>.
+ Current libstdc++ sources can always be found in the main GCC source
+ repository, available using the appropriate version control tool.
+ At this time, that tool is <application>Git</application>.
+ For more details see the documentation on
+ <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://gcc.gnu.org/git.html";>using the Git repository</link>.
</para>
</answer>
</qandaentry>
diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
index d2913b1663c..79fa0ed32b8 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
@@ -170,9 +170,10 @@
<listitem>
<para>
- The patch itself. If you are accessing the Git
- repository use <command>git pull; git diff >NEW</command>;
- else, use <command>diff -cp OLD NEW</command> ... If your
+ The patch itself. If you are using the Git repository use
+ <command>git diff</command> or <command>git format-patch</command>
+ to produce a patch;
+ otherwise, use <command>diff -cp OLD NEW</command>. If your
version of diff does not support these options, then get the
latest version of GNU diff.
</para>
diff --git a/libstdc++-v3/doc/xml/manual/spine.xml b/libstdc++-v3/doc/xml/manual/spine.xml
index a2cc1294e73..4db3037ac4d 100644
--- a/libstdc++-v3/doc/xml/manual/spine.xml
+++ b/libstdc++-v3/doc/xml/manual/spine.xml
@@ -27,6 +27,7 @@
<year>2017</year>
<year>2018</year>
<year>2019</year>
+ <year>2020</year>
<holder>
<link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://www.fsf.org";>FSF</link>
</holder>
