Update FSF address, add copyrights.1.1.3

4 files changed, 26 insertions, 21 deletions

diff --git a/COPYING b/COPYING
index 8def504..56a6c97 100644
--- a/COPYING
+++ b/COPYING
@@ -1,17 +1,15 @@
 Password Store is Copyright (C) 2012 Jason A. Donenfeld <Jason@zx2c4.com>.
 
-
-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 (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 MER‐
-CHANTABILITY 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.,
-675 Mass Ave, Cambridge, MA 02139, USA.
-
+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 (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.
diff --git a/bash-completion/pass-bash-completion.sh b/bash-completion/pass-bash-completion.sh
index 2decd7c..8ddc377 100644
--- a/bash-completion/pass-bash-completion.sh
+++ b/bash-completion/pass-bash-completion.sh
@@ -1,4 +1,8 @@
 # completion file for bash
+
+# (C) Copyright 2012 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+# This is released under the GPLv2+. Please see COPYING for more information.
+
 _pass()
 {
 	local cur prev prefix suffix gen
diff --git a/man/pass.1 b/man/pass.1
index 7ffb540..a65861a 100644
--- a/man/pass.1
+++ b/man/pass.1
@@ -313,16 +313,16 @@ be set using the \fBinit\fP command.
 Jason A. Donenfeld <Jason@zx2c4.com>
 
 .SH COPYING
-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
-(at your option) any later version.
+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 (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
+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., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
diff --git a/src/password-store.sh b/src/password-store.sh
index fd2a195..e22e8c9 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# (C) Copyright 2012 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+# This is released under the GPLv2+. Please see COPYING for more information.
+
 umask 077
 
 PREFIX="$HOME/.password-store"