Mailing-List: contact legal-discuss-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: legal-discuss@apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1731488 - in /infrastructure/site/trunk/content/legal:
 resolved.mdtext src-headers.mdtext
Date: Sat, 20 Feb 2016 22:13:07 -0000
To: site-cvs@apache.org, legal-discuss@apache.org
From: bayard@apache.org
Message-Id: <20160220221307.BC3443A0249@svn01-us-west.apache.org>

Author: bayard
Date: Sat Feb 20 22:13:07 2016
New Revision: 1731488

URL: http://svn.apache.org/viewvc?rev=1731488&view=rev
Log:
Moving the short-form src header question over to the src-headers file

Modified:
    infrastructure/site/trunk/content/legal/resolved.mdtext
    infrastructure/site/trunk/content/legal/src-headers.mdtext

Modified: infrastructure/site/trunk/content/legal/resolved.mdtext
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/content/legal/resolved.mdtext?rev=1731488&r1=1731487&r2=1731488&view=diff
==============================================================================
--- infrastructure/site/trunk/content/legal/resolved.mdtext (original)
+++ infrastructure/site/trunk/content/legal/resolved.mdtext Sat Feb 20 22:13:07 2016
@@ -394,16 +394,3 @@ Foundation when their status changes in
 be reassessed.
 
 
-##Is a short form of the source header available?
-
-Sometimes the situation of a file is such that the recommended Apache source header is not appropriate. 
-Examples would be within images, minified JavaScript or PDFs. In those cases, the following shorter 
-form may be used.
-
- "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
-
-Any additional licensing information relevant to the file (ie. that would ordinarily be in the NOTICE) 
-should be noted directly in the file when the short form is used.
-
-If you have doubts as to whether the short form is appropriate for your situation, please contact legal-discuss@.
-

Modified: infrastructure/site/trunk/content/legal/src-headers.mdtext
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/content/legal/src-headers.mdtext?rev=1731488&r1=1731487&r2=1731488&view=diff
==============================================================================
--- infrastructure/site/trunk/content/legal/src-headers.mdtext (original)
+++ infrastructure/site/trunk/content/legal/src-headers.mdtext Sat Feb 20 22:13:07 2016
@@ -185,5 +185,18 @@ including the right to copy, modify, and
 No.  This is strictly an ASF policy.  Other projects using the Apache License should still refer to the 
 <a href="/licenses/LICENSE-2.0.html#apply">license's appendix</a> for guidance on applying a header to their source files.
 
+###Is a short form of the source header available?
+
+Sometimes the situation of a file is such that the recommended Apache source header is not appropriate. 
+Examples would be within images, minified JavaScript or PDFs. In those cases, the following shorter 
+form may be used.
+
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+
+Any additional licensing information relevant to the file (ie. that would ordinarily be in the NOTICE) 
+should be noted directly in the file when the short form is used.
+
+If you have doubts as to whether the short form is appropriate for your situation, please contact legal-discuss@.
+
 
   [1]: http://apache.org/legal/resolved.html#required-third-party-notices


---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org