From a4251b6ffb69b64ed9c2b7ce8f5ecf5083e0140b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 2 Sep 2024 20:56:59 +0200 Subject: [PATCH] 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) --- doc/emacs/emacs.texi | 8 ++++---- doc/lispintro/emacs-lisp-intro.texi | 8 ++++---- doc/lispref/elisp.texi | 4 ++-- doc/misc/org.org | 4 ++-- etc/tutorials/TUTORIAL.eo | 4 ++-- lisp/elide-head.el | 2 +- lisp/textmodes/page-ext.el | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index a566472f3cd..751a0412d8c 100644 --- 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 83355d5ce78..7fd6c9331df 100644 --- 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 f464bcfe94f..1ce89c6431f 100644 --- 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 dcc1ddc7f44..e595d0be195 100644 --- 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 01423a04f50..633fa224c5d 100644 --- 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 808bf55a05f..800d2c27d35 100644 --- 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 1681f86b343..7a225ff7338 100644 --- 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 ;; -- 2.39.5