From e76659d1892281faba350efa1c64a07a98c456ba Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@pfeifer.com>
Date: Sat, 18 Mar 2017 18:39:54 +0000
Subject: [PATCH] appendix_contributing.xml: Convert link to ansi.org to https.

	* doc/xml/manual/appendix_contributing.xml: Convert link to
	ansi.org to https.
	Update link to the C++ standard at ansi.org.

	* doc/xml/faq.xml: Remove information redundant with the above;
	instead add a reference.

From-SVN: r246259
---
 libstdc++-v3/ChangeLog                        |  9 +++++++++
 libstdc++-v3/doc/xml/faq.xml                  | 20 +------------------
 .../doc/xml/manual/appendix_contributing.xml  |  8 +++++---
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6b858d1a14a..08ec49bc45e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-18  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* doc/xml/manual/appendix_contributing.xml: Convert link to
+	ansi.org to https.
+	Update link to the C++ standard at ansi.org.
+
+	* doc/xml/faq.xml: Remove information redundant with the above;
+	instead add a reference.
+
 2017-03-17  Jonathan Wakely  <jwakely@redhat.com>
 
 	* src/c++11/codecvt.cc (range): Add non-type template parameter and
diff --git a/libstdc++-v3/doc/xml/faq.xml b/libstdc++-v3/doc/xml/faq.xml
index 6203e8a1346..db676267b67 100644
--- a/libstdc++-v3/doc/xml/faq.xml
+++ b/libstdc++-v3/doc/xml/faq.xml
@@ -1177,25 +1177,7 @@
   </question>
   <answer xml:id="a-get_iso_cxx">
     <para>
-    Copies of the full ISO 14882 standard are available on line via
-    the ISO mirror site for committee members.  Non-members, or those
-    who have not paid for the privilege of sitting on the committee
-    and sustained their two-meeting commitment for voting rights, may
-    get a copy of the standard from their respective national
-    standards organization.  In the USA, this national standards
-    organization is ANSI and their website is
-    right <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.ansi.org">here</link>.  (And if
-    you've already registered with them, clicking this link will take
-    you to directly to the place where you can
-    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://webstore.ansi.org/RecordDetail.aspx?sku=ISO%2FIEC+14882:2003">buy the standard on-line</link>.
-    </para>
-    <para>
-    Who is your country's member body?  Visit the
-    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.iso.ch/">ISO homepage</link> and find out!
-    </para>
-    <para>
-    The 2003 version of the standard (the 1998 version plus TC1) is
-    available in print, ISBN 0-470-84674-7.
+    Please refer to the Contributing section in our manual.
     </para> 
   </answer>
 </qandaentry>
diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
index 1ee848ff672..e967f61f001 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
@@ -45,9 +45,11 @@
 	  the standard from their respective national standards
 	  organization. In the USA, this national standards
 	  organization is
-	  <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.ansi.org">ANSI</link>.
-	  (And if you've already registered with them you can
-	  <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://webstore.ansi.org/RecordDetail.aspx?sku=INCITS%2fISO%2fIEC+14882-2012">buy the standard on-line</link>.)
+	  <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.ansi.org">ANSI</link>.
+	  (And if you've already registered with them you can <link
+	  xmlns:xlink="http://www.w3.org/1999/xlink"
+	  xlink:href="https://webstore.ansi.org/RecordDetail.aspx?sku=ISO%2fIEC+14882%3a2014">buy
+	  the standard on-line</link>.)
 	</para>
       </listitem>
 
-- 
2.30.2