Three small changes (copyright, template.js copyright, and tildetidy target)

a.) Cleaned up copyright language to match conventions. (I used the memoir document class documentation as a reference, but these conventions are common throughout publishing) * The (c) symbol has no legal meaning. Only the word "Copyright" and an encircled lowercase c are appropriate. So the word "Copyright" was placed before each (c). * Each (C) was changed to (c). * Kris uses the correct symbols in copyright notices, but those symbols can be problematic in terminal-mode editors. Added the word "Copyright" as well. * Replaced colons/spaces after years with the word "by." b.) Added a copyright notice to common/content/template.js. It was missing one entirely. Please correct if it doesn't need one or if the copyright isn't held by Martin. c.) Also added a "tildetidy" target to Makefile common that includes a version of the find line from the existing "clean" target (however, this version uses "rm -fv" instead of "rm -f").
2025-12-20 02:57:59 +01:00 · 2009-01-12 09:14:54 -05:00
parent 358b4b2f4b
commit d29013a2fd
35 changed files with 71 additions and 36 deletions
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- a/2
+++ b/2
@@ -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:%=\%.%):
--- 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)
--- 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 ;
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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 <blake@cs.stanford.edu> (Original Author)
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
    Code based on venkman

 Alternatively, the contents of this file may be used under the terms of
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- a/common/content/services.js
+++ b/common/content/services.js
@@ -1,5 +1,5 @@
 /***** BEGIN LICENSE BLOCK ***** {{{
- ©2008-2009 Kris Maglione <maglione.k at Gmail>
+ Copyright © 2008-2009 by Kris Maglione <maglione.k at Gmail>
 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
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -1,5 +1,5 @@
 /***** BEGIN LICENSE BLOCK ***** {{{
- ©2008-2009 Kris Maglione <maglione.k at Gmail>
+ Copyright © 2008-2009 by Kris Maglione <maglione.k at Gmail>
 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+
+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 */

--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -1,5 +1,5 @@
 /***** BEGIN LICENSE BLOCK ***** {{{
- ©2008-2009 Kris Maglione <maglione.k at Gmail>
+ Copyright © 2008-2009 by Kris Maglione <maglione.k at Gmail>
 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stettberger@dokucode.de>
+Copyright (c) 2008 by Christian Dietrich <stettberger@dokucode.de>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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
--- 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 <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>

 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