summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@igalia.com>2015-12-07 12:00:36 +0100
committerMichael Catanzaro <mcatanzaro@igalia.com>2015-12-07 12:04:34 +0100
commit9a2dc4ecf3220fd3030ce941ef0e97082a68c949 (patch)
tree41f7db733ecda2b3a1fe1b17241b930be2b43b79
parent235e77de51aa1917a8eff49469537978eed442f7 (diff)
downloadepiphany-9a2dc4ecf3220fd3030ce941ef0e97082a68c949.tar.gz
Remove FSF address from license headers
-rw-r--r--configure.ac5
-rw-r--r--embed/ephy-about-handler.c4
-rw-r--r--embed/ephy-about-handler.h4
-rw-r--r--embed/ephy-download.c4
-rw-r--r--embed/ephy-download.h4
-rw-r--r--embed/ephy-embed-container.c4
-rw-r--r--embed/ephy-embed-container.h4
-rw-r--r--embed/ephy-embed-event.c4
-rw-r--r--embed/ephy-embed-event.h4
-rw-r--r--embed/ephy-embed-prefs.c4
-rw-r--r--embed/ephy-embed-prefs.h4
-rw-r--r--embed/ephy-embed-private.h4
-rw-r--r--embed/ephy-embed-shell.c4
-rw-r--r--embed/ephy-embed-shell.h4
-rw-r--r--embed/ephy-embed-utils.c4
-rw-r--r--embed/ephy-embed-utils.h4
-rw-r--r--embed/ephy-embed.c4
-rw-r--r--embed/ephy-embed.h4
-rw-r--r--embed/ephy-encoding.c4
-rw-r--r--embed/ephy-encoding.h4
-rw-r--r--embed/ephy-encodings.c4
-rw-r--r--embed/ephy-encodings.h4
-rw-r--r--embed/ephy-file-monitor.c4
-rw-r--r--embed/ephy-file-monitor.h4
-rw-r--r--embed/ephy-find-toolbar.c4
-rw-r--r--embed/ephy-find-toolbar.h4
-rw-r--r--embed/ephy-web-extension-proxy.c4
-rw-r--r--embed/ephy-web-extension-proxy.h4
-rw-r--r--embed/ephy-web-view.c4
-rw-r--r--embed/ephy-web-view.h4
-rw-r--r--embed/web-extension/ephy-embed-form-auth.c4
-rw-r--r--embed/web-extension/ephy-embed-form-auth.h4
-rw-r--r--embed/web-extension/ephy-uri-tester.c3
-rw-r--r--embed/web-extension/ephy-uri-tester.h3
-rw-r--r--embed/web-extension/ephy-web-extension-main.c3
-rw-r--r--embed/web-extension/ephy-web-extension-names.h3
-rw-r--r--embed/web-extension/ephy-web-extension.c3
-rw-r--r--embed/web-extension/ephy-web-extension.h3
-rw-r--r--embed/web-extension/ephy-web-overview-model.c4
-rw-r--r--embed/web-extension/ephy-web-overview-model.h4
-rw-r--r--embed/web-extension/ephy-web-overview.c4
-rw-r--r--embed/web-extension/ephy-web-overview.h4
-rw-r--r--lib/egg/eggtreemultidnd.c8
-rw-r--r--lib/egg/eggtreemultidnd.h6
-rw-r--r--lib/ephy-debug.c4
-rw-r--r--lib/ephy-debug.h4
-rw-r--r--lib/ephy-dnd.c4
-rw-r--r--lib/ephy-dnd.h4
-rw-r--r--lib/ephy-favicon-helpers.c4
-rw-r--r--lib/ephy-favicon-helpers.h4
-rw-r--r--lib/ephy-file-helpers.c4
-rw-r--r--lib/ephy-file-helpers.h4
-rw-r--r--lib/ephy-form-auth-data.c4
-rw-r--r--lib/ephy-form-auth-data.h4
-rw-r--r--lib/ephy-gui.c4
-rw-r--r--lib/ephy-gui.h4
-rw-r--r--lib/ephy-initial-state.c4
-rw-r--r--lib/ephy-initial-state.h4
-rw-r--r--lib/ephy-langs.c4
-rw-r--r--lib/ephy-langs.h4
-rw-r--r--lib/ephy-node-common.h4
-rw-r--r--lib/ephy-node-db.c4
-rw-r--r--lib/ephy-node-db.h4
-rw-r--r--lib/ephy-node-filter.c4
-rw-r--r--lib/ephy-node-filter.h4
-rw-r--r--lib/ephy-node.c4
-rw-r--r--lib/ephy-node.h4
-rw-r--r--lib/ephy-nss-glue.c4
-rw-r--r--lib/ephy-nss-glue.h4
-rw-r--r--lib/ephy-prefs.h4
-rw-r--r--lib/ephy-profile-migrator.c4
-rw-r--r--lib/ephy-profile-utils.c4
-rw-r--r--lib/ephy-profile-utils.h4
-rw-r--r--lib/ephy-security-levels.c4
-rw-r--r--lib/ephy-security-levels.h4
-rw-r--r--lib/ephy-settings.c4
-rw-r--r--lib/ephy-settings.h4
-rw-r--r--lib/ephy-signal-accumulator.c4
-rw-r--r--lib/ephy-signal-accumulator.h4
-rw-r--r--lib/ephy-smaps.c3
-rw-r--r--lib/ephy-smaps.h3
-rw-r--r--lib/ephy-snapshot-service.c4
-rw-r--r--lib/ephy-snapshot-service.h4
-rw-r--r--lib/ephy-sqlite-connection.c3
-rw-r--r--lib/ephy-sqlite-connection.h3
-rw-r--r--lib/ephy-sqlite-statement.c3
-rw-r--r--lib/ephy-sqlite-statement.h3
-rw-r--r--lib/ephy-sqlite.h3
-rw-r--r--lib/ephy-string.c4
-rw-r--r--lib/ephy-string.h4
-rw-r--r--lib/ephy-time-helpers.c3
-rw-r--r--lib/ephy-time-helpers.h4
-rw-r--r--lib/ephy-uri-helpers.c4
-rw-r--r--lib/ephy-uri-helpers.h4
-rw-r--r--lib/ephy-web-app-utils.c4
-rw-r--r--lib/ephy-web-app-utils.h4
-rw-r--r--lib/ephy-web-dom-utils.c4
-rw-r--r--lib/ephy-web-dom-utils.h4
-rw-r--r--lib/ephy-zoom.c4
-rw-r--r--lib/ephy-zoom.h4
-rw-r--r--lib/history/ephy-history-service-hosts-table.c3
-rw-r--r--lib/history/ephy-history-service-private.h3
-rw-r--r--lib/history/ephy-history-service-urls-table.c3
-rw-r--r--lib/history/ephy-history-service-visits-table.c3
-rw-r--r--lib/history/ephy-history-service.c3
-rw-r--r--lib/history/ephy-history-service.h3
-rw-r--r--lib/history/ephy-history-types.c3
-rw-r--r--lib/history/ephy-history-types.h3
-rw-r--r--lib/widgets/ephy-certificate-dialog.c4
-rw-r--r--lib/widgets/ephy-certificate-dialog.h4
-rw-r--r--lib/widgets/ephy-certificate-popover.c3
-rw-r--r--lib/widgets/ephy-certificate-popover.h3
-rw-r--r--lib/widgets/ephy-download-widget.c4
-rw-r--r--lib/widgets/ephy-download-widget.h4
-rw-r--r--lib/widgets/ephy-file-chooser.c4
-rw-r--r--lib/widgets/ephy-file-chooser.h4
-rw-r--r--lib/widgets/ephy-location-entry.c4
-rw-r--r--lib/widgets/ephy-location-entry.h4
-rw-r--r--lib/widgets/ephy-middle-clickable-button.c4
-rw-r--r--lib/widgets/ephy-middle-clickable-button.h6
-rw-r--r--lib/widgets/ephy-node-view.c4
-rw-r--r--lib/widgets/ephy-node-view.h4
-rw-r--r--lib/widgets/ephy-tree-model-node.c4
-rw-r--r--lib/widgets/ephy-tree-model-node.h4
-rw-r--r--lib/widgets/ephy-tree-model-sort.c4
-rw-r--r--lib/widgets/ephy-tree-model-sort.h4
-rw-r--r--lib/widgets/ephy-zoom-action.c4
-rw-r--r--lib/widgets/ephy-zoom-action.h4
-rw-r--r--lib/widgets/nautilus-floating-bar.c8
-rw-r--r--lib/widgets/nautilus-floating-bar.h8
-rw-r--r--po/yo.po4
-rw-r--r--src/bookmarks/ephy-bookmark-action-group.c4
-rw-r--r--src/bookmarks/ephy-bookmark-action-group.h4
-rw-r--r--src/bookmarks/ephy-bookmark-action.c4
-rw-r--r--src/bookmarks/ephy-bookmark-action.h4
-rw-r--r--src/bookmarks/ephy-bookmark-properties.c4
-rw-r--r--src/bookmarks/ephy-bookmark-properties.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-export.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-export.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-import.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-ui.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-ui.h4
-rw-r--r--src/bookmarks/ephy-bookmarks.c4
-rw-r--r--src/bookmarks/ephy-bookmarks.h4
-rw-r--r--src/bookmarks/ephy-nodes-cover.c4
-rw-r--r--src/bookmarks/ephy-nodes-cover.h4
-rw-r--r--src/bookmarks/ephy-open-tabs-action.c4
-rw-r--r--src/bookmarks/ephy-open-tabs-action.h4
-rw-r--r--src/bookmarks/ephy-topic-action-group.c4
-rw-r--r--src/bookmarks/ephy-topic-action-group.h4
-rw-r--r--src/bookmarks/ephy-topic-action.c4
-rw-r--r--src/bookmarks/ephy-topic-action.h4
-rw-r--r--src/bookmarks/ephy-topics-entry.c3
-rw-r--r--src/bookmarks/ephy-topics-entry.h4
-rw-r--r--src/bookmarks/ephy-topics-palette.c4
-rw-r--r--src/bookmarks/ephy-topics-palette.h4
-rw-r--r--src/clear-data-dialog.c4
-rw-r--r--src/clear-data-dialog.h4
-rw-r--r--src/cookies-dialog.c4
-rw-r--r--src/cookies-dialog.h4
-rw-r--r--src/ephy-action-helper.c4
-rw-r--r--src/ephy-action-helper.h4
-rw-r--r--src/ephy-combined-stop-reload-action.c4
-rw-r--r--src/ephy-combined-stop-reload-action.h4
-rw-r--r--src/ephy-completion-model.c4
-rw-r--r--src/ephy-completion-model.h4
-rw-r--r--src/ephy-encoding-dialog.c4
-rw-r--r--src/ephy-encoding-dialog.h4
-rw-r--r--src/ephy-encoding-menu.c4
-rw-r--r--src/ephy-encoding-menu.h4
-rw-r--r--src/ephy-history-window.c4
-rw-r--r--src/ephy-history-window.h4
-rw-r--r--src/ephy-home-action.c4
-rw-r--r--src/ephy-home-action.h4
-rw-r--r--src/ephy-link-action.c4
-rw-r--r--src/ephy-link-action.h4
-rw-r--r--src/ephy-link.c4
-rw-r--r--src/ephy-link.h4
-rw-r--r--src/ephy-location-controller.c4
-rw-r--r--src/ephy-location-controller.h4
-rw-r--r--src/ephy-lockdown.c4
-rw-r--r--src/ephy-lockdown.h4
-rw-r--r--src/ephy-main.c4
-rw-r--r--src/ephy-navigation-history-action.c4
-rw-r--r--src/ephy-navigation-history-action.h4
-rw-r--r--src/ephy-notebook.c4
-rw-r--r--src/ephy-notebook.h4
-rw-r--r--src/ephy-private.h4
-rw-r--r--src/ephy-search-provider-main.c6
-rw-r--r--src/ephy-search-provider.c6
-rw-r--r--src/ephy-search-provider.h6
-rw-r--r--src/ephy-session.c3
-rw-r--r--src/ephy-session.h4
-rw-r--r--src/ephy-shell.c4
-rw-r--r--src/ephy-shell.h4
-rw-r--r--src/ephy-title-box.c4
-rw-r--r--src/ephy-title-box.h4
-rw-r--r--src/ephy-toolbar.c4
-rw-r--r--src/ephy-toolbar.h4
-rw-r--r--src/ephy-window-action.c4
-rw-r--r--src/ephy-window-action.h4
-rw-r--r--src/ephy-window.c4
-rw-r--r--src/ephy-window.h4
-rw-r--r--src/languages.h4
-rw-r--r--src/passwords-dialog.c4
-rw-r--r--src/passwords-dialog.h4
-rw-r--r--src/popup-commands.c4
-rw-r--r--src/popup-commands.h4
-rw-r--r--src/prefs-dialog.c4
-rw-r--r--src/prefs-dialog.h4
-rw-r--r--src/resources/error.html3
-rw-r--r--src/window-commands.c4
-rw-r--r--src/window-commands.h4
-rw-r--r--tests/ephy-bookmarks-test.c4
-rw-r--r--tests/ephy-completion-model-test.c4
-rw-r--r--tests/ephy-download-test.c4
-rw-r--r--tests/ephy-embed-shell-test.c4
-rw-r--r--tests/ephy-embed-utils-test.c4
-rw-r--r--tests/ephy-encodings-test.c4
-rw-r--r--tests/ephy-file-helpers-test.c4
-rw-r--r--tests/ephy-history-test.c4
-rw-r--r--tests/ephy-location-entry-test.c4
-rw-r--r--tests/ephy-migration-test.c4
-rw-r--r--tests/ephy-session-test.c4
-rw-r--r--tests/ephy-shell-test.c4
-rw-r--r--tests/ephy-snapshot-service-test.c4
-rw-r--r--tests/ephy-sqlite-test.c4
-rw-r--r--tests/ephy-string-test.c4
-rw-r--r--tests/ephy-test-utils.c4
-rw-r--r--tests/ephy-test-utils.h4
-rw-r--r--tests/ephy-uri-helpers-test.c4
-rw-r--r--tests/ephy-web-app-utils-test.c4
-rw-r--r--tests/ephy-web-view-test.c4
238 files changed, 251 insertions, 697 deletions
diff --git a/configure.ac b/configure.ac
index 07ba166af..baa3a4b9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,8 @@
# 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 along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
m4_define([epiphany_version_major],[3])
m4_define([epiphany_version_minor],[18])
diff --git a/embed/ephy-about-handler.c b/embed/ephy-about-handler.c
index 2cc0993cb..354ef6fb0 100644
--- a/embed/ephy-about-handler.c
+++ b/embed/ephy-about-handler.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-about-handler.h b/embed/ephy-about-handler.h
index b94f2762d..d75be826b 100644
--- a/embed/ephy-about-handler.h
+++ b/embed/ephy-about-handler.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_ABOUT_HANDLER_H
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index 405cfda67..0d6bf4256 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-download.h b/embed/ephy-download.h
index 9458b1a9b..546bd6337 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-embed-container.c b/embed/ephy-embed-container.c
index 58c709dbe..cb216496a 100644
--- a/embed/ephy-embed-container.c
+++ b/embed/ephy-embed-container.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-embed-container.h b/embed/ephy-embed-container.h
index 8c9f7e9f5..1a5049691 100644
--- a/embed/ephy-embed-container.h
+++ b/embed/ephy-embed-container.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c
index 0975cdd08..bc491dbe2 100644
--- a/embed/ephy-embed-event.c
+++ b/embed/ephy-embed-event.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h
index 9e152a260..7226408fa 100644
--- a/embed/ephy-embed-event.h
+++ b/embed/ephy-embed-event.h
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index 734c0a0fe..7fc634923 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index 12685e584..5c31f50cc 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EPHY_EMBED_PREFS_H__
diff --git a/embed/ephy-embed-private.h b/embed/ephy-embed-private.h
index 34d648b32..aefd91088 100644
--- a/embed/ephy-embed-private.h
+++ b/embed/ephy-embed-private.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index f246d439b..756464624 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index c862ae514..c71f72e0d 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c
index 9f2854d31..4a22ab8a4 100644
--- a/embed/ephy-embed-utils.c
+++ b/embed/ephy-embed-utils.c
@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-embed-utils.h b/embed/ephy-embed-utils.h
index ec89fd971..425121272 100644
--- a/embed/ephy-embed-utils.h
+++ b/embed/ephy-embed-utils.h
@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 05609845b..42bf8abd2 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -18,9 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 158d184bc..c676512f7 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_EMBED_H
diff --git a/embed/ephy-encoding.c b/embed/ephy-encoding.c
index 4510d644a..a0665a515 100644
--- a/embed/ephy-encoding.c
+++ b/embed/ephy-encoding.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-encoding.h b/embed/ephy-encoding.h
index a09989dd8..2b0c41fee 100644
--- a/embed/ephy-encoding.h
+++ b/embed/ephy-encoding.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index 9954ab4eb..3936d3839 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h
index 401588b9a..b72904a79 100644
--- a/embed/ephy-encodings.h
+++ b/embed/ephy-encodings.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-file-monitor.c b/embed/ephy-file-monitor.c
index 57b9e805d..69da675a7 100644
--- a/embed/ephy-file-monitor.c
+++ b/embed/ephy-file-monitor.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-file-monitor.h b/embed/ephy-file-monitor.h
index b6bcc7c45..75d77f739 100644
--- a/embed/ephy-file-monitor.h
+++ b/embed/ephy-file-monitor.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-find-toolbar.c b/embed/ephy-find-toolbar.c
index ed524a6f7..ed796f1a3 100644
--- a/embed/ephy-find-toolbar.c
+++ b/embed/ephy-find-toolbar.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-find-toolbar.h b/embed/ephy-find-toolbar.h
index 8e2de67eb..07e06bce2 100644
--- a/embed/ephy-find-toolbar.h
+++ b/embed/ephy-find-toolbar.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-web-extension-proxy.c b/embed/ephy-web-extension-proxy.c
index f35500a06..a62ff4db6 100644
--- a/embed/ephy-web-extension-proxy.c
+++ b/embed/ephy-web-extension-proxy.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/embed/ephy-web-extension-proxy.h b/embed/ephy-web-extension-proxy.h
index b1f915e7b..1dac674c3 100644
--- a/embed/ephy-web-extension-proxy.h
+++ b/embed/ephy-web-extension-proxy.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index f5fbc6404..42f13a435 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index 542494898..26c4e04db 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/embed/web-extension/ephy-embed-form-auth.c b/embed/web-extension/ephy-embed-form-auth.c
index a4fef1e64..1ce650490 100644
--- a/embed/web-extension/ephy-embed-form-auth.c
+++ b/embed/web-extension/ephy-embed-form-auth.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/embed/web-extension/ephy-embed-form-auth.h b/embed/web-extension/ephy-embed-form-auth.h
index 022fadf08..256ff1cdf 100644
--- a/embed/web-extension/ephy-embed-form-auth.h
+++ b/embed/web-extension/ephy-embed-form-auth.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_EMBED_FORM_AUTH_H
diff --git a/embed/web-extension/ephy-uri-tester.c b/embed/web-extension/ephy-uri-tester.c
index f8a2d82ec..953a09cc0 100644
--- a/embed/web-extension/ephy-uri-tester.c
+++ b/embed/web-extension/ephy-uri-tester.c
@@ -18,8 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/web-extension/ephy-uri-tester.h b/embed/web-extension/ephy-uri-tester.h
index 757c7a162..2c0497eb2 100644
--- a/embed/web-extension/ephy-uri-tester.h
+++ b/embed/web-extension/ephy-uri-tester.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef URI_TESTER_H
diff --git a/embed/web-extension/ephy-web-extension-main.c b/embed/web-extension/ephy-web-extension-main.c
index f3891cac5..8a2320bd0 100644
--- a/embed/web-extension/ephy-web-extension-main.c
+++ b/embed/web-extension/ephy-web-extension-main.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/web-extension/ephy-web-extension-names.h b/embed/web-extension/ephy-web-extension-names.h
index 78153ebb2..93bbcf8c8 100644
--- a/embed/web-extension/ephy-web-extension-names.h
+++ b/embed/web-extension/ephy-web-extension-names.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_WEB_EXTENSION_NAMES_H
diff --git a/embed/web-extension/ephy-web-extension.c b/embed/web-extension/ephy-web-extension.c
index 5a0a6589d..f1dc57a49 100644
--- a/embed/web-extension/ephy-web-extension.c
+++ b/embed/web-extension/ephy-web-extension.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/web-extension/ephy-web-extension.h b/embed/web-extension/ephy-web-extension.h
index da227ef52..ce62c06d9 100644
--- a/embed/web-extension/ephy-web-extension.h
+++ b/embed/web-extension/ephy-web-extension.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_WEB_EXTENSION_H
diff --git a/embed/web-extension/ephy-web-overview-model.c b/embed/web-extension/ephy-web-overview-model.c
index 5fe08886c..7a8687fdf 100644
--- a/embed/web-extension/ephy-web-overview-model.c
+++ b/embed/web-extension/ephy-web-overview-model.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/web-extension/ephy-web-overview-model.h b/embed/web-extension/ephy-web-overview-model.h
index e2ab523cd..be9c4bd0d 100644
--- a/embed/web-extension/ephy-web-overview-model.h
+++ b/embed/web-extension/ephy-web-overview-model.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _EPHY_WEB_OVERVIEW_MODEL_H
diff --git a/embed/web-extension/ephy-web-overview.c b/embed/web-extension/ephy-web-overview.c
index 251dc92e9..bafda8c19 100644
--- a/embed/web-extension/ephy-web-overview.c
+++ b/embed/web-extension/ephy-web-overview.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/embed/web-extension/ephy-web-overview.h b/embed/web-extension/ephy-web-overview.h
index 3afb658c1..7d67c8422 100644
--- a/embed/web-extension/ephy-web-overview.h
+++ b/embed/web-extension/ephy-web-overview.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _EPHY_WEB_OVERVIEW_H
diff --git a/lib/egg/eggtreemultidnd.c b/lib/egg/eggtreemultidnd.c
index 1c4fc73ef..f140c2591 100644
--- a/lib/egg/eggtreemultidnd.c
+++ b/lib/egg/eggtreemultidnd.c
@@ -2,7 +2,7 @@
* Copyright (C) 2001 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
@@ -11,10 +11,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/lib/egg/eggtreemultidnd.h b/lib/egg/eggtreemultidnd.h
index 3df69fbad..e61a434cc 100644
--- a/lib/egg/eggtreemultidnd.h
+++ b/lib/egg/eggtreemultidnd.h
@@ -11,10 +11,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EGG_TREE_MULTI_DND_H__
diff --git a/lib/ephy-debug.c b/lib/ephy-debug.c
index 0677192b5..6a6997d7d 100644
--- a/lib/ephy-debug.c
+++ b/lib/ephy-debug.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index a9b252963..c7d96e788 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index 57de98d75..bb7b61acf 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-dnd.h b/lib/ephy-dnd.h
index 67cf61cbb..b2462e718 100644
--- a/lib/ephy-dnd.h
+++ b/lib/ephy-dnd.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-favicon-helpers.c b/lib/ephy-favicon-helpers.c
index 6ff236abd..d6ecf856c 100644
--- a/lib/ephy-favicon-helpers.c
+++ b/lib/ephy-favicon-helpers.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-favicon-helpers.h b/lib/ephy-favicon-helpers.h
index 2a6e326b1..3fcee37fa 100644
--- a/lib/ephy-favicon-helpers.h
+++ b/lib/ephy-favicon-helpers.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 0d8b85c05..abdb4a70c 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h
index f7c49e567..f10fd3cd7 100644
--- a/lib/ephy-file-helpers.h
+++ b/lib/ephy-file-helpers.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-form-auth-data.c b/lib/ephy-form-auth-data.c
index 44d670ead..020c13af5 100644
--- a/lib/ephy-form-auth-data.c
+++ b/lib/ephy-form-auth-data.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-form-auth-data.h b/lib/ephy-form-auth-data.h
index 6184beaf9..5ec13d786 100644
--- a/lib/ephy-form-auth-data.h
+++ b/lib/ephy-form-auth-data.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_FORM_AUTH_DATA_H
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 1e44c90fa..331d3d12b 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-gui.h b/lib/ephy-gui.h
index b4a8844b1..fc3466ac8 100644
--- a/lib/ephy-gui.h
+++ b/lib/ephy-gui.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-initial-state.c b/lib/ephy-initial-state.c
index 2bc5f7be2..e37031978 100644
--- a/lib/ephy-initial-state.c
+++ b/lib/ephy-initial-state.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-initial-state.h b/lib/ephy-initial-state.h
index 8458ac0d5..9ffa0af45 100644
--- a/lib/ephy-initial-state.h
+++ b/lib/ephy-initial-state.h
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index f1026e590..1651f4fae 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h
index cf88a8900..56964d92d 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-node-common.h b/lib/ephy-node-common.h
index 7fb87498c..9f92d798e 100644
--- a/lib/ephy-node-common.h
+++ b/lib/ephy-node-common.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EPHY_NODE_COMMON_H
diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c
index 87332439c..269411a68 100644
--- a/lib/ephy-node-db.c
+++ b/lib/ephy-node-db.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-node-db.h b/lib/ephy-node-db.h
index 2878e43f8..c0c0821e1 100644
--- a/lib/ephy-node-db.h
+++ b/lib/ephy-node-db.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index 63e0e86ab..e8021647d 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-node-filter.h b/lib/ephy-node-filter.h
index 37106b79e..c9703eac1 100644
--- a/lib/ephy-node-filter.h
+++ b/lib/ephy-node-filter.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 3f7d58403..fe0e1b60a 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-node.h b/lib/ephy-node.h
index 1509ce126..254ca75f3 100644
--- a/lib/ephy-node.h
+++ b/lib/ephy-node.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-nss-glue.c b/lib/ephy-nss-glue.c
index 37e547050..b9d01f5e6 100644
--- a/lib/ephy-nss-glue.c
+++ b/lib/ephy-nss-glue.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Portions of this file based on Chromium code.
diff --git a/lib/ephy-nss-glue.h b/lib/ephy-nss-glue.h
index 0c157226a..32626a709 100644
--- a/lib/ephy-nss-glue.h
+++ b/lib/ephy-nss-glue.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_NSS_GLUE_H
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 10adbc550..58cc5fafc 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
index ca46bc447..30a1fb8ad 100644
--- a/lib/ephy-profile-migrator.c
+++ b/lib/ephy-profile-migrator.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Portions of this file based on Chromium code.
diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
index d3ba9fe1a..0770b42bd 100644
--- a/lib/ephy-profile-utils.c
+++ b/lib/ephy-profile-utils.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-profile-utils.h b/lib/ephy-profile-utils.h
index 1648e49f3..a68387dd2 100644
--- a/lib/ephy-profile-utils.h
+++ b/lib/ephy-profile-utils.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_PROFILE_UTILS_H
diff --git a/lib/ephy-security-levels.c b/lib/ephy-security-levels.c
index 860780cd2..d67949bf2 100644
--- a/lib/ephy-security-levels.c
+++ b/lib/ephy-security-levels.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-security-levels.h b/lib/ephy-security-levels.h
index 1f88eff40..3d60c41f4 100644
--- a/lib/ephy-security-levels.h
+++ b/lib/ephy-security-levels.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-settings.c b/lib/ephy-settings.c
index 4c9810933..f68fbba71 100644
--- a/lib/ephy-settings.c
+++ b/lib/ephy-settings.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-settings.h b/lib/ephy-settings.h
index 197941c66..8ecb36ac9 100644
--- a/lib/ephy-settings.h
+++ b/lib/ephy-settings.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-signal-accumulator.c b/lib/ephy-signal-accumulator.c
index 566eb700d..fc2a3b670 100644
--- a/lib/ephy-signal-accumulator.c
+++ b/lib/ephy-signal-accumulator.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-signal-accumulator.h b/lib/ephy-signal-accumulator.h
index bdd9424bf..4a01a56cb 100644
--- a/lib/ephy-signal-accumulator.h
+++ b/lib/ephy-signal-accumulator.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-smaps.c b/lib/ephy-smaps.c
index 65ae25a35..5aa0b77af 100644
--- a/lib/ephy-smaps.c
+++ b/lib/ephy-smaps.c
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
diff --git a/lib/ephy-smaps.h b/lib/ephy-smaps.h
index 728198656..dc55dd736 100644
--- a/lib/ephy-smaps.h
+++ b/lib/ephy-smaps.h
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
diff --git a/lib/ephy-snapshot-service.c b/lib/ephy-snapshot-service.c
index ec9ac8111..599350842 100644
--- a/lib/ephy-snapshot-service.c
+++ b/lib/ephy-snapshot-service.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-snapshot-service.h b/lib/ephy-snapshot-service.h
index 0484b7941..84df9f6c4 100644
--- a/lib/ephy-snapshot-service.h
+++ b/lib/ephy-snapshot-service.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _EPHY_SNAPSHOT_SERVICE_H
diff --git a/lib/ephy-sqlite-connection.c b/lib/ephy-sqlite-connection.c
index 1f6486932..1800c0165 100644
--- a/lib/ephy-sqlite-connection.c
+++ b/lib/ephy-sqlite-connection.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-sqlite-connection.h b/lib/ephy-sqlite-connection.h
index 74f30bd64..bd9a4e292 100644
--- a/lib/ephy-sqlite-connection.h
+++ b/lib/ephy-sqlite-connection.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_SQLITE_CONNECTION_H
diff --git a/lib/ephy-sqlite-statement.c b/lib/ephy-sqlite-statement.c
index e1f3e0717..d0d370cb9 100644
--- a/lib/ephy-sqlite-statement.c
+++ b/lib/ephy-sqlite-statement.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-sqlite-statement.h b/lib/ephy-sqlite-statement.h
index abf6ac48f..10acea416 100644
--- a/lib/ephy-sqlite-statement.h
+++ b/lib/ephy-sqlite-statement.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_SQLITE_STATEMENT_H
diff --git a/lib/ephy-sqlite.h b/lib/ephy-sqlite.h
index e2ad297f5..db70cf3af 100644
--- a/lib/ephy-sqlite.h
+++ b/lib/ephy-sqlite.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_SQLITE_H
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index 00a9f8856..2abea4980 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-string.h b/lib/ephy-string.h
index 3fe2ae9c6..59630bce8 100644
--- a/lib/ephy-string.h
+++ b/lib/ephy-string.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-time-helpers.c b/lib/ephy-time-helpers.c
index 84a0208ba..dc3fe7422 100644
--- a/lib/ephy-time-helpers.c
+++ b/lib/ephy-time-helpers.c
@@ -16,8 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: John Sullivan <sullivan@eazel.com>
* Jorn Baayen
diff --git a/lib/ephy-time-helpers.h b/lib/ephy-time-helpers.h
index 8d6eddd98..ff00c1eec 100644
--- a/lib/ephy-time-helpers.h
+++ b/lib/ephy-time-helpers.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Following code is copied from Rhythmbox rb-cut-and-paste-code.h */
diff --git a/lib/ephy-uri-helpers.c b/lib/ephy-uri-helpers.c
index 956d9444b..bcc08a221 100644
--- a/lib/ephy-uri-helpers.c
+++ b/lib/ephy-uri-helpers.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-uri-helpers.h b/lib/ephy-uri-helpers.h
index 60a165e38..6e1467847 100644
--- a/lib/ephy-uri-helpers.h
+++ b/lib/ephy-uri-helpers.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
index 3d19d7d44..37b6be7f4 100644
--- a/lib/ephy-web-app-utils.c
+++ b/lib/ephy-web-app-utils.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-web-app-utils.h b/lib/ephy-web-app-utils.h
index 2c931877b..4b1299aaf 100644
--- a/lib/ephy-web-app-utils.h
+++ b/lib/ephy-web-app-utils.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-web-dom-utils.c b/lib/ephy-web-dom-utils.c
index 4b85e6b64..0001536e4 100644
--- a/lib/ephy-web-dom-utils.c
+++ b/lib/ephy-web-dom-utils.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-web-dom-utils.h b/lib/ephy-web-dom-utils.h
index 6ff4853df..9339c83d2 100644
--- a/lib/ephy-web-dom-utils.h
+++ b/lib/ephy-web-dom-utils.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/ephy-zoom.c b/lib/ephy-zoom.c
index be44217d0..c2c678027 100644
--- a/lib/ephy-zoom.c
+++ b/lib/ephy-zoom.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/ephy-zoom.h b/lib/ephy-zoom.h
index 0505d0398..a5b466f84 100644
--- a/lib/ephy-zoom.h
+++ b/lib/ephy-zoom.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/history/ephy-history-service-hosts-table.c b/lib/history/ephy-history-service-hosts-table.c
index 3a3e67206..f01d3c94f 100644
--- a/lib/history/ephy-history-service-hosts-table.c
+++ b/lib/history/ephy-history-service-hosts-table.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/history/ephy-history-service-private.h b/lib/history/ephy-history-service-private.h
index 8f059ec13..fc55d9859 100644
--- a/lib/history/ephy-history-service-private.h
+++ b/lib/history/ephy-history-service-private.h
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_HISTORY_SERVICE_PRIVATE_H
diff --git a/lib/history/ephy-history-service-urls-table.c b/lib/history/ephy-history-service-urls-table.c
index fa9142de5..35a92b9a5 100644
--- a/lib/history/ephy-history-service-urls-table.c
+++ b/lib/history/ephy-history-service-urls-table.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/history/ephy-history-service-visits-table.c b/lib/history/ephy-history-service-visits-table.c
index be5089a59..8d38df46e 100644
--- a/lib/history/ephy-history-service-visits-table.c
+++ b/lib/history/ephy-history-service-visits-table.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/history/ephy-history-service.c b/lib/history/ephy-history-service.c
index 30b622822..480f96e43 100644
--- a/lib/history/ephy-history-service.c
+++ b/lib/history/ephy-history-service.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/history/ephy-history-service.h b/lib/history/ephy-history-service.h
index c20f2c4df..84abf062c 100644
--- a/lib/history/ephy-history-service.h
+++ b/lib/history/ephy-history-service.h
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_HISTORY_SERVICE_H
diff --git a/lib/history/ephy-history-types.c b/lib/history/ephy-history-types.c
index 02b4b5517..9dccfa77e 100644
--- a/lib/history/ephy-history-types.c
+++ b/lib/history/ephy-history-types.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <glib.h>
diff --git a/lib/history/ephy-history-types.h b/lib/history/ephy-history-types.h
index 5f5f5fe00..61fdf96d0 100644
--- a/lib/history/ephy-history-types.h
+++ b/lib/history/ephy-history-types.h
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EPHY_HISTORY_TYPES_H
diff --git a/lib/widgets/ephy-certificate-dialog.c b/lib/widgets/ephy-certificate-dialog.c
index db556ecca..d50188e22 100644
--- a/lib/widgets/ephy-certificate-dialog.c
+++ b/lib/widgets/ephy-certificate-dialog.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-certificate-dialog.h b/lib/widgets/ephy-certificate-dialog.h
index 2f2a612b6..6551a7bf0 100644
--- a/lib/widgets/ephy-certificate-dialog.h
+++ b/lib/widgets/ephy-certificate-dialog.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/widgets/ephy-certificate-popover.c b/lib/widgets/ephy-certificate-popover.c
index e9d5c7bf3..5dc108805 100644
--- a/lib/widgets/ephy-certificate-popover.c
+++ b/lib/widgets/ephy-certificate-popover.c
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-certificate-popover.h b/lib/widgets/ephy-certificate-popover.h
index 7d214c116..9a196f9ca 100644
--- a/lib/widgets/ephy-certificate-popover.h
+++ b/lib/widgets/ephy-certificate-popover.h
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/widgets/ephy-download-widget.c b/lib/widgets/ephy-download-widget.c
index 06dc22852..c9a4d9047 100644
--- a/lib/widgets/ephy-download-widget.c
+++ b/lib/widgets/ephy-download-widget.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-download-widget.h b/lib/widgets/ephy-download-widget.h
index a0bc4ccef..372d314ab 100644
--- a/lib/widgets/ephy-download-widget.h
+++ b/lib/widgets/ephy-download-widget.h
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/widgets/ephy-file-chooser.c b/lib/widgets/ephy-file-chooser.c
index b53bba87c..7e68364ee 100644
--- a/lib/widgets/ephy-file-chooser.c
+++ b/lib/widgets/ephy-file-chooser.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-file-chooser.h b/lib/widgets/ephy-file-chooser.h
index bdf0b825b..84f4ad49d 100644
--- a/lib/widgets/ephy-file-chooser.h
+++ b/lib/widgets/ephy-file-chooser.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index d4019766b..2186f1789 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index 22f2d6570..22e761154 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/widgets/ephy-middle-clickable-button.c b/lib/widgets/ephy-middle-clickable-button.c
index a03cb4dcf..58b097d60 100644
--- a/lib/widgets/ephy-middle-clickable-button.c
+++ b/lib/widgets/ephy-middle-clickable-button.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-middle-clickable-button.h b/lib/widgets/ephy-middle-clickable-button.h
index e346a1488..e1bd5a873 100644
--- a/lib/widgets/ephy-middle-clickable-button.h
+++ b/lib/widgets/ephy-middle-clickable-button.h
@@ -14,11 +14,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
#error "Only <epiphany/epiphany.h> can be included directly."
#endif
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index 8ab9129ec..3c553039c 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 10da15c71..52aa13691 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EPHY_NODE_VIEW_H
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 2859db581..b02f718dd 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h
index 6ea68faf4..4e6d4dc09 100644
--- a/lib/widgets/ephy-tree-model-node.h
+++ b/lib/widgets/ephy-tree-model-node.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EPHY_TREE_MODEL_NODE_H
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index aeeb7652b..6a870f3f2 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h
index 4044704ee..2c9671fd3 100644
--- a/lib/widgets/ephy-tree-model-sort.h
+++ b/lib/widgets/ephy-tree-model-sort.h
@@ -11,9 +11,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index 86d8a06f8..70f22d95c 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/lib/widgets/ephy-zoom-action.h b/lib/widgets/ephy-zoom-action.h
index 647d0c14f..957ef5a68 100644
--- a/lib/widgets/ephy-zoom-action.h
+++ b/lib/widgets/ephy-zoom-action.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/lib/widgets/nautilus-floating-bar.c b/lib/widgets/nautilus-floating-bar.c
index 08265ef4f..5129f4af6 100644
--- a/lib/widgets/nautilus-floating-bar.c
+++ b/lib/widgets/nautilus-floating-bar.c
@@ -5,7 +5,7 @@
* Copyright (C) 2011 Red Hat Inc.
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
@@ -14,10 +14,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: Cosimo Cecchi <cosimoc@redhat.com>
*
diff --git a/lib/widgets/nautilus-floating-bar.h b/lib/widgets/nautilus-floating-bar.h
index ba31ac552..b5c8bbf04 100644
--- a/lib/widgets/nautilus-floating-bar.h
+++ b/lib/widgets/nautilus-floating-bar.h
@@ -5,7 +5,7 @@
* Copyright (C) 2011 Red Hat Inc.
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
@@ -14,10 +14,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: Cosimo Cecchi <cosimoc@redhat.com>
*
diff --git a/po/yo.po b/po/yo.po
index bbbda5918..c5fcee207 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -3035,8 +3035,8 @@ msgid ""
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
msgstr ""
"Ó yẹ kí o ti gba ẹ̀dà Ìwé-àṣẹ Gbogbo ti GNU pẹ̀lú Awáròyìn Wẹ́ẹ̀bù GNOME; tí kò "
-"bá rí bẹ́ẹ̀ kọ̀wé sí Free Software Foundation, Inc., 59 Temple Place, Suite "
-"330, Boston, MA 02111-1307 USA"
+"bá rí bẹ́ẹ̀ kọ̀wé sí Free Software Foundation, Inc., 51 Franklin Street, Fifth "
+"Floor, Boston, MA 02111-1301 USA"
#: ../src/window-commands.c:1300 ../src/window-commands.c:1316
#: ../src/window-commands.c:1327
diff --git a/src/bookmarks/ephy-bookmark-action-group.c b/src/bookmarks/ephy-bookmark-action-group.c
index f2c55cbc1..a2ad23b6c 100644
--- a/src/bookmarks/ephy-bookmark-action-group.c
+++ b/src/bookmarks/ephy-bookmark-action-group.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmark-action-group.h b/src/bookmarks/ephy-bookmark-action-group.h
index 856c7ebf9..2d7444fb4 100644
--- a/src/bookmarks/ephy-bookmark-action-group.h
+++ b/src/bookmarks/ephy-bookmark-action-group.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index cbe6ca2a4..446e82e81 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index e6b96f934..db89ee20b 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 85a99ff42..e1d4b1416 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 336337c4c..851ec7c5e 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 63eb735dd..aecd8ce2b 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h
index 3536d50ec..a86dac3be 100644
--- a/src/bookmarks/ephy-bookmarks-editor.h
+++ b/src/bookmarks/ephy-bookmarks-editor.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index 57c7cb9d6..d8b970b01 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmarks-export.h b/src/bookmarks/ephy-bookmarks-export.h
index fb2e53a4e..fe3a3dad4 100644
--- a/src/bookmarks/ephy-bookmarks-export.h
+++ b/src/bookmarks/ephy-bookmarks-export.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index fb22bc59b..f15897240 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h
index 728acd142..14160797e 100644
--- a/src/bookmarks/ephy-bookmarks-import.h
+++ b/src/bookmarks/ephy-bookmarks-import.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index dd3bf990f..4a4da38c3 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h
index 6ecd78355..c322dc2c9 100644
--- a/src/bookmarks/ephy-bookmarks-menu.h
+++ b/src/bookmarks/ephy-bookmarks-menu.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index 744033b76..2dc619a1c 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmarks-ui.h b/src/bookmarks/ephy-bookmarks-ui.h
index e1b5e8bfc..691c89067 100644
--- a/src/bookmarks/ephy-bookmarks-ui.h
+++ b/src/bookmarks/ephy-bookmarks-ui.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index ac9c65c95..0254fcbae 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 7042239cf..709bce2c4 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-nodes-cover.c b/src/bookmarks/ephy-nodes-cover.c
index 6d33b08e0..2e5fe7d63 100644
--- a/src/bookmarks/ephy-nodes-cover.c
+++ b/src/bookmarks/ephy-nodes-cover.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-nodes-cover.h b/src/bookmarks/ephy-nodes-cover.h
index 408f48674..28f5e2113 100644
--- a/src/bookmarks/ephy-nodes-cover.h
+++ b/src/bookmarks/ephy-nodes-cover.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-open-tabs-action.c b/src/bookmarks/ephy-open-tabs-action.c
index 9556a438f..99cf64116 100644
--- a/src/bookmarks/ephy-open-tabs-action.c
+++ b/src/bookmarks/ephy-open-tabs-action.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-open-tabs-action.h b/src/bookmarks/ephy-open-tabs-action.h
index 71145fa65..9039b36f3 100644
--- a/src/bookmarks/ephy-open-tabs-action.h
+++ b/src/bookmarks/ephy-open-tabs-action.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-topic-action-group.c b/src/bookmarks/ephy-topic-action-group.c
index df663d4b7..12b471be3 100644
--- a/src/bookmarks/ephy-topic-action-group.c
+++ b/src/bookmarks/ephy-topic-action-group.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h
index cf644783e..feac94005 100644
--- a/src/bookmarks/ephy-topic-action-group.h
+++ b/src/bookmarks/ephy-topic-action-group.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 61195c1b2..3519967e9 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
index a886693df..8dbac7ad3 100644
--- a/src/bookmarks/ephy-topic-action.h
+++ b/src/bookmarks/ephy-topic-action.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-topics-entry.c b/src/bookmarks/ephy-topics-entry.c
index e0c941913..1af25ed93 100644
--- a/src/bookmarks/ephy-topics-entry.c
+++ b/src/bookmarks/ephy-topics-entry.c
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-topics-entry.h b/src/bookmarks/ephy-topics-entry.h
index 9056e2221..aca5a3808 100644
--- a/src/bookmarks/ephy-topics-entry.h
+++ b/src/bookmarks/ephy-topics-entry.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/bookmarks/ephy-topics-palette.c b/src/bookmarks/ephy-topics-palette.c
index f6165d9eb..57df0f397 100644
--- a/src/bookmarks/ephy-topics-palette.c
+++ b/src/bookmarks/ephy-topics-palette.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/bookmarks/ephy-topics-palette.h b/src/bookmarks/ephy-topics-palette.h
index 6ffa30c6f..6046bcf8c 100644
--- a/src/bookmarks/ephy-topics-palette.h
+++ b/src/bookmarks/ephy-topics-palette.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/clear-data-dialog.c b/src/clear-data-dialog.c
index f7dc0556f..32ee5e10e 100644
--- a/src/clear-data-dialog.c
+++ b/src/clear-data-dialog.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/clear-data-dialog.h b/src/clear-data-dialog.h
index b177c336f..2af83bd74 100644
--- a/src/clear-data-dialog.h
+++ b/src/clear-data-dialog.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CLEAR_DATA_DIALOG_H
diff --git a/src/cookies-dialog.c b/src/cookies-dialog.c
index b185d6b11..629d4bb0e 100644
--- a/src/cookies-dialog.c
+++ b/src/cookies-dialog.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/cookies-dialog.h b/src/cookies-dialog.h
index 39c356142..0302bbd49 100644
--- a/src/cookies-dialog.h
+++ b/src/cookies-dialog.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef COOKIES_DIALOG_H
diff --git a/src/ephy-action-helper.c b/src/ephy-action-helper.c
index 4dbcdce1d..83a4e949f 100644
--- a/src/ephy-action-helper.c
+++ b/src/ephy-action-helper.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-action-helper.h b/src/ephy-action-helper.h
index 71c0bbcfa..607ce1859 100644
--- a/src/ephy-action-helper.h
+++ b/src/ephy-action-helper.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-combined-stop-reload-action.c b/src/ephy-combined-stop-reload-action.c
index 21db6bae0..1d8e28eca 100644
--- a/src/ephy-combined-stop-reload-action.c
+++ b/src/ephy-combined-stop-reload-action.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-combined-stop-reload-action.h b/src/ephy-combined-stop-reload-action.h
index f6e722d42..b6f465e01 100644
--- a/src/ephy-combined-stop-reload-action.h
+++ b/src/ephy-combined-stop-reload-action.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _EPHY_COMBINED_STOP_RELOAD_ACTION_H
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index c9ee421ea..ad61d59be 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h
index 5637a0acb..a621540fc 100644
--- a/src/ephy-completion-model.h
+++ b/src/ephy-completion-model.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 81288f25a..d38fed30b 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-encoding-dialog.h b/src/ephy-encoding-dialog.h
index 249e640a0..6cd445a0f 100644
--- a/src/ephy-encoding-dialog.h
+++ b/src/ephy-encoding-dialog.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 4a74ad989..71dff1d7b 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-encoding-menu.h b/src/ephy-encoding-menu.h
index 40a63c88d..6b67dca51 100644
--- a/src/ephy-encoding-menu.h
+++ b/src/ephy-encoding-menu.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index d00893e68..b92b81202 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 891eb8441..610b93999 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-home-action.c b/src/ephy-home-action.c
index 2d8e02d8e..c9889fb10 100644
--- a/src/ephy-home-action.c
+++ b/src/ephy-home-action.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-home-action.h b/src/ephy-home-action.h
index 0290c6816..f0361ff46 100644
--- a/src/ephy-home-action.h
+++ b/src/ephy-home-action.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-link-action.c b/src/ephy-link-action.c
index 665975a0b..114a5a811 100644
--- a/src/ephy-link-action.c
+++ b/src/ephy-link-action.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-link-action.h b/src/ephy-link-action.h
index b2113bd4e..4e7e06768 100644
--- a/src/ephy-link-action.h
+++ b/src/ephy-link-action.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-link.c b/src/ephy-link.c
index ca735886c..585f3866d 100644
--- a/src/ephy-link.c
+++ b/src/ephy-link.c
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-link.h b/src/ephy-link.h
index 58c542fb9..46a0f1713 100644
--- a/src/ephy-link.h
+++ b/src/ephy-link.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-location-controller.c b/src/ephy-location-controller.c
index 61575efe4..5d44d3e5b 100644
--- a/src/ephy-location-controller.c
+++ b/src/ephy-location-controller.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-location-controller.h b/src/ephy-location-controller.h
index 84c85dfdf..041bd8ca2 100644
--- a/src/ephy-location-controller.h
+++ b/src/ephy-location-controller.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 257a966cd..d3a75f5c3 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-lockdown.h b/src/ephy-lockdown.h
index ea6bb37d2..74e00cd69 100644
--- a/src/ephy-lockdown.h
+++ b/src/ephy-lockdown.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-main.c b/src/ephy-main.c
index bb7b9dcb7..9a0a66231 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-navigation-history-action.c b/src/ephy-navigation-history-action.c
index 38de783a2..8d14ed9d3 100644
--- a/src/ephy-navigation-history-action.c
+++ b/src/ephy-navigation-history-action.c
@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-navigation-history-action.h b/src/ephy-navigation-history-action.h
index d455e86d2..4c34b6429 100644
--- a/src/ephy-navigation-history-action.h
+++ b/src/ephy-navigation-history-action.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 536c5a60c..f7ecf17ab 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h
index 56d439bae..278320a06 100644
--- a/src/ephy-notebook.h
+++ b/src/ephy-notebook.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-private.h b/src/ephy-private.h
index 9d8770c14..b71bc289a 100644
--- a/src/ephy-private.h
+++ b/src/ephy-private.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-search-provider-main.c b/src/ephy-search-provider-main.c
index 8bf3d6fe0..adab13482 100644
--- a/src/ephy-search-provider-main.c
+++ b/src/ephy-search-provider-main.c
@@ -11,10 +11,8 @@
* 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 along
- * with the Control Center; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-search-provider.c b/src/ephy-search-provider.c
index 27cb8c138..4a52a5286 100644
--- a/src/ephy-search-provider.c
+++ b/src/ephy-search-provider.c
@@ -11,10 +11,8 @@
* 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 along
- * with the Control Center; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-search-provider.h b/src/ephy-search-provider.h
index 74faac33c..ca5c05763 100644
--- a/src/ephy-search-provider.h
+++ b/src/ephy-search-provider.h
@@ -11,10 +11,8 @@
* 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 along
- * with the Control Center; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _EPHY_SEARCH_PROVIDER_H
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 7be9c3994..43109598e 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -16,8 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-session.h b/src/ephy-session.h
index a26baa248..c9e775e86 100644
--- a/src/ephy-session.h
+++ b/src/ephy-session.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 9702d8181..afacba904 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 912a23747..93aafdfa1 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-title-box.c b/src/ephy-title-box.c
index 068b91d00..7815a2af0 100644
--- a/src/ephy-title-box.c
+++ b/src/ephy-title-box.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-title-box.h b/src/ephy-title-box.h
index b8130477e..41d95bfd0 100644
--- a/src/ephy-title-box.h
+++ b/src/ephy-title-box.h
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EPHY_TITLE_BOX_H__
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 893ec9084..c37d98a59 100644
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-toolbar.h b/src/ephy-toolbar.h
index e1ce4a772..233530d57 100644
--- a/src/ephy-toolbar.h
+++ b/src/ephy-toolbar.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-window-action.c b/src/ephy-window-action.c
index 22634ed99..d0e3854d1 100644
--- a/src/ephy-window-action.c
+++ b/src/ephy-window-action.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-window-action.h b/src/ephy-window-action.h
index 388bdfaeb..e9613a029 100644
--- a/src/ephy-window-action.h
+++ b/src/ephy-window-action.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 381393483..810330535 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 2b093111f..dda5d692a 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/src/languages.h b/src/languages.h
index 9234868a1..93dad5040 100644
--- a/src/languages.h
+++ b/src/languages.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
static const char languages[][7] =
diff --git a/src/passwords-dialog.c b/src/passwords-dialog.c
index 1a71a84ad..ab51b23ea 100644
--- a/src/passwords-dialog.c
+++ b/src/passwords-dialog.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/passwords-dialog.h b/src/passwords-dialog.h
index c60c13166..44152798b 100644
--- a/src/passwords-dialog.h
+++ b/src/passwords-dialog.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PASSWORDS_DIALOG_H
diff --git a/src/popup-commands.c b/src/popup-commands.c
index e3d228791..d58ad724a 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/popup-commands.h b/src/popup-commands.h
index ae33759eb..0a973c756 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef POPUP_COMMANDS_H
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 365e719bc..250e8c8bd 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/prefs-dialog.h b/src/prefs-dialog.h
index 4c65efd9a..f8cee57f5 100644
--- a/src/prefs-dialog.h
+++ b/src/prefs-dialog.h
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PREFS_DIALOG_H
diff --git a/src/resources/error.html b/src/resources/error.html
index 8b60b0fd2..a770fa001 100644
--- a/src/resources/error.html
+++ b/src/resources/error.html
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%s" lang="%s" dir="%s">
<head>
diff --git a/src/window-commands.c b/src/window-commands.c
index fd4efc600..efec82d4c 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/src/window-commands.h b/src/window-commands.h
index 4877e44be..3c55b6e65 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/tests/ephy-bookmarks-test.c b/tests/ephy-bookmarks-test.c
index ac89bb1b6..3adad21c6 100644
--- a/tests/ephy-bookmarks-test.c
+++ b/tests/ephy-bookmarks-test.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-completion-model-test.c b/tests/ephy-completion-model-test.c
index 55c02b42d..d2180051a 100644
--- a/tests/ephy-completion-model-test.c
+++ b/tests/ephy-completion-model-test.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-download-test.c b/tests/ephy-download-test.c
index 237de9242..4262245b5 100644
--- a/tests/ephy-download-test.c
+++ b/tests/ephy-download-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-embed-shell-test.c b/tests/ephy-embed-shell-test.c
index f78d74ed9..1c607ccd2 100644
--- a/tests/ephy-embed-shell-test.c
+++ b/tests/ephy-embed-shell-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-embed-utils-test.c b/tests/ephy-embed-utils-test.c
index 53e0677d5..42529f392 100644
--- a/tests/ephy-embed-utils-test.c
+++ b/tests/ephy-embed-utils-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-encodings-test.c b/tests/ephy-encodings-test.c
index 1ef727ff6..2e2d89885 100644
--- a/tests/ephy-encodings-test.c
+++ b/tests/ephy-encodings-test.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
index 43d000917..20a1f3cfe 100644
--- a/tests/ephy-file-helpers-test.c
+++ b/tests/ephy-file-helpers-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-history-test.c b/tests/ephy-history-test.c
index 83962aba7..66a3c30cb 100644
--- a/tests/ephy-history-test.c
+++ b/tests/ephy-history-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-location-entry-test.c b/tests/ephy-location-entry-test.c
index 46f920c69..1abfa6757 100644
--- a/tests/ephy-location-entry-test.c
+++ b/tests/ephy-location-entry-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-migration-test.c b/tests/ephy-migration-test.c
index fab9ee7b9..375f533aa 100644
--- a/tests/ephy-migration-test.c
+++ b/tests/ephy-migration-test.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-session-test.c b/tests/ephy-session-test.c
index 5d0b85576..1ad7f8a62 100644
--- a/tests/ephy-session-test.c
+++ b/tests/ephy-session-test.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-shell-test.c b/tests/ephy-shell-test.c
index 45c593e99..cf94462f6 100644
--- a/tests/ephy-shell-test.c
+++ b/tests/ephy-shell-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-snapshot-service-test.c b/tests/ephy-snapshot-service-test.c
index dc811954a..459b625b4 100644
--- a/tests/ephy-snapshot-service-test.c
+++ b/tests/ephy-snapshot-service-test.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-sqlite-test.c b/tests/ephy-sqlite-test.c
index 309f7cfb5..d97ece1cf 100644
--- a/tests/ephy-sqlite-test.c
+++ b/tests/ephy-sqlite-test.c
@@ -15,9 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-string-test.c b/tests/ephy-string-test.c
index bcb1aae63..ab39130bd 100644
--- a/tests/ephy-string-test.c
+++ b/tests/ephy-string-test.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-test-utils.c b/tests/ephy-test-utils.c
index ec9c7a8f7..a6e1383f2 100644
--- a/tests/ephy-test-utils.c
+++ b/tests/ephy-test-utils.c
@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-test-utils.h b/tests/ephy-test-utils.h
index 66a9f4450..60ed8801b 100644
--- a/tests/ephy-test-utils.h
+++ b/tests/ephy-test-utils.h
@@ -12,9 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
diff --git a/tests/ephy-uri-helpers-test.c b/tests/ephy-uri-helpers-test.c
index 0052671d4..a3ae24e94 100644
--- a/tests/ephy-uri-helpers-test.c
+++ b/tests/ephy-uri-helpers-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-web-app-utils-test.c b/tests/ephy-web-app-utils-test.c
index 98279d506..5f3e43067 100644
--- a/tests/ephy-web-app-utils-test.c
+++ b/tests/ephy-web-app-utils-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tests/ephy-web-view-test.c b/tests/ephy-web-view-test.c
index d68fb6d81..d9ece072d 100644
--- a/tests/ephy-web-view-test.c
+++ b/tests/ephy-web-view-test.c
@@ -17,9 +17,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Epiphany; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"