Remove old FSF address and point at FSF website instead.

Thanks Dan Callaghan.

19 files changed, 19 insertions, 39 deletions

diff --git a/fastimport/__init__.py b/fastimport/__init__.py
index 0e2570e..d9dfffd 100644
--- a/fastimport/__init__.py
+++ b/fastimport/__init__.py
@@ -11,8 +11,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/>.
 
 """Fastimport streams."""
 
diff --git a/fastimport/commands.py b/fastimport/commands.py
index 957928e..c1a4d05 100644
--- a/fastimport/commands.py
+++ b/fastimport/commands.py
@@ -11,8 +11,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/>.
 
 """Import command classes."""
 
diff --git a/fastimport/dates.py b/fastimport/dates.py
index ba484ef..c467ff7 100644
--- a/fastimport/dates.py
+++ b/fastimport/dates.py
@@ -11,8 +11,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/>.
 
 """Date parsing routines.
 
diff --git a/fastimport/errors.py b/fastimport/errors.py
index f2d5d88..068af6f 100644
--- a/fastimport/errors.py
+++ b/fastimport/errors.py
@@ -11,8 +11,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/>.
 
 """Exception classes for fastimport"""
 
diff --git a/fastimport/helpers.py b/fastimport/helpers.py
index a80a1f4..52c5b88 100644
--- a/fastimport/helpers.py
+++ b/fastimport/helpers.py
@@ -11,8 +11,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/>.
 
 """Miscellaneous useful stuff."""
 
diff --git a/fastimport/idmapfile.py b/fastimport/idmapfile.py
index 7b4ccf4..669dbce 100644
--- a/fastimport/idmapfile.py
+++ b/fastimport/idmapfile.py
@@ -11,8 +11,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/>.
 
 """Routines for saving and loading the id-map file."""
 
diff --git a/fastimport/parser.py b/fastimport/parser.py
index befff2a..7612ac0 100644
--- a/fastimport/parser.py
+++ b/fastimport/parser.py
@@ -11,8 +11,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/>.
 
 """Parser of import data into command objects.
 
diff --git a/fastimport/processor.py b/fastimport/processor.py
index 2455b4d..df00e2d 100644
--- a/fastimport/processor.py
+++ b/fastimport/processor.py
@@ -11,8 +11,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/>.
 
 """Processor of import commands.
 
diff --git a/fastimport/processors/filter_processor.py b/fastimport/processors/filter_processor.py
index 2445ae2..954c2e8 100644
--- a/fastimport/processors/filter_processor.py
+++ b/fastimport/processors/filter_processor.py
@@ -11,8 +11,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/>.
 
 """Import processor that filters the input (and doesn't import)."""
 
diff --git a/fastimport/processors/info_processor.py b/fastimport/processors/info_processor.py
index d35aaff..e4969b1 100644
--- a/fastimport/processors/info_processor.py
+++ b/fastimport/processors/info_processor.py
@@ -11,8 +11,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/>.
 
 """Import processor that dump stats about the input (and doesn't import)."""
 
diff --git a/fastimport/processors/query_processor.py b/fastimport/processors/query_processor.py
index fd9695c..c2e750f 100644
--- a/fastimport/processors/query_processor.py
+++ b/fastimport/processors/query_processor.py
@@ -11,8 +11,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/>.
 
 """Import processor that queries the input (and doesn't import)."""
 
diff --git a/fastimport/reftracker.py b/fastimport/reftracker.py
index 3862180..44136c7 100644
--- a/fastimport/reftracker.py
+++ b/fastimport/reftracker.py
@@ -11,8 +11,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/>.
 
 
 """Tracker of refs."""
diff --git a/fastimport/tests/__init__.py b/fastimport/tests/__init__.py
index 3a8e69f..3bedc42 100644
--- a/fastimport/tests/__init__.py
+++ b/fastimport/tests/__init__.py
@@ -13,9 +13,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/>.
 
 """Tests for fastimport."""
 
diff --git a/fastimport/tests/test_commands.py b/fastimport/tests/test_commands.py
index c887235..7da7e11 100644
--- a/fastimport/tests/test_commands.py
+++ b/fastimport/tests/test_commands.py
@@ -11,8 +11,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/>.
 
 """Test how Commands are displayed"""
 
diff --git a/fastimport/tests/test_errors.py b/fastimport/tests/test_errors.py
index 2b6b69d..bdd73b9 100644
--- a/fastimport/tests/test_errors.py
+++ b/fastimport/tests/test_errors.py
@@ -11,8 +11,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/>.
 
 """Test the Import errors"""
 
diff --git a/fastimport/tests/test_filter_processor.py b/fastimport/tests/test_filter_processor.py
index af107d3..ad040d7 100644
--- a/fastimport/tests/test_filter_processor.py
+++ b/fastimport/tests/test_filter_processor.py
@@ -11,8 +11,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/>.
 
 """Test FilterProcessor"""
 
diff --git a/fastimport/tests/test_head_tracking.py b/fastimport/tests/test_head_tracking.py
index 4a2a018..27b8ffe 100644
--- a/fastimport/tests/test_head_tracking.py
+++ b/fastimport/tests/test_head_tracking.py
@@ -11,8 +11,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/>.
 
 """Test tracking of heads"""
 
diff --git a/fastimport/tests/test_helpers.py b/fastimport/tests/test_helpers.py
index 639e436..64aee24 100644
--- a/fastimport/tests/test_helpers.py
+++ b/fastimport/tests/test_helpers.py
@@ -11,8 +11,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/>.
 
 """Test the helper functions."""
 
diff --git a/fastimport/tests/test_parser.py b/fastimport/tests/test_parser.py
index 6832df3..06270a8 100644
--- a/fastimport/tests/test_parser.py
+++ b/fastimport/tests/test_parser.py
@@ -11,8 +11,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/>.
 
 """Test the Import parsing"""