diff options
author | Ted Pavlic <ted@tedpavlic.com> | 2009-01-12 09:14:54 -0500 |
---|---|---|
committer | Ted Pavlic <ted@tedpavlic.com> | 2009-01-12 09:14:54 -0500 |
commit | d29013a2fd0eea7500e6e3580a2ebdb0dbe1fe9c (patch) | |
tree | 0df02f3a9da2fb56381be3354ba43bb81a697efc /common/content | |
parent | 358b4b2f4ba47ee0fb1650a4fa185423185c4ae3 (diff) | |
download | pentadactyl-d29013a2fd0eea7500e6e3580a2ebdb0dbe1fe9c.tar.gz |
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").
Diffstat (limited to 'common/content')
-rw-r--r-- | common/content/buffer.js | 2 | ||||
-rw-r--r-- | common/content/commands.js | 2 | ||||
-rw-r--r-- | common/content/completion.js | 2 | ||||
-rw-r--r-- | common/content/editor.js | 2 | ||||
-rw-r--r-- | common/content/events.js | 2 | ||||
-rw-r--r-- | common/content/find.js | 6 | ||||
-rw-r--r-- | common/content/help.css | 2 | ||||
-rw-r--r-- | common/content/hints.js | 2 | ||||
-rw-r--r-- | common/content/io.js | 2 | ||||
-rw-r--r-- | common/content/liberator.js | 2 | ||||
-rw-r--r-- | common/content/liberator.xul | 2 | ||||
-rw-r--r-- | common/content/mappings.js | 2 | ||||
-rw-r--r-- | common/content/modes.js | 2 | ||||
-rw-r--r-- | common/content/options.js | 2 | ||||
-rw-r--r-- | common/content/services.js | 2 | ||||
-rw-r--r-- | common/content/style.js | 2 | ||||
-rw-r--r-- | common/content/tabs.js | 2 | ||||
-rw-r--r-- | common/content/template.js | 27 | ||||
-rw-r--r-- | common/content/ui.js | 2 | ||||
-rw-r--r-- | common/content/util.js | 2 |
20 files changed, 48 insertions, 21 deletions
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 <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 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 <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 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 <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 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 <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 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 <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 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 <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) 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 */ 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 <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 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 <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 |