diff --git a/License.txt b/License.txt index 481f249c..7efdb050 100644 --- a/License.txt +++ b/License.txt @@ -10,7 +10,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/Makefile b/Makefile index ebdc570e..054f3b4c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DIRS = vimperator muttator -TARGETS = clean distclean doc help info jar release xpi +TARGETS = tildetidy clean distclean doc help info jar release xpi .SILENT: $(TARGETS:%=\%.%): diff --git a/common/Makefile.common b/common/Makefile.common index f3fbc038..82e48939 100644 --- a/common/Makefile.common +++ b/common/Makefile.common @@ -39,7 +39,7 @@ ASCIIDOC = asciidoc #### rules -.PHONY: all help info doc jar xpi install clean distclean $(JAR) +.PHONY: all help info doc jar xpi install clean distclean tildetidy $(JAR) all: help help: @@ -85,6 +85,10 @@ distclean: clean @set -e; for locale in $(LOCALES); do $(MAKE) -C clean; doc; done rm -rf ${BUILD_DIR} +tildetidy: + @echo "Removing vim backup files..." + find . -name '*~' -exec rm -fv {} \; + #### xpi $(XPI): $(JAR) diff --git a/common/Makefile.doc b/common/Makefile.doc index 6777d234..2ab13dbc 100644 --- a/common/Makefile.doc +++ b/common/Makefile.doc @@ -24,7 +24,7 @@ AWK = awk #### rules -.PHONY: all help doc asciidoc check-asciidoc clean distclean +.PHONY: all help doc asciidoc check-asciidoc clean distclean tildetidy all: doc doc: asciidoc t2t @@ -47,6 +47,10 @@ distclean: clean @echo "More cleanup..." rm -f $(DOC_FILES) +tildetidy: + @echo "Removing vim backup files..." + find . -name '*~' -exec rm -fv {} \; + #### Makes single-file makes easier to type %: %.html %.t2t %.xhtml %.t2t ; diff --git a/common/content/buffer.js b/common/content/buffer.js index 0544f04f..5f866e21 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/commands.js b/common/content/commands.js index 8aa01b5d..c8f886c1 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/completion.js b/common/content/completion.js index 133affe4..38bbdb11 100644 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/editor.js b/common/content/editor.js index 8e35c1c0..8f2f830f 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/events.js b/common/content/events.js index 8ba9bc1d..242f9e61 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/find.js b/common/content/find.js index 5a383c25..fe65eb17 100644 --- a/common/content/find.js +++ b/common/content/find.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or @@ -123,8 +123,8 @@ function Search() //{{{ * * The Initial Developer of the Original Code is * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 2003 - * the Initial Developer. All Rights Reserved. + * Portions created by the Initial Developer are Copyright (c) 2003 + * by the Initial Developer. All Rights Reserved. * * Contributor(s): * Blake Ross (Original Author) diff --git a/common/content/help.css b/common/content/help.css index 879e29b0..67bdba86 100644 --- a/common/content/help.css +++ b/common/content/help.css @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/hints.js b/common/content/hints.js index 31a30a23..343cc10f 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/io.js b/common/content/io.js index ca0befe6..38056324 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Code based on venkman Alternatively, the contents of this file may be used under the terms of diff --git a/common/content/liberator.js b/common/content/liberator.js index 8a99e868..739c2cd0 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/liberator.xul b/common/content/liberator.xul index eccb5e72..e7609f52 100644 --- a/common/content/liberator.xul +++ b/common/content/liberator.xul @@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/mappings.js b/common/content/mappings.js index df8c1112..0f222d64 100644 --- a/common/content/mappings.js +++ b/common/content/mappings.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/modes.js b/common/content/modes.js index 0a1ca076..68be3c99 100644 --- a/common/content/modes.js +++ b/common/content/modes.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/options.js b/common/content/options.js index af13f9b8..584fc344 100644 --- a/common/content/options.js +++ b/common/content/options.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/services.js b/common/content/services.js index 16638f8a..925be0a8 100644 --- a/common/content/services.js +++ b/common/content/services.js @@ -1,5 +1,5 @@ /***** BEGIN LICENSE BLOCK ***** {{{ - ©2008-2009 Kris Maglione + Copyright © 2008-2009 by Kris Maglione Distributable under the terms of the MIT license, which allows for sublicensing under any compatible license, including the MPL, GPL, and MPL. Anyone who changes this file is welcome to relicense diff --git a/common/content/style.js b/common/content/style.js index 9ba4a48e..50a38f5c 100644 --- a/common/content/style.js +++ b/common/content/style.js @@ -1,5 +1,5 @@ /***** BEGIN LICENSE BLOCK ***** {{{ - ©2008-2009 Kris Maglione + Copyright © 2008-2009 by Kris Maglione Distributable under the terms of the MIT license, which allows for sublicensing under any compatible license, including the MPL, GPL, and MPL. Anyone who changes this file is welcome to relicense diff --git a/common/content/tabs.js b/common/content/tabs.js index a1f03dbd..bb68506f 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/template.js b/common/content/template.js index 60f986df..981f72f8 100644 --- a/common/content/template.js +++ b/common/content/template.js @@ -1,3 +1,30 @@ +/***** BEGIN LICENSE BLOCK ***** {{{ +Version: MPL 1.1/GPL 2.0/LGPL 2.1 + +The contents of this file are subject to the Mozilla Public License Version +1.1 (the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. + +Copyright (c) 2006-2009 by Martin Stubenschrott + +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +in which case the provisions of the GPL or the LGPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL or the LGPL, and not to allow others to +use your version of this file under the terms of the MPL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL or the LGPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the MPL, the GPL or the LGPL. +}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/ui.js b/common/content/ui.js index 2af42f63..87735518 100644 --- a/common/content/ui.js +++ b/common/content/ui.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/content/util.js b/common/content/util.js index 93129683..a14894b2 100644 --- a/common/content/util.js +++ b/common/content/util.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm index ab59a77d..3d4c7840 100644 --- a/common/modules/storage.jsm +++ b/common/modules/storage.jsm @@ -1,5 +1,5 @@ /***** BEGIN LICENSE BLOCK ***** {{{ - ©2008-2009 Kris Maglione + Copyright © 2008-2009 by Kris Maglione Distributable under the terms of the MIT license, which allows for sublicensing under any compatible license, including the MPL, GPL, and MPL. Anyone who changes this file is welcome to relicense diff --git a/common/skin/liberator.css b/common/skin/liberator.css index ee8ad72f..677adbef 100644 --- a/common/skin/liberator.css +++ b/common/skin/liberator.css @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/muttator/License.txt b/muttator/License.txt index 481f249c..7efdb050 100644 --- a/muttator/License.txt +++ b/muttator/License.txt @@ -10,7 +10,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/muttator/content/addressbook.js b/muttator/content/addressbook.js index 49b3b83b..ee1a4a74 100644 --- a/muttator/content/addressbook.js +++ b/muttator/content/addressbook.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2008: Christian Dietrich +Copyright (c) 2008 by Christian Dietrich Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/muttator/content/compose/compose.xul b/muttator/content/compose/compose.xul index 75fc306d..f7466a7a 100644 --- a/muttator/content/compose/compose.xul +++ b/muttator/content/compose/compose.xul @@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/muttator/content/config.js b/muttator/content/config.js index 2ae985b0..259d019d 100644 --- a/muttator/content/config.js +++ b/muttator/content/config.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/muttator/content/mail.js b/muttator/content/mail.js index dae5ec1d..e0e9bbef 100644 --- a/muttator/content/mail.js +++ b/muttator/content/mail.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/muttator/content/muttator.xul b/muttator/content/muttator.xul index 801cdeaa..88816d94 100644 --- a/muttator/content/muttator.xul +++ b/muttator/content/muttator.xul @@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js index 3ee137aa..84bd3ca1 100644 --- a/vimperator/content/bookmarks.js +++ b/vimperator/content/bookmarks.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/vimperator/content/config.js b/vimperator/content/config.js index 09704823..33ea2a4c 100644 --- a/vimperator/content/config.js +++ b/vimperator/content/config.js @@ -11,7 +11,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/vimperator/content/vimperator.xul b/vimperator/content/vimperator.xul index 6d01761f..75cc8b5c 100644 --- a/vimperator/content/vimperator.xul +++ b/vimperator/content/vimperator.xul @@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2006-2009: Martin Stubenschrott +Copyright (c) 2006-2009 by Martin Stubenschrott Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or