r23801: The FSF has moved around a lot. This fixes their Mass Ave address.

(This used to be commit 87c91e4362c51819032bfbebbb273c52e203b227)

52 files changed, 53 insertions, 108 deletions

diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index 3e0f6a7f79..86b61dc00e 100644
--- a/examples/VFS/shadow_copy_test.c
+++ b/examples/VFS/shadow_copy_test.c
@@ -14,8 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 3da830ead9..6a5b34f3af 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -17,8 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 09461cff42..0a74cfc95d 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -17,8 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/examples/libmsrpc/cacusermgr/cacusermgr.c b/examples/libmsrpc/cacusermgr/cacusermgr.c
index 4336f20d3b..43c789b872 100644
--- a/examples/libmsrpc/cacusermgr/cacusermgr.c
+++ b/examples/libmsrpc/cacusermgr/cacusermgr.c
@@ -15,8 +15,7 @@
  * 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; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "cacusermgr.h"
 
diff --git a/examples/libmsrpc/cacusermgr/cacusermgr.h b/examples/libmsrpc/cacusermgr/cacusermgr.h
index 79d109843a..84c60eb17c 100644
--- a/examples/libmsrpc/cacusermgr/cacusermgr.h
+++ b/examples/libmsrpc/cacusermgr/cacusermgr.h
@@ -15,8 +15,7 @@
  * 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; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef CACUSERMGR_H_
 #define CACUSERMGR_H_
diff --git a/examples/libmsrpc/cacusermgr/mgr_group.c b/examples/libmsrpc/cacusermgr/mgr_group.c
index 2d2dc9c519..37c89db813 100644
--- a/examples/libmsrpc/cacusermgr/mgr_group.c
+++ b/examples/libmsrpc/cacusermgr/mgr_group.c
@@ -15,8 +15,7 @@
  * 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; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "cacusermgr.h"
 
diff --git a/examples/libmsrpc/cacusermgr/mgr_user.c b/examples/libmsrpc/cacusermgr/mgr_user.c
index 3dc9c06488..bdae55ddec 100644
--- a/examples/libmsrpc/cacusermgr/mgr_user.c
+++ b/examples/libmsrpc/cacusermgr/mgr_user.c
@@ -15,8 +15,7 @@
  * 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; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "cacusermgr.h"
 
diff --git a/examples/libmsrpc/cacusermgr/util.c b/examples/libmsrpc/cacusermgr/util.c
index ef1f27a5d0..fa83e9cda9 100644
--- a/examples/libmsrpc/cacusermgr/util.c
+++ b/examples/libmsrpc/cacusermgr/util.c
@@ -15,8 +15,7 @@
  * 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; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "cacusermgr.h"
 
diff --git a/examples/pcap2nbench/Makefile b/examples/pcap2nbench/Makefile
index 0e3a1a5f58..c1221b3876 100644
--- a/examples/pcap2nbench/Makefile
+++ b/examples/pcap2nbench/Makefile
@@ -14,8 +14,7 @@
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ##  Written by Anthony Liguori <aliguori@us.ibm.com>
 ##
