neilcsmith-net closed pull request #16: Update live site in line with master PR 
#13 #14 #15
URL: https://github.com/apache/incubator-netbeans-website/pull/16
 
 
   

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 00463e5..c13211b 100644
--- a/content/community/events.html
+++ b/content/community/events.html
@@ -91,21 +91,27 @@ <h1>Apache NetBeans 9.0 Beta</h1>
 <h2 id="_apache_netbeans_events">Apache NetBeans Events</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Users and developers either convoke or participate in different events and 
conferences.</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:tradema...@apache.org";>tradema...@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>
 </div>
 <div class="paragraph">
-<p>The Apache Software Foundation makes sure that all organizations are treated
-fairly, making sure the project does not favor any commercial entities or
-organizations over others.</p>
+<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>
 </div>
-<div class="paragraph">
-<p>In order to achieve those goals, the Apache NetBeans Project has to follow
-<a 
href="https://cwiki.apache.org/confluence/display/NETBEANS/NetBeans+Events";>some
-guidelines</a> before announcing or promoting these events.</p>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Have its opening keynote focus on the current state and roadmap of 
NetBeans.</p>
+</li>
+<li>
+<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>
+</li>
+</ol>
 </div>
 <div class="paragraph">
-<p>We are still working out those requirements, this page will then list
-events of interest for the NetBeans Community.</p>
+<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:pr...@apache.org";>pr...@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">
 <h3 id="_apache_software_foundation_resources">Apache Software Foundation 
resources</h3>
diff --git a/content/community/index.html b/content/community/index.html
index 21cd905..0baaecb 100644
--- a/content/community/index.html
+++ b/content/community/index.html
@@ -80,14 +80,14 @@ <h1>Apache NetBeans 9.0 Beta</h1>
             <div id="toc" class="toc">
 <div id="toctitle"></div>
 <ul class="sectlevel1">
-<li><a href="#__a_href_mailing_lists_html_keep_informed_a"><a 
href="mailing-lists.html">Keep Informed</a></a></li>
-<li><a href="#__a_href_participate_index_html_participate_a"><a 
href="/participate/index.html">Participate</a></a></li>
-<li><a href="#__a_href_events_html_netbeans_events_a"><a 
href="events.html">NetBeans Events</a></a></li>
-<li><a href="#__a_href_who_html_who_we_are_a"><a href="who.html">Who We 
Are</a></a></li>
+<li><a href="#_a_href_mailing_lists_html_keep_informed_a"><a 
href="mailing-lists.html">Keep Informed</a></a></li>
+<li><a href="#_a_href_participate_index_html_participate_a"><a 
href="/participate/index.html">Participate</a></a></li>
+<li><a href="#_a_href_events_html_netbeans_events_a"><a 
href="events.html">NetBeans Events</a></a></li>
+<li><a href="#_a_href_who_html_who_we_are_a"><a href="who.html">Who We 
Are</a></a></li>
 </ul>
 </div>
 <div class="sect1">
-<h2 id="__a_href_mailing_lists_html_keep_informed_a"><a 
href="mailing-lists.html">Keep Informed</a></h2>
+<h2 id="_a_href_mailing_lists_html_keep_informed_a"><a 
href="mailing-lists.html">Keep Informed</a></h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>The Apache NetBeans Community <a href="mailing-lists.html">communicates in 
many different ways</a>. See how to keep informed and in touch with other 
NetBeans users and developers.</p>
@@ -95,7 +95,7 @@ <h2 id="__a_href_mailing_lists_html_keep_informed_a"><a 
href="mailing-lists.html
 </div>
 </div>
 <div class="sect1">
-<h2 id="__a_href_participate_index_html_participate_a"><a 
href="/participate/index.html">Participate</a></h2>
+<h2 id="_a_href_participate_index_html_participate_a"><a 
href="/participate/index.html">Participate</a></h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>We welcome <a href="/participate/index.html">all kind of contributions</a>. 
And there are many ways to contribute: see how you can participate in Apache 
NetBeans.</p>
@@ -103,7 +103,7 @@ <h2 id="__a_href_participate_index_html_participate_a"><a 
href="/participate/ind
 </div>
 </div>
 <div class="sect1">
