| Message ID | 4EB2F686.20408@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, 3 Nov 2011, Aldy Hernandez wrote: > > As far as I know this is not printed by the FSF, and under 400 pages, so > > as per > > <http://www.gnu.org/prep/maintain/html_node/License-Notices-for-Documentation.html#License-Notices-for-Documentation> > > you can omit invariant sections and cover texts. > > > > > +Published by the Free Software Foundation > > > +51 Franklin Street, Fifth Floor > > > +Boston, MA 02110-1301 USA > > > > Again, not published on paper. > > > > OK for branch? The standard GFDL text says "; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts." if there are none. See the example at the end of fdl.texi.
Also, you should actually remove the gpl.texi and funding.texi includes as part of removing the Invariant Sections.
On 11/03/11 15:41, Joseph S. Myers wrote: > On Thu, 3 Nov 2011, Aldy Hernandez wrote: > >>> As far as I know this is not printed by the FSF, and under 400 pages, so >>> as per >>> <http://www.gnu.org/prep/maintain/html_node/License-Notices-for-Documentation.html#License-Notices-for-Documentation> >>> you can omit invariant sections and cover texts. >>> >>>> +Published by the Free Software Foundation >>>> +51 Franklin Street, Fifth Floor >>>> +Boston, MA 02110-1301 USA >>> >>> Again, not published on paper. >>> >> >> OK for branch? > > The standard GFDL text says "; with no Invariant Sections, no Front-Cover > Texts, and no Back-Cover Texts." if there are none. See the example at > the end of fdl.texi. > Torvald, could you please fix this as Joseph suggests, since this is your code?
On 11/03/11 15:42, Joseph S. Myers wrote: > Also, you should actually remove the gpl.texi and funding.texi includes as > part of removing the Invariant Sections. > Torvald, similarly here. Please wait for Joseph's approval of your patch, and then commit.
Index: libitm.texi =================================================================== --- libitm.texi (revision 180744) +++ libitm.texi (working copy) @@ -11,21 +11,7 @@ Copyright @copyright{} 2011 Free Softwar Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``Funding Free Software'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. +any later version published by the Free Software Foundation. @end copying @ifinfo @@ -51,11 +37,6 @@ Boston, MA 02110-1301 USA @page @vskip 0pt plus 1filll @comment For the @value{version-GCC} Version* -@sp 1 -Published by the Free Software Foundation @* -51 Franklin Street, Fifth Floor@* -Boston, MA 02110-1301, USA@* -@sp 1 @insertcopying @end titlepage