diff --git a/examples/pcap2nbench/closerequest.cpp b/examples/pcap2nbench/closerequest.cpp
index e870eb2996..b31a1b6731 100644
--- a/examples/pcap2nbench/closerequest.cpp
+++ b/examples/pcap2nbench/closerequest.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/closerequest.hpp b/examples/pcap2nbench/closerequest.hpp
index cfacae2b38..fe8866f5bc 100644
--- a/examples/pcap2nbench/closerequest.hpp
+++ b/examples/pcap2nbench/closerequest.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/ethernet.cpp b/examples/pcap2nbench/ethernet.cpp
index 2077591ef7..4d531594e2 100644
--- a/examples/pcap2nbench/ethernet.cpp
+++ b/examples/pcap2nbench/ethernet.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/ethernet.hpp b/examples/pcap2nbench/ethernet.hpp
index 455619fd52..baaca5afd1 100644
--- a/examples/pcap2nbench/ethernet.hpp
+++ b/examples/pcap2nbench/ethernet.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/ip.cpp b/examples/pcap2nbench/ip.cpp
index 34bdc6edf1..8f1d821404 100644
--- a/examples/pcap2nbench/ip.cpp
+++ b/examples/pcap2nbench/ip.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/ip.hpp b/examples/pcap2nbench/ip.hpp
index 8c57e0e403..da1f0d35d1 100644
--- a/examples/pcap2nbench/ip.hpp
+++ b/examples/pcap2nbench/ip.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/main.cpp b/examples/pcap2nbench/main.cpp
index 460136fe2a..e07b4735bd 100644
--- a/examples/pcap2nbench/main.cpp
+++ b/examples/pcap2nbench/main.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/ntcreateandxrequest.cpp b/examples/pcap2nbench/ntcreateandxrequest.cpp
index 7154fe7831..5efc256c61 100644
--- a/examples/pcap2nbench/ntcreateandxrequest.cpp
+++ b/examples/pcap2nbench/ntcreateandxrequest.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/ntcreateandxrequest.hpp b/examples/pcap2nbench/ntcreateandxrequest.hpp
index be0663e79d..07c19fdc8a 100644
--- a/examples/pcap2nbench/ntcreateandxrequest.hpp
+++ b/examples/pcap2nbench/ntcreateandxrequest.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/ntcreateandxresponse.cpp b/examples/pcap2nbench/ntcreateandxresponse.cpp
index 32b31d1500..7e427b9716 100644
--- a/examples/pcap2nbench/ntcreateandxresponse.cpp
+++ b/examples/pcap2nbench/ntcreateandxresponse.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/ntcreateandxresponse.hpp b/examples/pcap2nbench/ntcreateandxresponse.hpp
index 69c65c257c..c17ff21f55 100644
--- a/examples/pcap2nbench/ntcreateandxresponse.hpp
+++ b/examples/pcap2nbench/ntcreateandxresponse.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/readandxrequest.cpp b/examples/pcap2nbench/readandxrequest.cpp
index fd67b887a8..87411fc0c9 100644
--- a/examples/pcap2nbench/readandxrequest.cpp
+++ b/examples/pcap2nbench/readandxrequest.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/readandxrequest.hpp b/examples/pcap2nbench/readandxrequest.hpp
index c44a627fa8..21e0bca3b3 100644
--- a/examples/pcap2nbench/readandxrequest.hpp
+++ b/examples/pcap2nbench/readandxrequest.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/readandxresponse.hpp b/examples/pcap2nbench/readandxresponse.hpp
index 75834c738f..0a302cb657 100644
--- a/examples/pcap2nbench/readandxresponse.hpp
+++ b/examples/pcap2nbench/readandxresponse.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/smb.cpp b/examples/pcap2nbench/smb.cpp
index 87f1ab46cc..78f8aaf23a 100644
--- a/examples/pcap2nbench/smb.cpp
+++ b/examples/pcap2nbench/smb.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/smb.hpp b/examples/pcap2nbench/smb.hpp
index 5cc33621ac..79a7f8c415 100644
--- a/examples/pcap2nbench/smb.hpp
+++ b/examples/pcap2nbench/smb.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/tcp.cpp b/examples/pcap2nbench/tcp.cpp
index ccec915121..8b5106011a 100644
--- a/examples/pcap2nbench/tcp.cpp
+++ b/examples/pcap2nbench/tcp.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/tcp.hpp b/examples/pcap2nbench/tcp.hpp
index 7cee717527..5eb7aaaa66 100644
--- a/examples/pcap2nbench/tcp.hpp
+++ b/examples/pcap2nbench/tcp.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/writeandxrequest.cpp b/examples/pcap2nbench/writeandxrequest.cpp
index c81f996868..f56a03168c 100644
--- a/examples/pcap2nbench/writeandxrequest.cpp
+++ b/examples/pcap2nbench/writeandxrequest.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pcap2nbench/writeandxrequest.hpp b/examples/pcap2nbench/writeandxrequest.hpp
index 55c49441f0..c91bcc3b14 100644
--- a/examples/pcap2nbench/writeandxrequest.hpp
+++ b/examples/pcap2nbench/writeandxrequest.hpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  Written by Anthony Liguori <aliguori@us.ibm.com>
 \*/
