texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo update (Sun Jul 1 17:23:01 EDT 2007)


From: Karl Berry
Subject: texinfo update (Sun Jul 1 17:23:01 EDT 2007)
Date: Sun, 01 Jul 2007 17:23:04 -0400

Index: system.h
===================================================================
RCS file: /sources/texinfo/texinfo/system.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system.h    1 Jul 2007 18:46:20 -0000       1.5
+++ system.h    1 Jul 2007 21:20:28 -0000       1.6
@@ -1,13 +1,13 @@
 /* system.h: system-dependent declarations; include this first.
-   $Id: system.h,v 1.5 2007/07/01 18:46:20 karl Exp $
+   $Id: system.h,v 1.6 2007/07/01 21:20:28 karl Exp $
 
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
    2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef TEXINFO_SYSTEM_H
 #define TEXINFO_SYSTEM_H
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- doc/texi2dvi.1      1 Jul 2007 16:56:00 -0000       1.60
+++ doc/texi2dvi.1      1 Jul 2007 21:20:29 -0000       1.61
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-.TH TEXI2DVI "1" "July 2007" "texi2dvi 1.96" "User Commands"
+.TH TEXI2DVI "1" "July 2007" "texi2dvi 1.97" "User Commands"
 .SH NAME
 texi2dvi \- convert Texinfo documents to DVI
 .SH SYNOPSIS
Index: doc/txi-ru.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/txi-ru.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doc/txi-ru.tex      26 Apr 2006 21:30:02 -0000      1.1
+++ doc/txi-ru.tex      1 Jul 2007 21:20:29 -0000       1.2
@@ -1,13 +1,13 @@
-% Russian ranslation for texinfo.tex. 
+% Russian translation for texinfo.tex. 
 %
-% Copyright (C) 2005 Free Software Foundation.
+% Copyright (C) 2005, 2007 Free Software Foundation.
 %
 % Author:
 %  Sergey Poznyakoff
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
+% the Free Software Foundation; either version 3 of the License, or
 % (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
 % 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.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 %\include plainenc
 %
Index: doc/txi-uk.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/txi-uk.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doc/txi-uk.tex      26 Apr 2006 21:30:02 -0000      1.1
+++ doc/txi-uk.tex      1 Jul 2007 21:20:29 -0000       1.2
@@ -1,13 +1,13 @@
 % Ukrainian translation for texinfo.tex.
 %
-% Copyright (C) 2005 Free Software Foundation.
+% Copyright (C) 2005, 2007 Free Software Foundation.
 %
 % Author:
 %  Sergey Poznyakoff
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
+% the Free Software Foundation; either version 3 of the License, or
 % (at your option) any later version.
 %
 % This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
 % 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.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \gdef\putwordAppendix{äÏÄÁÔÏË}
 \gdef\putwordChapter{òÏÚĦÌ}
Index: info/dir.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/dir.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/dir.c  1 Jul 2007 18:46:21 -0000       1.6
+++ info/dir.c  1 Jul 2007 21:20:29 -0000       1.7
@@ -1,12 +1,12 @@
 /* dir.c -- how to build a special "dir" node from "localdir" files.
-   $Id: dir.c,v 1.6 2007/07/01 18:46:21 karl Exp $
+   $Id: dir.c,v 1.7 2007/07/01 21:20:29 karl Exp $
 
    Copyright (C) 1993, 1997, 1998, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,10 +14,9 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-   Written by Brian Fox (address@hidden). */
+  Written by Brian Fox (address@hidden). */
 
 #include "info.h"
 #include "info-utils.h"