-<h2 id="__a_href_events_html_netbeans_events_a"><a href="events.html">NetBeans 
Events</a></h2>
+<h2 id="_a_href_events_html_netbeans_events_a"><a href="events.html">NetBeans 
Events</a></h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>NetBeans users and developers participate in <a 
href="events.html">different events</a>. See how this works.</p>
@@ -111,7 +111,7 @@ <h2 id="__a_href_events_html_netbeans_events_a"><a 
href="events.html">NetBeans E
 </div>
 </div>
 <div class="sect1">
-<h2 id="__a_href_who_html_who_we_are_a"><a href="who.html">Who We Are</a></h2>
+<h2 id="_a_href_who_html_who_we_are_a"><a href="who.html">Who We Are</a></h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>The Apache NetBeans source code was donated by Oracle to the <a 
href="https://www.apache.org";>Apache Software Foundation</a> in 2016.
diff --git a/content/download/nb90/index.html b/content/download/nb90/index.html
index c9b5890..e409cad 100644
--- a/content/download/nb90/index.html
+++ b/content/download/nb90/index.html
@@ -230,7 +230,7 @@ <h4 id="_java_shell_support">Java Shell support</h4>
 code.</p>
 </div>
 <div class="paragraph">
-<p>When the prototype is ready, it can be saved to a regular java source file
+<p>When the prototype is ready, it can be saved to a regular Java source file
 and integrated with the project.</p>
 </div>
 </div>
diff --git a/content/participate/index.html b/content/participate/index.html
index 8e51f4b..239dde7 100644
--- a/content/participate/index.html
+++ b/content/participate/index.html
@@ -80,18 +80,18 @@ <h1>Apache NetBeans 9.0 Beta</h1>
             <div id="toc" class="toc">
 <div id="toctitle"></div>
 <ul class="sectlevel1">
-<li><a href="#__a_href_submit_pr_html_contributing_code_a"><a 
href="submit-pr.html">Contributing code</a></a></li>
-<li><a href="#__a_href_report_issue_html_reporting_issues_a"><a 
href="report-issue.html">Reporting issues</a></a></li>
-<li><a href="#__a_href_netcat_html_join_the_netcat_program_a"><a 
href="netcat.html">Join the NetCAT program</a></a></li>
+<li><a href="#_a_href_submit_pr_html_contributing_code_a"><a 
href="submit-pr.html">Contributing code</a></a></li>
+<li><a href="#_a_href_report_issue_html_reporting_issues_a"><a 
href="report-issue.html">Reporting issues</a></a></li>
+<li><a href="#_a_href_netcat_html_join_the_netcat_program_a"><a 
href="netcat.html">Join the NetCAT program</a></a></li>
 <li><a href="#documentation">Improving the documentation</a></li>
-<li><a href="#asf">ASF Sponsorthip Program</a></li>
+<li><a href="#asf">Contributing to the ASF</a></li>
 </ul>
 </div>
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
 <p>The Apache Software Foundation has set up <a 
href="http://community.apache.org/";>a
-specific website</a> designed to help newcomers take their first steps towards
+specific website</a> designed to help newcomers take their first steps toward
 being part of our Community.</p>
 </div>
 <div class="paragraph">
@@ -101,7 +101,7 @@ <h1>Apache NetBeans 9.0 Beta</h1>
 </div>
 </div>
 <div class="sect1">
-<h2 id="__a_href_submit_pr_html_contributing_code_a"><a 
href="submit-pr.html">Contributing code</a></h2>
+<h2 id="_a_href_submit_pr_html_contributing_code_a"><a 
href="submit-pr.html">Contributing code</a></h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>See <a href="submit-pr.html">contributing code</a> to learn how to 
contribute code to the Apache NetBeans project.</p>
@@ -109,7 +109,7 @@ <h2 id="__a_href_submit_pr_html_contributing_code_a"><a 
href="submit-pr.html">Co
 </div>
 </div>
 <div class="sect1">
