Merge pull request #664 from ebarboni/wikiindex3

more wiki reordering
diff --git a/netbeans.apache.org/globals.yml b/netbeans.apache.org/globals.yml
index 4f5ae76..fa9519d 100644
--- a/netbeans.apache.org/globals.yml
+++ b/netbeans.apache.org/globals.yml
@@ -16,15 +16,14 @@
 # under the License.
 
 site:
-    host: http://netbeans.apache.org
+    host: https://netbeans.apache.org
 
 render:
     tags: false
     sitemap: true
     index: false
     archive: false
-    feed: false
-        
+    feed: true
 
 template:
     page:
@@ -40,13 +39,22 @@
     wikidev:
         file: wikidev.gsp
     wikidevindex:
-        file: wikidevindex.gsp    
+        file: wikidevindex.gsp
     wiki:
         file: wiki.gsp
     raw:
         file: raw.gsp
     sitemap:
         file: sitemap.gsp
+    blogindex:
+        file: blogindex.gsp
+    post:
+        file: blogentry.gsp
+    feed:
+        file: feed.ftl
+
+feed:
+    file: blogs/atom
 
 asciidoctor:
     attributes:
@@ -71,7 +79,7 @@
 #         
 # markdown:
 #    extensions: ALL, -HARDWRAPS
-    
+
 globals:
     test:
         data: This is a test
diff --git a/netbeans.apache.org/src/content/.htaccess b/netbeans.apache.org/src/content/.htaccess
index 3e97d2a..514acb8 100644
--- a/netbeans.apache.org/src/content/.htaccess
+++ b/netbeans.apache.org/src/content/.htaccess
@@ -39,6 +39,8 @@
 Redirect 302 /nb/plugins/17/ https://plugins.netbeans.apache.org/data/17/
 Redirect 302 /nb/updates/18/ https://netbeans-vm1.apache.org/uc/18/
 Redirect 302 /nb/plugins/18/ https://plugins.netbeans.apache.org/data/18/
+Redirect 302 /nb/updates/19/ https://netbeans-vm1.apache.org/uc/19/
+Redirect 302 /nb/plugins/19/ https://plugins.netbeans.apache.org/data/18/
 Redirect 302 /nb/updates/dev/ https://netbeans-vm1.apache.org/uc/dev/
 Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/18/
 Redirect 302 /nb/issues_redirect.html https://netbeans.apache.org/participate/report-issue.html
diff --git a/netbeans.apache.org/src/content/blogs/annnb17.adoc b/netbeans.apache.org/src/content/blogs/annnb17.adoc
new file mode 100644
index 0000000..40725a8
--- /dev/null
+++ b/netbeans.apache.org/src/content/blogs/annnb17.adoc
@@ -0,0 +1,55 @@
+// 
+//     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.
+//
+
+= [ANNOUNCE] Apache NetBeans 17 Released
+Geertjan Wielenga
+2023-02-21
+:jbake-type: post
+:jbake-tags: blogentry
+:jbake-status: published
+:keywords: Apache NetBeans blog index
+:description: Apache NetBeans blog index
+:toc: left
+:toc-title:
+:syntax: true
+
+
+The Apache NetBeans team is pleased to announce that Apache NetBeans 17 was released on February 21, 2023.
+
+What's in the Apache NetBeans 17 release:
+
+https://github.com/apache/netbeans/releases/tag/17
+
+With thanks to 36 contributors, including 7 who have contributed for the first time. Thank you!
+
+Downloads:
+
+https://netbeans.apache.org/download/nb17/
+
+See our release schedule:
+
+https://cwiki.apache.org/confluence/display/NETBEANS/Release+Schedule
+
+Feel free to share the good news!
+
+Thanks everyone, and best wishes,
+
+Neil, Eric, Martin, Geertjan
+
+on behalf of Apache NetBeans PMC
diff --git a/netbeans.apache.org/src/content/blogs/annnb18.adoc b/netbeans.apache.org/src/content/blogs/annnb18.adoc
new file mode 100644
index 0000000..770ffc9
--- /dev/null
+++ b/netbeans.apache.org/src/content/blogs/annnb18.adoc
@@ -0,0 +1,55 @@
+// 
+//     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.
+//
+
+= [ANNOUNCE] Apache NetBeans 18 Released
+Geertjan Wielenga
+2023-06-01
+:jbake-type: post
+:jbake-tags: blogentry
+:jbake-status: published
+:keywords: Apache NetBeans 18 release
+:description: Apache NetBeans 18 release
+:toc: left
+:toc-title:
+:syntax: true
+
+
+The Apache NetBeans team is pleased to announce that Apache NetBeans 18 was released on May 30, 2023.
+
+What's in the Apache NetBeans 18 release:
+
+https://github.com/apache/netbeans/releases/tag/18
+
+With thanks to 31 contributors, including 5 who have contributed for the first time. Thank you!
+
+Downloads:
+
+https://netbeans.apache.org/download/nb18/
+
+See our release schedule:
+
+https://cwiki.apache.org/confluence/display/NETBEANS/Release+Schedule
+
+Feel free to share the good news!
+
+Thanks everyone, and best wishes,
+
+Neil, Eric, Martin, Geertjan
+
+on behalf of Apache NetBeans PMC
diff --git a/netbeans.apache.org/src/content/blogs/geertjan/index.adoc b/netbeans.apache.org/src/content/blogs/geertjan/index.adoc
index 5886100..7d67ea3 100644
--- a/netbeans.apache.org/src/content/blogs/geertjan/index.adoc
+++ b/netbeans.apache.org/src/content/blogs/geertjan/index.adoc
@@ -27,7 +27,7 @@
 :toc-title: 
 
 