Index: info/display.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/display.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- info/display.c      1 Jul 2007 18:46:21 -0000       1.10
+++ info/display.c      1 Jul 2007 21:20:29 -0000       1.11
@@ -1,12 +1,13 @@
 /* display.c -- How to display Info windows.
-   $Id: display.c,v 1.10 2007/07/01 18:46:21 karl Exp $
+   $Id: display.c,v 1.11 2007/07/01 21:20:29 karl Exp $
 
-   Copyright (C) 1993, 1997, 2003, 2004, 2006, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1993, 1997, 2003, 2004, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/display.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/display.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/display.h      1 Jul 2007 18:46:21 -0000       1.5
+++ info/display.h      1 Jul 2007 21:20:29 -0000       1.6
@@ -1,15 +1,15 @@
 /* display.h -- How the display in Info is done.
-   $Id: display.h,v 1.5 2007/07/01 18:46:21 karl Exp $
+   $Id: display.h,v 1.6 2007/07/01 21:20:29 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
    Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/doc.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/doc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/doc.h  1 Jul 2007 18:46:21 -0000       1.5
+++ info/doc.h  1 Jul 2007 21:20:29 -0000       1.6
@@ -1,12 +1,12 @@
 /* doc.h -- Structures associating function pointers with documentation.
-   $Id: doc.h,v 1.5 2007/07/01 18:46:21 karl Exp $
+   $Id: doc.h,v 1.6 2007/07/01 21:20:29 karl Exp $
 
    Copyright (C) 1993, 2001, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/dribble.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/dribble.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/dribble.c      1 Jul 2007 18:46:21 -0000       1.5
+++ info/dribble.c      1 Jul 2007 21:20:29 -0000       1.6
@@ -1,12 +1,12 @@
 /* dribble.c -- dribble files for Info.
-   $Id: dribble.c,v 1.5 2007/07/01 18:46:21 karl Exp $
+   $Id: dribble.c,v 1.6 2007/07/01 21:20:29 karl Exp $
 
    Copyright (C) 1993, 1998, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/dribble.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/dribble.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/dribble.h      1 Jul 2007 18:46:21 -0000       1.5
+++ info/dribble.h      1 Jul 2007 21:20:29 -0000       1.6
@@ -5,10 +5,10 @@
 
    Copyright (C) 1993, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/echo-area.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/echo-area.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- info/echo-area.c    1 Jul 2007 18:46:21 -0000       1.9
+++ info/echo-area.c    1 Jul 2007 21:20:29 -0000       1.10
@@ -1,13 +1,13 @@
 /* echo-area.c -- how to read a line in the echo area.
-   $Id: echo-area.c,v 1.9 2007/07/01 18:46:21 karl Exp $
+   $Id: echo-area.c,v 1.10 2007/07/01 21:20:29 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/echo-area.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/echo-area.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/echo-area.h    1 Jul 2007 18:46:21 -0000       1.6
+++ info/echo-area.h    1 Jul 2007 21:20:29 -0000       1.7
@@ -1,15 +1,15 @@
 /* echo-area.h -- Functions used in reading information from the echo area.
-   $Id: echo-area.h,v 1.6 2007/07/01 18:46:21 karl Exp $
+   $Id: echo-area.h,v 1.7 2007/07/01 21:20:29 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
    Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/filesys.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/filesys.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- info/filesys.c      1 Jul 2007 18:46:21 -0000       1.8
+++ info/filesys.c      1 Jul 2007 21:20:29 -0000       1.9
@@ -1,13 +1,13 @@
 /* filesys.c -- filesystem specific functions.
-   $Id: filesys.c,v 1.8 2007/07/01 18:46:21 karl Exp $
+   $Id: filesys.c,v 1.9 2007/07/01 21:20:29 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2000, 2002, 2003, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2000, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/filesys.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/filesys.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/filesys.h      1 Jul 2007 18:46:21 -0000       1.6
+++ info/filesys.h      1 Jul 2007 21:20:29 -0000       1.7
@@ -1,13 +1,13 @@
 /* filesys.h -- external declarations for filesys.c.
-   $Id: filesys.h,v 1.6 2007/07/01 18:46:21 karl Exp $
+   $Id: filesys.h,v 1.7 2007/07/01 21:20:29 karl Exp $
 
    Copyright (C) 1993, 1997, 1998, 2002, 2004, 2005, 2007 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/footnotes.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/footnotes.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/footnotes.c    1 Jul 2007 18:46:21 -0000       1.6
+++ info/footnotes.c    1 Jul 2007 21:20:29 -0000       1.7
@@ -1,13 +1,13 @@
 /* footnotes.c -- Some functions for manipulating footnotes.
-   $Id: footnotes.c,v 1.6 2007/07/01 18:46:21 karl Exp $
+   $Id: footnotes.c,v 1.7 2007/07/01 21:20:29 karl Exp $
 
    Copyright (C) 1993, 1997, 1998, 1999, 2002, 2004, 2007 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/footnotes.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/footnotes.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/footnotes.h    1 Jul 2007 18:46:21 -0000       1.5
+++ info/footnotes.h    1 Jul 2007 21:20:29 -0000       1.6
@@ -1,12 +1,13 @@
 /* footnotes.h -- Some functions for manipulating footnotes.
-   $Id: footnotes.h,v 1.5 2007/07/01 18:46:21 karl Exp $
+   $Id: footnotes.h,v 1.6 2007/07/01 21:20:29 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/gc.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/gc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/gc.h   1 Jul 2007 18:46:21 -0000       1.5
+++ info/gc.h   1 Jul 2007 21:20:30 -0000       1.6
@@ -1,15 +1,15 @@
 /* gc.h -- Functions for garbage collecting unused node contents.
-   $Id: gc.h,v 1.5 2007/07/01 18:46:21 karl Exp $
+   $Id: gc.h,v 1.6 2007/07/01 21:20:30 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
    Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/indices.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/indices.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- info/indices.c      1 Jul 2007 18:46:21 -0000       1.7
+++ info/indices.c      1 Jul 2007 21:20:30 -0000       1.8
@@ -1,13 +1,13 @@
 /* indices.c -- deal with an Info file index.
-   $Id: indices.c,v 1.7 2007/07/01 18:46:21 karl Exp $
+   $Id: indices.c,v 1.8 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/indices.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/indices.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/indices.h      1 Jul 2007 18:46:21 -0000       1.5
+++ info/indices.h      1 Jul 2007 21:20:30 -0000       1.6
@@ -1,15 +1,15 @@
 /* indices.h -- Functions defined in indices.c.
-   $Id: indices.h,v 1.5 2007/07/01 18:46:21 karl Exp $
+   $Id: indices.h,v 1.6 2007/07/01 21:20:30 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
    Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/info-utils.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info-utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/info-utils.c   1 Jul 2007 18:46:21 -0000       1.6
+++ info/info-utils.c   1 Jul 2007 21:20:30 -0000       1.7
@@ -1,12 +1,12 @@
 /* info-utils.c -- miscellanous.
-   $Id: info-utils.c,v 1.6 2007/07/01 18:46:21 karl Exp $
+   $Id: info-utils.c,v 1.7 2007/07/01 21:20:30 karl Exp $
 
    Copyright (C) 1993, 1998, 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/info-utils.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/info-utils.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/info-utils.h   1 Jul 2007 18:46:21 -0000       1.6
+++ info/info-utils.h   1 Jul 2007 21:20:30 -0000       1.7
@@ -1,13 +1,13 @@
 /* info-utils.h -- Exported functions and variables from info-utils.c.
-   $Id: info-utils.h,v 1.6 2007/07/01 18:46:21 karl Exp $   
+   $Id: info-utils.h,v 1.7 2007/07/01 21:20:30 karl Exp $   
 
    Copyright (C) 1993, 1996, 1998, 2002, 2003, 2004, 2007 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- info/info.c 1 Jul 2007 18:46:21 -0000       1.18
+++ info/info.c 1 Jul 2007 21:20:30 -0000       1.19
@@ -1,13 +1,13 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.18 2007/07/01 18:46:21 karl Exp $
+   $Id: info.c,v 1.19 2007/07/01 21:20:30 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2005, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/info.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/info.h 1 Jul 2007 18:46:22 -0000       1.6
+++ info/info.h 1 Jul 2007 21:20:30 -0000       1.7
@@ -1,13 +1,13 @@
 /* info.h -- Header file which includes all of the other headers.
-   $Id: info.h,v 1.6 2007/07/01 18:46:22 karl Exp $
+   $Id: info.h,v 1.7 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007 Free 
Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/infodoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infodoc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- info/infodoc.c      1 Jul 2007 18:46:22 -0000       1.11
+++ info/infodoc.c      1 Jul 2007 21:20:30 -0000       1.12
@@ -1,13 +1,13 @@
 /* infodoc.c -- functions which build documentation nodes.
-   $Id: infodoc.c,v 1.11 2007/07/01 18:46:22 karl Exp $
+   $Id: infodoc.c,v 1.12 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007 
Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/infokey.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infokey.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- info/infokey.c      1 Jul 2007 18:46:22 -0000       1.14
+++ info/infokey.c      1 Jul 2007 21:20:30 -0000       1.15
@@ -1,13 +1,13 @@
 /* infokey.c -- compile ~/.infokey to ~/.info.
-   $Id: infokey.c,v 1.14 2007/07/01 18:46:22 karl Exp $
+   $Id: infokey.c,v 1.15 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Andrew Bettison <address@hidden>. */
 