-<h2 id="__a_href_report_issue_html_reporting_issues_a"><a 
href="report-issue.html">Reporting issues</a></h2>
+<h2 id="_a_href_report_issue_html_reporting_issues_a"><a 
href="report-issue.html">Reporting issues</a></h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>See <a href="report-issue.html">reporting issues</a> for instructions on 
how to report an issue.</p>
@@ -117,10 +117,10 @@ <h2 id="__a_href_report_issue_html_reporting_issues_a"><a 
href="report-issue.htm
 </div>
 </div>
 <div class="sect1">
-<h2 id="__a_href_netcat_html_join_the_netcat_program_a"><a 
href="netcat.html">Join the NetCAT program</a></h2>
+<h2 id="_a_href_netcat_html_join_the_netcat_program_a"><a 
href="netcat.html">Join the NetCAT program</a></h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>The NetBeans Community Acceptance Test (<a href="netcat.html">NetCAT</a>) 
has helped stabilize development
+<p>The NetBeans Community Acceptance Testing program (<a 
href="netcat.html">NetCAT</a>) has helped stabilize development
 builds for years.</p>
 </div>
 </div>
@@ -129,16 +129,18 @@ <h2 
id="__a_href_netcat_html_join_the_netcat_program_a"><a href="netcat.html">Jo
 <h2 id="documentation">Improving the documentation</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>We will be porting existing NetBeans documentation soon. Keep posted for 
information on how to help with this task.</p>
+<p>We will be porting existing NetBeans documentation soon. Consider joining 
the
+<a href="/community/mailing-lists.html">dev mailing list</a> for updates on 
how to help with this task.</p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="asf">ASF Sponsorthip Program</h2>
+<h2 id="asf">Contributing to the ASF</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>You may also want to consider doing a donation to the <a 
href="https://www.apache.org/foundation/sponsorship.html";>Apache Sponsorship 
Program</a>,
-or <a href="https://www.apache.org/foundation/buy_stuff.html";>buying some ASF 
swag</a>.</p>
+<p>You may also want to consider <a 
href="http://www.apache.org/foundation/contributing.html";>donating to the
+Apache Software Foundation</a>, joining the <a 
href="https://www.apache.org/foundation/sponsorship.html";>ASF
+Sponsorship Program</a>, or <a 
href="https://www.apache.org/foundation/buy_stuff.html";>buying ASF 
merchandise</a>.</p>
 </div>
 </div>
 </div>
diff --git a/content/participate/netcat.html b/content/participate/netcat.html
index 0565d15..6bed21b 100644
--- a/content/participate/netcat.html
+++ b/content/participate/netcat.html
@@ -171,11 +171,13 @@ <h2 id="_should_e_mails_be_prefixed">Should e-mails be 
prefixed?</h2>
 <col style="width: 50%;">
 <col style="width: 50%;">
 </colgroup>
-<tbody>
+<thead>
 <tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">Prefix</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">Tribe</p></td>
+<th class="tableblock halign-left valign-top">Prefix</th>
+<th class="tableblock halign-left valign-top">Tribe</th>
 </tr>
+</thead>
+<tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">[rcp]</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">API 
Support</p></td>
diff --git a/content/participate/report-issue.html 
b/content/participate/report-issue.html
index 005ebba..e5f3ee9 100644
--- a/content/participate/report-issue.html
+++ b/content/participate/report-issue.html
@@ -113,11 +113,13 @@ <h3 id="Components">Components</h3>
 <col style="width: 50%;">
 <col style="width: 50%;">
 </colgroup>
-<tbody>
+<thead>
 <tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">Component</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock">Description</p></td>
+<th class="tableblock halign-left valign-top">Component</th>
+<th class="tableblock halign-left valign-top">Description</th>
 </tr>
+</thead>
+<tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">ant.browsetask</p></td>
 <td class="tableblock halign-left valign-top"></td>
