Update FSF's address

* doc/emacs/emacs.texi (Distrib):
* doc/lispintro/emacs-lisp-intro.texi:
* doc/lispref/elisp.texi:
* doc/misc/org.org (Link Abbreviations):
* etc/tutorials/TUTORIAL.eo:
* lisp/elide-head.el:
* lisp/textmodes/page-ext.el: Update the FSF address to 31 Milk Street.

(cherry picked from commit 4047072c7d847afb5027dab27e97606a49c1d62e)

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index a566472f3cd3bd0e708cab1f2fbe4b16af42cf97..751a0412d8c6341a8263e691f856a71bc7191cc3 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -89,8 +89,8 @@ developing GNU and promoting software freedom.''
 
 @sp 2
 Published by the Free Software Foundation @*
-51 Franklin Street, Fifth Floor @*
-Boston, MA 02110-1301 USA @*
+31 Milk Street, # 960789 @*
+Boston, MA 02196 @*
 ISBN 978-0-9831592-8-5
 
 @sp 2
@@ -1430,8 +1430,8 @@ If you need to contact the Free Software Foundation, see
 
 @display
 Free Software Foundation
-51 Franklin Street, Fifth Floor
-Boston, MA 02110-1301
+31 Milk Street # 960789
+Boston, MA 02196
 USA
 @end display
 

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 83355d5ce78be92fd467778a0227049acee43530..7fd6c9331df8e13649762152289f750a0cf58e3f 100644 (file)
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -125,8 +125,8 @@ Published by the:@*
 GNU Press,               @hfill @uref{https://www.fsf.org/licensing/gnu-press/}@*
 a division of the               @hfill email: @email{sales@@fsf.org}@*
 Free Software Foundation, Inc.  @hfill Tel: +1 (617) 542-5942@*
-51 Franklin Street, Fifth Floor @hfill Fax: +1 (617) 542-2652@*
-Boston, MA 02110-1301 USA
+31 Milk Street, # 960789        @hfill Fax: +1 (617) 542-2652@*
+Boston, MA 02196 USA
 @end iftex
 
 @ifnottex
@@ -136,8 +136,8 @@ Printed copies available from @uref{https://shop.fsf.org/}.  Published by:
 GNU Press,                        https://www.fsf.org/licensing/gnu-press/
 a division of the                 email: sales@@fsf.org
 Free Software Foundation, Inc.    Tel: +1 (617) 542-5942
-51 Franklin Street, Fifth Floor   Fax: +1 (617) 542-2652
-Boston, MA 02110-1301 USA
+31 Milk Street, # 960789          Fax: +1 (617) 542-2652
+Boston, MA 02196 USA
 @end example
 @end ifnottex
 

diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index f464bcfe94fa5ddda73d9faa8ac7a33a2a6f81db..1ce89c6431f7019b550e1e49d97b33268e81bef5 100644 (file)
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -140,8 +140,8 @@ developing GNU and promoting software freedom.''
 
 @sp 2
 Published by the Free Software Foundation @*
-51 Franklin St, Fifth Floor @*
-Boston, MA 02110-1301 @*
+31 Milk Street, # 960789 @*
+Boston, MA 02196 @*
 USA @*
 ISBN 1-882114-74-4
 

diff --git a/doc/misc/org.org b/doc/misc/org.org
index dcc1ddc7f44723e380425f63f404068673c17965..e595d0be195fdf1b1c8e927b2a4a3a542153dfce 100644 (file)
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -3788,8 +3788,8 @@ argument.
 
 With the above setting, you could link to a specific bug with
 =[[bugzilla:129]]=, search the web for =OrgMode= with =[[duckduckgo:OrgMode]]=,
-show the map location of the Free Software Foundation =[[gmap:51
-Franklin Street, Boston]]= or of Carsten office =[[omap:Science Park 904,
+show the map location of the Free Software Foundation =[[omap:31
+Milk Street, Boston]]= or of Carsten's office =[[omap:Science Park 904,
 Amsterdam, The Netherlands]]= and find out what the Org author is doing
 besides Emacs hacking with =[[ads:Dominik,C]]=.
 

diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo
index 01423a04f5061059ad745d727fe44cce56b64f2a..633fa224c5d4699d164d62caacc508f3e362b6ca 100644 (file)
--- a/etc/tutorials/TUTORIAL.eo
+++ b/etc/tutorials/TUTORIAL.eo
@@ -1098,8 +1098,8 @@ kondiĉoj estas observataj:
 
    Ekzemplero de la GNUa Ĝenerala Publika Permesilo devas esti
    liverita al vi kun ĉi tiu programo; se vi ĝin ne ricevis, turnu vin
-   al: Free Software Foundation, Inc., 51 Franklin Street, Fifth
-   Floor, Boston, MA 02110-1301, USA.
+   al: Free Software Foundation, Inc., 31 Milk Street, # 960789,
+   Boston, MA 02196, USA.
 
 Bonvole legu la dosieron COPYING kaj sekve donu kopiojn de GNU Emakso
 al viaj amikoj.  Helpu ekstermi programaran obstrukcismon

diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 808bf55a05f6e9f7321b4c410aa25b020feca7c7..800d2c27d35b12c720bd1db79743331f73baa102 100644 (file)
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -68,7 +68,7 @@
                      "http" (? "s") "://www.gnu.org/licenses"
                      (? "/") (? ">") (? " "))
                 (seq "Boston," delim "MA" delim
-                     (or "02111-1307" "02110-1301" "02111-1301")
+                     (or "02111-1307" "02110-1301" "02111-1301" "02196")
                      (? ",") delim
                      "USA")
                 "675 Mass Ave, Cambridge, MA 02139, USA")

diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 1681f86b343348450ac626450550e69deff0e0d5..7a225ff7338ec673ad68e70e13105a107ff52f07 100644 (file)
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -119,8 +119,8 @@
 ;;
 ;;     FSF
 ;;     Free Software Foundation
-;;     51 Franklin Street, Fifth Floor
-;;     Boston, MA 02110-1301  USA.
+;;     31 Milk Street, # 960789
+;;     Boston, MA 02196  USA.
 ;;     (617) 542-5942
 ;;     gnu@gnu.org
 ;;