Index: info/infokey.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/infokey.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/infokey.h      1 Jul 2007 18:46:22 -0000       1.4
+++ info/infokey.h      1 Jul 2007 21:20:30 -0000       1.5
@@ -1,12 +1,12 @@
 /* infokey.h -- Custom keystroke definition support.
-   $Id: infokey.h,v 1.4 2007/07/01 18:46:22 karl Exp $
+   $Id: infokey.h,v 1.5 2007/07/01 21:20:30 karl Exp $
 
    Copyright (C) 1999, 2002, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Andrew Bettison <address@hidden>.
 
Index: info/infomap.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infomap.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- info/infomap.c      1 Jul 2007 18:46:22 -0000       1.12
+++ info/infomap.c      1 Jul 2007 21:20:30 -0000       1.13
@@ -1,13 +1,13 @@
 /* infomap.c -- keymaps for Info.
-   $Id: infomap.c,v 1.12 2007/07/01 18:46:22 karl Exp $
+   $Id: infomap.c,v 1.13 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007 Free 
Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/infomap.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/infomap.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/infomap.h      1 Jul 2007 18:46:22 -0000       1.5
+++ info/infomap.h      1 Jul 2007 21:20:30 -0000       1.6
@@ -1,12 +1,12 @@
 /* infomap.h -- description of a keymap in Info and related functions.
-   $Id: infomap.h,v 1.5 2007/07/01 18:46:22 karl Exp $
+   $Id: infomap.h,v 1.6 2007/07/01 21:20:30 karl Exp $
 
    Copyright (C) 1993, 2001, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/key.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/key.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- info/key.h  1 Jul 2007 18:46:22 -0000       1.3
+++ info/key.h  1 Jul 2007 21:20:30 -0000       1.4
@@ -5,10 +5,10 @@
 
    Copyright (C) 1993, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Andrew Bettison <address@hidden> */
 
Index: info/m-x.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/m-x.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/m-x.c  1 Jul 2007 18:46:22 -0000       1.5
+++ info/m-x.c  1 Jul 2007 21:20:30 -0000       1.6
@@ -1,13 +1,13 @@
 /* m-x.c -- Meta-x minibuffer reader.
-   $Id: m-x.c,v 1.5 2007/07/01 18:46:22 karl Exp $
+   $Id: m-x.c,v 1.6 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/makedoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/makedoc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- info/makedoc.c      1 Jul 2007 18:46:22 -0000       1.7
+++ info/makedoc.c      1 Jul 2007 21:20:30 -0000       1.8
@@ -1,13 +1,13 @@
 /* makedoc.c -- make doc.c and funs.h from input files.
-   $Id: makedoc.c,v 1.7 2007/07/01 18:46:22 karl Exp $
+   $Id: makedoc.c,v 1.8 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007 Free 
Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/man.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/man.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- info/man.c  1 Jul 2007 18:46:22 -0000       1.8
+++ info/man.c  1 Jul 2007 21:20:30 -0000       1.9
@@ -1,13 +1,13 @@
 /*  man.c: How to read and format man files.
-    $Id: man.c,v 1.8 2007/07/01 18:46:22 karl Exp $
+    $Id: man.c,v 1.9 2007/07/01 21:20:30 karl Exp $
 
    Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox Thu May  4 09:17:52 1995. */
 
Index: info/man.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/man.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/man.h  1 Jul 2007 18:46:22 -0000       1.5
+++ info/man.h  1 Jul 2007 21:20:30 -0000       1.6
@@ -1,15 +1,15 @@
 /* man.h: Defines and external function declarations for man.c.
-   $Id: man.h,v 1.5 2007/07/01 18:46:22 karl Exp $
+   $Id: man.h,v 1.6 2007/07/01 21:20:30 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
    Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Author: Brian J. Fox (address@hidden) Sat May  6 16:19:13 1995. */
 
Index: info/nodemenu.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/nodemenu.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- info/nodemenu.c     1 Jul 2007 18:46:22 -0000       1.7
+++ info/nodemenu.c     1 Jul 2007 21:20:30 -0000       1.8
@@ -1,13 +1,13 @@
 /* nodemenu.c -- produce a menu of all visited nodes.
-   $Id: nodemenu.c,v 1.7 2007/07/01 18:46:22 karl Exp $
+   $Id: nodemenu.c,v 1.8 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/nodes.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/nodes.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- info/nodes.c        1 Jul 2007 18:46:22 -0000       1.8
+++ info/nodes.c        1 Jul 2007 21:20:30 -0000       1.9
@@ -1,13 +1,13 @@
 /* nodes.c -- how to get an Info file and node.
-   $Id: nodes.c,v 1.8 2007/07/01 18:46:22 karl Exp $
+   $Id: nodes.c,v 1.9 2007/07/01 21:20:30 karl Exp $
 
-   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004, 2006, 2007 Free
-   Software Foundation, Inc.
+   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/nodes.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/nodes.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/nodes.h        1 Jul 2007 18:46:22 -0000       1.5
+++ info/nodes.h        1 Jul 2007 21:20:31 -0000       1.6
@@ -1,12 +1,13 @@
 /* nodes.h -- How we represent nodes internally.
-   $Id: nodes.h,v 1.5 2007/07/01 18:46:22 karl Exp $
+   $Id: nodes.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/pcterm.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/pcterm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/pcterm.c       1 Jul 2007 18:46:22 -0000       1.6
+++ info/pcterm.c       1 Jul 2007 21:20:31 -0000       1.7
@@ -1,21 +1,20 @@
 /* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
-   $Id: pcterm.c,v 1.6 2007/07/01 18:46:22 karl Exp $
+   $Id: pcterm.c,v 1.7 2007/07/01 21:20:31 karl Exp $
 
    Copyright (C) 1998, 1999, 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    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.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* WARNING WARNING WARNING!!!
Index: info/search.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/search.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/search.c       1 Jul 2007 18:46:22 -0000       1.5
+++ info/search.c       1 Jul 2007 21:20:31 -0000       1.6
@@ -1,12 +1,13 @@
 /* search.c -- searching large bodies of text.
-   $Id: search.c,v 1.5 2007/07/01 18:46:22 karl Exp $
+   $Id: search.c,v 1.6 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/search.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/search.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/search.h       1 Jul 2007 18:46:22 -0000       1.5
+++ info/search.h       1 Jul 2007 21:20:31 -0000       1.6
@@ -1,12 +1,13 @@
 /* search.h -- Structure used to search large bodies of text, with bounds.
-   $Id: search.h,v 1.5 2007/07/01 18:46:22 karl Exp $
+   $Id: search.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/session.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- info/session.c      1 Jul 2007 18:46:22 -0000       1.18
+++ info/session.c      1 Jul 2007 21:20:31 -0000       1.19
@@ -1,13 +1,13 @@
 /* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.18 2007/07/01 18:46:22 karl Exp $
+   $Id: session.c,v 1.19 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/session.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/session.h      1 Jul 2007 18:46:22 -0000       1.5
+++ info/session.h      1 Jul 2007 21:20:31 -0000       1.6
@@ -1,13 +1,13 @@
 /* session.h -- Functions found in session.c.
-   $Id: session.h,v 1.5 2007/07/01 18:46:22 karl Exp $
+   $Id: session.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/signals.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/signals.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- info/signals.c      1 Jul 2007 18:46:23 -0000       1.9
+++ info/signals.c      1 Jul 2007 21:20:31 -0000       1.10
@@ -1,13 +1,13 @@
 /* signals.c -- install and maintain signal handlers.
-   $Id: signals.c,v 1.9 2007/07/01 18:46:23 karl Exp $
+   $Id: signals.c,v 1.10 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/signals.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/signals.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/signals.h      1 Jul 2007 18:46:23 -0000       1.4
+++ info/signals.h      1 Jul 2007 21:20:31 -0000       1.5
@@ -1,12 +1,13 @@
 /* signals.h -- header to include system dependent signal definitions.
-   $Id: signals.h,v 1.4 2007/07/01 18:46:23 karl Exp $
+   $Id: signals.h,v 1.5 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1994, 1995, 1997, 2002, 2004, 2007 Free Software 
Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1997, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/termdep.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/termdep.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/termdep.h      1 Jul 2007 18:46:23 -0000       1.4
+++ info/termdep.h      1 Jul 2007 21:20:31 -0000       1.5
@@ -1,13 +1,13 @@
 /* termdep.h -- system things that terminal.c depends on.
-   $Id: termdep.h,v 1.4 2007/07/01 18:46:23 karl Exp $
+   $Id: termdep.h,v 1.5 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 1998, 2001, 2002, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 1998, 2001, 2002, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/terminal.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/terminal.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/terminal.c     1 Jul 2007 18:46:23 -0000       1.5
+++ info/terminal.c     1 Jul 2007 21:20:31 -0000       1.6
@@ -1,13 +1,13 @@
 /* terminal.c -- how to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.5 2007/07/01 18:46:23 karl Exp $
+   $Id: terminal.c,v 1.6 2007/07/01 21:20:31 karl Exp $
 
    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998,
    1999, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Brian Fox (address@hidden). */
 
