Updated FSF addressalpha_0_6_90

22 files changed, 48 insertions, 27 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index f4b5b3f4a..d00cdc68e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -14,7 +14,8 @@
 ##
 ##   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
+##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
+##   02110-1301 USA
 
 SUBDIRS = config cpp scheme
 
diff --git a/examples/addr.c b/examples/addr.c
index ed0affca4..072ae796e 100644
--- a/examples/addr.c
+++ b/examples/addr.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/examples/base64.c b/examples/base64.c
index 34bec0899..e8fcb90fb 100644
--- a/examples/base64.c
+++ b/examples/base64.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/examples/config/Makefile.am b/examples/config/Makefile.am
index 672334e1e..02f1f22db 100644
--- a/examples/config/Makefile.am
+++ b/examples/config/Makefile.am
@@ -14,7 +14,8 @@
 ##
 ##   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
+##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
+##   02110-1301 USA
 
 EXTRA_DIST = comsat.conf dot.biffrc gnu-imap4d.pam gnu-pop3d.pam\
  mailutils.rc
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index eadc5d6f8..310c3d784 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -14,5 +14,6 @@
 ##
 ##   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
+##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
+##   02110-1301 USA
 
diff --git a/examples/decode2047.c b/examples/decode2047.c
index 5dc993436..f0bb4c639 100644
--- a/examples/decode2047.c
+++ b/examples/decode2047.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/examples/http.c b/examples/http.c
index 66c573a4f..6713463b8 100644
--- a/examples/http.c
+++ b/examples/http.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 /* This is an example program to illustrate the use of stream functions.
    It connects to a remote HTTP server and prints the contents of its
diff --git a/examples/iconv.c b/examples/iconv.c
index 906942a45..da45ea9e1 100644
--- a/examples/iconv.c
+++ b/examples/iconv.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/examples/listop.c b/examples/listop.c
index 41ed66056..324961c62 100644
--- a/examples/listop.c
+++ b/examples/listop.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/examples/mailcap.c b/examples/mailcap.c
index 81ef71906..8ed5f5dd2 100644
--- a/examples/mailcap.c
+++ b/examples/mailcap.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <stdio.h>
 #include <mailutils/mailcap.h>
diff --git a/examples/mimetest.c b/examples/mimetest.c
index 3e692a7d4..385e217e6 100644
--- a/examples/mimetest.c
+++ b/examples/mimetest.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/examples/msg-send.c b/examples/msg-send.c
index b07117d17..e9731ec49 100644
--- a/examples/msg-send.c
+++ b/examples/msg-send.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/examples/mta.c b/examples/mta.c
index 771623aba..60949ab40 100644
--- a/examples/mta.c
+++ b/examples/mta.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 /* This is a "fake" mta designed for testing purposes. It imitates
    sendmail sending and daemon modes. It does not actually send anything,
diff --git a/examples/muemail.c b/examples/muemail.c
index 9553ab2d6..852606171 100644
--- a/examples/muemail.c
+++ b/examples/muemail.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <mailutils/mutil.h>
 #include <mailutils/argp.h>
diff --git a/examples/murun.c b/examples/murun.c
index c62eec377..97fc4d979 100644
--- a/examples/murun.c
+++ b/examples/murun.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/examples/nntpclient.c b/examples/nntpclient.c
index c0e513f91..97ce9d85b 100644
--- a/examples/nntpclient.c
+++ b/examples/nntpclient.c
@@ -16,7 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
diff --git a/examples/numaddr.c b/examples/numaddr.c
index 628e66b32..7dcce22bd 100644
--- a/examples/numaddr.c
+++ b/examples/numaddr.c
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with GNU Mailutils; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 /*  This is an example on how to write extension tests for GNU sieve.
     It provides test "numaddr".
diff --git a/examples/pop3client.c b/examples/pop3client.c
index 4717ae0c2..b12802a11 100644
--- a/examples/pop3client.c
+++ b/examples/pop3client.c
@@ -16,7 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
diff --git a/examples/scheme/Makefile.am b/examples/scheme/Makefile.am
index 292ef9eca..f34206072 100644
--- a/examples/scheme/Makefile.am
+++ b/examples/scheme/Makefile.am
@@ -14,7 +14,8 @@
 ##
 ##   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
+##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
+##   02110-1301 USA
 
 EXTRA_DIST = reply.scm
 
diff --git a/examples/scheme/reply.scm b/examples/scheme/reply.scm
index 63738f394..4f6e42f46 100644
--- a/examples/scheme/reply.scm
+++ b/examples/scheme/reply.scm
@@ -11,9 +11,9 @@
 ;;;; 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 GNU Mailutils; if not, write to the Free Software
-;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+;;;; You should have received a copy of the GNU General Public License along
+;;;; with GNU Mailutils; if not, write to the Free Software Foundation,
+;;;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ;;; This is a simple Guile program that generates automatic reply to 
 ;;; incoming mail messages.
@@ -77,4 +77,4 @@ Kind regards\n")
   (reply msg))	
     
     
-	
\ No newline at end of file
+	
diff --git a/examples/sfrom.c b/examples/sfrom.c
index 1acace6fd..0e6db7808 100644
--- a/examples/sfrom.c
+++ b/examples/sfrom.c
@@ -14,7 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/examples/url-parse.c b/examples/url-parse.c
index 9aea15b87..79172f6de 100644
--- a/examples/url-parse.c
+++ b/examples/url-parse.c
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
 
 #include <stdio.h>
 #include <string.h>