From 6971d539013b3ad2e44aa1e3f6ef335101ba362c Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Tue, 3 Oct 2023 11:02:39 +0200
Subject: [PATCH] docs,m4: remove paragraph about writing to FSF

The Free Software Foundation has changed addresses in the past, and
may do so again. NetworkManager already includes a copy of the
licenses.
---
 docs/api/network-manager-docs.xml | 19 ++-----------------
 docs/libnm/libnm-docs.xml         | 18 ++----------------
 m4/attributes.m4                  |  4 +---
 m4/vapigen.m4                     |  3 +--
 4 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index d8f4725cf6..5c45ca74ee 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -33,15 +33,7 @@
 	Texts. You may obtain a copy of the <citetitle>GNU Free
 	Documentation License</citetitle> from the Free Software
 	Foundation by visiting <ulink type="http"
-	url="http://www.fsf.org">their Web site</ulink> or by writing
-	to:
-
-	<address>
-	  The Free Software Foundation, Inc.,
-	  <street>51 Franklin Street</street> - Fifth Floor,
-	  <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>,
-	  <country>USA</country>
-	</address>
+	url="http://www.fsf.org">their Web site</ulink>.
       </para>
     </legalnotice>
 
@@ -322,14 +314,7 @@
 
     <para>
       You should have received a copy of the <citetitle>GNU
-      General Public License</citetitle> along with this program;
-      if not, write to the
-      <address>
-        Free Software Foundation, Inc.,
-        <street>51 Franklin Street</street> - Fifth Floor,
-        <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>,
-        <country>USA</country>
-      </address>
+      General Public License</citetitle> along with this program.
     </para>
 
     <para>
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index 09468a5cdb..18a3fe05ba 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -34,15 +34,7 @@
 	Texts. You may obtain a copy of the <citetitle>GNU Free
 	Documentation License</citetitle> from the Free Software
 	Foundation by visiting <ulink type="http"
-	url="http://www.fsf.org">their Web site</ulink> or by writing
-	to:
-
-	<address>
-	  The Free Software Foundation, Inc.,
-	  <street>51 Franklin Street</street> - Fifth Floor,
-	  <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>,
-	  <country>USA</country>
-	</address>
+	url="http://www.fsf.org">their Web site</ulink>.
       </para>
     </legalnotice>
   </bookinfo>
@@ -467,13 +459,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <para>
       You should have received a copy of the <citetitle>GNU
       Lesser General Public License</citetitle> along with this
-      library; if not, write to the
-      <address>
-        Free Software Foundation, Inc.,
-        <street>51 Franklin Street</street> - Fifth Floor,
-        <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>,
-        <country>USA</country>
-      </address>
+      library.
     </para>
 
     <para>
diff --git a/m4/attributes.m4 b/m4/attributes.m4
index 51ac88be61..7f785afa6b 100644
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -14,9 +14,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-dnl 02110-1301, USA.
+dnl along with this program.
 dnl
 dnl As a special exception, the copyright owners of the
 dnl macro gives unlimited permission to copy, distribute and modify the
diff --git a/m4/vapigen.m4 b/m4/vapigen.m4
index 3ade411e3b..a2055fe1b0 100644
--- a/m4/vapigen.m4
+++ b/m4/vapigen.m4
@@ -13,8 +13,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 dnl Lesser General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+dnl License along with this library.
 
 # VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION])
 # --------------------------------------