Index: info/terminal.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/terminal.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/terminal.h     1 Jul 2007 18:46:23 -0000       1.5
+++ info/terminal.h     1 Jul 2007 21:20:31 -0000       1.6
@@ -1,13 +1,13 @@
 /* terminal.h -- The external interface to terminal I/O.
-   $Id: terminal.h,v 1.5 2007/07/01 18:46:23 karl Exp $
+   $Id: terminal.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/tilde.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/tilde.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/tilde.c        1 Jul 2007 18:46:23 -0000       1.6
+++ info/tilde.c        1 Jul 2007 21:20:31 -0000       1.7
@@ -1,13 +1,13 @@
 /* tilde.c -- tilde expansion code (~/foo := $HOME/foo).
-   $Id: tilde.c,v 1.6 2007/07/01 18:46:23 karl Exp $
+   $Id: tilde.c,v 1.7 2007/07/01 21:20:31 karl Exp $
 
    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1998, 1999,
    2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/tilde.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/tilde.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/tilde.h        1 Jul 2007 18:46:23 -0000       1.5
+++ info/tilde.h        1 Jul 2007 21:20:31 -0000       1.6
@@ -1,16 +1,16 @@
 /* tilde.h: Externally available variables and function in libtilde.a.
-   $Id: tilde.h,v 1.5 2007/07/01 18:46:23 karl Exp $
+   $Id: tilde.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
    This file has appeared in prior works by the Free Software Foundation;
    thus it carries copyright dates from 1988 through 1993.
 
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,8 +18,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/variables.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/variables.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/variables.c    1 Jul 2007 18:46:23 -0000       1.5
+++ info/variables.c    1 Jul 2007 21:20:31 -0000       1.6
@@ -1,12 +1,13 @@
 /* variables.c -- how to manipulate user visible variables in Info.
-   $Id: variables.c,v 1.5 2007/07/01 18:46:23 karl Exp $
+   $Id: variables.c,v 1.6 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1997, 2001, 2002, 2004, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1993, 1997, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/variables.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/variables.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/variables.h    1 Jul 2007 18:46:23 -0000       1.5
+++ info/variables.h    1 Jul 2007 21:20:31 -0000       1.6
@@ -1,15 +1,15 @@
 /* variables.h -- Description of user visible variables in Info.
-   $Id: variables.h,v 1.5 2007/07/01 18:46:23 karl Exp $
+   $Id: variables.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
    Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/window.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/window.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/window.c       1 Jul 2007 18:46:23 -0000       1.6
+++ info/window.c       1 Jul 2007 21:20:31 -0000       1.7
@@ -1,13 +1,13 @@
 /* window.c -- windows in Info.
-   $Id: window.c,v 1.6 2007/07/01 18:46:23 karl Exp $
+   $Id: window.c,v 1.7 2007/07/01 21:20:31 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: info/window.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/window.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/window.h       1 Jul 2007 18:46:23 -0000       1.5
+++ info/window.h       1 Jul 2007 21:20:31 -0000       1.6
@@ -1,15 +1,15 @@
 /* window.h -- Structure and flags used in manipulating Info windows.
-   $Id: window.h,v 1.5 2007/07/01 18:46:23 karl Exp $
+   $Id: window.h,v 1.6 2007/07/01 21:20:31 karl Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
    Copyright (C) 1993, 1997, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: lib/substring.c
===================================================================
RCS file: /sources/texinfo/texinfo/lib/substring.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lib/substring.c     1 Jul 2007 18:46:23 -0000       1.4
+++ lib/substring.c     1 Jul 2007 21:20:31 -0000       1.5
@@ -1,21 +1,20 @@
 /* substring.c -- extract substring.
-   $Id: substring.c,v 1.4 2007/07/01 18:46:23 karl Exp $
+   $Id: substring.c,v 1.5 2007/07/01 21:20:31 karl Exp $
 
    Copyright (C) 1999, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    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.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 
Index: lib/xexit.c
===================================================================
RCS file: /sources/texinfo/texinfo/lib/xexit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lib/xexit.c 1 Jul 2007 18:46:23 -0000       1.7
+++ lib/xexit.c 1 Jul 2007 21:20:31 -0000       1.8
@@ -1,21 +1,21 @@
 /* xexit.c -- exit with attention to return values and closing stdout.
-   $Id: xexit.c,v 1.7 2007/07/01 18:46:23 karl Exp $
+   $Id: xexit.c,v 1.8 2007/07/01 21:20:31 karl Exp $
 
    Copyright (C) 1999, 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    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.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
 
 #include "system.h"
 
Index: makeinfo/cmds.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- makeinfo/cmds.c     1 Jul 2007 18:31:41 -0000       1.72
+++ makeinfo/cmds.c     1 Jul 2007 21:20:31 -0000       1.73
@@ -1,13 +1,13 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.72 2007/07/01 18:31:41 karl Exp $
+   $Id: cmds.c,v 1.73 2007/07/01 21:20:31 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "mbswidth.h"
Index: makeinfo/cmds.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- makeinfo/cmds.h     1 Jul 2007 18:31:41 -0000       1.11
+++ makeinfo/cmds.h     1 Jul 2007 21:20:32 -0000       1.12
@@ -1,22 +1,21 @@
 /* cmds.h -- declarations for cmds.c.
-   $Id: cmds.h,v 1.11 2007/07/01 18:31:41 karl Exp $
+   $Id: cmds.h,v 1.12 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2004, 2007 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    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.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef CMDS_H
 #define CMDS_H
Index: makeinfo/defun.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/defun.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- makeinfo/defun.c    1 Jul 2007 18:31:41 -0000       1.16
+++ makeinfo/defun.c    1 Jul 2007 21:20:32 -0000       1.17
@@ -1,13 +1,13 @@
 /* defun.c -- @defun and friends.
-   $Id: defun.c,v 1.16 2007/07/01 18:31:41 karl Exp $
+   $Id: defun.c,v 1.17 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "defun.h"
Index: makeinfo/defun.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/defun.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- makeinfo/defun.h    1 Jul 2007 18:31:41 -0000       1.5
+++ makeinfo/defun.h    1 Jul 2007 21:20:32 -0000       1.6
@@ -1,12 +1,12 @@
 /* defun.h -- declaration for defuns.
-   $Id: defun.h,v 1.5 2007/07/01 18:31:41 karl Exp $
+   $Id: defun.h,v 1.6 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1999, 2005, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Karl Heinz Marbaise <address@hidden>.  */
 
Index: makeinfo/files.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/files.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makeinfo/files.c    1 Jul 2007 18:31:42 -0000       1.7
+++ makeinfo/files.c    1 Jul 2007 21:20:32 -0000       1.8
@@ -1,13 +1,13 @@
 /* files.c -- file-related functions for makeinfo.
-   $Id: files.c,v 1.7 2007/07/01 18:31:42 karl Exp $
+   $Id: files.c,v 1.8 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "files.h"
Index: makeinfo/files.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/files.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- makeinfo/files.h    1 Jul 2007 18:31:42 -0000       1.6
+++ makeinfo/files.h    1 Jul 2007 21:20:32 -0000       1.7
@@ -1,12 +1,12 @@
 /* files.h -- declarations for files.c.
-   $Id: files.h,v 1.6 2007/07/01 18:31:42 karl Exp $
+   $Id: files.h,v 1.7 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1998, 2002, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
-   */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef FILES_H
 #define FILES_H
Index: makeinfo/float.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- makeinfo/float.c    1 Jul 2007 18:31:42 -0000       1.11
+++ makeinfo/float.c    1 Jul 2007 21:20:32 -0000       1.12
@@ -1,12 +1,12 @@
 /* float.c -- float environment functions.
-   $Id: float.c,v 1.11 2007/07/01 18:31:42 karl Exp $
+   $Id: float.c,v 1.12 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Alper Ersoy <address@hidden>.  */
 
Index: makeinfo/float.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/float.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makeinfo/float.h    1 Jul 2007 18:31:42 -0000       1.7
+++ makeinfo/float.h    1 Jul 2007 21:20:32 -0000       1.8
@@ -1,12 +1,12 @@
 /* float.h -- declarations for the float environment.
-   $Id: float.h,v 1.7 2007/07/01 18:31:42 karl Exp $
+   $Id: float.h,v 1.8 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Alper Ersoy <address@hidden>.  */
 