-:leveloffset: +2
+:leveloffset: +1
 
 include::serializing_nodes.adoc[]
 
diff --git a/netbeans.apache.org/src/content/blogs/index.adoc b/netbeans.apache.org/src/content/blogs/index.adoc
new file mode 100644
index 0000000..421c002
--- /dev/null
+++ b/netbeans.apache.org/src/content/blogs/index.adoc
@@ -0,0 +1,29 @@
+// 
+//     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.
+//
+
+= Apache NetBeans Blog
+:jbake-type: blogindex
+:jbake-tags: blog
+:jbake-status: published
+:keywords: Apache NetBeans blog index
+:description: Apache NetBeans blog index
+:toc: left
+:toc-title:
+:syntax: true
+
diff --git a/netbeans.apache.org/src/content/download/nb123/index.adoc b/netbeans.apache.org/src/content/download/nb123/index.adoc
index 2b0f68f..7e3806a 100644
--- a/netbeans.apache.org/src/content/download/nb123/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb123/index.adoc
@@ -41,7 +41,7 @@
 
 == Java
 
-==== LSP/VS Code Integration
+=== LSP/VS Code Integration
 
 link:https://marketplace.visualstudio.com/items?itemName=ASF.apache-netbeans-java[Apache NetBeans Language Server] enhancements.
 
@@ -59,13 +59,13 @@
  - Don't show reload/save dialogs: I didn't find the appropriate PR and it's a too small detail to mention IMHO
  - Properly stop Maven execution from LSP/DAP: https://github.com/apache/netbeans/pull/2679
 
-==== nb-javac
+=== nb-javac
 
  - Update to (Maven distributed) nbjavac 15.0.0.2: https://github.com/apache/netbeans/pull/2759
  - Fix an issue where permits is treated as a keyword: https://github.com/apache/netbeans/pull/2759
  - Test case for nb-javac for JDK 15: https://github.com/apache/netbeans/pull/2562
 
-==== Gradle
+=== Gradle
  - Favorite tasks can be added to Gradle Navigator: https://github.com/apache/netbeans/pull/2595
  - Improved Gradle Sub-Project display on large projects: https://github.com/apache/netbeans/pull/2629
  - Fix IAE, when using composite Gradle Builds: https://github.com/apache/netbeans/pull/2606
@@ -74,13 +74,13 @@
 
 Complete PHP 8.0 syntax is supported, though code completion for attributes and named parameters is not implemented yet.
 
-==== PHP 8.0 Support
+=== PHP 8.0 Support
  - Constructor Property Promotion: https://github.com/apache/netbeans/pull/2674
  - Named Arguments: https://github.com/apache/netbeans/pull/2704
  - Attribute Syntax: https://github.com/apache/netbeans/pull/2640
  - Allow trailing comma in closure use lists: https://github.com/apache/netbeans/pull/2692
 
-==== Enhancements
+=== Enhancements
  - Show and change the PHP Version of project properties on the status bar: https://github.com/apache/netbeans/pull/2681
  - Added PSR-4 hints: https://github.com/apache/netbeans/pull/2630
  - Use complete Composer package name: https://github.com/apache/netbeans/pull/2583