diff --git a/examples/pdb/test.c b/examples/pdb/test.c
index a5e98c74ba..b5ddefc480 100644
--- a/examples/pdb/test.c
+++ b/examples/pdb/test.c
@@ -13,8 +13,7 @@
  * 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; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/examples/perfcounter/Makefile b/examples/perfcounter/Makefile
index ce480578a5..925e2ea080 100644
--- a/examples/perfcounter/Makefile
+++ b/examples/perfcounter/Makefile
@@ -12,8 +12,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 # 
 
 SAMBA_SRC_DIR=../../source
diff --git a/examples/perfcounter/perf.h b/examples/perfcounter/perf.h
index 458e2ceb8c..2c24d31260 100644
--- a/examples/perfcounter/perf.h
+++ b/examples/perfcounter/perf.h
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __PERF_H__
diff --git a/examples/perfcounter/perf_writer.c b/examples/perfcounter/perf_writer.c
index c967579b89..4260f9595d 100644
--- a/examples/perfcounter/perf_writer.c
+++ b/examples/perfcounter/perf_writer.c
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "perf.h"
diff --git a/examples/perfcounter/perf_writer_cpu.c b/examples/perfcounter/perf_writer_cpu.c
index eed69de033..215e073b8d 100644
--- a/examples/perfcounter/perf_writer_cpu.c
+++ b/examples/perfcounter/perf_writer_cpu.c
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "perf.h"
diff --git a/examples/perfcounter/perf_writer_disk.c b/examples/perfcounter/perf_writer_disk.c
index 31bc703739..15188d2531 100644
--- a/examples/perfcounter/perf_writer_disk.c
+++ b/examples/perfcounter/perf_writer_disk.c
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "perf.h"
diff --git a/examples/perfcounter/perf_writer_mem.c b/examples/perfcounter/perf_writer_mem.c
index 2c0e30663d..580207fb64 100644
--- a/examples/perfcounter/perf_writer_mem.c
+++ b/examples/perfcounter/perf_writer_mem.c
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "perf.h"
diff --git a/examples/perfcounter/perf_writer_process.c b/examples/perfcounter/perf_writer_process.c
index cc26b208d4..bddceeab15 100644
--- a/examples/perfcounter/perf_writer_process.c
+++ b/examples/perfcounter/perf_writer_process.c
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "perf.h"
diff --git a/examples/perfcounter/perf_writer_util.c b/examples/perfcounter/perf_writer_util.c
index 9cf12ab792..6f1eb16d3e 100644
--- a/examples/perfcounter/perf_writer_util.c
+++ b/examples/perfcounter/perf_writer_util.c
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "perf.h"
diff --git a/examples/perfcounter/perfcountd.init b/examples/perfcounter/perfcountd.init
index d28138ff75..683e91395b 100755
--- a/examples/perfcounter/perfcountd.init
+++ b/examples/perfcounter/perfcountd.init
@@ -13,8 +13,7 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 ####################################################################
 
diff --git a/examples/printing/VampireDriversFunctions b/examples/printing/VampireDriversFunctions
index ec00d21bb2..3d46411e91 100644
--- a/examples/printing/VampireDriversFunctions
+++ b/examples/printing/VampireDriversFunctions
@@ -17,8 +17,7 @@
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
diff --git a/examples/printing/prtpub.c b/examples/printing/prtpub.c
index fc27398ffe..2839940b97 100644
--- a/examples/printing/prtpub.c
+++ b/examples/printing/prtpub.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This needs to be defined for certain compilers */
diff --git a/examples/scripts/eventlog/parselog.pl b/examples/scripts/eventlog/parselog.pl
index 3fe1fa9b6a..0c21a94103 100644
--- a/examples/scripts/eventlog/parselog.pl
+++ b/examples/scripts/eventlog/parselog.pl
@@ -16,8 +16,7 @@
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
diff --git a/examples/scripts/printing/cups/smbaddprinter.pl b/examples/scripts/printing/cups/smbaddprinter.pl
index 4b26285d4c..aee2020bfc 100755
--- a/examples/scripts/printing/cups/smbaddprinter.pl
+++ b/examples/scripts/printing/cups/smbaddprinter.pl
@@ -14,9 +14,7 @@
 ##   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.
