diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/doc/html/faq.html | 2 | ||||
| -rw-r--r-- | libstdc++-v3/doc/xml/faq.xml | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4fd29e8ea60..b78daca58ca 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2014-05-08 Joshua Gay <jgay@gnu.org> + + PR libstdc++/61117 + * doc/xml/faq.xml (faq.license.what_restrictions): Replace "open + source" with "free software". + * doc/html/faq.html: Likewise. + 2014-05-08 Jonathan Wakely <jwakely@redhat.com> * include/std/iostream: Fix URL in comment. diff --git a/libstdc++-v3/doc/html/faq.html b/libstdc++-v3/doc/html/faq.html index 2e0f3e252c9..81b295f036f 100644 --- a/libstdc++-v3/doc/html/faq.html +++ b/libstdc++-v3/doc/html/faq.html @@ -223,7 +223,7 @@ </p></td></tr><tr class="question"><td align="left" valign="top"><a id="faq.license.what_restrictions"></a><a id="q-license.what_restrictions"></a><p><strong>2.4.</strong></p></td><td align="left" valign="top"><p> I see. So, what restrictions are there on programs that use the library? </p></td></tr><tr class="answer"><td align="left" valign="top"><a id="a-license.what_restrictions"></a></td><td align="left" valign="top"><p> - None. We encourage such programs to be released as open source, + None. We encourage such programs to be released as free software, but we won't punish you or sue you if you choose otherwise. </p></td></tr><tr class="toc"><td align="left" valign="top" colspan="2"><dl><dt>3.1. <a href="faq.html#faq.how_to_install">How do I install libstdc++? </a></dt><dt>3.2. <a href="faq.html#faq.how_to_get_sources">How does one get current libstdc++ sources? diff --git a/libstdc++-v3/doc/xml/faq.xml b/libstdc++-v3/doc/xml/faq.xml index 3a2fbad8ed6..69e2f902200 100644 --- a/libstdc++-v3/doc/xml/faq.xml +++ b/libstdc++-v3/doc/xml/faq.xml @@ -241,7 +241,7 @@ </question> <answer xml:id="a-license.what_restrictions"> <para> - None. We encourage such programs to be released as open source, + None. We encourage such programs to be released as free software, but we won't punish you or sue you if you choose otherwise. </para> </answer> |