@@ -93,7 +93,7 @@
  - Improvements for constants in code completion: https://github.com/apache/netbeans/pull/2536 and https://github.com/apache/netbeans/pull/2578
  - Remove consecutive empty lines when formatting PHP code: https://github.com/apache/netbeans/pull/2573
 
-==== Fixes
+=== Fixes
  - Shared settings for PHP code generators: https://github.com/apache/netbeans/pull/2691
  - Fix code completion for traits of use and group use statements: https://github.com/apache/netbeans/pull/2533
  - Fix anonymous function formatting: https://github.com/apache/netbeans/pull/2614
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/remotedev-tutorial.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/remotedev-tutorial.adoc
index 5a8ece7..c8e3ddb 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/remotedev-tutorial.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/remotedev-tutorial.adoc
@@ -97,7 +97,7 @@
 
 For correct operation of editor features like code completion and semantic highlighting, the Classes window, and others, your project has to be used in the correct environment, which means system includes, macro definitions, platform, etc. All of this information is gathered from the remote server and stored locally on your client system, so that when you edit locally the code assistance will work even when the project is set up to use a remote build host.
 
-[system]
+[[system]]
 == Setting Up the System
 
 Your remote Linux or Solaris server must allow communication through the SSH protocol from the client where you are running the IDE. If you want to use file sharing instead of allowing the IDE to copy files to the remote server, the file sharing must be set up in the network for both systems.
diff --git a/netbeans.apache.org/src/content/scss/common/_netbeans.scss b/netbeans.apache.org/src/content/scss/common/_netbeans.scss
index 410e603..ceb8b8a 100644
--- a/netbeans.apache.org/src/content/scss/common/_netbeans.scss
+++ b/netbeans.apache.org/src/content/scss/common/_netbeans.scss
@@ -351,3 +351,19 @@
     box-shadow: 0 1px 3px rgb(0, 0, 0),0 1px 2px rgba(0,0,0,0.24);
     font-size: 95%;
 }
+
+.blogdate {
+    margin-top:20px;
+    border-bottom: black 1px dashed;
+}
+
+.blogtitle {
+    color:black;
+    font-weight:bold;
+    font-size:25px;
+}
+
+.blogbody {
+    font-size:12px;
+}
+
diff --git a/netbeans.apache.org/src/content/templates/blogentry.gsp b/netbeans.apache.org/src/content/templates/blogentry.gsp
new file mode 100644
index 0000000..a8ffd5d
--- /dev/null
+++ b/netbeans.apache.org/src/content/templates/blogentry.gsp
@@ -0,0 +1,41 @@
+<%/*
+
+    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.
+
+*/%>
+<%/*
+
+    page_noaside.gsp: A main area with no aside.
+
+*/%>
+<!doctype html>
+<html class="no-js" lang="en" dir="ltr">
+  <%include "templatesparts/head.gsp"%>
+  <body>
+    <%include "templatesparts/menu.gsp"%>
+    <%include "templatesparts/news.gsp"%>
+    <div class='grid-container main-content'>
+      <h1 class="sect1">${content.title}</h1>
+      <div class="blogdate"><% out.print(content.date.format('EEEEE MMMM dd, YYYY')); %></div>
+      ${content.body}
+      <%include "templatesparts/tools.gsp"%>
+    </div>
+    <%include "templatesparts/footer.gsp"%>
+    <%include "templatesparts/scripts.gsp"%>
+  </body>
+</html>
diff --git a/netbeans.apache.org/src/content/templates/blogindex.gsp b/netbeans.apache.org/src/content/templates/blogindex.gsp
new file mode 100644
index 0000000..b588177
--- /dev/null
+++ b/netbeans.apache.org/src/content/templates/blogindex.gsp
@@ -0,0 +1,60 @@
+<%/*
+
+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.
+
+ */%>
+<%/*
+
+page_noaside.gsp: A main area with no aside.
+
+ */%>
+<!doctype html>
+<html class="no-js" lang="en" dir="ltr">
+    <%include "templatesparts/head.gsp"%>
+    <body>
+        <%include "templatesparts/menu.gsp"%>
+        <%include "templatesparts/news.gsp"%>
+        <div class='grid-container main-content'>
+            <h1 class="sect1">${content.title}</h1>
+            <%
+      // content by aggregation 
+      TreeMap sectionsubitm = [:]
+      for ( atag in tags ) {
+          if ( atag.name=="blogentry") {
+              for ( mydoc in atag.tagged_documents ) {
+                  sectionsubitm.put(mydoc.date.format('YYYY-MM-DD').toString(),mydoc);
+              }
+          }
+      }
+      TreeMap desc = sectionsubitm.descendingMap();
+      for (adoc in desc) {
+          out.println('<div class="blogdate">'+adoc.value.date.format('EEEEE MMMM dd, YYYY')+'</div>');
+          out.println('<div class="blogtitle"><a href="'+content.rootpath+adoc.value.uri+'">'+adoc.value.title+'</a></div>');
+          out.println('<div class="blogbody">');
+          out.println(adoc.value.body);
+          out.println('</div>');
+      }
+
+%>
+            ${content.body}
+            <%include "templatesparts/tools.gsp"%>
+        </div>
+        <%include "templatesparts/footer.gsp"%>
+        <%include "templatesparts/scripts.gsp"%>
+    </body>
+</html>
diff --git a/netbeans.apache.org/src/content/templates/feed.ftl b/netbeans.apache.org/src/content/templates/feed.ftl
new file mode 100644
index 0000000..d07d164
--- /dev/null
+++ b/netbeans.apache.org/src/content/templates/feed.ftl
@@ -0,0 +1,45 @@
+<#--
+  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.
+-->
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title type="html">Apache NetBeans</title>
+  <subtitle type="html">Quickly and easily develop web, mobile and desktop applications with Java, JavaScript, HTML5, PHP, C/C++ and more. </subtitle>
+  <id>https://netbeans.apache.org/blogs/atom</id>
+  <link rel="self" type="application/atom+xml" href="https://netbeans.apache.org/blogs/atom" />
+  <link rel="alternate" type="text/html" href="https://netbeans.apache.org/blogs/atom" />
+  <updated>${published_date?datetime?string.xs}</updated>
+  <#list published_posts as post>
+  <#--
+   All published post, adoc file of :jbake-type: post will be on entry, need authors, date
+  -->
+  <entry>
+    <id>${post.noExtensionUri!post.uri}</id>
+    <title type="html"><#escape x as x?xml>${post.title}</#escape></title>
+    <author><name>${post.author}</name></author>
+    <link rel="alternate" type="text/html" href="${config.site_host}/${post.noExtensionUri!post.uri}"/>
+    <published>${post.date?datetime?string.xs}</published>
+    <updated>${post.date?datetime?string.xs}</updated>
+    <content type="html">
+	<#escape x as x?xml>	
+	${post.body}
+	</#escape>
+    </content>
+  </entry>
+  </#list>
+</feed>
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/templates/templatesparts/head.gsp b/netbeans.apache.org/src/content/templates/templatesparts/head.gsp
index 8affa12..c618cf5 100644
--- a/netbeans.apache.org/src/content/templates/templatesparts/head.gsp
+++ b/netbeans.apache.org/src/content/templates/templatesparts/head.gsp
@@ -28,6 +28,7 @@
     <meta name="keywords" content="${content.keywords}">
     <meta name="generator" content="Apache NetBeans">
     <link rel="stylesheet" href="/css/font-awesome.min.css">