diff --git a/content/test.html b/content/test.html
new file mode 100644
index 0000000..cea3998
--- /dev/null
+++ b/content/test.html
@@ -0,0 +1,195 @@
+
+<!DOCTYPE html>
+<html class="no-js" lang="en" dir="ltr">
+    
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>Markdown test</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="Markdown test">
+    <meta name="author" content="Apache NetBeans">
+    <meta name="keywords" content="Markdown test">
+    <meta name="generator" content="Apache NetBeans">
+    <link rel="stylesheet" href="/css/font-awesome.min.css">
+    <link rel="stylesheet" href="/css/netbeans.css">
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+    <meta name="msapplication-TileColor" content="#ffc40d">
+    <meta name="theme-color" content="#ffffff">
+    <link href="https://fonts.googleapis.com/css?family=Lato:400,700"; 
rel="stylesheet"> 
+    <!--
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
+    -->
+</head>
+
+
+    <body>
+        
+
+<div class="title-bar" data-responsive-toggle="responsive-menu" 
data-hide-for="medium">
+    <button type="button" data-toggle="responsive-menu"><i style='font-size: 
32px; color: #fff; padding: 8px' class='fa fa-bars'></i></button>
+    <div class="title-bar-title">Apache NetBeans</div>
+</div>
+<div class="top-bar" id="responsive-menu">
+    <div class='top-bar-left'>
+        <a class='title' href="/"><img src='/images/apache-netbeans.svg' 
style='padding: 8px; height: 48px;'></img> Apache NetBeans</a>
+    </div>
+    <div class="top-bar-right">
+        <ul class="vertical medium-horizontal menu" 
data-responsive-menu="drilldown medium-dropdown">
+            <li> <a href="/community/index.html">Community</a> </li>
+            <li> <a href="/participate/index.html">Participate</a> </li>
+            <li> <a href="https://blogs.apache.org/netbeans/";>Blog</a></li>
+            <li> <a href="/help/index.html">Get Help</a> </li>
+            <li> <a href="/plugins/index.html">Plugins</a> </li>
+            <li> <a href="/download/index.html">Download</a> </li>
+        </ul>
+    </div>
+</div>
+
+
+        
+<!-- src/templates/news -->
+<section class="hero news alternate" style='margin-bottom: 2em'>
+    <div class='grid-container'>
+        <div class='cell'>
+            <div class="annotation">Just released!</div>
+            <h1>Apache NetBeans 9.0 Beta</h1>
+            <p><a class="button success" 
href="/download/nb90/nb90-beta.html">Read more</a></p>
+        </div>
+    </div>
+</section>
+
+        <div class='grid-container main-content'>
+            <h1>This is a markdown test</h1>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod 
tempor<br/>incididunt ut labore et dolore magna aliqua. Ut enim ad minim 
veniam, quis<br/>nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat.<br/>Duis aute irure dolor in reprehenderit in voluptate 
velit esse cillum dolore eu<br/>fugiat nulla pariatur. Excepteur sint occaecat 
cupidatat non proident, sunt in<br/>culpa qui officia deserunt mollit anim id 
est laborum.</p>
+<h2>Heading 2</h2>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod 
tempor<br/>incididunt ut labore et dolore magna aliqua. Ut enim ad minim 
veniam, quis<br/>nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat.<br/>Duis aute irure dolor in reprehenderit in voluptate 
velit esse cillum dolore eu<br/>fugiat nulla pariatur. Excepteur sint occaecat 
cupidatat non proident, sunt in<br/>culpa qui officia deserunt mollit anim id 
est laborum.</p>
+<div id='top'>
+    An aside.
+</div>
+            
+<section class='tools'>
+    <ul class="menu align-center">
+        <li><a title="Facebook" href="https://www.facebook.com/NetBeans";><i 
class="fa fa-md fa-facebook"></i></a></li>
+        <li><a title="Twitter" href="https://twitter.com/netbeans";><i 
class="fa fa-md fa-twitter"></i></a></li>
+        <li><a title="Github" 
href="https://github.com/apache/incubator-netbeans";><i class="fa fa-md 
fa-github"></i></a></li>
+        <li><a title="YouTube" 
href="https://www.youtube.com/user/netbeansvideos";><i class="fa fa-md 
fa-youtube"></i></a></li>
+        <li><a title="Slack" href="https://netbeans.signup.team/";><i class="fa 
fa-md fa-slack"></i></a></li>
+        <li><a title="JIRA" 
href="https://issues.apache.org/jira/projects/NETBEANS/summary";><i class="fa 
fa-mf fa-bug"></i></a></li>
+    </ul>
+    <ul class="menu align-center">
+        
+        <li><a 
href="https://github.com/apache/incubator-netbeans-website/blob/master/netbeans.apache.org/src/content/test.md";
 title="See this page in github"><i class="fa fa-md fa-edit"></i> See this page 
in github.</a></li>
+    </ul>
+</section>
+
+        </div>
+        
+
+<div class='grid-container incubator-area'>
+    <div class='grid-x grid-padding-x'>
+        <div class='large-auto cell'>
+        </div>
+    </div>
+</div>
+<footer>
+    <div class="grid-container">
+        <div class="grid-x grid-padding-x">
+            <div class="large-auto cell">
+                
+                <h1>About</h1>
+                <ul>
+                    <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                    <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                    <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    <li><a 
href="http://incubator.apache.org/projects/netbeans.html";>Incubation 
Status</a></li>
+                </ul>
+            </div>
+            <div class="large-auto cell">
+                <h1><a href="/community/index.html">Community</a></h1>
+                <ul>
+                    <li><a href="/community/mailing-lists.html">Mailing 
lists</a></li>
+                    <li><a href="/community/committer.html">Becoming a 
commiter</a></li>
+                    <li><a href="/community/events.html">NetBeans 
Events</a></li>
+                    <li><a href="/community/who.html">Who is who</a></li>
+                </ul>
+            </div>
+            <div class="large-auto cell">
+                <h1><a href="/participate/index.html">Participate</a></h1>
+                <ul>
+                    <li><a href="/participate/submit-pr.html">Submitting Pull 
Requests</a></li>
+                    <li><a href="/participate/report-issue.html">Reporting 
Issues</a></li>
+                    <li><a href="/participate/netcat.html">NetCAT - Community 
Acceptance Testing</a></li>
+                    <li><a 
href="/participate/index.html#documentation">Improving the 
documentation</a></li>
+                </ul>
+            </div>
+            <div class="large-auto cell">
+                <h1><a href="/help/index.html">Get Help</a></h1>
+                <ul>
+                    <li><a 
href="/help/index.html#documentation">Documentation</a></li>
+                    <li><a href="/wiki/index.asciidoc">Wiki</a></li>
+                    <li><a href="/help/index.html#support">Community 
Support</a></li>
+                    <li><a href="/help/commercial-support.html">Commercial 
Support</a></li>
+                </ul>
+            </div>
+            <div class="large-auto cell">
+                <h1><a href="/download/index.html">Download</a></h1>
+                <ul>
+                    <li><a 
href="/download/index.html#releases">Releases</a></li>
+                    <ul>
+                        <li><a href="/download/nb90/index.html">Apache 
NetBeans 9.0 (beta)</a></li>
+                    </ul>
+                    <li><a href="/plugins/index.html">Plugins</a></li>
+                    <li><a href="/download/index.html#source">Building from 
source</a></li>
+                    <li><a href="/download/index.html#previous">Previous 
releases</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</footer>
+<div class='footer-disclaimer'>
+    <div class="footer-disclaimer-content">
+        <p>Copyright &copy; 2017-2018 the <a href="//www.apache.org">The 
Apache Software Foundation</a>.</p>
+        <p>Licensed under the <a href="//www.apache.org/licenses/">Apache 
Software License, version 2.0.</a></p>
+        <p><a href="https://incubator.apache.org/"; alt="Apache Incubator"><img 
src='/images/incubator_feather_egg_logo_bw_crop.png' title='Apache 
Incubator'></img></a></p>
+        <div style='max-width: 40em; margin: 0 auto'>
+            <p>Apache NetBeans is an effort undergoing incubation at The 
Apache Software Foundation</a> (ASF).</p>
+            <p>Incubation is required of all newly accepted projects until a 
further review indicates that the infrastructure, communications, and decision 
making process have stabilized in a manner
+            consistent with other successful ASF projects.</p>
+            <p>While incubation status is not necessarily a reflection of the 
completeness or stability of the code, it does indicate that the project has 
yet to be fully endorsed by the Apache Software Foundation.</p>
+            <p>Apache Incubator, Apache, the Apache feather logo, and the 
Apache Incubator project logo are trademarks of <a href="//www.apache.org">The 
Apache Software Foundation</a>.</p>
+            <p>Oracle and Java are registered trademarks of Oracle and/or its 
affiliates.</p>
+        </div>
+        
+    </div>
+</div>
+
+
+        <script src="/js/vendor/jquery-3.2.1.min.js"></script>
+        <script src="/js/vendor/what-input.js"></script>
+        <script src="/js/vendor/jquery.colorbox-min.js"></script>
+        <script src="/js/vendor/foundation.min.js"></script>
+        <script src="/js/netbeans.js"></script>
+        <script>
+            
+            $(function(){ $(document).foundation(); });
+        </script>
+    </body>
+</html>
diff --git a/content/wiki/DevFaqAddDoingEvilThingsToForeignNodes.asciidoc 
b/content/wiki/DevFaqAddDoingEvilThingsToForeignNodes.asciidoc
index 550bf1c..e195d18 100644
--- a/content/wiki/DevFaqAddDoingEvilThingsToForeignNodes.asciidoc
+++ b/content/wiki/DevFaqAddDoingEvilThingsToForeignNodes.asciidoc
@@ -100,7 +100,7 @@
 <p>Occasionally people want to do something like this, because they want to 
