You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/03/09 10:36:37 UTC

[GitHub] neilcsmith-net closed pull request #19: Update live site in line with master PR #17 #18

neilcsmith-net closed pull request #19: Update live site in line with master PR #17 #18
URL: https://github.com/apache/incubator-netbeans-website/pull/19
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/content/community/events.html b/content/community/events.html
index c13211b..d52c2a7 100644
--- a/content/community/events.html
+++ b/content/community/events.html
@@ -91,7 +91,10 @@ <h1>Apache NetBeans 9.0 Beta</h1>
 <h2 id="_apache_netbeans_events">Apache NetBeans Events</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>For events held by Apache projects, clearance needs to be obtained. Clearance is granted by VP, Brand (Shane Curcuru) usually in response to an email to <a href="mailto:trademarks@apache.org">trademarks@apache.org</a> with a description of what is being requested. This is a private email list. The request should reference any discussion that has happened on dev and private lists to give complete context. For a list of events such as the continually ongoing NetBeans Days (to be renamed to Apache NetBeans Days), a blanket request is fine assuming that the (P)PMC has been involved, i.e., the committers on the NetBeans Apache dev mailing list. A description of the events and the involvement of the (P)PMC is what VP, Brand will use to either approve or ask more questions. Casual get-togethers with no commercial sponsors are easier to get approval for, which is exactly what the Apache NetBeans Days are.</p>
+<p>For events held by Apache projects, clearance needs to be obtained. Clearance is granted by VP, Brand (Shane Curcuru) usually in response to an email to <a href="mailto:trademarks@apache.org">trademarks@apache.org</a> with a description of what is being requested. This is a private email list. The request should reference any discussion that has happened on dev and private lists to give complete context.</p>
+</div>
+<div class="paragraph">
+<p>For a list of events such as the continually ongoing NetBeans Days (to be renamed to Apache NetBeans Days), a blanket request is fine assuming that the (P)PMC has been involved, i.e., the committers on the NetBeans Apache dev mailing list. A description of the events and the involvement of the (P)PMC is what VP, Brand will use to either approve or ask more questions. Casual get-togethers with no commercial sponsors are easier to get approval for, which is exactly what the Apache NetBeans Days are.</p>
 </div>
 <div class="paragraph">
 <p>Apache NetBeans Days are a class of events which happen regularly, with a clear definition of what makes an event be part of that class:</p>
@@ -105,12 +108,14 @@ <h2 id="_apache_netbeans_events">Apache NetBeans Events</h2>
 <p>Have all demos done throughout the event in NetBeans.</p>
 </li>
 <li>
-<p>Must be discussed/notified via the Apache NetBeans dev mailing list.
-Note: From an Apache point of view what&#8217;s important (besides trademarks being respected) is that all organizations are treated fairly and that it&#8217;s clear that they cannot "own" the event or project. Making sure we don&#8217;t favor commercial entities or organizations over others is a strong requirement of the ASF&#8217;s 501c(3) status, so we&#8217;re very picky about that. And besides this legal requirement, it&#8217;s what makes the ASF a unique place where companies which might compete in the market can collaborate in a fair way, due to our very neutral status.</p>
+<p>Must be discussed/notified via the Apache NetBeans dev mailing list.</p>
 </li>
 </ol>
 </div>
 <div class="paragraph">
+<p>Note: From an Apache point of view what&#8217;s important (besides trademarks being respected) is that all organizations are treated fairly and that it&#8217;s clear that they cannot "own" the event or project. We need to make sure we don&#8217;t favor commercial entities or organizations over others is a strong requirement of the ASF&#8217;s 501c(3) status, so we&#8217;re very picky about that. And besides this legal requirement, it&#8217;s what makes the ASF a unique place where companies which might compete in the market can collaborate in a fair way, due to our very neutral status.</p>
+</div>
+<div class="paragraph">
 <p>For publicizing NetBeans events, the Apache News posts at <a href="https://blogs.apache.org/foundation/" class="bare">https://blogs.apache.org/foundation/</a> could mention those events, best is to contact <a href="mailto:press@apache.org">press@apache.org</a> for that. Apache has an Event Listing (<a href="https://events.apache.org/" class="bare">https://events.apache.org/</a>), that we&#8217;d also like to make use of.</p>
 </div>
 <div class="sect2">
diff --git a/content/help/index.html b/content/help/index.html
index 6cc36a1..2b4be1d 100644
--- a/content/help/index.html
+++ b/content/help/index.html
@@ -118,7 +118,7 @@ <h2 id="documentation">Documentation</h2>
 <p>The <a href="https://github.com/apache/incubator-netbeans-website-cleanup">content of the previous netbeans.org website</a> is being cleaned up in github.</p>
 </li>
 <li>
-<p>The <a href="https://github.com/apache/incubator-netbenas-website">current Apache NetBeans website</a> (i.e., this website) is also hosted at github.</p>
+<p>The <a href="https://github.com/apache/incubator-netbeans-website">current Apache NetBeans website</a> (i.e., this website) is also hosted at github.</p>
 </li>
 </ul>
 </div>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists