incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r1433180 - /incubator/public/branches/license_howto/licensing_howto.mdtext
Date Mon, 14 Jan 2013 22:32:29 GMT
Author: marvin
Date: Mon Jan 14 22:32:27 2013
New Revision: 1433180

URL: http://svn.apache.org/viewvc?rev=1433180&view=rev
Log:
Add some links providing justification for certain passages.

Modified:
    incubator/public/branches/license_howto/licensing_howto.mdtext

Modified: incubator/public/branches/license_howto/licensing_howto.mdtext
URL: http://svn.apache.org/viewvc/incubator/public/branches/license_howto/licensing_howto.mdtext?rev=1433180&r1=1433179&r2=1433180&view=diff
==============================================================================
--- incubator/public/branches/license_howto/licensing_howto.mdtext (original)
+++ incubator/public/branches/license_howto/licensing_howto.mdtext Mon Jan 14 22:32:27 2013
@@ -29,8 +29,10 @@ The complete requirements for `LICENSE` 
 Location Within the Source Tree
 -------------------------------
 
-`LICENSE` and `NOTICE` belong at the top level of the source tree.  They may
-be named `LICENSE.txt` and `NOTICE.txt`, but the bare names are preferred.
+`LICENSE` and `NOTICE` belong at the [top level of the source
+tree](http://www.apache.org/legal/src-headers.html#notice).  They may
+be named `LICENSE.txt` and `NOTICE.txt`, but the [bare names are
+preferred](http://apache.org/dev/apply-license.html#license-file-name).
 
 The Simple Case -- No Bundled Dependencies
 ------------------------------------------
@@ -40,11 +42,12 @@ copyright holders and which has no bundl
 contain the text of the [ALv2](http://apache.org/licenses/LICENSE-2.0.txt) --
 no more, no less.
 
-`NOTICE` should contain only the following text, adapted with the product's
-name and copyright dates:
+`NOTICE` should contain only the [following
+text](http://www.apache.org/legal/src-headers.html#notice), adapted with the
+product's name and copyright dates:
 
-    Apache Foo
-    Copyright XXXX-20XX The Apache Software Foundation
+    Apache [PRODUCT_NAME]
+    Copyright [XXXX-20XX] The Apache Software Foundation
 
     This product includes software developed at
     The Apache Software Foundation (http://www.apache.org/).
@@ -59,8 +62,8 @@ within the dependency:
 *   BSD (without advertising clause)
 *   MIT/X11
 
-In `LICENSE`, add a pointer to the dependency's location within the source tree
-and a short note summarizing its licensing:
+In `LICENSE`, add a [pointer](http://s.apache.org/Hqj) to the dependency's
+location within the source tree and a short note summarizing its licensing:
 
     This product bundles SuperWidget, which is available under a "3-clause
     BSD" license.  For details, see deps/superwidget/.
@@ -73,8 +76,6 @@ by the ASF Legal Affairs Committee.  Som
 `NOTICE` -- if in doubt,
 [ask](http://www.apache.org/legal/resolved.html#asking-questions).
 
-(TODO: Clarify with Roy that this "pointer" text satisfies his intent.)
-
 (TODO: Ensure that pointers suffice for binary distributions.)
 
 Bundling an Apache-2.0-licensed Dependency



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message