+    <link rel="alternate" type="application/atom+xml" title="Apache NetBeans Blog" href="https://netbeans.apache.org/blogs/atom" />
     <% if (content.syntax) { %><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/styles/default.min.css"> <% } %>
     <link rel="stylesheet" href="/css/netbeans.css">
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
@@ -54,4 +55,4 @@
         specific language governing permissions and limitations
         under the License.
     -->
-  </head>
\ No newline at end of file
+  </head>
diff --git a/netbeans.apache.org/src/content/templates/templatesparts/menu.gsp b/netbeans.apache.org/src/content/templates/templatesparts/menu.gsp
index 195705f..f35ee16 100644
--- a/netbeans.apache.org/src/content/templates/templatesparts/menu.gsp
+++ b/netbeans.apache.org/src/content/templates/templatesparts/menu.gsp
@@ -31,7 +31,7 @@
         <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="/blogs/index.html">Blog</a></li>
             <li> <a href="/help/index.html">Get Help</a> </li>
             <li> <a href="https://plugins.netbeans.apache.org/">Plugins</a> </li>
             <li> <a href="/download/index.html">Download</a> </li>
diff --git a/netbeans.apache.org/src/content/templates/templatesparts/tools.gsp b/netbeans.apache.org/src/content/templates/templatesparts/tools.gsp
index ec747e1..f28f9c0 100644
--- a/netbeans.apache.org/src/content/templates/templatesparts/tools.gsp
+++ b/netbeans.apache.org/src/content/templates/templatesparts/tools.gsp
@@ -24,6 +24,7 @@
         <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/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="Atom Feed" href="https://netbeans.apache.org/blogs/atom"><i class="fa fa-mf fa-rss"></i></a></li>
         <li><a title="Slack" href="https://tinyurl.com/netbeans-slack-signup/"><i class="fa fa-md fa-slack"></i></a></li>
         <li><a title="Issues" href="https://github.com/apache/netbeans/issues"><i class="fa fa-mf fa-bug"></i></a></li>
     </ul>
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-maven-commandline.adoc b/netbeans.apache.org/src/content/tutorials/nbm-maven-commandline.adoc
index 60bef2c..7fd89e6 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-maven-commandline.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-maven-commandline.adoc
@@ -380,19 +380,19 @@
     <dependency>
         <groupId>org.netbeans.api</groupId>
         <artifactId>org-netbeans-api-annotations-common</artifactId>
-        <version>RELEASE120-1</version> <!-- 2 -->
+        <version>RELEASE120-1</version> <!--2-->
     </dependency>
-    <dependency> <!-- 1 -->
+    <dependency> <!--1-->
         <groupId>org.netbeans.api</groupId>
         <artifactId>org-openide-util</artifactId>
         <version>RELEASE120-1</version>
     </dependency>
-    <dependency> <!-- 1 -->
+    <dependency> <!--1-->
         <groupId>org.netbeans.api</groupId>
         <artifactId>org-openide-awt</artifactId>
         <version>RELEASE120-1</version>
     </dependency>
-    <dependency> <!-- 1 -->
+    <dependency> <!--1-->
         <groupId>org.netbeans.api</groupId>
         <artifactId>org-openide-dialogs</artifactId>
         <version>RELEASE120-1</version>
@@ -475,7 +475,7 @@
         <artifactId>mavenPlatformApp-branding</artifactId>
         <version>${project.version}</version>
     </dependency>
-    <dependency> <!-- 1 -->
+    <dependency> <!--1-->
         <groupId>com.mycompany</groupId>
         <artifactId>mavenPlatformModuleA</artifactId>
         <version>1.0-SNAPSHOT</version>
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-projecttype.adoc b/netbeans.apache.org/src/content/tutorials/nbm-projecttype.adoc
index 275b729..b92a42e 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-projecttype.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-projecttype.adoc
@@ -848,7 +848,7 @@
 
 You now have the start of a project customizer.
 
-[[projectcustomizer]]
+[[projectsubtype]]
 === Creating and Registering the Project Subprojects
 
 In this section, you learn how to create new project types that are nested within other project types:
@@ -1035,7 +1035,7 @@
 
 In this section, you have defined the basic infrastructure of a new type of project in your NetBeans Platform application.
 
-[[projectsubtype]]
+[[registeringprojectypeasprojecsample]]
 == Registering the Project Type as Project Sample
 
 In this section, we create some project samples that make use of our project type. We also register these project samples in the New Project window of our application.
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc b/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
index 78a4b5d..89c885d 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
@@ -467,7 +467,7 @@
 image::images/quickstart_platform_new-impl-13.png[]
 
 [start=6]
-6. Now we can modify the `WordTopComponent.java` implementation to load implementations of the "WordFilter" interface. Replace the previous implementation (which was hard-coded to just upper-case text) with the following:
+1. Now we can modify the `WordTopComponent.java` implementation to load implementations of the "WordFilter" interface. Replace the previous implementation (which was hard-coded to just upper-case text) with the following:
 
 
 [source,java]
diff --git a/netbeans.apache.org/src/content/wiki/APITest.adoc b/netbeans.apache.org/src/content/wiki/APITest.adoc
index da25912..e6dcdcf 100644
--- a/netbeans.apache.org/src/content/wiki/APITest.adoc
+++ b/netbeans.apache.org/src/content/wiki/APITest.adoc
@@ -30,7 +30,7 @@
 :toc-title:
 :experimental:
 
-include::SigTest.asciidoc[leveloffset=1]
+include::SigTest.adoc[leveloffset=1]
 
 [NOTE]
 ====
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionContextSensitive.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionContextSensitive.adoc
index 91b9859..d645e47 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionContextSensitive.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionContextSensitive.adoc
@@ -76,11 +76,11 @@
 
 If you need something more featureful, there are a few options, old and new:
 
-=== NodeAction
+== NodeAction
 
 link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/util/actions/NodeAction.html[NodeAction] is somewhat more flexible, but requires more code to implement.  It is just passed the array of activated nodes whenever that changes, and can choose to enable or disable itself as it wishes.  Essentially this is just an action that automagically xref:DevFaqTrackingExplorerSelections.adoc[tracks the global Node selection].
 
-=== Roll your own
+== Roll your own
 
 The following is relatively simple and affords a way to perform whatever enablement logic you like (`NodeAction` can do that too, but this might be a little more straightforward and your code doesn't have to worry about nodes at all: xref:DevFaqWhatIsANode.adoc[DevFaqWhatIsANode]).  To understand how this works, see xref:DevFaqTrackGlobalSelection.adoc[DevFaqTrackGlobalSelection]:
 
@@ -138,7 +138,7 @@
 
 ----
 
-=== Deprecated CookieAction
+== Deprecated CookieAction
 
 In many older (pre-NB 6.8) examples you may find link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/util/actions/CookieAction.html[CookieAction]. It should be (but is not) deprecated. The original info is left here for reference and/or old code maintenance:
 
@@ -146,7 +146,7 @@
 
 Being an older class, under the hood it is using xref:DevFaqLookupCookie.adoc[Node.getCookie()], so your action will only be sensitive to things actually returned by that method - in other words, only objects that implement the marker interface `Node.Cookie` can work here.
 
-=== Not-Yet-Official spi.actions
+== Not-Yet-Official spi.actions
 
 This module is part of the platform as of 6.8, but has not yet become official API (and nobody seems to be willing to make it stable API, so judge your own decisions based on this fact).  Nonetheless it is there, it is not changing and straightforward to use.  The example below opens a visual editor window if an instance of RAFDataObject is selected and has a RandomAccessFile in its lookup:
 
diff --git a/netbeans.apache.org/src/content_ja/kb/docs/ide/clearcase_ja.adoc b/netbeans.apache.org/src/content_ja/kb/docs/ide/clearcase_ja.adoc
index b451dbe..6471be8 100644
--- a/netbeans.apache.org/src/content_ja/kb/docs/ide/clearcase_ja.adoc
+++ b/netbeans.apache.org/src/content_ja/kb/docs/ide/clearcase_ja.adoc
@@ -44,9 +44,9 @@
 |===
 |ソフトウェアまたはリソース |必須バージョン 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |バージョン6.9以降 
+|link:https://netbeans.org/downloads/index.html[NetBeans IDE] |バージョン6.9以降 
 
-|link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |バージョン6、7または8 
+|link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[Java Development Kit (JDK)] |バージョン6、7または8 
 
 |ClearCaseクライアント・ソフトウェア |V 7.0以降 
 
@@ -84,7 +84,7 @@
 1. メイン・メニューから「ツール」>「オプション」(Macでは「NetBeans」>「プリファレンス」)を選択します。「オプション」ダイアログが開きます。
 2. ダイアログの上部にある「その他」アイコンを選択し、「バージョン管理」タブをクリックします。「バージョン管理システム」下の左側のペインで、「ClearCase」を選択します。ダイアログのメイン・ウィンドウに、ClearCaseのユーザー定義オプションが表示されます。
 
- [.feature]
+[.feature]
 --
 
 image::images/cc-options-small.jpg[role="left", link="images/cc-options.jpg"]
@@ -137,7 +137,7 @@
 
 1. 「プロジェクト」ウィンドウでプロジェクト・ノードを右クリックし、「ソース管理に追加」を選択します。「追加」ダイアログが開き、IDEで自動的に無視されない新規view-privateファイルが表示されます。
 
- [.feature]
+[.feature]
 --
 
 image::images/add-dialog-small.jpg[role="left", link="images/add-dialog.jpg"]
diff --git a/netbeans.apache.org/src/content_ja/kb/docs/ide/subversion_ja.adoc b/netbeans.apache.org/src/content_ja/kb/docs/ide/subversion_ja.adoc
index c38a9dd..f8771d3 100644
--- a/netbeans.apache.org/src/content_ja/kb/docs/ide/subversion_ja.adoc
+++ b/netbeans.apache.org/src/content_ja/kb/docs/ide/subversion_ja.adoc
@@ -91,7 +91,7 @@
 1. メイン・メニューから「ツール」→「オプション」(OS Xでは「NetBeans」→プリファレンス)を選択します。「オプション」ダイアログが開きます。
 2. ダイアログの上部にある「その他」アイコンを選択し、「バージョン管理」タブをクリックします。「バージョン管理システム」下の左側のペインで、「Subversion」を選択します。ダイアログのメイン・ウィンドウに、Subversionのユーザー定義オプションが表示されます。
 
- [.feature]
+[.feature]
 --
 
 image::images/svn-options-small.png[role="left", link="images/svn-options.png"]
diff --git a/netbeans.apache.org/src/content_pt_BR/kb/docs/ide/clearcase_pt_BR.adoc b/netbeans.apache.org/src/content_pt_BR/kb/docs/ide/clearcase_pt_BR.adoc
index 8d87525..088f82f 100644
--- a/netbeans.apache.org/src/content_pt_BR/kb/docs/ide/clearcase_pt_BR.adoc
+++ b/netbeans.apache.org/src/content_pt_BR/kb/docs/ide/clearcase_pt_BR.adoc
@@ -44,9 +44,9 @@
 |===
 |Software ou Recurso |Versão Necessária 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |versão 6.9 e mais recente 
+|link:https://netbeans.org/downloads/index.html[NetBeans IDE] |versão 6.9 e mais recente 
 
-|link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+JDK (Java Development Kit)+] |versão 6, 7 ou 8 
+|link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[JDK (Java Development Kit)] |versão 6, 7 ou 8 
 
 |Software cliente do ClearCase |V 7.0 ou posterior 
 
@@ -84,7 +84,7 @@
 1. Escolha Ferramentas > Opções (NetBeans > Preferências no Mac) no menu principal. A caixa de diálogo Opções é aberta.
 2. Selecione o ícone Diversos na parte superior da caixa de diálogo e clique na guia Controle de Versão. No painel esquerdo, em Sistemas de Controle de Versão, selecione ClearCase. As opções definidas pelo usuário para o ClearCase são exibidas na janela principal da caixa de diálogo:
 
- [.feature]
+[.feature]
 --
 
 image::images/cc-options-small.jpg[role="left", link="images/cc-options.jpg"]
@@ -137,7 +137,7 @@
 
 1. Clique com o botão direito do mouse no nó do projeto na janela Projetos e escolha Adicionar ao controle de código-fonte. A caixa de diálogo Adicionar se abre listando todos os novos arquivos de view privada que não são ignorados automaticamente pelo IDE:
 
- [.feature]
+[.feature]
 --
 
 image::images/add-dialog-small.jpg[role="left", link="images/add-dialog.jpg"]
diff --git a/netbeans.apache.org/src/content_pt_BR/kb/docs/ide/subversion_pt_BR.adoc b/netbeans.apache.org/src/content_pt_BR/kb/docs/ide/subversion_pt_BR.adoc
index b1e2bfb..f208d84 100644
--- a/netbeans.apache.org/src/content_pt_BR/kb/docs/ide/subversion_pt_BR.adoc
+++ b/netbeans.apache.org/src/content_pt_BR/kb/docs/ide/subversion_pt_BR.adoc
@@ -87,7 +87,7 @@
 1. Escolha Ferramentas > Opções(NetBeans > Preferências no OS X) a partir do menu principal. A caixa de diálogo Opções é aberta.
 2. Selecione o ícone Diversos na parte superior da caixa de diálogo e clique na guia Controle de Versão. No painel esquerdo, em Sistemas de Controle de Versão, selecione Subversion. As opções definidas pelo usuário para o Subversion são exibidas na janela principal da caixa de diálogo:
 
- [.feature]
+[.feature]
 --
 
 image::images/svn-options-small.png[role="left", link="images/svn-options.png"]
diff --git a/netbeans.apache.org/src/content_ru/kb/docs/ide/clearcase_ru.adoc b/netbeans.apache.org/src/content_ru/kb/docs/ide/clearcase_ru.adoc
index cd685db..23105f1 100644
--- a/netbeans.apache.org/src/content_ru/kb/docs/ide/clearcase_ru.adoc
+++ b/netbeans.apache.org/src/content_ru/kb/docs/ide/clearcase_ru.adoc
@@ -84,7 +84,7 @@
 1. Выберите Tools ("Сервис") > Options ("Параметры") (NetBeans > Preferences ("Настройки") на Mac) из главного меню. Откроется диалоговое окно Options ("Параметры").
 2. Выберите значок Miscellaneous ("Разное") наверху диалогового окна, затем щелкните вкладку Versioning ("Управление версии"). В левой панели, под Versioning Systems ("Системы управления версиями"), выберите ClearCase. Определенные пользователем параметры ClearCase отобразятся в основном окне диалога:
 
- [.feature]
+[.feature]
 --
 
 image::images/cc-options-small.jpg[role="left", link="images/cc-options.jpg"]
@@ -137,7 +137,7 @@
 
 1. Щелкните правой кнопкой мыши узел проекта в окне проектов и выберите Add to Source Control ("Добавить под контроль версий"). Откроется диалоговое окно добавления, в котором перечислены все новые файлы для частного просмотра, кроме игнорируемых средой IDE автоматически:
 
- [.feature]
+[.feature]
 --
 
 image::images/add-dialog-small.jpg[role="left", link="images/add-dialog.jpg"]
diff --git a/netbeans.apache.org/src/content_ru/kb/docs/ide/subversion_ru.adoc b/netbeans.apache.org/src/content_ru/kb/docs/ide/subversion_ru.adoc
index 5065c57..c2e04fc 100644
--- a/netbeans.apache.org/src/content_ru/kb/docs/ide/subversion_ru.adoc
+++ b/netbeans.apache.org/src/content_ru/kb/docs/ide/subversion_ru.adoc
@@ -91,7 +91,7 @@
 1. Выберите 'Сервис' > 'Параметры' ('NetBeans'> 'Предпочтения' в OS X) в главном меню. Откроется диалоговое окно Options ("Параметры").
 2. Выберите значок Miscellaneous ("Разное") наверху диалогового окна, затем щелкните вкладку Versioning ("Управление версии"). В левой панели под заголовком Versioning Systems ("Системы контроля версий") выберите Subversion. Параметры пользователя Subversion отображаются в главном окне диалога:
 
- [.feature]
+[.feature]
 --
 
 image::images/svn-options-small.png[role="left", link="images/svn-options.png"]
diff --git a/netbeans.apache.org/src/content_zh_CN/kb/docs/ide/clearcase_zh_CN.adoc b/netbeans.apache.org/src/content_zh_CN/kb/docs/ide/clearcase_zh_CN.adoc
index 8c2232c..401052d 100644
--- a/netbeans.apache.org/src/content_zh_CN/kb/docs/ide/clearcase_zh_CN.adoc
+++ b/netbeans.apache.org/src/content_zh_CN/kb/docs/ide/clearcase_zh_CN.adoc
@@ -84,7 +84,7 @@
 1. 从主菜单中选择 "Tools"(工具)> "Options"(选项);在 Mac 上为 "NetBeans" > "Preferences"(首选项)。"Options"(选项)对话框打开。
 2. 选择对话框顶部的 "Miscellaneous"(其他)图标,然后单击 "Versioning"(版本控制)标签。在 "Versioning Systems"(版本控制系统)下面的左侧窗格中,选择 ClearCase。对话框主窗口中将会显示 ClearCase 的用户定义选项:
 
- [.feature]
+[.feature]
 --
 
 image::images/cc-options-small.jpg[role="left", link="images/cc-options.jpg"]
@@ -137,7 +137,7 @@
 
 1. 在 "Projects"(项目)窗口中右键单击项目节点,选择 "Add to source control"(添加到源代码控制中)。此时将打开 "Add"(添加)对话框,其中列出 IDE 自动忽略的所有新建的视图私有文件:
 
- [.feature]
+[.feature]
 --
 
 image::images/add-dialog-small.jpg[role="left", link="images/add-dialog.jpg"]
diff --git a/netbeans.apache.org/src/content_zh_CN/kb/docs/ide/subversion_zh_CN.adoc b/netbeans.apache.org/src/content_zh_CN/kb/docs/ide/subversion_zh_CN.adoc
index c53abbe..ddd2e9f 100644
--- a/netbeans.apache.org/src/content_zh_CN/kb/docs/ide/subversion_zh_CN.adoc
+++ b/netbeans.apache.org/src/content_zh_CN/kb/docs/ide/subversion_zh_CN.adoc
@@ -88,7 +88,7 @@
 1. 从主菜单中选择 "Tools"(工具)> "Options"(选项);在 OS X 上为 "NetBeans" > "Preferences"(首选项)。"Options"(选项)对话框打开。
 2. 选择对话框顶部的 "Miscellaneous"(其他)图标,然后单击 "Versioning"(版本控制)标签。在 "Versioning Systems"(版本控制系统)下的左窗格中,选择 "Subversion"。对话框主窗口中将会显示 Subversion 的用户定义选项:
 
- [.feature]
+[.feature]
 --
 
 image::images/svn-options-small.png[role="left", link="images/svn-options.png"]