From f4d89d801e9a527f12b32555560879c661682c6f Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Fri, 13 Jan 2012 11:32:22 +0100
Subject: [PATCH] Fixes: #330 FSF address incorrect in source code and
 documentation files

---
 include/accept-to-gettext.inc                                   | 2 +-
 include/class_CopyPasteHandler.inc                              | 2 +-
 include/class_SnapShotDialog.inc                                | 2 +-
 include/class_SnapshotHandler.inc                               | 2 +-
 include/class_acl.inc                                           | 2 +-
 include/class_baseSelector.inc                                  | 2 +-
 include/class_certificate.inc                                   | 2 +-
 include/class_config.inc                                        | 2 +-
 include/class_departmentSortIterator.inc                        | 2 +-
 include/class_divSelectBox.inc                                  | 2 +-
 include/class_divlist.inc                                       | 2 +-
 include/class_filter.inc                                        | 2 +-
 include/class_filterLDAP.inc                                    | 2 +-
 include/class_ldap.inc                                          | 2 +-
 include/class_ldapMultiplexer.inc                               | 2 +-
 include/class_listing.inc                                       | 2 +-
 include/class_listingSortIterator.inc                           | 2 +-
 include/class_log.inc                                           | 2 +-
 include/class_management.inc                                    | 2 +-
 include/class_msg_dialog.inc                                    | 2 +-
 include/class_multi_plug.inc                                    | 2 +-
 include/class_plugin.inc                                        | 2 +-
 include/class_pluglist.inc                                      | 2 +-
 include/class_session.inc                                       | 2 +-
 include/class_socketClient.inc                                  | 2 +-
 include/class_sortableListing.inc                               | 2 +-
 include/class_tabs.inc                                          | 2 +-
 include/class_userinfo.inc                                      | 2 +-
 include/exporter/class_PDF.inc                                  | 2 +-
 include/exporter/class_cvsExporter.inc                          | 2 +-
 include/exporter/class_pdfExporter.inc                          | 2 +-
 include/functions.inc                                           | 2 +-
 include/password-methods/class_password-methods-clear.inc       | 2 +-
 include/password-methods/class_password-methods-crypt.inc       | 2 +-
 include/password-methods/class_password-methods-md5.inc         | 2 +-
 include/password-methods/class_password-methods-sha.inc         | 2 +-
 include/password-methods/class_password-methods-smd5.inc        | 2 +-
 include/password-methods/class_password-methods-ssha.inc        | 2 +-
 include/password-methods/class_password-methods.inc             | 2 +-
 include/php_setup.inc                                           | 2 +-
 include/utils/class_msgPool.inc                                 | 2 +-
 include/utils/class_tests.inc                                   | 2 +-
 include/utils/class_timezone.inc                                | 2 +-
 include/utils/class_xml.inc                                     | 2 +-
 include/variables.inc                                           | 2 +-
 plugins/admin/acl/class_aclManagement.inc                       | 2 +-
 plugins/admin/acl/class_aclRole.inc                             | 2 +-
 plugins/admin/acl/class_filterACL.inc                           | 2 +-
 plugins/admin/acl/main.inc                                      | 2 +-
 plugins/admin/acl/tabs_acl.inc                                  | 2 +-
 plugins/admin/acl/tabs_acl_role.inc                             | 2 +-
 plugins/admin/departments/class_countryGeneric.inc              | 2 +-
 plugins/admin/departments/class_dcObject.inc                    | 2 +-
 plugins/admin/departments/class_department.inc                  | 2 +-
 plugins/admin/departments/class_departmentManagement.inc        | 2 +-
 plugins/admin/departments/class_domain.inc                      | 2 +-
 plugins/admin/departments/class_localityGeneric.inc             | 2 +-
 plugins/admin/departments/class_organizationGeneric.inc         | 2 +-
 plugins/admin/departments/main.inc                              | 2 +-
 plugins/admin/departments/tabs_department.inc                   | 2 +-
 plugins/admin/groups/class_filterGroupLDAP.inc                  | 2 +-
 plugins/admin/groups/class_group.inc                            | 2 +-
 plugins/admin/groups/class_groupManagement.inc                  | 2 +-
 plugins/admin/groups/main.inc                                   | 2 +-
 .../admin/groups/singleUserSelect/class_singleUserSelect.inc    | 2 +-
 plugins/admin/groups/tabs_group.inc                             | 2 +-
 plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc  | 2 +-
 plugins/admin/groups/userSelect/class_userSelect.inc            | 2 +-
 plugins/admin/ogroups/class_ogroup.inc                          | 2 +-
 plugins/admin/ogroups/class_ogroupManagement.inc                | 2 +-
 plugins/admin/ogroups/main.inc                                  | 2 +-
 .../objectSelect/class_filterLDAPDepartmentBlacklist.inc        | 2 +-
 plugins/admin/ogroups/objectSelect/class_objectSelect.inc       | 2 +-
 plugins/admin/ogroups/tabs_ogroups.inc                          | 2 +-
 plugins/admin/users/class_userManagement.inc                    | 2 +-
 plugins/admin/users/main.inc                                    | 2 +-
 plugins/admin/users/tabs_user.inc                               | 2 +-
 plugins/generic/references/class_reference.inc                  | 2 +-
 plugins/generic/welcome/main.inc                                | 2 +-
 plugins/personal/generic/class_user.inc                         | 2 +-
 plugins/personal/generic/main.inc                               | 2 +-
 plugins/personal/password/class_password.inc                    | 2 +-
 plugins/personal/password/main.inc                              | 2 +-
 plugins/personal/posix/class_posixAccount.inc                   | 2 +-
 .../personal/posix/groupSelect/class_filterLDAPBlacklist.inc    | 2 +-
 plugins/personal/posix/groupSelect/class_groupSelect.inc        | 2 +-
 plugins/personal/posix/main.inc                                 | 2 +-
 plugins/personal/posix/trustSelect/class_trustSelect.inc        | 2 +-
 setup/class_setup.inc                                           | 2 +-
 setup/class_setupStep.inc                                       | 2 +-
 setup/class_setupStep_Checks.inc                                | 2 +-
 setup/class_setupStep_Config1.inc                               | 2 +-
 setup/class_setupStep_Config2.inc                               | 2 +-
 setup/class_setupStep_Config3.inc                               | 2 +-
 setup/class_setupStep_Feedback.inc                              | 2 +-
 setup/class_setupStep_Finish.inc                                | 2 +-
 setup/class_setupStep_Language.inc                              | 2 +-
 setup/class_setupStep_Ldap.inc                                  | 2 +-
 setup/class_setupStep_Migrate.inc                               | 2 +-
 setup/class_setupStep_Schema.inc                                | 2 +-
 setup/class_setupStep_Welcome.inc                               | 2 +-
 setup/main.inc                                                  | 2 +-
 102 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index a417a7202..839ced51e 100644
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Usage:
  *
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 33aeb4722..8850bd370 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #define("TEMP_DIR","/var/cache/fusiondirectory/tmp");
diff --git a/include/class_SnapShotDialog.inc b/include/class_SnapShotDialog.inc
index da7a00ea0..dd37c638f 100644
--- a/include/class_SnapShotDialog.inc
+++ b/include/class_SnapShotDialog.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index eacfb7ab1..58397dedf 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class SnapshotHandler {
diff --git a/include/class_acl.inc b/include/class_acl.inc
index 043716c89..258a4e09b 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \brief ACL management plugin */ 
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index c13bd45a4..b311578c8 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class baseSelector {
diff --git a/include/class_certificate.inc b/include/class_certificate.inc
index d68216e56..da7611021 100644
--- a/include/class_certificate.inc
+++ b/include/class_certificate.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* definitions */
diff --git a/include/class_config.inc b/include/class_config.inc
index 07e3c58b8..8b81e4db9 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \brief Configuration class
diff --git a/include/class_departmentSortIterator.inc b/include/class_departmentSortIterator.inc
index 966e58272..956d840be 100644
--- a/include/class_departmentSortIterator.inc
+++ b/include/class_departmentSortIterator.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class departmentSortIterator implements Iterator {
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index 1f3b339a3..a06234951 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class divSelectBox {
diff --git a/include/class_divlist.inc b/include/class_divlist.inc
index 2afbfbf50..e8f66ce62 100644
--- a/include/class_divlist.inc
+++ b/include/class_divlist.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class divlist {
diff --git a/include/class_filter.inc b/include/class_filter.inc
index deedbf752..7dfc4b507 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filter {
diff --git a/include/class_filterLDAP.inc b/include/class_filterLDAP.inc
index 4b8356f20..650105364 100644
--- a/include/class_filterLDAP.inc
+++ b/include/class_filterLDAP.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterLDAP {
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index bde874e05..18c940ed3 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -19,7 +19,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 define("ALREADY_EXISTING_ENTRY",-10001);
diff --git a/include/class_ldapMultiplexer.inc b/include/class_ldapMultiplexer.inc
index b557e2fae..b3fc92a80 100644
--- a/include/class_ldapMultiplexer.inc
+++ b/include/class_ldapMultiplexer.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class ldapMultiplexer {
diff --git a/include/class_listing.inc b/include/class_listing.inc
index c5caefdf7..c9ba42209 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class listing {
diff --git a/include/class_listingSortIterator.inc b/include/class_listingSortIterator.inc
index 6ab274724..30ea8fa17 100644
--- a/include/class_listingSortIterator.inc
+++ b/include/class_listingSortIterator.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class listingSortIterator implements Iterator {
diff --git a/include/class_log.inc b/include/class_log.inc
index 570a521cf..9b698e2e8 100644
--- a/include/class_log.inc
+++ b/include/class_log.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \brief   The logging base class
diff --git a/include/class_management.inc b/include/class_management.inc
index cfb76d01c..4ae6c9e4f 100644
--- a/include/class_management.inc
+++ b/include/class_management.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class management
diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index 23c8717a6..e41dbcf49 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 define("INFO_DIALOG"		, 10001);
diff --git a/include/class_multi_plug.inc b/include/class_multi_plug.inc
index 0131e5b69..346f499c8 100644
--- a/include/class_multi_plug.inc
+++ b/include/class_multi_plug.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index f7a8c8be7..ff4de2037 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 8ccea9d71..189210794 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class pluglist {
diff --git a/include/class_session.inc b/include/class_session.inc
index 473a48d66..81ca18ea8 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class session {
diff --git a/include/class_socketClient.inc b/include/class_socketClient.inc
index 2a1dfca9e..461240654 100644
--- a/include/class_socketClient.inc
+++ b/include/class_socketClient.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Socket_Client
diff --git a/include/class_sortableListing.inc b/include/class_sortableListing.inc
index af9db476a..e5393dbe3 100644
--- a/include/class_sortableListing.inc
+++ b/include/class_sortableListing.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 define ('LIST_NORMAL', 0);
diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index 9f3084574..a2e193ed9 100644
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class tabs
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 1e973bed0..94202486f 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class userinfo
diff --git a/include/exporter/class_PDF.inc b/include/exporter/class_PDF.inc
index ac4545107..edefb78be 100644
--- a/include/exporter/class_PDF.inc
+++ b/include/exporter/class_PDF.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Avoid autoloading this class */ class PDF extends FPDF
diff --git a/include/exporter/class_cvsExporter.inc b/include/exporter/class_cvsExporter.inc
index 56c442d0d..1cc99b064 100644
--- a/include/exporter/class_cvsExporter.inc
+++ b/include/exporter/class_cvsExporter.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class csvExporter
diff --git a/include/exporter/class_pdfExporter.inc b/include/exporter/class_pdfExporter.inc
index c3a6b4971..3fb01d43c 100644
--- a/include/exporter/class_pdfExporter.inc
+++ b/include/exporter/class_pdfExporter.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/include/functions.inc b/include/functions.inc
index bbb1037d1..1c4119402 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \file
diff --git a/include/password-methods/class_password-methods-clear.inc b/include/password-methods/class_password-methods-clear.inc
index c551ccf03..03e21c586 100644
--- a/include/password-methods/class_password-methods-clear.inc
+++ b/include/password-methods/class_password-methods-clear.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodClear extends passwordMethod
diff --git a/include/password-methods/class_password-methods-crypt.inc b/include/password-methods/class_password-methods-crypt.inc
index 48ca1ec19..2047a1d5b 100644
--- a/include/password-methods/class_password-methods-crypt.inc
+++ b/include/password-methods/class_password-methods-crypt.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodCrypt extends passwordMethod
diff --git a/include/password-methods/class_password-methods-md5.inc b/include/password-methods/class_password-methods-md5.inc
index da66b1325..61f5220fb 100644
--- a/include/password-methods/class_password-methods-md5.inc
+++ b/include/password-methods/class_password-methods-md5.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodMd5 extends passwordMethod
diff --git a/include/password-methods/class_password-methods-sha.inc b/include/password-methods/class_password-methods-sha.inc
index 705c87396..2f07abb59 100644
--- a/include/password-methods/class_password-methods-sha.inc
+++ b/include/password-methods/class_password-methods-sha.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodsha extends passwordMethod
diff --git a/include/password-methods/class_password-methods-smd5.inc b/include/password-methods/class_password-methods-smd5.inc
index d66bcd308..80d52c140 100644
--- a/include/password-methods/class_password-methods-smd5.inc
+++ b/include/password-methods/class_password-methods-smd5.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodsmd5 extends passwordMethod
diff --git a/include/password-methods/class_password-methods-ssha.inc b/include/password-methods/class_password-methods-ssha.inc
index e38f4784c..d4858d380 100644
--- a/include/password-methods/class_password-methods-ssha.inc
+++ b/include/password-methods/class_password-methods-ssha.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethodssha extends passwordMethod
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_password-methods.inc
index 682fa8f35..e1aac16e3 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_password-methods.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class passwordMethod
diff --git a/include/php_setup.inc b/include/php_setup.inc
index 12dccf42b..be6096ddd 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 require_once ("variables.inc");
diff --git a/include/utils/class_msgPool.inc b/include/utils/class_msgPool.inc
index 0eb2d9b09..2cb1f1921 100644
--- a/include/utils/class_msgPool.inc
+++ b/include/utils/class_msgPool.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/include/utils/class_tests.inc b/include/utils/class_tests.inc
index d9d12277a..4bcb77a83 100644
--- a/include/utils/class_tests.inc
+++ b/include/utils/class_tests.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*! \brief Test functions
diff --git a/include/utils/class_timezone.inc b/include/utils/class_timezone.inc
index 3fc5ded38..2ba9d1a7b 100644
--- a/include/utils/class_timezone.inc
+++ b/include/utils/class_timezone.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class timezone {
diff --git a/include/utils/class_xml.inc b/include/utils/class_xml.inc
index 89b171d3d..8e0507086 100644
--- a/include/utils/class_xml.inc
+++ b/include/utils/class_xml.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class xml {
diff --git a/include/variables.inc b/include/variables.inc
index 559cee3ec..20eba09e8 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Define common locations and variables */
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index 67c278e18..2891c8d15 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class aclManagement extends management
diff --git a/plugins/admin/acl/class_aclRole.inc b/plugins/admin/acl/class_aclRole.inc
index 0121436b5..7232442ad 100644
--- a/plugins/admin/acl/class_aclRole.inc
+++ b/plugins/admin/acl/class_aclRole.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class aclrole extends acl
diff --git a/plugins/admin/acl/class_filterACL.inc b/plugins/admin/acl/class_filterACL.inc
index 4cb6d2dc5..a7d3f8f61 100644
--- a/plugins/admin/acl/class_filterACL.inc
+++ b/plugins/admin/acl/class_filterACL.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterACL {
diff --git a/plugins/admin/acl/main.inc b/plugins/admin/acl/main.inc
index 597183a6e..d1a9f5fea 100644
--- a/plugins/admin/acl/main.inc
+++ b/plugins/admin/acl/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin
diff --git a/plugins/admin/acl/tabs_acl.inc b/plugins/admin/acl/tabs_acl.inc
index 29b08fb94..6e023c599 100644
--- a/plugins/admin/acl/tabs_acl.inc
+++ b/plugins/admin/acl/tabs_acl.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class acltab extends tabs
diff --git a/plugins/admin/acl/tabs_acl_role.inc b/plugins/admin/acl/tabs_acl_role.inc
index b3aa14a27..dc8ce18d0 100644
--- a/plugins/admin/acl/tabs_acl_role.inc
+++ b/plugins/admin/acl/tabs_acl_role.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class aclroletab extends tabs
diff --git a/plugins/admin/departments/class_countryGeneric.inc b/plugins/admin/departments/class_countryGeneric.inc
index 254061c80..f3f93400f 100644
--- a/plugins/admin/departments/class_countryGeneric.inc
+++ b/plugins/admin/departments/class_countryGeneric.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class country extends department
diff --git a/plugins/admin/departments/class_dcObject.inc b/plugins/admin/departments/class_dcObject.inc
index ea81b5798..4998127c0 100644
--- a/plugins/admin/departments/class_dcObject.inc
+++ b/plugins/admin/departments/class_dcObject.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class dcObject extends department
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 65e313202..dd0308f39 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class department extends plugin
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index cd10ec148..d4e77bd32 100644
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class departmentManagement extends management
diff --git a/plugins/admin/departments/class_domain.inc b/plugins/admin/departments/class_domain.inc
index 7bddcd487..8cc64239d 100644
--- a/plugins/admin/departments/class_domain.inc
+++ b/plugins/admin/departments/class_domain.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class domain extends department
diff --git a/plugins/admin/departments/class_localityGeneric.inc b/plugins/admin/departments/class_localityGeneric.inc
index 608cb9c32..227fa01bb 100644
--- a/plugins/admin/departments/class_localityGeneric.inc
+++ b/plugins/admin/departments/class_localityGeneric.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class locality extends department
diff --git a/plugins/admin/departments/class_organizationGeneric.inc b/plugins/admin/departments/class_organizationGeneric.inc
index 1e3eeda81..4300b8660 100644
--- a/plugins/admin/departments/class_organizationGeneric.inc
+++ b/plugins/admin/departments/class_organizationGeneric.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class organization extends department
diff --git a/plugins/admin/departments/main.inc b/plugins/admin/departments/main.inc
index 135229cc3..ee0b7de6a 100644
--- a/plugins/admin/departments/main.inc
+++ b/plugins/admin/departments/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 2739414c9..b313a5577 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class deptabs extends tabs
diff --git a/plugins/admin/groups/class_filterGroupLDAP.inc b/plugins/admin/groups/class_filterGroupLDAP.inc
index 05a2fcb6f..6eabca38d 100644
--- a/plugins/admin/groups/class_filterGroupLDAP.inc
+++ b/plugins/admin/groups/class_filterGroupLDAP.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterGroupLDAP {
diff --git a/plugins/admin/groups/class_group.inc b/plugins/admin/groups/class_group.inc
index 3b28c6929..51684c0d3 100644
--- a/plugins/admin/groups/class_group.inc
+++ b/plugins/admin/groups/class_group.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class group extends plugin
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 36988a8d0..a3acbc990 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class groupManagement extends management
diff --git a/plugins/admin/groups/main.inc b/plugins/admin/groups/main.inc
index b26870886..95dfdd0dd 100644
--- a/plugins/admin/groups/main.inc
+++ b/plugins/admin/groups/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc b/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
index 35375276d..76e25643c 100644
--- a/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
+++ b/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class singleUserSelect extends management
diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index dc68f598d..c8bdf7d5c 100644
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class grouptabs extends tabs
diff --git a/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc b/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
index c62508f03..8a1fbb436 100644
--- a/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
+++ b/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class userGroupSelect extends management
diff --git a/plugins/admin/groups/userSelect/class_userSelect.inc b/plugins/admin/groups/userSelect/class_userSelect.inc
index 47e8f420a..abec8d2fc 100644
--- a/plugins/admin/groups/userSelect/class_userSelect.inc
+++ b/plugins/admin/groups/userSelect/class_userSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class userSelect extends management
diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index f24aebedd..a9fce6c9e 100644
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Sort multidimensional arrays for key 'text' */
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 7aeb6feb5..70861ab73 100644
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class ogroupManagement extends management
diff --git a/plugins/admin/ogroups/main.inc b/plugins/admin/ogroups/main.inc
index 0712325a2..b2b1487ff 100644
--- a/plugins/admin/ogroups/main.inc
+++ b/plugins/admin/ogroups/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc b/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
index bb06cc1bb..615058210 100644
--- a/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
+++ b/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterLDAPDepartmentBlacklist  extends filterLDAPBlacklist{
diff --git a/plugins/admin/ogroups/objectSelect/class_objectSelect.inc b/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
index ab5d0b375..774146545 100644
--- a/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
+++ b/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class objectSelect extends management
diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 2e046bd4c..e29146a60 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class ogrouptabs extends tabs
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index f889861de..167a2a576 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class userManagement extends management
diff --git a/plugins/admin/users/main.inc b/plugins/admin/users/main.inc
index 54dbeda27..136dc2fce 100644
--- a/plugins/admin/users/main.inc
+++ b/plugins/admin/users/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/admin/users/tabs_user.inc b/plugins/admin/users/tabs_user.inc
index 69b56c8d0..7f60f3f11 100644
--- a/plugins/admin/users/tabs_user.inc
+++ b/plugins/admin/users/tabs_user.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class usertabs extends tabs
diff --git a/plugins/generic/references/class_reference.inc b/plugins/generic/references/class_reference.inc
index 055b7f139..e6d6ab21f 100644
--- a/plugins/generic/references/class_reference.inc
+++ b/plugins/generic/references/class_reference.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class reference extends plugin
diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc
index 442c425c5..1bf43f5d4 100644
--- a/plugins/generic/welcome/main.inc
+++ b/plugins/generic/welcome/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 if (!$cleanup){
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 6d3a16622..783447057 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*!
diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index 6233789ec..5e04754bc 100644
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/personal/password/class_password.inc b/plugins/personal/password/class_password.inc
index 1e599a43b..404b399c0 100644
--- a/plugins/personal/password/class_password.inc
+++ b/plugins/personal/password/class_password.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class password extends plugin
diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc
index a81285cfc..4032031b3 100644
--- a/plugins/personal/password/main.inc
+++ b/plugins/personal/password/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin  */
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index bc7e1cebe..b37c82777 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /*!
diff --git a/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc b/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
index b65747d09..842c39c5a 100644
--- a/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
+++ b/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class filterLDAPBlacklist {
diff --git a/plugins/personal/posix/groupSelect/class_groupSelect.inc b/plugins/personal/posix/groupSelect/class_groupSelect.inc
index f981edb1a..95472c059 100644
--- a/plugins/personal/posix/groupSelect/class_groupSelect.inc
+++ b/plugins/personal/posix/groupSelect/class_groupSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class groupSelect extends management
diff --git a/plugins/personal/posix/main.inc b/plugins/personal/posix/main.inc
index a2500afec..970721bc0 100644
--- a/plugins/personal/posix/main.inc
+++ b/plugins/personal/posix/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Remove locks created by this plugin */
diff --git a/plugins/personal/posix/trustSelect/class_trustSelect.inc b/plugins/personal/posix/trustSelect/class_trustSelect.inc
index f12a9f62d..832b58272 100644
--- a/plugins/personal/posix/trustSelect/class_trustSelect.inc
+++ b/plugins/personal/posix/trustSelect/class_trustSelect.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class trustSelect extends management
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 214995b54..62d89427e 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 require_once("class_setupStep.inc");
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 542896e9a..9b24053b3 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class setup_step extends plugin
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index ff314eeb0..e2ae58929 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Checks extends setup_step
diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 5bbf258e1..1560c492b 100644
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Config1 extends setup_step
diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 38ca8b1af..7c6d316c0 100644
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index a8e4f71f0..efea5ff2d 100644
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/setup/class_setupStep_Feedback.inc b/setup/class_setupStep_Feedback.inc
index 12a3010dd..339481e09 100644
--- a/setup/class_setupStep_Feedback.inc
+++ b/setup/class_setupStep_Feedback.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index e0172b2cb..154f4856d 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Finish extends setup_step
diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 86a670af8..0baa085d9 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 365ecc76a..bc555503c 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Ldap extends setup_step
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 585ad17b6..cced2f9b7 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /****************
diff --git a/setup/class_setupStep_Schema.inc b/setup/class_setupStep_Schema.inc
index 6c297117f..7134d065d 100644
--- a/setup/class_setupStep_Schema.inc
+++ b/setup/class_setupStep_Schema.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Schema extends setup_step
diff --git a/setup/class_setupStep_Welcome.inc b/setup/class_setupStep_Welcome.inc
index 152f0866f..fce459ec7 100644
--- a/setup/class_setupStep_Welcome.inc
+++ b/setup/class_setupStep_Welcome.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 class Step_Welcome  extends setup_step
diff --git a/setup/main.inc b/setup/main.inc
index 1e1deea7d..74b8b51b7 100644
--- a/setup/main.inc
+++ b/setup/main.inc
@@ -17,7 +17,7 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 /* Create a new setup class if necessary  */
-- 
GitLab