enhance, for example, the behavior or nodes for Java files or other nodes 
created by some other modules.  However, this is a recipe for disaster - nobody 
writing a Node subclass does so expecting that random modules will change its 
internal structures without warning.  It is possible to write code that does 
this sort of thing that looks like it works, but it is sheer luck and it will 
probably not work for long.</p>
 </div>
 <div class="sect3">
-<h4 
id="__strong_em_do_not_do_that_under_any_circumstances_em_strong"><strong><em>DO
 NOT DO THAT UNDER ANY CIRCUMSTANCES</em></strong></h4>
+<h4 
id="_strong_em_do_not_do_that_under_any_circumstances_em_strong"><strong><em>DO 
NOT DO THAT UNDER ANY CIRCUMSTANCES</em></strong></h4>
 <div class="paragraph">
 <p>(there, did I say that strongly enough?).</p>
 </div>
diff --git a/content/wiki/DevFaqExecutableIcon.asciidoc 
b/content/wiki/DevFaqExecutableIcon.asciidoc
index 15f60e1..a4f641d 100644
--- a/content/wiki/DevFaqExecutableIcon.asciidoc
+++ b/content/wiki/DevFaqExecutableIcon.asciidoc
@@ -97,7 +97,7 @@
 <p>In short, the current NetBeans IDE (6.7) only provides limited support for 
changing application icons. Alternate solutions are described below, but 
NetBeans itself does not include any way to change the icon of the Windows 
launcher executable called <code>&lt;your branding name&gt;.exe</code>, nor 
does it provide a way to specify an <code>.icns</code> file for Mac OS X. There 
is already an enhancement request for Windows icon support: <a 
href="http://www.netbeans.org/nonav/issues/show_bug.cgi?id=64612";>issue 
#64612</a>.</p>
 </div>
 <div class="sect3">
-<h4 id="__application_icon_images">'Application Icon' Images</h4>
+<h4 id="_application_icon_images">'Application Icon' Images</h4>
 <div class="paragraph">
 <p>NetBeans only provides GUI support for choosing a 48x48 GIF or PNG image, 
within the Project Properties dialog on the Build screen. Using this screen 
produces two files within your project&#8217;s 
<code>branding/core/core.jar/org/netbeans/core/startup</code> folder: 
<code>frame.gif</code> and <code>frame48.gif</code>. However, these files are 
crudely resized from the selected image. For this reason, and because a 32x32 
icon is not generated, it is best to create the image files for the three icon 
sizes yourself using another editor, and then simply place them into the 
startup folder mentioned above.</p>
 </div>
