Permalink
Browse files

Adopted the Unlicense terminology.

  • Loading branch information...
1 parent 1f194df commit 7284bab54f8856b5119e75082dac480de2b34ec5 @tav committed Jan 23, 2011
Showing with 283 additions and 293 deletions.
  1. +2 −2 .gitreview/config.yaml
  2. +3 −3 .gitreview/watchlist.yaml
  3. +4 −4 AUTHORS
  4. +2 −2 Makefile
  5. +1 −1 README.md
  6. +51 −62 LICENSE → UNLICENSE
  7. +3 −3 doc/TODO
  8. +1 −1 doc/_layouts/code.genshi
  9. +3 −3 doc/_layouts/page.genshi
  10. +1 −1 doc/{license.txt → unlicense.txt}
  11. +2 −2 doc/website/css/site.css
  12. +2 −2 doc/website/js/plan.js
  13. +5 −2 doc/website/js/site.js
  14. +2 −2 environ/airbeam
  15. +2 −2 environ/amp
  16. +2 −2 environ/ampengine
  17. +2 −2 environ/ampenv.sh
  18. +2 −2 environ/assetgen
  19. +2 −2 environ/buildrecipes
  20. +2 −2 environ/cssembed
  21. +2 −2 environ/fab
  22. +2 −2 environ/git-languages
  23. +2 −2 environ/git-update
  24. +2 −3 environ/jsoncheck
  25. +2 −2 environ/keyspace-proxy
  26. +2 −2 environ/makeucd
  27. +2 −2 environ/py.test
  28. +2 −2 environ/pylibs.py
  29. +2 −2 environ/pynodule
  30. +2 −2 environ/redpill
  31. +2 −2 environ/rubylibs.rb
  32. +2 −2 environ/sass
  33. +2 −2 environ/yatiblog
  34. +2 −2 revhook
  35. +2 −2 src/amp/Makefile
  36. +2 −2 src/amp/argo/Makefile
  37. +2 −2 src/amp/argo/argo.go
  38. +2 −2 src/amp/argo/argo_test.go
  39. +2 −2 src/amp/big/Makefile
  40. +2 −2 src/amp/big/decimal.go
  41. +2 −2 src/amp/big/decimal_test.go
  42. +2 −2 src/amp/command/Makefile
  43. +2 −2 src/amp/command/command.go
  44. +2 −2 src/amp/encoding/Makefile
  45. +2 −2 src/amp/encoding/encoding.go
  46. +2 −2 src/amp/hubproxy/Makefile
  47. +2 −2 src/amp/hubproxy/hubproxy.go
  48. +2 −2 src/amp/logging/Makefile
  49. +2 −2 src/amp/logging/logging.go
  50. +2 −2 src/amp/lzf/Makefile
  51. +2 −2 src/amp/lzf/lzf.go
  52. +2 −2 src/amp/lzf/lzf_test.go
  53. +2 −2 src/amp/optparse/Makefile
  54. +2 −2 src/amp/optparse/optparse.go
  55. +2 −2 src/amp/optparse/optparse_test.go
  56. +2 −2 src/amp/pyksproxy/Makefile
  57. +2 −2 src/amp/pyksproxy/pyksproxy.go
  58. +2 −2 src/amp/redis/Makefile
  59. +2 −2 src/amp/redis/redis.go
  60. +2 −2 src/amp/revhook
  61. +2 −2 src/amp/runtime/Makefile
  62. +2 −2 src/amp/runtime/runtime.go
  63. +2 −2 src/amp/runtime/runtime_test.go
  64. +2 −2 src/amp/slice/Makefile
  65. +2 −2 src/amp/slice/slice.go
  66. +2 −2 src/amp/tentproxy/Makefile
  67. +2 −2 src/amp/tentproxy/tentproxy.go
  68. +2 −2 src/amp/tlsconf/Makefile
  69. +2 −2 src/amp/tlsconf/tlsconf.go
  70. +2 −2 src/amp/url/Makefile
  71. +2 −2 src/amp/url/url.go
  72. +2 −2 src/amp/url/url_test.go
  73. +2 −2 src/amp/yaml/Makefile
  74. +2 −2 src/amp/yaml/yaml.go
  75. +2 −2 src/amp/yaml/yaml_test.go
  76. +2 −2 src/cajoleit/com/espians/cajoleit/CajoleitServlet.java
  77. +2 −2 src/cajoleit/com/espians/cajoleit/CoffeeScript.java
  78. +2 −2 src/cajoleit/deps
  79. +2 −2 src/instance/redis.conf.template
  80. +2 −2 src/instance/www/static/site.sass
  81. +2 −2 src/jsutil/Makefile
  82. +2 −2 src/jsutil/amp.coffee
  83. +2 −2 src/jsutil/argonought.coffee
  84. +2 −2 src/jsutil/naaga.coffee
  85. +2 −2 src/jsutil/test/tokenise.coffee
  86. +2 −2 src/pyutil/__init__.py
  87. +2 −2 src/pyutil/argonought.py
  88. +2 −2 src/pyutil/async.py
  89. +2 −2 src/pyutil/crypto.py
  90. +2 −2 src/pyutil/darwinsandbox.pyx
  91. +2 −2 src/pyutil/env.py
  92. +2 −2 src/pyutil/io.py
  93. +2 −2 src/pyutil/ip.py
  94. +2 −2 src/pyutil/jsonp.py
  95. +2 −2 src/pyutil/lzf.pyx
  96. +2 −2 src/pyutil/paypalx.py
  97. +5 −5 src/pyutil/redis.py
  98. +2 −2 src/pyutil/rst.py
  99. +2 −2 src/pyutil/sanitise.py
  100. +2 −2 src/pyutil/scm.py
  101. +2 −2 src/pyutil/test_paypalx.py
  102. +2 −2 src/pyutil/validation.py
  103. +2 −2 src/pyutil/yatiblog.py
  104. +2 −2 src/pyutil/zeroconf.py
  105. +2 −2 src/setup.py
  106. +2 −2 src/tentapp/config.py
  107. +2 −2 src/tentapp/login.py
  108. +2 −2 src/tentapp/model.py
  109. +2 −2 src/tentapp/parallel.py
  110. +2 −2 src/tentapp/static/css/tentapp.sass
  111. +2 −3 src/tentapp/static/js/tentapp.coffee
  112. +2 −2 src/tentapp/tentapp.py
  113. +2 −2 src/tentapp/weblite.py
View
@@ -1,5 +1,5 @@
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
repo_id: ampify
upstream_repo: https://github.com/tav/ampify.git
@@ -1,13 +1,13 @@
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
pathsets:
all:
- "*"
documentation:
- "doc/*"
- AUTHORS
- - LICENSE
+ - UNLICENSE
- README.md
go-code:
- "*.go"
View
@@ -1,7 +1,7 @@
Ampify Authors
==============
-This is the official list of the Ampify Authors ("The Contributors"), listed in
+This is the official list of the Ampify Authors ("The Authors"), listed in
alphabetical order:
+----------------------------+--------------------+--------------------------+----------------+
@@ -35,7 +35,7 @@ alphabetical order:
.. _Tav: http://tav.espians.com
By adding yourself to this list, you explicitly agree to affirm all of your
-Contributions to the Public Domain according to the Public Domain license that
-can be found in the root `LICENSE`_ file.
+Contributions to Ampify ("The Work") to be covered by the Unlicense that can be
+found in the `UNLICENSE`_ file.
-.. _LICENSE: license.html
+.. _UNLICENSE: unlicense.html
View
@@ -1,5 +1,5 @@
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
# ------------------------------------------------------------------------------
# some konstants
View
@@ -88,7 +88,7 @@ Enjoy, tav <<tav@espians.com>>
[see the planfile]: http://ampify.it/planfile.html
[Ampify Authors]: http://ampify.it/authors.html
-[public domain]: http://ampify.it/license.html
+[public domain]: http://ampify.it/unlicense.html
[authors]: http://ampify.it/authors.html
[credits]: http://ampify.it/credits.html
View
@@ -1,5 +1,5 @@
-Public Domain License
-=====================
+Unlicense
+=========
.. contents:: Table of Contents
:depth: 1
@@ -10,10 +10,10 @@ under law, the Ampify Authors ("The Authors") have waived all copyright, patent
and related or neighboring rights to their Contributions to Ampify ("The Work").
This does not apply to works authored by third parties ("Third Party Works")
-which have their own copyright and licensing terms. These terms may be defined
-in explicit files within the `third_party` directories or specified as part of
-the contents of a licensed file. We recommend you read them as their terms
-may differ from the terms below.
+which come with their own copyright and licensing terms. These terms may be
+defined in explicit files within the `third_party` directories or specified as
+part of the contents of licensed files. We recommend you read them as their
+terms may differ from the terms below.
All trademarks and registered trademarks mentioned in The Work are the property
of their respective owners.
@@ -22,17 +22,17 @@ of their respective owners.
Usage
-----
-To affirm that a Contribution to The Work is covered by this Public Domain
-License, add an informative header like::
+To affirm that a Contribution to The Work is covered by this Unlicense, add an
+informative header like::
- # No Copyright (-) 2011 The Ampify Authors. This file is under the
- # Public Domain license that can be found in the root LICENSE file.
+ # Public Domain (-) 2011 The Ampify Authors.
+ # See the UNLICENSE file for details.
-If the Public Domain Contribution is to an already existing Third Party Work,
-then it can be affirmed as such with an informative header like::
+If the Contribution is to an existing Third Party Work, then it can be affirmed
+with an informative header like::
- # Changes to this file by The Ampify Authors are according to the
- # Public Domain license that can be found in the root LICENSE file.
+ # Changes to this file by The Ampify Authors are in the Public Domain.
+ # See the UNLICENSE file for details.
Statement of Purpose
@@ -56,52 +56,44 @@ or to gain reputation or greater distribution for their Work in part through the
use and efforts of others.
For these and/or other purposes and motivations, and without any expectation of
-additional consideration or compensation, the person associating the Public
-Domain License with a Work (the "Affirmer"), to the extent that he or she is an
-owner of Copyright and Related Rights in the Work, voluntarily elects to apply
-the Public Domain License to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the Work and
-the meaning and intended legal effect of the Public Domain License on those
-rights.
+additional consideration or compensation, the person associating the Unlicense
+with a Work (the "Affirmer"), to the extent that he or she is an owner of
+Copyright and Related Rights in the Work, voluntarily elects to apply the
+Unlicense to the Work and publicly distribute the Work under its terms, with
+knowledge of his or her Copyright and Related Rights in the Work and the meaning
+and intended legal effect of the Unlicense on those rights.
Definitions
-----------
-The term "Distribute" has the same meaning here as under U.S. copyright law. A
-"Contribution" is the original Work, or any additions or changes to it. A
-"Contributor" is any person that affirms their contribution under this license.
-"Licensed Patents" are a Contributor's patent claims that read directly on any
-Contribution.
+The term "distribute" has the same meaning here as under U.S. copyright law. A
+"Contribution" is the original Work, or any additions or changes to it.
-A Work made available under the Public Domain License may be protected by
-copyright, patent and related or neighboring rights ("Copyright and Related
-Rights"). Copyright and Related Rights include, but are not limited to, the
-following:
+A Work made available under the Unlicense may be protected by copyright and
+related or neighboring rights ("Copyright and Related Rights"). Copyright and
+Related Rights include, but are not limited to, the following:
1. the right to reproduce, adapt, distribute, perform, display, communicate, and
translate a Work;
-2. any and all patent rights relating to the material of a Work, including
- Licensed Patents;
+2. moral rights retained by the original author(s) and/or performer(s);
-3. moral rights retained by the original author(s) and/or performer(s);
-
-4. publicity and privacy rights pertaining to a person's image or likeness
+3. publicity and privacy rights pertaining to a person's image or likeness
depicted in a Work;
-5. rights protecting against unfair competition in regards to a Work, subject to
+4. rights protecting against unfair competition in regards to a Work, subject to
the Limitations and Disclaimers, below;
-6. rights protecting the extraction, dissemination, use and reuse of data in a
+5. rights protecting the extraction, dissemination, use and reuse of data in a
Work;
-7. database rights (such as those arising under Directive 96/9/EC of the
+6. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation thereof,
including any amended or successor version of such directive); and
-8. other similar, equivalent or corresponding rights throughout the world based
+7. other similar, equivalent or corresponding rights throughout the world based
on applicable law or treaty, and any national implementations thereof.
@@ -143,30 +135,29 @@ for any number of copies, and (iv) for any purpose whatsoever, including without
limitation commercial, advertising or promotional purposes (the "Public
License").
-The Public License shall be deemed effective as of the date the Public Domain
-License was applied by Affirmer to the Work. Should any part of the License for
-any reason be judged legally invalid or ineffective under applicable law, such
+The Public License shall be deemed effective as of the date the Unlicense was
+applied by Affirmer to the Work. Should any part of the Public License for any
+reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder of the
-License, and in such case Affirmer hereby affirms that he or she will not (i)
-exercise any of his or her remaining Copyright and Related Rights in the Work or
-(ii) assert any associated claims and causes of action with respect to the Work,
-in either case contrary to Affirmer's express Statement of Purpose.
+Public License, and in such case Affirmer hereby affirms that he or she will not
+(i) exercise any of his or her remaining Copyright and Related Rights in the
+Work or (ii) assert any associated claims and causes of action with respect to
+the Work, in either case contrary to Affirmer's express Statement of Purpose.
Grant of Patent Rights
----------------------
-Subject to the terms and conditions of this License, the Affirmer hereby grants
-to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer this Work, where
-such license applies only to those patent claims licensable by the Affirmer that
-are necessarily infringed by use of this Work. If You institute patent
-litigation against any entity (including a cross-claim or counterclaim in a
-lawsuit) alleging that this Work or a Contribution incorporated within the Work
-constitutes direct or contributory patent infringement, then any patent licenses
-granted to You under this License for the Work shall terminate as of the date
-such litigation is filed.
+Affirmer hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
+royalty-free, irrevocable (except as stated in this section) patent license to
+make, have made, use, offer to sell, sell, import, and otherwise transfer this
+Work, where such license applies only to those patent claims licensable by the
+Affirmer that are necessarily infringed by use of this Work. If You institute
+patent litigation against any entity (including a cross-claim or counterclaim in
+a lawsuit) alleging that this Work or a Contribution incorporated within the
+Work constitutes direct or contributory patent infringement, then any patent
+licenses granted to You under this Grant of Patent Rights for the Work shall
+terminate as of the date such litigation is filed.
Limitations and Disclaimers
@@ -201,12 +192,10 @@ Appendix
--------
* The text of this document is derived from `Creative Commons CC0 1.0
- Universal`_, the `Microsoft Public License`_ and the `BSD style license`_ that
- ships with Google Go.
+ Universal`_ and the `BSD style license`_ that ships with Google Go.
-* This Public Domain License is seen as a mere transitional requirement until
- international law adapts to the post intellectual property reality.
+* This Unlicense is seen as a mere transitional requirement until international
+ law adapts to the post intellectual property reality.
.. _Creative Commons CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/legalcode
-.. _Microsoft Public License: http://www.opensource.org/licenses/ms-pl.html
.. _BSD style license: http://go.googlecode.com/hg/LICENSE
View
@@ -1,10 +1,10 @@
#! /bin/sh
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
if [ "x$1" == "xignored" ]; then
- grep "^#" $0 | grep -v "bin/sh" | grep -v "No Copyright" | grep -v LICENSE
+ grep "^#" $0 | grep -v "bin/sh" | grep -v "Public Domain" | grep -v UNLICENSE
exit
fi
View
@@ -54,7 +54,7 @@ license: Public Domain
<td class="code-source">
<br /><br /><br />
<div class="center"><py:if test="defined('__by__')">
- This file was last updated by <a href="mailto:${__by__}">${__by__.split('@')[0] or 'unknown'}</a> on ${__updated__.strftime('%B %d, %Y')} @ <a href="https://github.com/tav/ampify/commits/master/${__gitpath__}">${__updated__.strftime('%H:%M')}</a> &nbsp;<a href="https://github.com/tav/ampify/raw/master/LICENSE"><img src="http://static.ampify.it/gfx.public-domain.png" width="20px" height="20px" alt="Public Domain" class="absmiddle" /></a>
+ This file was last updated by <a href="mailto:${__by__}">${__by__.split('@')[0] or 'unknown'}</a> on ${__updated__.strftime('%B %d, %Y')} @ <a href="https://github.com/tav/ampify/commits/master/${__gitpath__}">${__updated__.strftime('%H:%M')}</a> &nbsp;<a href="https://github.com/tav/ampify/raw/master/UNLICENSE"><img src="http://static.ampify.it/gfx.public-domain.png" width="20px" height="20px" alt="Public Domain" class="absmiddle" /></a>
</py:if></div>
<br />
</td>
View
@@ -36,8 +36,8 @@ ${Markup(content)}
<div>The technical architecture and planfile for Ampify.</div>
</li>
<li>
- <a href="license.html">Public Domain License</a>
- <div>The super permissive open source license for Ampify.</div>
+ <a href="unlicense.html">Unlicense</a>
+ <div>Use Ampify however you want!</div>
</li>
<li>
<a href="code.html">Code</a>
@@ -67,7 +67,7 @@ ${Markup(content)}
<py:if test="defined('__by__')">
<h3>Meta</h3>
<div class="sidebar-text">
-This page was last updated by <a href="mailto:${__by__}">${__by__.split('@')[0] or 'unknown'}</a> on ${__updated__.strftime('%B %d, %Y')} @ <a href="https://github.com/tav/ampify/commits/master/doc/${__id__}">${__updated__.strftime('%H:%M')}</a> <a href="https://github.com/tav/ampify/raw/master/LICENSE"><img src="http://static.ampify.it/gfx.public-domain.png" width="20px" height="20px" alt="Public Domain" class="absmiddle" /></a>
+This page was last updated by <a href="mailto:${__by__}">${__by__.split('@')[0] or 'unknown'}</a> on ${__updated__.strftime('%B %d, %Y')} @ <a href="https://github.com/tav/ampify/commits/master/doc/${__id__}">${__updated__.strftime('%H:%M')}</a> <a href="https://github.com/tav/ampify/raw/master/UNLICENSE"><img src="http://static.ampify.it/gfx.public-domain.png" width="20px" height="20px" alt="Public Domain" class="absmiddle" /></a>
</div>
</py:if>
</div>
@@ -4,4 +4,4 @@ license: Public Domain
title: Public Domain License
---
-.. include:: ../LICENSE
+.. include:: ../UNLICENSE
View
@@ -1,5 +1,5 @@
-/* No Copyright (-) 2010 The Ampify Authors. This file is under the */
-/* Public Domain license that can be found in the root LICENSE file. */
+/* Public Domain (-) 2010-2011 The Ampify Authors. */
+/* See the UNLICENSE file for details. */
/* Element styles */
View
@@ -1,5 +1,5 @@
-// No Copyright (-) 2009-2010 The Ampify Authors. This file is under the
-// Public Domain license that can be found in the root LICENSE file.
+// Public Domain (-) 2009-2011 The Ampify Authors.
+// See the UNLICENSE file for details.
/*jslint plusplus: false */
/*global $, alert, window */
View
@@ -260,8 +260,11 @@ try {
BrowserDetect.init();
} catch (err) {};
-/* No Copyright (-) 2009-2010 The Ampify Authors. The rest of this file is under
- * under the Public Domain license that can be found in the root LICENSE file.
+/* The rest of this file is:
+ *
+ * Public Domain (-) 2009-2011 The Ampify Authors.
+ * See the UNLICENSE file for details.
+ *
*/
// some konstants
View
@@ -1,7 +1,7 @@
#! /usr/bin/env python
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
"""Airbeam provides the support structure for Tentapp."""
View
@@ -1,7 +1,7 @@
#! /usr/bin/env bash
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
if [[ "x$BASH_SOURCE" == "x" ]]; then
echo "Sorry, this only works under Bash shells atm. Patches welcome... =)"
View
@@ -1,7 +1,7 @@
#! /usr/bin/env python
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
"""
==========
View
@@ -1,7 +1,7 @@
#! /bin/bash
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
# NOTE: This script has only been tested in the context of a modern Bash Shell
# on Ubuntu Linux and OS X. Any patches to make it work under alternative Unix
View
@@ -1,7 +1,7 @@
#! /usr/bin/env python
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
"""Javascript, CSS and Images Assets Builder."""
View
@@ -1,7 +1,7 @@
#! /usr/bin/env python
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
"""Build recipes for Ampify."""
View
@@ -1,7 +1,7 @@
#! /usr/bin/env python
-# No Copyright (-) 2010 The Ampify Authors. This file is under the
-# Public Domain license that can be found in the root LICENSE file.
+# Public Domain (-) 2010-2011 The Ampify Authors.
+# See the UNLICENSE file for details.
import base64
import mimetypes
Oops, something went wrong.

0 comments on commit 7284bab

Please sign in to comment.