Patchwork 3/n: trans-mem: runtime

login
register
mail settings
Submitter Torvald Riegel
Date Nov. 3, 2011, 9:52 p.m.
Message ID <1320357160.5756.1061.camel@triegel.csb>
Download mbox | patch
Permalink /patch/123511/
State New
Headers show

Comments

Torvald Riegel - Nov. 3, 2011, 9:52 p.m.
On Thu, 2011-11-03 at 16:18 -0500, Aldy Hernandez wrote:
> 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.

Joseph,

is this what you had in mind? OK for branch?
commit a2c54395c589260b3ca6ad713119958301aeb6e2
Author: Torvald Riegel <triegel@redhat.com>
Date:   Thu Nov 3 22:47:09 2011 +0100

    Remove cover text and invariant sections.
    
    	* libitm.texi: No cover text and invariant sections.
Joseph S. Myers - Nov. 3, 2011, 11:24 p.m.
On Thu, 3 Nov 2011, Torvald Riegel wrote:

> On Thu, 2011-11-03 at 16:18 -0500, Aldy Hernandez wrote:
> > 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.
> 
> Joseph,
> 
> is this what you had in mind? OK for branch?

Yes, this looks right to me.  OK.
Torvald Riegel - Nov. 4, 2011, 10:58 a.m.
On Thu, 2011-11-03 at 23:24 +0000, Joseph S. Myers wrote:
> On Thu, 3 Nov 2011, Torvald Riegel wrote:
> 
> > On Thu, 2011-11-03 at 16:18 -0500, Aldy Hernandez wrote:
> > > 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.
> > 
> > Joseph,
> > 
> > is this what you had in mind? OK for branch?
> 
> Yes, this looks right to me.  OK.
> 

Committed to branch.

Patch

diff --git a/libitm/libitm.texi b/libitm/libitm.texi
index a752c16..b31657f 100644
--- a/libitm/libitm.texi
+++ b/libitm/libitm.texi
@@ -11,21 +11,10 @@  Copyright @copyright{} 2011 Free Software Foundation, Inc.
 
 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; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
 @end copying
 
 @ifinfo
@@ -36,10 +25,6 @@  texts being (a) (see below), and with the Back-Cover Texts being (b)
 
 This manual documents the GNU Transactional Memory Library.
 
-Published by the Free Software Foundation
-51 Franklin Street, Fifth Floor
-Boston, MA 02110-1301 USA
-
 @insertcopying
 @end ifinfo
 
@@ -52,10 +37,6 @@  Boston, MA 02110-1301 USA
 @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
 
@@ -86,12 +67,8 @@  several threads.
                                by gcc.
 * The libitm ABI::             Notes on the external ABI provided by libitm.
 * Internals::                  Notes on libitm's internal synchronization.
-* Copying::                    GNU general public license says
-                               how you can copy and share libgomp.
 * GNU Free Documentation License::
                                How you can copy and share this manual.
-* Funding::                    How to help assure continued work for free 
-                               software.
 * Index::                      Index of this documentation.
 @end menu
 
@@ -745,27 +722,11 @@  priority inheritance until the TM has priority-aware contention management.
 
 
 @c ---------------------------------------------------------------------
-@c GNU General Public License
-@c ---------------------------------------------------------------------
-
-@include gpl.texi
-
-
-
-@c ---------------------------------------------------------------------
 @c GNU Free Documentation License
 @c ---------------------------------------------------------------------
 
 @include fdl.texi
 
-
-
-@c ---------------------------------------------------------------------
-@c Funding Free Software
-@c ---------------------------------------------------------------------
-
-@include funding.texi
-
 @c ---------------------------------------------------------------------
 @c Index
 @c ---------------------------------------------------------------------