diff --git a/content/wiki/DevFaqLookupGenerics.asciidoc 
b/content/wiki/DevFaqLookupGenerics.asciidoc
index 6d4ec99..710d5cd 100644
--- a/content/wiki/DevFaqLookupGenerics.asciidoc
+++ b/content/wiki/DevFaqLookupGenerics.asciidoc
@@ -121,23 +121,23 @@
 <td class="tableblock halign-left valign-top"><p 
class="tableblock"><code>Collection&lt;? extends X&gt; c = 
r.allInstances()</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock"><code>Lookup.Template t = new Lookup.Template(X.class);
-</p><p class="tableblock">Lookup.Result r = lkp.lookup(t);
-</p><p class="tableblock">Collection c = r.allInstances();</code></p></td>
+<td class="tableblock halign-left valign-top"><p 
class="tableblock"><code>Lookup.Template t = new Lookup.Template(X.class);</p>
+<p class="tableblock">Lookup.Result r = lkp.lookup(t);</p>
+<p class="tableblock">Collection c = r.allInstances();</code></p></td>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock"><code>Collection&lt;? extends X&gt; c = 
lkp.lookupAll(X.class);</code></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock"><code>Lookup.Template t = new Lookup.Template(X.class);
-</p><p class="tableblock">Lookup.Result r = lkp.lookup(t);
-</p><p class="tableblock">Collection c = r.allInstances();
+<td class="tableblock halign-left valign-top"><p 
class="tableblock"><code>Lookup.Template t = new Lookup.Template(X.class);</p>
+<p class="tableblock">Lookup.Result r = lkp.lookup(t);</p>
+<p class="tableblock">Collection c = r.allInstances();
 `
 `for (Iterator it=c.iterator(); it.hasNext();) {
-&nbsp;&nbsp;X x = (X) it.next();
-</p><p class="tableblock">&nbsp;&nbsp;//do something with x
-</p><p class="tableblock">}</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>for 
(X x : lkp.lookupAll(X.class)) {
-</p><p class="tableblock">&nbsp;&nbsp;//do something with x
-</p><p class="tableblock">}</code></p></td>
+&nbsp;&nbsp;X x = (X) it.next();</p>
+<p class="tableblock">&nbsp;&nbsp;//do something with x</p>
+<p class="tableblock">}</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>for 
(X x : lkp.lookupAll(X.class)) {</p>
+<p class="tableblock">&nbsp;&nbsp;//do something with x</p>
+<p class="tableblock">}</code></p></td>
 </tr>
 </tbody>
 </table>
diff --git a/content/wiki/DevFaqMemoryLeaks.asciidoc 
b/content/wiki/DevFaqMemoryLeaks.asciidoc
index 44b8f6b..14d4fa8 100644
--- a/content/wiki/DevFaqMemoryLeaks.asciidoc
+++ b/content/wiki/DevFaqMemoryLeaks.asciidoc
@@ -89,7 +89,7 @@
 <ul class="sectlevel1">
 <li><a href="#_how_can_i_fix_memory_leaks">How can I fix memory leaks?</a>
 <ul class="sectlevel2">
-<li><a href="#__code_jmap_code_and_built_in_dumpers_in_jdk"><code>jmap</code> 
and built-in dumpers in JDK</a></li>
+<li><a href="#_code_jmap_code_and_built_in_dumpers_in_jdk"><code>jmap</code> 
and built-in dumpers in JDK</a></li>
 <li><a href="#_other_tools">Other tools</a></li>
 <li><a href="#_tips_and_tricks">Tips and tricks</a></li>
 <li><a href="#_apache_migration_information">Apache Migration 
Information</a></li>
@@ -108,7 +108,7 @@ The usual approach for this is to analyze the complete 
contents of memory when t
 <p>Below are some hints on how to analyze the content of memory:</p>
 </div>
 <div class="sect2">
-<h3 id="__code_jmap_code_and_built_in_dumpers_in_jdk"><code>jmap</code> and 
built-in dumpers in JDK</h3>
+<h3 id="_code_jmap_code_and_built_in_dumpers_in_jdk"><code>jmap</code> and 
built-in dumpers in JDK</h3>
 <div class="sect3">
 <h4 id="_obtain_the_dump">Obtain the dump.</h4>
 <div class="paragraph">