+##   License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 @argv = @ARGV;
 
diff --git a/examples/scripts/printing/cups/smbdelprinter.pl b/examples/scripts/printing/cups/smbdelprinter.pl
index 2d245a65d5..23adeb719c 100755
--- a/examples/scripts/printing/cups/smbdelprinter.pl
+++ b/examples/scripts/printing/cups/smbdelprinter.pl
@@ -14,9 +14,7 @@
 ##   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.
+##   License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 @argv = @ARGV;
 
diff --git a/examples/scripts/shares/perl/modify_samba_config.pl b/examples/scripts/shares/perl/modify_samba_config.pl
index 3a566d1e81..20b613aba8 100755
--- a/examples/scripts/shares/perl/modify_samba_config.pl
+++ b/examples/scripts/shares/perl/modify_samba_config.pl
@@ -17,8 +17,7 @@
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
diff --git a/examples/scripts/shares/python/SambaConfig.py b/examples/scripts/shares/python/SambaConfig.py
index e0689e3bd4..3d4a47398c 100644
--- a/examples/scripts/shares/python/SambaConfig.py
+++ b/examples/scripts/shares/python/SambaConfig.py
@@ -18,8 +18,7 @@ from smbparm import parm_table
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
diff --git a/examples/scripts/shares/python/SambaParm.py b/examples/scripts/shares/python/SambaParm.py
index 4933a2f702..82c99c84ac 100644
--- a/examples/scripts/shares/python/SambaParm.py
+++ b/examples/scripts/shares/python/SambaParm.py
@@ -15,8 +15,7 @@
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
diff --git a/examples/scripts/shares/python/generate_parm_table.py b/examples/scripts/shares/python/generate_parm_table.py
index 0d04c2b961..1d2c5f246c 100755
--- a/examples/scripts/shares/python/generate_parm_table.py
+++ b/examples/scripts/shares/python/generate_parm_table.py
@@ -16,8 +16,7 @@
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
@@ -41,8 +40,7 @@ HEADER = """####################################################################
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
diff --git a/examples/scripts/shares/python/modify_samba_config.py b/examples/scripts/shares/python/modify_samba_config.py
index 5f8d8811b3..88b3fcb394 100755
--- a/examples/scripts/shares/python/modify_samba_config.py
+++ b/examples/scripts/shares/python/modify_samba_config.py
@@ -16,8 +16,7 @@
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
diff --git a/examples/scripts/shares/python/smbparm.py b/examples/scripts/shares/python/smbparm.py
index 57e26836d3..73637a7095 100644
--- a/examples/scripts/shares/python/smbparm.py
+++ b/examples/scripts/shares/python/smbparm.py
@@ -16,8 +16,7 @@
 ##  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.
+##  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 ######################################################################
 
diff --git a/examples/scripts/users_and_groups/adduserstogroups.pl b/examples/scripts/users_and_groups/adduserstogroups.pl
index 52a7d01703..17ca5bd842 100755
--- a/examples/scripts/users_and_groups/adduserstogroups.pl
+++ b/examples/scripts/users_and_groups/adduserstogroups.pl
@@ -19,8 +19,7 @@
 # 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; if not, see <http://www.gnu.org/licenses/>.
 #
 
 #
diff --git a/examples/scripts/users_and_groups/createdomobj.pl b/examples/scripts/users_and_groups/createdomobj.pl
index 36e0c0f9fd..60f34b84f2 100755
--- a/examples/scripts/users_and_groups/createdomobj.pl
+++ b/examples/scripts/users_and_groups/createdomobj.pl
@@ -19,8 +19,7 @@
 # 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; if not, see <http://www.gnu.org/licenses/>.
 #
 
 #