[PATCH] Remove some junk characters from COPYING

[PATCH] Remove some junk characters from COPYING

[Ramkumar Ramachandra]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

I removed a few ^L characters from COPYING. Kindly find patch
attached. Again, I'm sorry I couldn't include it inline- I'm behind a
restrictive firewall, and Gmail mangles up patches.

-- Ram

[-- Attachment #2: 0001-Remove-some-junk-characters-from-COPYING.patch --]
[-- Type: text/x-patch, Size: 2369 bytes --]

From 9c59a1588c796b022903573ef7f281dacc8d4858 Mon Sep 17 00:00:00 2001
From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Fri, 15 Jan 2010 13:41:38 +0530
Subject: [PATCH] Remove some junk characters from COPYING

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 COPYING |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/COPYING b/COPYING
index 6ff87c4..78e208a 100644
--- a/COPYING
+++ b/COPYING
@@ -76,7 +76,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-\f
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -131,7 +131,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-\f
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -189,7 +189,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-\f
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -246,7 +246,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-\f
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -299,7 +299,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-\f
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
-- 
1.6.5

Re: [PATCH] Remove some junk characters from COPYING

[David Aguilar]

Hello,

On Fri, Jan 15, 2010 at 01:52:30PM +0530, Ramkumar Ramachandra wrote:
> I removed a few ^L characters from COPYING. Kindly find patch
> attached. Again, I'm sorry I couldn't include it inline- I'm behind a
> restrictive firewall, and Gmail mangles up patches.
> 
> -- Ram

I've had great success with the 'git send-email', msmtp, and
gmail combination.

http://git.or.cz/gitwiki/GitTips#Usingmsmtptosendyourpatches

I highly recommend using that setup.


I'm sure there are other ways, but that's the one that works for
me.  I also use mutt to read gmail; also highly recommended :)


Have a nice day,

-- 
		David

Re: [PATCH] Remove some junk characters from COPYING

[Robin Rosenberg]

fredagen den 15 januari 2010 09.22.30 skrev  Ramkumar Ramachandra:
> I removed a few ^L characters from COPYING. Kindly find patch
> attached. Again, I'm sorry I couldn't include it inline- I'm behind a
> restrictive firewall, and Gmail mangles up patches.

It is a form-feed (force new page when printing) so it should probably be 
called by that name, if it were to be removed.

-- robin

Re: [PATCH] Remove some junk characters from COPYING

[Ramkumar Ramachandra]

Hi,

> http://git.or.cz/gitwiki/GitTips#Usingmsmtptosendyourpatches

Thank you for the link! Yes, I know about git send-imap, but I my
firewall blocked traffic on all ports except 80 and 443 until
yesterday. I jumped some hoops and got a few more ports opened up for
myself yesterday, so no more attachments in Gmail :)

> I'm sure there are other ways, but that's the one that works for
> me.  I also use mutt to read gmail; also highly recommended :)

In that case, check out Sup. It's *much* better than mutt :)

Re: [PATCH] Remove some junk characters from COPYING

[Ramkumar Ramachandra]

Hi,

> It is a form-feed (force new page when printing) so it should probably be
> called by that name, if it were to be removed.

Oh, thanks for that- I just looked it up. I don't know if they should
be removed at all.

Re: [PATCH] Remove some junk characters from COPYING

[Junio C Hamano]

Ramkumar Ramachandra <artagnon@gmail.com> writes:

>> It is a form-feed (force new page when printing) so it should probably be
>> called by that name, if it were to be removed.
>
> Oh, thanks for that- I just looked it up. I don't know if they should
> be removed at all.

Most likely the copy we have is what Linus copied from the kernel tree and
adjusted his preamble without touching these form feeds.

While I don't think these form-feeds alone would be a good enough reason
to touch the file, FSF's address has changed some time ago, and the copy
we have does not reflect it, while the copy in the kernel tree was updated
in Sep 2005.  Curiously enough, the copy in the kernel tree doesn't have
the more recent update to rename "GNU Library General Public License" to
"GNU Lesser General Public License" (I am CC'ing Linus in case he cares).

I'll update our copy with http://www.gnu.org/licenses/gpl-2.0.txt.  This
will automatically lose the form-feeds.

Thanks.

-- >8 --
Subject: Update COPYING with GPLv2 with new FSF address

The mailing address of FSF changed quite a while ago.  Also the expansion
of the acronym LGPL (which we don't use) is "Lesser GPL" not "Library GPL"
these days in recent copies of GPLv2.  Update the copy we have with a
fresh download of <http://www.gnu.org/licenses/gpl-2.0.txt>.

This incidentally removes form-feeds in the text we retained for all these
years.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

---
diff --git a/COPYING b/COPYING
index 6ff87c4..536e555 100644
--- a/COPYING
+++ b/COPYING
@@ -22,8 +22,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -36,7 +36,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -76,7 +76,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-\f
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -131,7 +131,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-\f
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -189,7 +189,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-\f
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -246,7 +246,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-\f
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -299,7 +299,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-\f
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -324,10 +324,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -357,5 +356,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.