Index: makeinfo/footnote.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/footnote.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- makeinfo/footnote.c 1 Jul 2007 18:31:42 -0000       1.10
+++ makeinfo/footnote.c 1 Jul 2007 21:20:32 -0000       1.11
@@ -1,12 +1,12 @@
 /* footnote.c -- footnotes for Texinfo.
-   $Id: footnote.c,v 1.10 2007/07/01 18:31:42 karl Exp $
+   $Id: footnote.c,v 1.11 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1998, 1999, 2002, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "footnote.h"
Index: makeinfo/footnote.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/footnote.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makeinfo/footnote.h 1 Jul 2007 18:31:42 -0000       1.4
+++ makeinfo/footnote.h 1 Jul 2007 21:20:32 -0000       1.5
@@ -1,13 +1,13 @@
 /* footnote.h -- declarations for footnote.c.
-   $Id: footnote.h,v 1.4 2007/07/01 18:31:42 karl Exp $
+   $Id: footnote.h,v 1.5 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
-   */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef FOOTNOTE_H
 #define FOOTNOTE_H
Index: makeinfo/html.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- makeinfo/html.c     1 Jul 2007 18:31:42 -0000       1.38
+++ makeinfo/html.c     1 Jul 2007 21:20:32 -0000       1.39
@@ -1,13 +1,13 @@
 /* html.c -- html-related utilities.
-   $Id: html.c,v 1.38 2007/07/01 18:31:42 karl Exp $
+   $Id: html.c,v 1.39 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
Index: makeinfo/html.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- makeinfo/html.h     1 Jul 2007 18:31:42 -0000       1.9
+++ makeinfo/html.h     1 Jul 2007 21:20:32 -0000       1.10
@@ -1,12 +1,12 @@
 /* html.h -- declarations for html-related utilities.
-   $Id: html.h,v 1.9 2007/07/01 18:31:42 karl Exp $
+   $Id: html.h,v 1.10 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1999, 2000, 2002, 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef HTML_H
 #define HTML_H
Index: makeinfo/index.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- makeinfo/index.c    1 Jul 2007 18:31:42 -0000       1.23
+++ makeinfo/index.c    1 Jul 2007 21:20:32 -0000       1.24
@@ -1,13 +1,13 @@
 /* index.c -- indexing for Texinfo.
-   $Id: index.c,v 1.23 2007/07/01 18:31:42 karl Exp $
+   $Id: index.c,v 1.24 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2004, 2007 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "mbswidth.h"
Index: makeinfo/index.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/index.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makeinfo/index.h    1 Jul 2007 18:31:42 -0000       1.4
+++ makeinfo/index.h    1 Jul 2007 21:20:32 -0000       1.5
@@ -1,12 +1,12 @@
 /* index.h -- declarations for index.c.
-   $Id: index.h,v 1.4 2007/07/01 18:31:42 karl Exp $
+   $Id: index.h,v 1.5 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 99, 07 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef INDEX_H
 #define INDEX_H
Index: makeinfo/insertion.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- makeinfo/insertion.c        1 Jul 2007 18:31:42 -0000       1.63
+++ makeinfo/insertion.c        1 Jul 2007 21:20:32 -0000       1.64
@@ -1,13 +1,13 @@
 /* insertion.c -- insertions for Texinfo.
-   $Id: insertion.c,v 1.63 2007/07/01 18:31:42 karl Exp $
+   $Id: insertion.c,v 1.64 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
Index: makeinfo/insertion.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- makeinfo/insertion.h        1 Jul 2007 18:31:43 -0000       1.13
+++ makeinfo/insertion.h        1 Jul 2007 21:20:32 -0000       1.14
@@ -1,12 +1,13 @@
 /* insertion.h -- declarations for insertion.c.
-   $Id: insertion.h,v 1.13 2007/07/01 18:31:43 karl Exp $
+   $Id: insertion.h,v 1.14 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef INSERTION_H
 #define INSERTION_H
Index: makeinfo/lang.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- makeinfo/lang.c     1 Jul 2007 18:31:43 -0000       1.26
+++ makeinfo/lang.c     1 Jul 2007 21:20:32 -0000       1.27
@@ -1,13 +1,13 @@
 /* lang.c -- language-dependent support.
-   $Id: lang.c,v 1.26 2007/07/01 18:31:43 karl Exp $
+   $Id: lang.c,v 1.27 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
-   Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Karl Heinz Marbaise <address@hidden>.  */
 
Index: makeinfo/lang.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- makeinfo/lang.h     1 Jul 2007 18:31:43 -0000       1.12
+++ makeinfo/lang.h     1 Jul 2007 21:20:32 -0000       1.13
@@ -1,13 +1,13 @@
 /* lang.h -- declarations for language codes etc.
-   $Id: lang.h,v 1.12 2007/07/01 18:31:43 karl Exp $
+   $Id: lang.h,v 1.13 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1999, 2001, 2002, 2003, 2006, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Karl Heinz Marbaise <address@hidden>.  */
 
