Update FSF address

COPYING

@@ -4,8 +4,8 @@ with the OpenSSL library and distribute the resulting binary.
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -306,9 +306,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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
+    You should have received a copy of the GNU General Public License along
-    along with this program; if not, write to the Free Software
+    with this program; if not, write to the Free Software Foundation, Inc.,
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 Also add information on how to contact you by electronic and paper mail.

include/adhoc.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/ejabberd.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/ejabberd_commands.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/ejabberd_config.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/ejabberd_ctl.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/ejabberd_http.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/ejabberd_web_admin.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/eldap.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/http_bind.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/jlib.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/logger.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 -define(PRINT(Format, Args), io:format(Format, Args)).

include/mod_muc_room.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/mod_privacy.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/mod_proxy65.hrl

@@ -14,10 +14,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/mod_roster.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

include/ns.hrl

@@ -12,10 +12,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

sql/mssql2000.sql

@@ -11,10 +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
+ * You should have received a copy of the GNU General Public License along
- * along with this program; if not, write to the Free Software
+ * with this program; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- * 02111-1307 USA
  *
  */
 

sql/mssql2005.sql

@@ -11,10 +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
+ * You should have received a copy of the GNU General Public License along
- * along with this program; if not, write to the Free Software
+ * with this program; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- * 02111-1307 USA
  *
  */
 

sql/mssql2012.sql

@@ -11,10 +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
+ * You should have received a copy of the GNU General Public License along
- * along with this program; if not, write to the Free Software
+ * with this program; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- * 02111-1307 USA
  *
  */
 

sql/mysql.sql

@@ -11,10 +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
+-- You should have received a copy of the GNU General Public License along
--- along with this program; if not, write to the Free Software
+-- with this program; if not, write to the Free Software Foundation, Inc.,
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--- 02111-1307 USA
 --
 
 CREATE TABLE users (

sql/pg.sql

@@ -11,10 +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
+-- You should have received a copy of the GNU General Public License along
--- along with this program; if not, write to the Free Software
+-- with this program; if not, write to the Free Software Foundation, Inc.,
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--- 02111-1307 USA
 --
 
 CREATE TABLE users (

src/acl.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/adhoc.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl_anonymous.erl

@@ -18,10 +18,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl_digest.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl_plain.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl_scram.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_admin.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%-------------------------------------------------------------------
 

src/ejabberd_app.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_auth.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_auth_anonymous.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_auth_external.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_auth_internal.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_auth_ldap.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_auth_odbc.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_auth_pam.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%-------------------------------------------------------------------
 -module(ejabberd_auth_pam).

src/ejabberd_c2s.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_c2s_config.erl

@@ -18,10 +18,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_captcha.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%-------------------------------------------------------------------
 

src/ejabberd_commands.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_config.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_ctl.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_frontend_socket.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_hooks.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_http.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_http_poll.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_listener.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_local.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_logger.erl

@@ -18,10 +18,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 
 %%%-------------------------------------------------------------------
 -module(ejabberd_logger).

src/ejabberd_node_groups.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_odbc.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_odbc_sup.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_piefxis.erl

@@ -21,10 +21,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_rdbms.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_receiver.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_regexp.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_router.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_s2s.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_s2s_in.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_s2s_out.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_service.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_sm.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_socket.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_sup.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_system_monitor.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%-------------------------------------------------------------------
 

src/ejabberd_tmp_sup.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_update.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%-------------------------------------------------------------------
 

src/ejabberd_web.erl

@@ -18,10 +18,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_web_admin.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/ejd2odbc.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/eldap.erl

@@ -18,9 +18,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 %%% Modified by Sean Hinde <shinde@iee.org> 7th Dec 2000
 %%% Turned into gen_fsm, made non-blocking, added timers etc to support this.

src/eldap_filter.erl

@@ -18,10 +18,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 -module(eldap_filter).

src/eldap_pool.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%-------------------------------------------------------------------
 

src/eldap_utils.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/extauth.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/gen_iq_handler.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/gen_mod.erl

@@ -18,10 +18,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/idna.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/jd2ejd.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/jlib.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_adhoc.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_announce.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_blocking.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_caps.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%% 2009, improvements from ProcessOne to support correct PEP handling
 %%% through s2s, use less memory, and speedup global caps handling

src/mod_carboncopy.erl

@@ -19,10 +19,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 -module (mod_carboncopy).

src/mod_configure.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_configure2.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_disco.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_echo.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_http_bind.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_http_fileserver.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_ip_blacklist.erl

@@ -19,10 +19,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_irc.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_irc_connection.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_last.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_muc.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------
 

src/mod_muc_log.erl

@@ -17,10 +17,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
+%%% You should have received a copy of the GNU General Public License along
-%%% along with this program; if not, write to the Free Software
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%% 02111-1307 USA
 %%%
 %%%----------------------------------------------------------------------