diff --git a/content/wiki/DevFaqModulesGeneral.asciidoc 
b/content/wiki/DevFaqModulesGeneral.asciidoc
index 225d9ee..37d1750 100644
--- a/content/wiki/DevFaqModulesGeneral.asciidoc
+++ b/content/wiki/DevFaqModulesGeneral.asciidoc
@@ -102,7 +102,7 @@ declarative (<a 
href="DevFaqModulesDeclarativeVsProgrammatic.asciidoc">DevFaqMod
 <p>If you are writing a module that has an API you want other modules to plug 
in to, you probably want to read <a 
href="DevFaqWhenToUseWhatRegistrationMethod.asciidoc">DevFaqWhenToUseWhatRegistrationMethod</a>.</p>
 </div>
 <div class="sect3">
-<h4 id="__code_serviceprovider_code"><code>@ServiceProvider</code></h4>
+<h4 id="_code_serviceprovider_code"><code>@ServiceProvider</code></h4>
 <div class="paragraph">
 <p>For global services, singletons and such, using this annotation is the 
preferred technique.</p>
 </div>
diff --git 
a/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.asciidoc 
b/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.asciidoc
index 99295dc..86c6844 100644
--- a/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.asciidoc
+++ b/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.asciidoc
@@ -121,8 +121,8 @@
 &nbsp;&nbsp;&lt;attr name=&quot;instanceClass&quot; 
stringvalue=&quot;com.foo.mymodule.MyStatusBarElementProvider&quot;/&gt;
 &lt;/file&gt; <code>&lt;/blockquote&gt;
 [source,xml]
-----
-</p><p class="tableblock"> If you want to use a factory method and set up some 
configuration of the object using your own <a 
href="DevFaqFileAttributes.asciidoc">FileObject attributes</a>, you can instead 
&lt;ul&gt;&lt;li&gt;Create a public static method on some class, which takes a 
`<a 
href="http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html";>FileObject</a></code>
 as an argument, e.g.&lt;blockquote&gt;`&lt;file 
name=&quot;x.instance&quot;&gt;&nbsp;&nbsp;&lt;attr 
name=&quot;instanceClass&quot; 
stringvalue=&quot;com.foo.mymodule.MyStatusBarElementProvider&quot;/&gt;&nbsp;&nbsp;&lt;attr
 name=&quot;instanceCreate&quot; 
methodvalue=&quot;com.foo.mymodule.MyStatusBarElementProvider.factoryMethod&quot;/&gt;&nbsp;&nbsp;attr
 name=&quot;yourCustomAttribute&quot; 
stringvalue=&quot;someValueYouCareAbout&quot;/&gt;&lt;/file&gt;`&lt;/blockquote&gt;
+----</p>
+<p class="tableblock"> If you want to use a factory method and set up some 
configuration of the object using your own <a 
href="DevFaqFileAttributes.asciidoc">FileObject attributes</a>, you can instead 
&lt;ul&gt;&lt;li&gt;Create a public static method on some class, which takes a 
`<a 
href="http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html";>FileObject</a></code>
 as an argument, e.g.&lt;blockquote&gt;`&lt;file 
name=&quot;x.instance&quot;&gt;&nbsp;&nbsp;&lt;attr 
name=&quot;instanceClass&quot; 
stringvalue=&quot;com.foo.mymodule.MyStatusBarElementProvider&quot;/&gt;&nbsp;&nbsp;&lt;attr
 name=&quot;instanceCreate&quot; 
methodvalue=&quot;com.foo.mymodule.MyStatusBarElementProvider.factoryMethod&quot;/&gt;&nbsp;&nbsp;attr
 name=&quot;yourCustomAttribute&quot; 
stringvalue=&quot;someValueYouCareAbout&quot;/&gt;&lt;/file&gt;`&lt;/blockquote&gt;
 ----</p></td>
 </tr>
 <tr>


 

----------------------------------------------------------------
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:
us...@infra.apache.org


With regards,
Apache Git Services

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

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

Reply via email to