Index: makeinfo/macro.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/macro.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- makeinfo/macro.c    1 Jul 2007 18:31:43 -0000       1.11
+++ makeinfo/macro.c    1 Jul 2007 21:20:32 -0000       1.12
@@ -1,12 +1,13 @@
 /* macro.c -- user-defined macros for Texinfo.
-   $Id: macro.c,v 1.11 2007/07/01 18:31:43 karl Exp $
+   $Id: macro.c,v 1.12 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2005, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
Index: makeinfo/macro.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/macro.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- makeinfo/macro.h    1 Jul 2007 18:31:43 -0000       1.5
+++ makeinfo/macro.h    1 Jul 2007 21:20:32 -0000       1.6
@@ -1,12 +1,12 @@
 /* macro.h -- declarations for macro.c.
-   $Id: macro.h,v 1.5 2007/07/01 18:31:43 karl Exp $
+   $Id: macro.h,v 1.6 2007/07/01 21:20:32 karl Exp $
 
-   Copyright (C) 1998, 99, 07 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
-   */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef MACRO_H
 #define MACRO_H
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- makeinfo/makeinfo.c 1 Jul 2007 18:31:43 -0000       1.101
+++ makeinfo/makeinfo.c 1 Jul 2007 21:20:32 -0000       1.102
@@ -1,14 +1,14 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.101 2007/07/01 18:31:43 karl Exp $
+   $Id: makeinfo.c,v 1.102 2007/07/01 21:20:32 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Original author of makeinfo: Brian Fox (address@hidden).  */
 
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- makeinfo/makeinfo.h 1 Jul 2007 18:31:43 -0000       1.26
+++ makeinfo/makeinfo.h 1 Jul 2007 21:20:33 -0000       1.27
@@ -1,13 +1,13 @@
 /* makeinfo.h -- declarations for Makeinfo.
-   $Id: makeinfo.h,v 1.26 2007/07/01 18:31:43 karl Exp $
+   $Id: makeinfo.h,v 1.27 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    2005, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: makeinfo/multi.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/multi.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- makeinfo/multi.c    1 Jul 2007 18:31:44 -0000       1.17
+++ makeinfo/multi.c    1 Jul 2007 21:20:33 -0000       1.18
@@ -1,13 +1,13 @@
 /* multi.c -- multiple-column tables (@multitable) for makeinfo.
-   $Id: multi.c,v 1.17 2007/07/01 18:31:44 karl Exp $
+   $Id: multi.c,v 1.18 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,8 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-   
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
    Originally written by address@hidden (Paul Rubin).  */
 
 #include "system.h"
Index: makeinfo/multi.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/multi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makeinfo/multi.h    1 Jul 2007 18:31:44 -0000       1.3
+++ makeinfo/multi.h    1 Jul 2007 21:20:33 -0000       1.4
@@ -1,12 +1,12 @@
 /* multi.h -- declarations for multi.c.
-   $Id: multi.h,v 1.3 2007/07/01 18:31:44 karl Exp $
+   $Id: multi.h,v 1.4 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
-   */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef MULTI_H
 #define MULTI_H
Index: makeinfo/node.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/node.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- makeinfo/node.c     1 Jul 2007 18:31:44 -0000       1.35
+++ makeinfo/node.c     1 Jul 2007 21:20:33 -0000       1.36
@@ -1,13 +1,13 @@
 /* node.c -- nodes for Texinfo.
-   $Id: node.c,v 1.35 2007/07/01 18:31:44 karl Exp $
+   $Id: node.c,v 1.36 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
Index: makeinfo/node.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/node.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makeinfo/node.h     1 Jul 2007 18:31:44 -0000       1.4
+++ makeinfo/node.h     1 Jul 2007 21:20:33 -0000       1.5
@@ -1,12 +1,13 @@
 /* node.h -- declarations for Node.
-   $Id: node.h,v 1.4 2007/07/01 18:31:44 karl Exp $
+   $Id: node.h,v 1.5 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2002, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2002, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Brian Fox (address@hidden). */
 
Index: makeinfo/sectioning.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/sectioning.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- makeinfo/sectioning.c       1 Jul 2007 18:31:44 -0000       1.28
+++ makeinfo/sectioning.c       1 Jul 2007 21:20:33 -0000       1.29
@@ -1,12 +1,13 @@
 /* sectioning.c -- for @chapter, @section, ..., @contents ...
-   $Id: sectioning.c,v 1.28 2007/07/01 18:31:44 karl Exp $
+   $Id: sectioning.c,v 1.29 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Karl Heinz Marbaise <address@hidden>.  */
 
Index: makeinfo/sectioning.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/sectioning.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makeinfo/sectioning.h       1 Jul 2007 18:31:44 -0000       1.7
+++ makeinfo/sectioning.h       1 Jul 2007 21:20:33 -0000       1.8
@@ -1,12 +1,12 @@
 /* sectioning.h -- all related stuff @chapter, @section... @contents
-   $Id: sectioning.h,v 1.7 2007/07/01 18:31:44 karl Exp $
+   $Id: sectioning.h,v 1.8 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 1999, 2003, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Karl Heinz Marbaise <address@hidden>.  */
 
Index: makeinfo/toc.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/toc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- makeinfo/toc.c      1 Jul 2007 18:31:44 -0000       1.9
+++ makeinfo/toc.c      1 Jul 2007 21:20:33 -0000       1.10
@@ -1,12 +1,13 @@
 /* toc.c -- table of contents handling.
-   $Id: toc.c,v 1.9 2007/07/01 18:31:44 karl Exp $
+   $Id: toc.c,v 1.10 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2007 Free Software Foundation, 
Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Karl Heinz Marbaise <address@hidden>.  */
 
Index: makeinfo/toc.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/toc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makeinfo/toc.h      1 Jul 2007 18:31:44 -0000       1.4
+++ makeinfo/toc.h      1 Jul 2007 21:20:33 -0000       1.5
@@ -1,12 +1,12 @@
 /* toc.h -- table of contents handling.
-   $Id: toc.h,v 1.4 2007/07/01 18:31:44 karl Exp $
+   $Id: toc.h,v 1.5 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 1999, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Karl Heinz Marbaise <address@hidden>.  */
 
Index: makeinfo/xml.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- makeinfo/xml.c      1 Jul 2007 18:31:44 -0000       1.71
+++ makeinfo/xml.c      1 Jul 2007 21:20:33 -0000       1.72
@@ -1,13 +1,13 @@
 /* xml.c -- xml output, both TexinfoML and Docbook.
-   $Id: xml.c,v 1.71 2007/07/01 18:31:44 karl Exp $
+   $Id: xml.c,v 1.72 2007/07/01 21:20:33 karl Exp $
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Philippe Martin <address@hidden>.  */
 
Index: makeinfo/xml.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- makeinfo/xml.h      1 Jul 2007 18:31:45 -0000       1.29
+++ makeinfo/xml.h      1 Jul 2007 21:20:33 -0000       1.30
@@ -1,13 +1,13 @@
 /* xml.h -- xml (including Docbook) output declarations.
-   $Id: xml.h,v 1.29 2007/07/01 18:31:45 karl Exp $
+   $Id: xml.h,v 1.30 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Originally written by Philippe Martin <address@hidden>.  */
 
Index: makeinfo/xref.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- makeinfo/xref.c     1 Jul 2007 18:31:45 -0000       1.11
+++ makeinfo/xref.c     1 Jul 2007 21:20:33 -0000       1.12
@@ -1,12 +1,12 @@
 /* xref.c -- cross references for Texinfo.
-   $Id: xref.c,v 1.11 2007/07/01 18:31:45 karl Exp $
+   $Id: xref.c,v 1.12 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include "cmds.h"
Index: makeinfo/xref.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makeinfo/xref.h     1 Jul 2007 18:31:45 -0000       1.3
+++ makeinfo/xref.h     1 Jul 2007 21:20:33 -0000       1.4
@@ -1,12 +1,12 @@
 /* xref.h -- declarations for the cross references.
-   $Id: xref.h,v 1.3 2007/07/01 18:31:45 karl Exp $
+   $Id: xref.h,v 1.4 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef XREF_H
 #define XREF_H
Index: util/deref.c
===================================================================
RCS file: /sources/texinfo/texinfo/util/deref.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util/deref.c        15 May 2005 00:00:08 -0000      1.2
+++ util/deref.c        1 Jul 2007 21:20:33 -0000       1.3
@@ -8,11 +8,11 @@
  * Written: December, 1991
  * Released: November, 1998
  *
- * Copyright, 1991, 1998 Arnold David Robbins
+ * Copyright 1991, 1998 Arnold David Robbins
  *
  * DEREF is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * DEREF is distributed in the hope that it will be useful,
@@ -21,8 +21,7 @@
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
Index: util/install-info.c
===================================================================
RCS file: /sources/texinfo/texinfo/util/install-info.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- util/install-info.c 1 Jul 2007 15:35:46 -0000       1.17
+++ util/install-info.c 1 Jul 2007 21:20:33 -0000       1.18
@@ -1,12 +1,12 @@
 /* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.17 2007/07/01 15:35:46 karl Exp $
+   $Id: install-info.c,v 1.18 2007/07/01 21:20:33 karl Exp $
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    2005, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include <getopt.h>
Index: util/texi-docstring-magic.el
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi-docstring-magic.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util/texi-docstring-magic.el        11 Apr 2004 17:56:47 -0000      1.2
+++ util/texi-docstring-magic.el        1 Jul 2007 21:20:33 -0000       1.3
@@ -5,10 +5,10 @@
 ;; Copyright (C) 1998 David Aspinall
 ;; Maintainer:  David Aspinall <address@hidden>
 ;;
-;; $Id: texi-docstring-magic.el,v 1.2 2004/04/11 17:56:47 karl Exp $
+;; $Id: texi-docstring-magic.el,v 1.3 2007/07/01 21:20:33 karl Exp $
 ;;
 ;; This package is distributed under the terms of the 
-;; GNU General Public License, Version 2.   
+;; GNU General Public License, Version 3.
 ;; You should have a copy of the GPL with your version of 
 ;; GNU Emacs or the Texinfo distribution.
 ;; 
Index: util/texindex.c
===================================================================
RCS file: /sources/texinfo/texinfo/util/texindex.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- util/texindex.c     1 Jul 2007 18:46:24 -0000       1.21
+++ util/texindex.c     1 Jul 2007 21:20:34 -0000       1.22
@@ -1,13 +1,13 @@
 /* texindex -- sort TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.21 2007/07/01 18:46:24 karl Exp $
+   $Id: texindex.c,v 1.22 2007/07/01 21:20:34 karl Exp $
 
    Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
    2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "system.h"
 #include <getopt.h>
P system.h
P doc/texi2dvi.1
P doc/txi-ru.tex
P doc/txi-uk.tex
P info/dir.c
P info/display.c
P info/display.h
P info/doc.h
P info/dribble.c
P info/dribble.h
P info/echo-area.c
P info/echo-area.h
P info/filesys.c
P info/filesys.h
P info/footnotes.c
P info/footnotes.h
P info/gc.h
P info/indices.c
P info/indices.h
P info/info-utils.c
P info/info-utils.h
P info/info.c
P info/info.h
P info/infodoc.c
P info/infokey.c
P info/infokey.h
P info/infomap.c
P info/infomap.h
P info/key.h
P info/m-x.c
P info/makedoc.c
P info/man.c
P info/man.h
P info/nodemenu.c
P info/nodes.c
P info/nodes.h
P info/pcterm.c
P info/search.c
P info/search.h
P info/session.c
P info/session.h
P info/signals.c
P info/signals.h
P info/termdep.h
P info/terminal.c
P info/terminal.h
P info/tilde.c
P info/tilde.h
P info/variables.c
P info/variables.h
P info/window.c
P info/window.h
P lib/substring.c
P lib/xexit.c
P makeinfo/cmds.c
P makeinfo/cmds.h
P makeinfo/defun.c
P makeinfo/defun.h
P makeinfo/files.c
P makeinfo/files.h
P makeinfo/float.c
P makeinfo/float.h
P makeinfo/footnote.c
P makeinfo/footnote.h
P makeinfo/html.c
P makeinfo/html.h
P makeinfo/index.c
P makeinfo/index.h
P makeinfo/insertion.c
P makeinfo/insertion.h
P makeinfo/lang.c
P makeinfo/lang.h
P makeinfo/macro.c
P makeinfo/macro.h
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h
P makeinfo/multi.c
P makeinfo/multi.h
P makeinfo/node.c
P makeinfo/node.h
P makeinfo/sectioning.c
P makeinfo/sectioning.h
P makeinfo/toc.c
P makeinfo/toc.h
P makeinfo/xml.c
P makeinfo/xml.h
P makeinfo/xref.c
P makeinfo/xref.h
P util/deref.c
P util/install-info.c
P util/texi-docstring-magic.el
P util/texindex.c




reply via email to

[Prev in Thread] Current Thread [Next in Thread]