Merge pull request #667 from ebarboni/wikiindex4

more wiki using autoindex
diff --git a/netbeans.apache.org/src/content/templates/wikidevindex.gsp b/netbeans.apache.org/src/content/templates/wikidevindex.gsp
index 20e41fb..d0450cb 100644
--- a/netbeans.apache.org/src/content/templates/wikidevindex.gsp
+++ b/netbeans.apache.org/src/content/templates/wikidevindex.gsp
@@ -32,6 +32,7 @@
     <div class='grid-container main-content'>
       <h1 class="sect1">${content.title}</h1>
       <%include "templatesparts/wiki-devindexbread.gsp"%>
+      ${content.body}
       <%
 // order by wiki section on former wiki
 def sectionMap=['_getting_started':'Getting Started',
@@ -53,6 +54,7 @@
                 '_nodes_and_explorer':'Nodes and Explorer',
                 '_tasks_and_progressbar':'Tasks and Progressbar',
                 '_command_line_parsing':'Command Line Parsing',
+                '_threading':'Threading',
                 '_creating_a_custom_programming_language':'Creating a Custom Programming Language',
                 '_settings':'Settings',
                 '_window_system':'Window System',
@@ -98,9 +100,18 @@
     for ( atag in tags ) {
         if ( atag.name=="devfaq") {
             for ( mydoc in atag.tagged_documents ) {
-                if ( mydoc.position!=null && mydoc.wikidevsection!=null && asection.key==mydoc.wikidevsection ) {
-                    sectionsubitm.put(mydoc.position.toInteger(),mydoc);
-                }
+                // wikidevsection and position may have space separated value length must match, by index mapping
+                if ( mydoc.position!=null && mydoc.wikidevsection!=null) { 
+                          String[] sections = mydoc.wikidevsection.split(" ");
+                          String[] positions = mydoc.position.split(" ");
+                          int i = 0;
+                          for (String section in sections) {
+                              if ( asection.key==section ) {
+                                  sectionsubitm.put(positions[i].toInteger(),mydoc);
+                              }
+                              i++;
+                          }
+                      }
             }
         }
     }
@@ -120,11 +131,7 @@
     out.println('</div>');
 }
 
-      %>
-      <hr>
-       Manually edited
-      <hr>
-      ${content.body}
+      %>      
       <%include "templatesparts/tools.gsp"%>
     </div>
     <%include "templatesparts/footer.gsp"%>
diff --git a/netbeans.apache.org/src/content/wiki/Autoload.adoc b/netbeans.apache.org/src/content/wiki/Autoload.adoc
index 40c916f..1e77613 100644
--- a/netbeans.apache.org/src/content/wiki/Autoload.adoc
+++ b/netbeans.apache.org/src/content/wiki/Autoload.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= Autoload
-:jbake-type: wiki
+= What is an autoload module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki Autoload
@@ -26,13 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _module_system
+:position: 10
 
 The *autoload* in the xref:../index.adoc[NetBeans] module system world means that certain module is turned on when _needed_. In contrast to regular modules which require some manual action (user locating a module and activating it) to turn them on, the *autoload* modules are opaque for users and managed solely by the infrastructure. As soon as there is some module needing (by dependency or require/needs token) an *autoload* module, the infrastructure enables it.
 
 In the link:http://wiki.apidesign.org/wiki/OSGi[OSGi] mode, the meaning of *autoload* remains as close as the original meaning. The bundle JAR is registered to the underlaying link:http://wiki.apidesign.org/wiki/OSGi[OSGi] framework, but it is not _started_ until there is some NetBeans module which would depend on the bundle. If there is no such xref:../index.adoc[NetBeans] module, the link:http://wiki.apidesign.org/wiki/OSGi[OSGi] bundle remains in _installed_ state (or _resolved_?).
 
 The *autoload* mode is most suitable for link:http://wiki.apidesign.org/wiki/OSGi[OSGi] bundles which shall be left in the full control of the link:http://wiki.apidesign.org/wiki/OSGi[OSGi] container. For example there can be other link:http://wiki.apidesign.org/wiki/OSGi[OSGi] bundles which may later _start_ such bundles. Such enablement is outside of control of the xref:../index.adoc[NetBeans] module system and is temporary (on subsequent launch of the system the module remains *autoload.adoc*).
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +46,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaq2SrcPaths.adoc b/netbeans.apache.org/src/content/wiki/DevFaq2SrcPaths.adoc
index 9792805..1df74b5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaq2SrcPaths.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaq2SrcPaths.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaq2SrcPaths
-:jbake-type: wiki
+= How do I have two source directories within one module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaq2SrcPaths
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 3
 
-== How do I have two source directories within one module?
 
 Adding an extra source directories is possible in case you need to create a separate output JARs (besides the module itself), generally with its own special classpath.
 
@@ -60,7 +61,7 @@
 
 Applies to: NetBeans IDE 6.x
 Platforms: All
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -72,3 +73,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectCustomizer.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectCustomizer.adoc
index fbdc8b1..1002578 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectCustomizer.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectCustomizer.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqActionAddProjectCustomizer
-:jbake-type: wiki
+= How do I add a new panel to a Project Properties dialog?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqActionAddProjectCustomizer
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I add a new panel to a Project Properties dialog?
+:wikidevsection: _project_types
+:position: 2
 
 Create and register the panel (here for Java SE projects):
 
@@ -52,6 +52,7 @@
 
 See also link:http://blogs.sun.com/gridbag/entry/project_properties_gui_for_custom[Project Properties GUI for custom project templates] and link:http://netbeans.dzone.com/new-tabs-netbeans-project-props[Adding New Tabs to the Project Properties Dialog in NetBeans IDE].
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -63,3 +64,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectCustomizerToMultipleTypes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectCustomizerToMultipleTypes.adoc
index 1342bf3..579ea12 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectCustomizerToMultipleTypes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectCustomizerToMultipleTypes.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqActionAddProjectCustomizerToMultipleTypes
-:jbake-type: wiki
+= How do I register a "ProjectCustomizer" to multiple project types?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqActionAddProjectCustomizerToMultipleTypes
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I register a "ProjectCustomizer" to multiple project types?
+:wikidevsection: _project_types
+:position: 6
 
 Use the *@Registrations* annotation to group the multiple *@Registration* annotations.
 
@@ -51,6 +51,7 @@
 
 See xref:../tutorials/nbm-projecttype.adoc#projectcustomizer[https://netbeans.apache.org/tutorials/nbm-projecttype.html#projectcustomizer]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -62,3 +63,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectPopUp.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectPopUp.adoc
index 601a375..9f603f5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectPopUp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectPopUp.adoc
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-:wikidevsection: _actions_how_to_add_things_to_files_folders_menus_toolbars_and_more
-:position: 12
+:wikidevsection: _actions_how_to_add_things_to_files_folders_menus_toolbars_and_more _project_types
+:position: 12 3
 
 Just use `@ActionReference(path="Projects/Actions")`. The action should take a context parameter in its constructor.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectTypePopUp.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectTypePopUp.adoc
index 1453db4..5ff25cc 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectTypePopUp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectTypePopUp.adoc
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-:wikidevsection: _actions_how_to_add_things_to_files_folders_menus_toolbars_and_more
-:position: 13
+:wikidevsection: _actions_how_to_add_things_to_files_folders_menus_toolbars_and_more _project_types
+:position: 13 4
 
 
 == Generic approach
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionAllAvailableProjectTypes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionAllAvailableProjectTypes.adoc
index fb336d3..a5ac895 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionAllAvailableProjectTypes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionAllAvailableProjectTypes.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqActionAllAvailableProjectTypes
-:jbake-type: wiki
+= How determine all available project types?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqActionAllAvailableProjectTypes
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How determine all available project types?
+:wikidevsection: _project_types
+:position: 7
 
 * create a new nbm-module using the "_New Project..._"-wizard and choose your target platform
 * create a layer.xml using the "_New File..._"-wizard
@@ -36,7 +36,7 @@
 
 The project type can be used for extending the project properties - See xref:DevFaqActionAddProjectCustomizer.adoc[DevFaqActionAddProjectCustomizer].
 
-=== Example of some available types in NetBeans 7.2
+== Example of some available types in NetBeans 7.2
 
 image:ChildnodesRepresentingProjectTypes.jpg[])
 
@@ -64,6 +64,7 @@
 Applies to: NetBeans IDE 7.x
 Platforms: All
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -75,3 +76,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAddDefaultActionShortcuts.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAddDefaultActionShortcuts.adoc
index 5a4904a..e39cdc7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAddDefaultActionShortcuts.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAddDefaultActionShortcuts.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAddDefaultActionShortcuts
-:jbake-type: wiki
+= How do I add default shortcuts for SystemActions (like cut, paste, etc)?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAddDefaultActionShortcuts
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _key_bindings
+:position: 7
 
 You just need to include the defaults module _org.netbeans.modules.defaults_ that defines the key bindings for the system actions.
 
@@ -40,7 +42,7 @@
       <version>${netbeans.version}</version>        
   </dependency>
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -52,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAddDoingEvilThingsToForeignNodes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAddDoingEvilThingsToForeignNodes.adoc
index e55bb25..f034a25 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAddDoingEvilThingsToForeignNodes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAddDoingEvilThingsToForeignNodes.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAddDoingEvilThingsToForeignNodes
-:jbake-type: wiki
+= I have a reference to an existing Node from some other module. Can I add cookies/properties/actions/children?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAddDoingEvilThingsToForeignNodes
@@ -26,23 +26,28 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 10
 
-== I have a reference to an existing Node from some other module. Can I add cookies/properties/actions/children?
 
 No.
 
-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.  
+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.  
 
-=== *_DO NOT DO THAT UNDER ANY CIRCUMSTANCES_*
+== *_DO NOT DO THAT UNDER ANY CIRCUMSTANCES_*
 
 (there, did I say that strongly enough?).
 
-Many modules are designed for extensibility - in fact, Nodes for Java files in the IDE do allow you to add children, actions, etc.  They offer an API for doing this sort of thing (for example, adding Actions to `Loaders/text/x-java/Actions` declaratively);  see the beans module for an example of adding sub-nodes to Java classes.
+Many modules are designed for extensibility - in fact, Nodes for Java files in the IDE do allow you to add children, actions, etc.  
+They offer an API for doing this sort of thing (for example, adding Actions to `Loaders/text/x-java/Actions` declaratively);  see the beans module for an example of adding sub-nodes to Java classes.
 
 If you want to modify the children/properties/actions/etc. of a Node you did not create, look for an API that lets you do that in a supported way.  
 
-If one does not exist, link:http://www.netbeans.org/issues/enter_bug.cgi[file an enhancement request] against the module that actually creates these nodes, asking for an appropriate API for doing what you want (and be clear about exactly what you want or why).  If you really want to expedite it, write a patch that creates such an API (look at how other modules do this sort of thing and aim to follow a similar pattern) - it's hard to say no to working code.
-
+If one does not exist, link:http://www.netbeans.org/issues/enter_bug.cgi[file an enhancement request] against the module that actually creates these nodes, asking for an appropriate API for doing what you want (and be clear about exactly what you want or why).  
+If you really want to expedite it, write a patch that creates such an API (look at how other modules do this sort of thing and aim to follow a similar pattern) - it's hard to say no to working code.
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +59,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAddFileTemplateToNewFileContentMenu.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAddFileTemplateToNewFileContentMenu.adoc
index b531c01..fbbd60f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAddFileTemplateToNewFileContentMenu.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAddFileTemplateToNewFileContentMenu.adoc
@@ -17,7 +17,7 @@
 //     under the License.
 //
 
-= DevFaqAddFileTemplateToNewFileContentMenu
+= How can I define the available File types when the user right-clicks the project folder and chooses "New"?
 :jbake-type: wiki
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _project_types
+:position: 8
 
-== How can I define the available File types when the user right-clicks the project folder and chooses "New"?
 
 See documentation of "Privileged and Recommended Templates" at 
 link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/templates/support/package-summary.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/templates/support/package-summary.html]
@@ -65,6 +66,7 @@
 * xref:../blogs/geertjan/privileged_and_recommended_templates.adoc[Privileged and Recommended Templates]
 * xref:../blogs/geertjan/nescide_an_ide_for_the.adoc[Nescide: An IDE for Hacking the TinyOS Platform ]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -76,3 +78,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAddShortCutForAction.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAddShortCutForAction.adoc
index eb8f11b..4892f33 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAddShortCutForAction.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAddShortCutForAction.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAddShortCutForAction
-:jbake-type: wiki
+= How to set the shortcut of an action outside of your own module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAddShortCutForAction
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _key_bindings
+:position: 9
 
-== How to set the shortcut of an action outside of your own module?
 
 Register a shortcut at the "Shortcuts" folder in the layer.xml.
 
@@ -41,7 +42,7 @@
         </file>
     </folder>
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -53,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAddTimestampToLogs.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAddTimestampToLogs.adoc
index e18cbb4..4271c8a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAddTimestampToLogs.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAddTimestampToLogs.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAddTimestampToLogs
-:jbake-type: wiki
+= How Do I Add a Timestamp to the Logs?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAddTimestampToLogs
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How Do I Add a Timestamp to the Logs?
+:wikidevsection: _logging_and_error_handling
+:position: 5
 
 This FAQ entry demonstrates how to prepend a timestamp to your log file entries. For example:
 
@@ -39,15 +39,15 @@
 05:42:52.151 INFO [org.netbeans.core.startup.NbEvents]: Turning on modules: ....
 ----
 
-=== Caveats
+== Caveats
 
 The NetBeans Platform includes its own logging mechanism.  If you customize the logging through the use of the _java.util.logging.config.file_ or _java.util.logging.config.class_ property settings, then the native NetBeans logging mechanism is completely disabled, and either the default Java logging or your custom logging class is used instead.
 
-=== Solution
+== Solution
 
 This solution shows how to customize the output from the native NetBeans log formatter (_NbFormatter_) by creating a new custom formatter that by prepends a timestamp to the log messages.  Note, using _NbFormatter_ requires a private package reference to the _org-netbeans-core-startup_ module.  This FAQ will also show how to establish the private package access.
 
-==== Step 1. Establish Project Dependencies
+=== Step 1. Establish Project Dependencies
 
 Include the a dependency on *org-netbeans-core-startup* in the project that will implement the custom formatter. In Maven, add following entry to the project POM:
 
@@ -63,7 +63,7 @@
 
 ----
 
-==== Step 2. Create the Custom Log Formatter
+=== Step 2. Create the Custom Log Formatter
 
 Here's an example of a custom _Formatter_.  It uses the NetBeans _NbFormatter_ instance to obtain a formatted message from the _LogRecord_.  NbFormatter is a final class that exposes itself via a public static _FORMATTER_ property. This solution simply prepends a timestamp, extracted from the LogRecord, to the formatted log message. 
 
@@ -96,7 +96,7 @@
 
 ----
 
-==== Step 3. Override the Default Formatters
+=== Step 3. Override the Default Formatters
 
 In a module _Installer_ class, include the following code block in the restored method to replace the default formatters with the custom formatter:
 
@@ -120,7 +120,7 @@
 
 ----
 
-==== Step 4. Configure Access to Private Package
+=== Step 4. Configure Access to Private Package
 
 In the project's POM, edit the *nbm-maven-plugin* configuration to allow  private package access to *org.netbeans.modules:org-netbeans-core-startup* via an *impl* module dependency, for example:
 
@@ -144,14 +144,14 @@
 
 ----
 
-=== Final Notes
+== Final Notes
 
 To leverage the NetBeans logging, you must disable any _java.util.logging.config.file_ or _java.util.logging.config.class_ property settings.  Check your application's .conf file, and, in the application's POM, check the _additionalArguments_ entry.
 
 
 
 This example was tested with NetBeans 8.0 and JDK 8.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -163,3 +163,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAddingRemovingChildrenDynamically.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAddingRemovingChildrenDynamically.adoc
index cda50aa..fa45791 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAddingRemovingChildrenDynamically.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAddingRemovingChildrenDynamically.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAddingRemovingChildrenDynamically
-:jbake-type: wiki
+= Can I add or remove children of a node on the fly?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAddingRemovingChildrenDynamically
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 11
 
-== Can I add or remove children of a node on the fly?
 
 Yes.  Have your node subclass link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html[AbstractNode]
 or whatever else you like.
@@ -47,7 +48,7 @@
 ---
 
 Applies to: NetBeans 4.0, 4.1, 5.0
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -59,3 +60,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAnnotationDevelopDebug.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAnnotationDevelopDebug.adoc
index 72efe86..30eb2d5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAnnotationDevelopDebug.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAnnotationDevelopDebug.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAnnotationDevelopDebug
-:jbake-type: wiki
+=  How do I develop and debug annotations for NetBeans platform apps?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAnnotationDevelopDebug
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 41
 
-== How do I develop and debug annotations for NetBeans platform apps?
 
 The NetBeans platform has API support for creating XML layer entries from annotations. The popular book "NetBeans Platform for Beginners" has several examples of writing your own annotations. Familiarity with developing annotations and annotation processing is a prerequisite. Though not specifically about NetBeans platform annotations, link:https://netbeans.org/kb/docs/java/annotations.html[Annotation Processors Support in the NetBeans IDE] may also be useful for those new to working with annotions.
 
@@ -120,7 +121,7 @@
     return enumConstantsNames;
 }
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -132,3 +133,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqApiSpi.adoc b/netbeans.apache.org/src/content/wiki/DevFaqApiSpi.adoc
index c3ab28c..9ac42eb 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqApiSpi.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqApiSpi.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqApiSpi
-:jbake-type: wiki
+= What is an SPI?  How is it different from an API?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqApiSpi
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 9
 include::../inc/database.adoc[]
 
 
@@ -46,6 +48,7 @@
 
 link:http://weblogs.java.net/blog/2008/08/11/capability-pattern-future-proof-your-apis[More on API and SPI]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +60,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAppClientOnNbPlatformTut.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAppClientOnNbPlatformTut.adoc
index 2991dd2..9673a49 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAppClientOnNbPlatformTut.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAppClientOnNbPlatformTut.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAppClientOnNbPlatformTut
-:jbake-type: wiki
+= Java EE Application Client on top of the NetBeans Platform Tutorial
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAppClientOnNbPlatformTut
@@ -26,16 +26,17 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _using_enterprise_resources_from_netbeans_module
+:position: 2
 
-== Java EE Application Client on top of the NetBeans Platform Tutorial
 
-=== Draft
+== Draft
 
 This is document currently has draft status
 
 This tutorial will show you how easy is to create an application client on top of the NetBeans Platform. It will be demonstrated on the example of Database Reader.
 
-=== Table of Contents
+== Table of Contents
 
 * xref:DevFaqAppClientOnNbPlatformTut.adoc#Requirements[Requirements]
 * xref:DevFaqAppClientOnNbPlatformTut.adoc#InstallationAndConfiguration[Installation And Configuration]
@@ -54,14 +55,14 @@
 * xref:DevFaqAppClientOnNbPlatformTut.adoc#DebugApplication[Debug Application]
 
 
-=== Requirements
+== Requirements
 
 * link:http://java.sun.com/javase/downloads/index_jdk5.jsp[Java(TM) SE Development Kit 5.0]
 * link:http://www.netbeans.org/[NetBeans IDE 5.5.1] or later
 * NetBeans Platform 5.5.1 or later
 * link:https://glassfish.dev.java.net/public/downloadsindex.html[GlassFish v2] or later
 
-=== Installation And Configuration
+== Installation And Configuration
 
 Install all of the required products (installation guides are available on the product's websites). When it'll be done we have to set up a few things. First of all please start NetBeans IDE 5.5.1 and register GlassFish v2. Right click on the Servers node in the Runtime tab and select Add server (choose Sun Java Application Server).
 
@@ -71,7 +72,7 @@
 
 image:addplatform_DevFaqAppClientOnNbPlatformTut.png[]
 
-=== Projects Creation
+== Projects Creation
 
 It's time to create all projects. We need NetBeans Module Suite project, NetBeans Module (added into your NetBeans Module Suite) project and Enterprise Application project with Application Client and EJB module included. Let's do it. First of all we create NetBeans Module Suite project. Call it dbreader. As used platform choose the new one what you registered before.
 
@@ -93,9 +94,9 @@
 
 image:projects_DevFaqAppClientOnNbPlatformTut.png[]
 
-=== Enterprise Application Development
+== Enterprise Application Development
 
-==== Build Script Modifying (5.5.x)
+=== Build Script Modifying (5.5.x)
 
 We need to modify dbreader-ear build.xml script because the dbreader suite jnlp distro has to be packed into dbreader ear. Due to add these lines into dbreader-ear build.xml (instructions for 6.x are in the next part).
 
@@ -132,7 +133,7 @@
 
 image:editearbuild2_DevFaqAppClientOnNbPlatformTut.png[]
 
-==== Build Script Modifying (6.x)
+=== Build Script Modifying (6.x)
 
 [source,xml]
 ----
@@ -162,7 +163,7 @@
 
 If you're not using Mac then also don't forget to exclude "Apple Application Menu" module (module suite project properties -> libraries -> PlatformX). Also make sure you're including only modules from platformX cluster.
 
-==== Generating Entity Classes From Database
+=== Generating Entity Classes From Database
 
 We have dbreader-ear project infrastructure prepared. Now we have to generate entity classes from sample database. Right click on dbreader-ear-ejb project in Project tab and select New -> Entity Classes From Database. In wizard chose as datasource jdbc/sample datasource and select CUSTOMER table.
 
@@ -176,7 +177,7 @@
 
 image:generateentity3_DevFaqAppClientOnNbPlatformTut.png[]
 
-==== Create Session Bean
+=== Create Session Bean
 
 We need to create stateless session bean with remote interface to communicate with persistence unit. Create one and call it DataBean.
 
@@ -201,7 +202,7 @@
 
 image:createsession3_DevFaqAppClientOnNbPlatformTut.png[]
 
-==== Modify Application Client
+=== Modify Application Client
 
 We prepared EJB module and now we have to implement functionality into dbreader-ear-app-client Application Client module. Open Main.java file in dbreader-ear-app-client project.
 
@@ -246,9 +247,9 @@
 
 Great ! We have finished development of the dbreader-ear Enterprise Application. Let's go to develop NetBeans Modules.
 
-=== NetBeans Modules Development
+== NetBeans Modules Development
 
-==== Set Up Suite
+=== Set Up Suite
 
 Now we set up the dbreader NetBeans module suite. We have to set it as standalone application and also we are able to change splash screen. Right click on dbreader project and select Properties. There select Application and then click on the Create Standalone Application.
 
@@ -258,7 +259,7 @@
 
 image:setupsuite2_DevFaqAppClientOnNbPlatformTut.png[]
 
-==== Set Up Module
+=== Set Up Module
 
 Now we set up the customers NetBeans Module. We have to add dbreader-ear-ejb.jar, dbreader-ear-app-client.jar and javaee.jar on compile classpath. First of all set sources level of the module to 1.5. Right click on customers project and on the first panel select 1.5 for sources level.
 
@@ -283,7 +284,7 @@
 
 image:setupmodule3_DevFaqAppClientOnNbPlatformTut.png[]
 
-==== Create Window Component
+=== Create Window Component
 
 Now we create a new window component which will serve as viewer for database data. Right click on customers project and select New -> Window Component. On the first wizard panel choose editor as Window Position and select Open on Application Start.
 
@@ -297,7 +298,7 @@
 
 image:createwindow3_DevFaqAppClientOnNbPlatformTut.png[]
 
-==== Write Customers Top Component Logic
+=== Write Customers Top Component Logic
 
 We have to write application logic for customers top component. Open CustomersTopComponent.java file in design mode and drag and drop a jTable component from palette into it.
 
@@ -341,7 +342,7 @@
 
 image:writelogic2_DevFaqAppClientOnNbPlatformTut.png[]
 
-=== Run Application
+== Run Application
 
 Great job !! Everything is done. Now you can run your application. Right click on dbreader-ear project and select Run Project. Wait a minute do build and glassfish to start. Enjoy your application :o)
 
@@ -372,6 +373,7 @@
 
 For more details about the JPDA debugging arguments, see link:http://java.sun.com/javase/6/docs/technotes/guides/jpda/conninv.html[here].
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -383,3 +385,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.adoc
similarity index 92%
rename from netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc
rename to netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.adoc
index 84c264e..ec57e08 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAutoUpdateAPIJavadoc
-:jbake-type: wiki
+= How can I find Javadoc of Autoupdate API with hints to use it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAutoUpdateAPIJavadoc
@@ -26,26 +26,28 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 4
 
-== How can I find Javadoc of Autoupdate API with hints to use it?
 
 Since NetBeans 6.0 there is a public *API* to use *Autoupdate Services*. Autoupdate API provides several services to applications built on NetBeans Platform: it allows users to download and install available updates of installed plugins, search and install new plugins from subscribed Update Centers, browsing and manipulating plugins already installed. To use these services NetBeans Platform supplies a GUI (_Plugin Manager_ in _Tools->Plugins_ menu item) to easy call these services. AutoUpdate API also cares about registration of Update Centers.
 
 * Where to find Javadoc? link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/overview-summary.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/overview-summary.html]
 * Which version of NetBeans should I use? This API was firstly introduced in NetBeans 6.0 Platform where the API was still in development. In NetBeans 6.1 Platform it was made official API, it means further changes should be backward compatible. Use xref:../download/index.adoc[NetBeans Platform of the latest version] for the best performance.
 
-=== Related articles
+== Related articles
 
 * xref:DevFaqWhatIsNbm.adoc[What is an NBM?]
 * xref:FaqPluginManagerCustomization.adoc[How to customize Plugin Manager?]
 * xref:DevFaqNbmPostInstall.adoc[How to specify post-install code in NBM?]
 * xref:FaqDevComponentWithCustomInstaller.adoc[How to install components using its custom installers?]
 
-=== Other resources
+== Other resources
 
 * link:https://blogs.oracle.com/rechtacek/[Rechtacek's Blog]
 * xref:../blogs/geertjan/index.adoc[Geertjan's Blog]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +59,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateBranding.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateBranding.adoc
index 8922c51..fa3a634 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateBranding.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateBranding.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAutoUpdateBranding
-:jbake-type: wiki
+= How can I update the splash screen, title bar and other branding items via AutoUpdate?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAutoUpdateBranding
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I update the splash screen, title bar and other branding items via AutoUpdate?
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 2
 
 It's easy to distribute new and/or updated modules via AutoUpdate, but you might also like to update branding items like the splash screen and version number in the application's title bar to reflect the changes.
 
@@ -74,7 +74,7 @@
 Note that you link:https://bz.apache.org/netbeans/show_bug.cgi?id=122815[may encounter problems doing this in NetBeans 6.0].
 
 Thanks to Matteo Di Giovinazzo for sharing how to do this on the dev@openide list.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -86,3 +86,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateCheckEveryStartup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateCheckEveryStartup.adoc
index 9ed6d74..087370f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateCheckEveryStartup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateCheckEveryStartup.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAutoUpdateCheckEveryStartup
-:jbake-type: wiki
+= How to force to check for updates at every startup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAutoUpdateCheckEveryStartup
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How to force to check for updates at every startup?
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 10
 
 [source,java]
 ----
@@ -36,7 +36,7 @@
 ----
 
 See also "The Definitive Guide to the NetBeans Platform 7" book, chapter 25.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAutomaticPlatformDownload.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAutomaticPlatformDownload.adoc
index a952d60..0f3a9da 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAutomaticPlatformDownload.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAutomaticPlatformDownload.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqAutomaticPlatformDownload
-:jbake-type: wiki
+= How can I have my application compiled in a specific version of the platform ?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqAutomaticPlatformDownload
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I have my application compiled in a specific version of the platform ?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 40
 
 Now the platform can be downloaded on demand! Just update your platform.properties files as follows:
 
@@ -290,7 +290,7 @@
 .
 autoupdate.catalog.urlx=urlx
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -302,3 +302,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqBackgroundThread.adoc b/netbeans.apache.org/src/content/wiki/DevFaqBackgroundThread.adoc
index 2d054bc..33ffbf7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqBackgroundThread.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqBackgroundThread.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqBackgroundThread
-:jbake-type: wiki
+= What is a background thread and why do I need one?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqBackgroundThread
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _threading
+:position: 1
 
-== What is a background thread and why do I need one?
 
 As with most user interface (UI) toolkits, Swing is _single threaded_.  That means there is one and only one thread that should create or alter the state of UI components, and that is the AWT Event Dispatch Thread (also known as the EDT or the "event thread").  It processes things like key and mouse events and calls components to respond to them.  
 
@@ -49,6 +50,7 @@
 
 Note that the caveat about Swing includes creating components - it is probably not safe to even construct Swing components on a background thread, because of synchronization on `Component.getTreeLock()`.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -60,3 +62,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCallEjbFromNbm.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCallEjbFromNbm.adoc
index 6de3f07..a0c75fe 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCallEjbFromNbm.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCallEjbFromNbm.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCallEjbFromNbm
-:jbake-type: wiki
+= How to call EJB from NetBeans module
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCallEjbFromNbm
@@ -26,19 +26,20 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _using_enterprise_resources_from_netbeans_module
+:position: 2
 
-== How to call EJB from NetBeans module
 
 This How-To is based on link:https://glassfish.dev.java.net/javaee5/ejb/EJB_FAQ.html[GlassFish EJB Faq]
 
-=== How to call EJB from Java EE Application Client built on top of NetBeans Platform
+== How to call EJB from Java EE Application Client built on top of NetBeans Platform
 
 *Important:* Application Client must be created as it is described in xref:DevFaqAppClientOnNbPlatformTut.adoc[Java EE Application Client on top of the NetBeans Platform Tutorial] otherwise this will not work
 
 * create lookup method in some class in your module
 * add entry to `application-client.xml` in application client module
 
-==== Example
+=== Example
 
 * for following lookup method in some class from your module:
 [source,java]
@@ -66,9 +67,9 @@
 </ejb-ref>
 ----
 
-=== How to call EJB from standalone module/NB platform based application
+== How to call EJB from standalone module/NB platform based application
 
-==== Call EJB on GlassFish
+=== Call EJB on GlassFish
 
 * ensure that $GLASSFISH_HOME/lib/appserv-rt.jar, $GLASSFISH_HOME/lib/appserv-ext.jar, $GLASSFISH_HOME/lib/appserv-deployment-client.jar, $GLASSFISH_HOME/lib/javaee.jar, $GLASSFISH_HOME/lib/jmxremote_optional.jar are on NB platform based *application's classpath* (startup classpath is not enough)
 * ensure that the same applies to jar with EJB interfaces and its helper classes
@@ -76,7 +77,7 @@
 * add org.omg.CORBA.ORBInitialHost and org.omg.CORBA.ORBInitialPort JVM options to application's startup JVM options
 * use lookup
 
-==== Example
+=== Example
 
 * add:
 [source,java]
@@ -114,7 +115,7 @@
 Applies to: NetBeans 5.5, 6.0, 6.1
 
 Platforms: all
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -126,3 +127,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqChangeNodeAppearance.adoc b/netbeans.apache.org/src/content/wiki/DevFaqChangeNodeAppearance.adoc
index 9ee8575..873423e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqChangeNodeAppearance.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqChangeNodeAppearance.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqChangeNodeAppearance
-:jbake-type: wiki
+= How can I change my node's appearance?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqChangeNodeAppearance
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I change my node's appearance?
+:wikidevsection: _nodes_and_explorer
+:position: 25
 
 It's pretty simple to change the font color, style or weight for your node's label.  Simply override `getHtmlDisplayName` and provide some HTML in your return value. (An example can be found in xref:../tutorials/nbm-nodesapi2.adoc[this] tutorial.) Here is another example:
 
@@ -59,7 +59,7 @@
 The javadoc for the HtmlRenderer class link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/HtmlRenderer.html[explains what subset of HTML is supported].  You can also change the icon's node by overriding various methods such as `getIcon(int type)` or `{getOpenedIcon()`}.
 
 It's also possible, but far more difficult, to control other aspects of the node's appearance; for example, drawing a box around the node or changing its background color.  To do this you must create or modify the explorer view in which the node is rendered.  link:http://openide.netbeans.org/servlets/ReadMsg?list=dev&msgNo=31412[Fabrizio Giudici posted code that illustrates this] on the `dev@openide` list.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -71,3 +71,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqChangeRestartSplash.adoc b/netbeans.apache.org/src/content/wiki/DevFaqChangeRestartSplash.adoc
index 59ca2cf..f75b902 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqChangeRestartSplash.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqChangeRestartSplash.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqChangeRestartSplash
-:jbake-type: wiki
+= How Can I Change the NetBeans Splash Screen Shown When A User Installs a Module Requiring Restart?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqChangeRestartSplash
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _module_system
+:position: 4
 
-== How Can I Change the NetBeans Splash Screen Shown When A User Installs a Module Requiring Restart?
 
 The splash screen is here:
 
@@ -41,7 +42,7 @@
 
 
 Applies to: NetBeans 6.5 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -53,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqClassLoaders.adoc b/netbeans.apache.org/src/content/wiki/DevFaqClassLoaders.adoc
index a86fe51..4f88d41 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqClassLoaders.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqClassLoaders.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqClassLoaders
-:jbake-type: wiki
+= What class loaders are created by the module system?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqClassLoaders
@@ -26,14 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 4
 
-== What class loaders are created by the module system?
 
-=== Overview
+== Overview
 
 This FAQ item should be a companion to the main link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/classpath.html[classpath documentation]. Please refer to the original document for additional details.
 
-=== Class loaders in the NetBeans platform
+== Class loaders in the NetBeans platform
 
 There are basically three main class loader types used in the platform.
 Most code is loaded by module class loaders.
@@ -48,7 +49,7 @@
 This means that the class loader can have zero or more parents.
 `org.netbeans.ProxyClassLoader` implements the search across multiple parents.
 
-=== Module class loader
+== Module class loader
 
 Every module loaded by the module system has its own class loader.
 This loader loads resources primarily from the module's JAR.
@@ -62,14 +63,14 @@
 
 The implementation class is `link:http://hg.netbeans.org/main/file/tip/o.n.bootstrap/src/org/netbeans/StandardModule.java[org.netbeans.StandardModule$OneModuleClassLoader]`.
 
-=== System class loader
+== System class loader
 
 The "system" loader loads no resources on its own,
 but has as its parents all enabled module's class loaders.
 It is accessible via `Lookup.getDefault().lookup(ClassLoader.class)`
 or by using the fact that it is the context loader on all threads by default: `Thread.currentThread().getContextClassLoader()`
 
-=== Application class loader
+== Application class loader
 
 This class loader is set up by the launch script (or by `javaws` if running in JNLP mode).
 It can load classes from `lib/*.jar` in specified clusters.
@@ -77,7 +78,7 @@
 but it is sometimes needed e.g. for Look &amp; Feel classes
 (which must be loaded very early during the startup sequence).
 
-=== Example
+== Example
 
 Take a very simple module `a`:
 
@@ -106,7 +107,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -118,3 +119,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCreateExplorerPanel.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCreateExplorerPanel.adoc
index 74831c8..d6689b5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCreateExplorerPanel.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCreateExplorerPanel.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCreateExplorerPanel
-:jbake-type: wiki
+= How do I create a TopComponent to show an explorer view?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCreateExplorerPanel
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I create a TopComponent to show an explorer view?
+:wikidevsection: _nodes_and_explorer
+:position: 9
 
 xref:DevFaqExplorerViews.adoc[Explorer views ] are generic Swing components, not subclasses of xref:DevFaqWindowsTopComponent.adoc[TopComponent ], the Swing panel class that is used for top level components (tabs) in the main window.  So an explorer view component is added to a TopComponent, using the TopComponent as a Swing container for the view.
 
@@ -76,8 +76,8 @@
 
 ----
 
-The primary difference between the above code and ExplorerPanel is that ExplorerPanel automagically persisted paths from the selected nodes to the root, so that it could be deserialized on restart with the same selection it had before shutdown (assuming that selection still existed - this was never terribly robust).
-
+The primary difference between the above code and ExplorerPanel is that ExplorerPanel automatically persisted paths from the selected nodes to the root, so that it could be deserialized on restart with the same selection it had before shutdown (assuming that selection still existed - this was never terribly robust).
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -89,3 +89,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCustomIOProvider.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomIOProvider.adoc
index 27be6db..61da230 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomIOProvider.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomIOProvider.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCustomIOProvider
-:jbake-type: wiki
+= How do I implement a custom IOProvider?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCustomIOProvider
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _output_window
+:position: 3
 
-== How do I implement a custom IOProvider?
 
 _Note: You will only do this if you are writing a replacement for the NetBeans output window, which is a fairly unusual activity._
 
@@ -78,7 +79,7 @@
 Then instance of your provider could be obtained by `IOProvider.get("My IO provider")`
 
 Applies to: NetBeans 6.7 or higher
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -90,3 +91,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCustomWindowMode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomWindowMode.adoc
index 8424e34..b606bbb 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomWindowMode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomWindowMode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCustomWindowMode
-:jbake-type: wiki
+= How to create a custom window mode?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCustomWindowMode
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How to create a custom window mode?
+:wikidevsection: _window_system
+:position: 22
 
 From time to time the available options are not enough. The available options are displayed below:
 
@@ -38,7 +38,7 @@
 image:Netbeans_Window_Modes.graphml[]
 
 If you want a custom "mode" or location for a top component follow this blog from Geertjan's Blog: xref:../blogs/geertjan/creating_a_new_mode_in.adoc[Creating A New Mode In Your Application]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -50,3 +50,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCustomizeBuild.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomizeBuild.adoc
index fa0c857..429aba4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomizeBuild.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomizeBuild.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCustomizeBuild
-:jbake-type: wiki
+= How can I customize the build process?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCustomizeBuild
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 35
 
-== How can I customize the build process?
 
 Problem: Customization of the build process is not documented properly
 
@@ -50,7 +51,7 @@
 Applies to: NetBeans IDE 6.8 and 6.9
 Platforms: All
 See also xref:DevFaqSignNbm.adoc[DevFaqSignNbm] for an example using this.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -62,3 +63,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCustomizeWindowSystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomizeWindowSystem.adoc
index 3d45abc..76701b2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomizeWindowSystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomizeWindowSystem.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCustomizeWindowSystem
-:jbake-type: wiki
+= How can I customize the window system via the latest 7.1 techniques/enhancements?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCustomizeWindowSystem
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 24
 
 When developing an application based on NetBeans platform there's sometimes need to tweak the Window System for your target users. Here's a couple of tips how to use various switches and options.
 
@@ -122,7 +124,7 @@
 == External Link
 
 Up to date list of all Window System related properties and brading options should be available at link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/architecture-summary.html[architecture summary] page.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -134,3 +136,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCustomizingUnexpectedExceptionDialog.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomizingUnexpectedExceptionDialog.adoc
index d4f3fa9..aff6e8d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomizingUnexpectedExceptionDialog.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomizingUnexpectedExceptionDialog.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCustomizingUnexpectedExceptionDialog
-:jbake-type: wiki
+=  How can I customize the Unexpected Exception dialog ?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCustomizingUnexpectedExceptionDialog
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _logging_and_error_handling
+:position: 4
 
-== How can I customize the Unexpected Exception dialog ?
 
 Problem: How do I add new functionality to the Unexpected Exception dialog?
 
@@ -164,7 +165,7 @@
 Applies to: NetBeans IDE 6.0 and newer
 
 Platforms: All
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -176,3 +177,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCutCopyPaste.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCutCopyPaste.adoc
index 9c59af1..6261aa7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCutCopyPaste.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCutCopyPaste.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCutCopyPaste
-:jbake-type: wiki
+= How do I handle cut, copy and paste?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCutCopyPaste
@@ -26,13 +26,13 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I handle cut, copy and paste?
+:wikidevsection: _nodes_and_explorer
+:position: 26
 
 The subject of properly handling cut, copy and paste is underdocumented in modern material on the NetBeans Platform and I am not aware of any clear and concise examples that show how to handle all aspects of these common actions.  Anyone who can improve these shortcomings would be doing a great service for the NetBeans Platform developer community.
 
 The link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html#edit[Nodes API documentation] provides some guidance, while chapter 14 of _NetBeans: The Definitive Guide_ link:http://www.netbeans.org/download/books/definitive-guide/html/apis-c_betterexplorer.html#N400551[goes into greater detail].  Although some parts of _NetBeans: The Definitive Guide_ are now outdated, the portions related to the Nodes API are likely still relevant.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +44,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
index 685956b..285cc7f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDataLoader
-:jbake-type: wiki
+= What is a DataLoader?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDataLoader
@@ -26,11 +26,10 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 6
 include::../inc/database.adoc[]
 
-
-== What is a DataLoader?
-
 As of NetBeans 6.8, it is usually not necessary to implement DataLoader directly - today it is usually an implementation detail of writing file support, and you can simply write a xref:DevFaqDataObject.adoc[DataObject] subclass and register it as follows:
 
 [source,java]
@@ -54,7 +53,7 @@
 
 This registers the DataObject subclass `com.modules.foofile.FooDataObject` against the MIME type `text/x-foo`.
 
-=== DataLoader Details
+== DataLoader Details
 
 link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataLoader.html[DataLoaders] are factories for DataObjects.  A DataLoader is typically associated with one or more link:{wikipedia}MIME[MIME types] (such as `text/x-java`), and is allowed to be the system-wide factory for DataObjects for individual files of that MIME type.
 
@@ -66,7 +65,7 @@
 subclass.
 
 Note that DataLoaders do not _have_ to be tied to MIME types &mdash; you can still write a DataLoader subclass, registered the old-fashioned way via the JAR manifest, which gets the first chance in the system to claim *any* file in the system.  However this is rarely wise or useful to do.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -78,3 +77,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataObject.adoc
index 34ca656..3f873ca 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataObject.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDataObject
-:jbake-type: wiki
+= What is a DataObject?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDataObject
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 5
 
-== What is a DataObject?
 
 link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/index.html?org/openide/loaders/DataObject.html[DataObjects] wrap xref:DevFaqFileObject.adoc[FileObjects].  (If you do not want to visualize files on disk in an explorer view or create a text editor [with syntax coloring, etc] for files, then you will never need to touch DataObjects.) A FileObject is just a container
 for data;  it happens to have a MIME type, but like `java.io.File`, it doesn't know or care what kind
@@ -54,11 +55,11 @@
 
 However, this ability to represent multiple files with a single DataObject is strongly discouraged for new code and will probably eventually be deprecated - it has serious negative implications for scalability.
 
-=== Related tutorials
+== Related tutorials
 
 * xref:../tutorials/nbm-copyfqn.adoc[NetBeans Java Language Infrastructure Tutorial]
 * xref:../tutorials/nbm-filetype.adoc[File Type Integration Tutorial]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -70,3 +71,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataObjectFileObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataObjectFileObject.adoc
index ad15105..42dc6a1 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataObjectFileObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataObjectFileObject.adoc
@@ -17,32 +17,21 @@
 //     under the License.
 //
 
-= DevFaqDataObjectFileObject
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
+= How do I get a DataObject for a FileObject?
+:jbake-type: wikidev
+:jbake-tags: wiki, devfaq
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDataObjectFileObject
 :description: Apache NetBeans wiki DevFaqDataObjectFileObject
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 5
 
-== How do I get a DataObject for a FileObject?
 
 [source,java]
 ----
 
 DataObject.find (theFileObject)
 ----
-
-== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/DevFaqDataObjectFileObject[http://wiki.netbeans.org/DevFaqDataObjectFileObject] , 
-that was last modified by NetBeans user Admin 
-on 2009-11-06T15:38:44Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataObjectInItsCookieSet.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataObjectInItsCookieSet.adoc
index e01c286..d6ae4ba 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataObjectInItsCookieSet.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataObjectInItsCookieSet.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDataObjectInItsCookieSet
-:jbake-type: wiki
+=  The next button is never enabled when I create my DataObject from a template. Help!
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDataObjectInItsCookieSet
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== The next button is never enabled when I create my DataObject from a template. Help!
+:wikidevsection: _files_and_data_objects
+:position: 13
 
 Most likely your `DataObject` does not put itself into its own `CookieSet`/`Lookup`.  If you call `setCookieSet()`, or override `getLookup()` or `getCookie()`, this can happen.  There are a few parts of NetBeans which will expect `Node`s to be present in their own `Lookup`s and `DataObject`s to be present in theirs.  It is always best to make sure they are there.  For a `DataObject`, the code for this is usually as simple as:
 
@@ -36,7 +36,7 @@
 
 getCookieSet().add(this);
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataObjectNode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataObjectNode.adoc
index 85eeb74..2563e13 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataObjectNode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataObjectNode.adoc
@@ -17,17 +17,19 @@
 //     under the License.
 //
 
-= DevFaqDataObjectNode
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
+= How do I get a DataObject for a Node?
+:jbake-type: wikidev
+:jbake-tags: wiki, devfaq
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDataObjectNode
 :description: Apache NetBeans wiki DevFaqDataObjectNode
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 8
 
-== How do I get a DataObject for a Node?
+== 
 
 [source,java]
 ----
@@ -37,15 +39,3 @@
    //do something
 }
 ----
-
-== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/DevFaqDataObjectNode[http://wiki.netbeans.org/DevFaqDataObjectNode] , 
-that was last modified by NetBeans user Admin 
-on 2009-11-06T15:38:59Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataSystemsAddPopupToAllFolders.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataSystemsAddPopupToAllFolders.adoc
index ae89dff..941f5f5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataSystemsAddPopupToAllFolders.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataSystemsAddPopupToAllFolders.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDataSystemsAddPopupToAllFolders
-:jbake-type: wiki
+= How do I add an item to for every folder in the system?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDataSystemsAddPopupToAllFolders
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 9
 
-== How do I add an item to for every folder in the system?
 
 There is a folder in the xref:DevFaqSystemFilesystem.adoc[System Filesystem ] called Loaders.  It is where various things are registered that apply to specific xref:DevFaqDataObject.adoc[DataObject ] types.  For example, there is a folder `Loaders/text/x-java` that contains things that pertain to Java files (notice that the path is a MIME type).  It has an `Actions` subfolder where you can add actions to the popup menu for Java files.
 
@@ -49,7 +50,7 @@
 </filesystem>
 
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -61,3 +62,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDependOnCore.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDependOnCore.adoc
index 2511a76..182fe3c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDependOnCore.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDependOnCore.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDependOnCore
-:jbake-type: wiki
+= There is a class under org.netbeans.core that does what I need. Can I call/use/depend on it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDependOnCore
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 23
 
-== There is a class under org.netbeans.core that does what I need. Can I call/use/depend on it?
 
 No.  Not if you want your module to work in the future.  Copy the code instead.  If it is a thing that seems generally useful, link:http://www.netbeans.org/issues/enter_bug.cgi[file an enhancement request] requesting an API for the thing you need to do (and make sure there isn't already a supported way to do it).
 
@@ -40,7 +41,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -52,3 +53,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDisableAutoupdate.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDisableAutoupdate.adoc
index 41dcd6e..d23fca0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDisableAutoupdate.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDisableAutoupdate.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDisableAutoupdate
-:jbake-type: wiki
+= Can I disable Auto Update (for example, while running tests)?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDisableAutoupdate
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Can I disable Auto Update (for example, while running tests)?
+:wikidevsection: _module_system
+:position: 3
 
 The IDE often checks for updates on startup.
 This behavior may not be desired in some cases;
@@ -45,7 +45,7 @@
 
 
 Applies to: NetBeans 6.5 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +57,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDotSettingsFiles.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDotSettingsFiles.adoc
index c0a2d91..05ee8d6 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDotSettingsFiles.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDotSettingsFiles.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDotSettingsFiles
-:jbake-type: wiki
+= What are `{asterisk}.settings` files?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDotSettingsFiles
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 8
 
-== What are .settings files?
 
 `.settings` files are similar to [[DevFaqInstanceDataObject| `.instance` files]],
 with the difference that they are XML format, and can contain serialized data rather than just default instances.
@@ -39,7 +40,7 @@
 
 Settings files are also useful if you are declaring some objects in a layer file (see xref:DevFaqModulesLayerFile.adoc[DevFaqModulesLayerFile]) _and intend to write them back out to disk after they have been modified in-memory_ (note this involves writing ugly and inefficient hexadecimal-encoded serialized data into XML files - if the object is a singleton, using `link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences]` will be both more efficient and more readable).
 
-=== Example
+== Example
 
 [source,xml,subs="verbatim,macros"]
 ----
@@ -56,7 +57,7 @@
     </serialdata>
 </settings>
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -68,3 +69,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDotShadowFiles.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDotShadowFiles.adoc
index 1d5aa36..08f0ab9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDotShadowFiles.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDotShadowFiles.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDotShadowFiles
-:jbake-type: wiki
+= What are `{asterisk}.shadow` files?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDotShadowFiles
@@ -26,23 +26,24 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 9
 
-== What are `*.shadow` files?
 
-`*.shadow` files are mainly used in the xref:DevFaqSystemFilesystem.adoc[system filesystem]
+`{asterisk}.shadow` files are mainly used in the xref:DevFaqSystemFilesystem.adoc[system filesystem]
 for configuration data.
 They are the functional equivalent of Unix symbolic links -
-a `*.shadow` file is a pointer to another file whose
+a `{asterisk}.shadow` file is a pointer to another file whose
 behavior in every respect except its path and file name is the same as the original.
 
-`*.shadow` files are commonly used where only a single instance of an object is needed,
+`{asterisk}.shadow` files are commonly used where only a single instance of an object is needed,
 but it must be registered in multiple folders.
 For example, a general `Action` is declared in the `Actions/` folder of the
 system filesystem.
 But the action also needs to appear in menus and toolbars, possibly other places.
-So, rather than create multiple instances of an action, one [[DevFaqInstanceDataObject|`*.instance` file]]
+So, rather than create multiple instances of an action, one xref:DevFaqInstanceDataObject.adoc[`{asterisk}.instance` file]
 is created in the xref:DevFaqModulesLayerFile.adoc[module's layer file], in the `Actions/` folder.
-Then `*.shadow` files are created in all of the other places the `*.instance` file would be needed,
+Then `{asterisk}.shadow` files are created in all of the other places the `{asterisk}.instance` file would be needed,
 pointing to the original file.
 
 Declaring a .shadow file in the system filesystem looks like this:
@@ -69,10 +70,10 @@
 For example, the Favorites tab in the NetBeans IDE
 uses shadow files to link to real directories on disk.
 
-=== Creating Shadow Files Programmatically
+== Creating Shadow Files Programmatically
 
-If you need to create `.shadow` files programmatically, use [link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataShadow.html#create(org.openide.loaders.DataFolder,%20java.lang.String,%20org.openide.loaders.DataObject[http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataShadow.html#create(org.openide.loaders.DataFolder,%20java.lang.String,%20org.openide.loaders.DataObject]) `DataShadow.create()`] &mdash; do not write `FileObject`s and try to set attributes on them.  In an XML layer, a `DataShadow`'s original file is pointed to by a file attribute.  On disk, that is accomplished via the _file's content_ instead.  To reliably create `DataShadow`s, let the infrastructure do it for you - do not make assumptions about how the original file is pointed to.
-
+If you need to create `.shadow` files programmatically, use link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataShadow.html#create(org.openide.loaders.DataFolder,%20java.lang.String,%20org.openide.loaders.DataObject[`DataShadow.create()`] &mdash; do not write `FileObject`s and try to set attributes on them.  In an XML layer, a `DataShadow`'s original file is pointed to by a file attribute.  On disk, that is accomplished via the _file's content_ instead.  To reliably create `DataShadow`s, let the infrastructure do it for you - do not make assumptions about how the original file is pointed to.
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -84,3 +85,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDynamicSystemFilesystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDynamicSystemFilesystem.adoc
index f337edc..d005391 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDynamicSystemFilesystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDynamicSystemFilesystem.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqDynamicSystemFilesystem
-:jbake-type: wiki
+= Can I dynamically change the contents of the System Filesystem at runtime?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqDynamicSystemFilesystem
@@ -26,14 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 12
 
-== Can I dynamically change the contents of the System Filesystem at runtime?
 
 Yes.  This technique is commonly used in platform applications which require the user to log in, to keep menu contents/toolbar actions/keyboard shortcuts/window definitions hidden until the user is authenticated.
 
 There are two ways to do it.  The most obvious way is to programmatically write files to disk at runtime (call `FileUtil.getConfigRoot().createFolder()`, etc.).  This technique is appropriate if you are creating files which should be preserved across restarts (for example, adding folders to the Favorites window).  _It is completely inappropriate in the case of authentication, or any other case where you do not want the added files to be present after restart. You cannot depend on the application always being shut down normally and having a chance to clean such files up - since they are actually written to disk._
 
-=== Using Dynamically Added Layers
+== Using Dynamically Added Layers
 
 The alternative is quite simple:  Write a subclass of `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MultiFileSystem.html[MultiFileSystem]`.  Put it in the xref:DevFaqLookupDefault.adoc[default lookup].
 
@@ -80,7 +81,7 @@
 * Write contents programmatically, but write folders/files to an in-memory filesystem created using `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#createMemoryFileSystem()[FileUtil.createMemoryFileSystem()]` so the contents disappear on VM exit
 
 link:https://bitbucket.org/jglick/dynamicmenudemo/[https://bitbucket.org/jglick/dynamicmenudemo/] tries to automate this kind of task.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -92,3 +93,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorCodeCompletionAnyJEditorPane.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorCodeCompletionAnyJEditorPane.adoc
index 6775ef0..816115d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorCodeCompletionAnyJEditorPane.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorCodeCompletionAnyJEditorPane.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorCodeCompletionAnyJEditorPane
-:jbake-type: wiki
+=  How to add code completion to any JEditorPane
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorCodeCompletionAnyJEditorPane
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 11
 
-== How to add code completion to any JEditorPane
 
 You can add the built-in Java code completion from the Netbeans 6 Java editor to any arbitrary JEditorPane. See the code below for how this can be achieved. Note that Netbeans Java editor functionality is derived from an underlying FileObject, so we are essentially creating a dummy Java FileObject and tying our JEditorPane document in with the appropriate hooks.
 
@@ -97,7 +98,7 @@
 Applies to: Netbeans 6.0, 6.1 and 6.5. Since 6.7 `DialogBinding` class was moved to `org.netbeans.api.editor` package in `Editor Library 2` module.
 
 Platforms: All
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -109,3 +110,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorGetCurrentDocument.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorGetCurrentDocument.adoc
index 3742278..a314278 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorGetCurrentDocument.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorGetCurrentDocument.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorGetCurrentDocument
-:jbake-type: wiki
+= How can I find the currently open document in the selected editor?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorGetCurrentDocument
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I find the currently open document in the selected editor?
+:wikidevsection: _editor_and_edited_files
+:position: 2
 
 [source,java]
 ----
@@ -35,7 +35,7 @@
 JTextComponent ed = org.netbeans.api.editor.EditorRegistry.lastFocusedComponent();
 Document doc = ed.getDocument();
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -47,3 +47,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowIsMimeLookupComposed.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowIsMimeLookupComposed.adoc
index 90bf223..c84e57f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowIsMimeLookupComposed.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowIsMimeLookupComposed.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorHowIsMimeLookupComposed
-:jbake-type: wiki
+= How is MimeLookup composed?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorHowIsMimeLookupComposed
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How is MimeLookup composed?
+:wikidevsection: _editor_and_edited_files
+:position: 14
 
 In order to get xref:DevFaqEditorWhatIsMimeLookup.adoc[MimeLookup] you have to supply
 xref:DevFaqEditorWhatIsMimePath.adoc[MimePath]. With the default `MimeLookup`
@@ -57,7 +57,7 @@
 supports compound mime types such as `text/x-ant+xml` and embedded mime types
 such as `text/x-jsp/text/x-java`.
 
-=== Compound mime types
+== Compound mime types
 
 Let's have a look at the `MimeLookup` composition for a compound mime type
 `text/x-ant+xml`. The resulting `Lookup` will contain things registered in
@@ -74,7 +74,7 @@
 That's the reason why editor features provided by XML modules for general
 XML files work also for specialized, but XML-based, files.
 
-=== Embedded mime types
+== Embedded mime types
 
 The inheritance hierarchy becomes even more complicated when dealing with embedded mime
 types. Let's use a java scriplet inside a JSP page as an example of language embedding.
@@ -103,7 +103,7 @@
 xref:DevFaqEditorWhatIsMimeLookup.adoc[What is MimeLookup?],
 xref:DevFaqEditorWhatIsMimePath.adoc[What is MimePath?],
 link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/index.html[MimeLookup API]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -115,3 +115,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToAddCodeTemplates.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToAddCodeTemplates.adoc
index c520d10..9b23fb4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToAddCodeTemplates.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToAddCodeTemplates.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorHowToAddCodeTemplates
-:jbake-type: wiki
+= How to add code templates?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorHowToAddCodeTemplates
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How to add code templates?
+:wikidevsection: _editor_and_edited_files
+:position: 21
 
 1. Create your template file
 
@@ -61,7 +61,7 @@
         </folder>
     </folder>
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -73,3 +73,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToAddDiffView.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToAddDiffView.adoc
index 559454a..3accfb2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToAddDiffView.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToAddDiffView.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorHowToAddDiffView
-:jbake-type: wiki
+=  How to use the diff view in my own application/plugin
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorHowToAddDiffView
@@ -26,10 +26,10 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 19
 
-== How to use the diff view in my own application/plugin
-
-=== Show non-editable diff for files
+== Show non-editable diff for files
 
 [source,java]
 ----
@@ -88,11 +88,11 @@
 * xref:../blogs/geertjan/netbeans_diff_api.adoc[NetBeans Diff API]
 * link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-diff/overview-summary.html[https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-diff/overview-summary.html]
 
-=== Show editable diff for nodes with FileObject in node's lookup
+== Show editable diff for nodes with FileObject in node's lookup
 
 * xref:../blogs/geertjan/how_to_create_an_editable.adoc[How to Create an Editable Diff Viewer]
 
-=== Show editable diff for a FileObject and an arbitrary base source
+== Show editable diff for a FileObject and an arbitrary base source
 
 You have to an editable StreamSource for your FileObject to create a editable diff viewer. 
 
@@ -231,10 +231,10 @@
 
 ----
 
-PS: There is a small trick to enable the “save”-action (Menubar File->Save / CTRL-S) for your new editable diff, which won’t get enabled after changing content in the right editor pane of the diff viewer by default. You have to associate your node to the TopComponent – see makeDiffWindowSaveable(). Thanks to  Ondrej Vrabec for the solution – see link:http://netbeans.org/bugzilla/show_bug.cgi?id=223703[http://netbeans.org/bugzilla/show_bug.cgi?id=223703].
+PS: There is a small trick to enable the "save"-action (Menubar File->Save / CTRL-S) for your new editable diff, which won't get enabled after changing content in the right editor pane of the diff viewer by default. You have to associate your node to the TopComponent – see makeDiffWindowSaveable(). Thanks to  Ondrej Vrabec for the solution – see link:http://netbeans.org/bugzilla/show_bug.cgi?id=223703[http://netbeans.org/bugzilla/show_bug.cgi?id=223703].
 
 Copied from  link:http://benkiew.wordpress.com/2013/01/24/netbeans-rcp-editable-diff-viewer-using-custom-base-source/[http://benkiew.wordpress.com/2013/01/24/netbeans-rcp-editable-diff-viewer-using-custom-base-source/]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -246,3 +246,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToGetMimeTypeFromDocumentOrJTextComponent.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToGetMimeTypeFromDocumentOrJTextComponent.adoc
index a45b2fb..3ed955a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToGetMimeTypeFromDocumentOrJTextComponent.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToGetMimeTypeFromDocumentOrJTextComponent.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorHowToGetMimeTypeFromDocumentOrJTextComponent
-:jbake-type: wiki
+= How to get mime type from `Document` or `JTextComponent`?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorHowToGetMimeTypeFromDocumentOrJTextComponent
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 7
 
-== How to get mime type from `Document` or `JTextComponent`?
 
 WARNING: The API described here is not official! Check the javadoc for its
 stability level.
@@ -57,7 +58,7 @@
 Platforms: All
 
 See also: link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor/index.html[Editor Module API]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -69,3 +70,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToReuseEditorHighlighting.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToReuseEditorHighlighting.adoc
index eaa84f8..9eed096 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToReuseEditorHighlighting.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorHowToReuseEditorHighlighting.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorHowToReuseEditorHighlighting
-:jbake-type: wiki
+= How to reuse XML syntax highlighting in your own editor
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorHowToReuseEditorHighlighting
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 20
 
 If you don't want to open or edit your data in a new editor TopComponent, but you still want to have nice syntax coloring in your own editor, you can get the EditorKit for the mime type and reuse it in your own JEditorPane.
 
@@ -42,7 +44,7 @@
 ----
 
 And you will get nice syntax coloring. However you won't get line numbers and other editing facilities since they are not provided by the EditorKit.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +56,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorJEPForMimeType.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorJEPForMimeType.adoc
index 936aa00..a935631 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorJEPForMimeType.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorJEPForMimeType.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorJEPForMimeType
-:jbake-type: wiki
+= How can I create JEditorPane for a specific document type?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorJEPForMimeType
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 15
 
-== How can I create JEditorPane for a specific document type?
 
 You need to find the right `EditorKit` first and then set it on your `JEditorPane`. Here is an example showing how to do that for a java file.
 
@@ -48,7 +49,7 @@
 
 See also:
 link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/CloneableEditorSupport.html#getEditorKit(java.lang.String)[CloneableEditorSupport.getEditorKit()]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -60,3 +61,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorTopComponent.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorTopComponent.adoc
index 7cb2a3f..2e46ecf 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorTopComponent.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorTopComponent.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorTopComponent
-:jbake-type: wiki
+= I want to create a TopComponent class to use as an editor, not a singleton
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorTopComponent
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I want to create a TopComponent class to use as an editor, not a singleton
+:wikidevsection: _window_system
+:position: 17
 
 This entry is about creating non-text-editor (e.g. graphical) editors for files or other objects.  If you want a text editor, NetBeans has a lot of built-in support for text editors and you will probably want to use `link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/text/DataEditorSupport.html#create(org.openide.loaders.DataObject,%20org.openide.loaders.MultiDataObject.Entry,%20org.openide.nodes.CookieSet)[DataEditorSupport.create()]` and its relatives (hint: *New > File Type* will get you basic text editor support which you can build on).
 
@@ -174,7 +174,7 @@
  }
 ----
 
-=== Implementing A Very Simple DataObject For Our Very Simple Editor
+== Implementing A Very Simple DataObject For Our Very Simple Editor
 
 The skeleton of our DataObject class is generated from the *New > File Type* template - this includes registering our DataObject subclass and associating it with a file extension.  What we need to do is
 
@@ -256,7 +256,7 @@
 }
 ----
 
-=== Caveats For Production Use
+== Caveats For Production Use
 
 A few things may be worth considering if you want to use code like this in a production environment:
 
@@ -266,7 +266,7 @@
 * Use WeakListeners.propertyChange (this, file) rather than directly adding the editor as a listener to the DataObject
 * As of 6.9, the `Openable` interface is preferred to `OpenCookie`;  a similar `Savable` interface is probably on the horizon to replace `SaveCookie`
 * The DataObject's lookup could alternately be implemented xref:DevFaqNodesCustomLookup.adoc[using ProxyLookup and AbstractLookup] and this will probably be the preferred way in the future
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -278,3 +278,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimeLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimeLookup.adoc
index a219103..29c1894 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimeLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimeLookup.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorWhatIsMimeLookup
-:jbake-type: wiki
+= What is MimeLookup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorWhatIsMimeLookup
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 13
 
-== What is MimeLookup?
 
 The `MimeLookup` is a mechanism for extending editor functionality provided by
 NetBeans modules.
@@ -54,7 +55,7 @@
 
 ---
 
-=== Examples
+== Examples
 
 [source,xml]
 ----
@@ -82,7 +83,7 @@
 See also:
 xref:DevFaqLookup.adoc[What is Lookup?], 
 link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/index.html[MimeLookup API]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -94,3 +95,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimePath.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimePath.adoc
index add55e9..3247a1b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimePath.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimePath.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEditorWhatIsMimePath
-:jbake-type: wiki
+= What is MimePath?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEditorWhatIsMimePath
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What is MimePath?
+:wikidevsection: _editor_and_edited_files
+:position: 12
 
 Basically, `MimePath` is an ordered list of mime types.
 
@@ -74,7 +74,7 @@
 xref:DevFaqEditorWhatIsMimeLookup.adoc[What is MimeLookup?],
 link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimePath.html[MimePath Javadoc],
 link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/index.html[MimeLookup API]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -86,3 +86,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEpl3rdPartySources.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEpl3rdPartySources.adoc
index f668aec..5766089 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEpl3rdPartySources.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEpl3rdPartySources.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqEpl3rdPartySources
-:jbake-type: wiki
+=  Where to download sources of EPL third-party components?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqEpl3rdPartySources
@@ -26,10 +26,10 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _licensing_issues
+:position: 4
 
-== Where to download sources of EPL third-party components?
-
-The following third-party components licensed under EPL license have the sources available for download from netbeans.org:
+== The following third-party components licensed under EPL license have the sources available for download from netbeans.org:
 
 |===
 |3rd party component |binaries in installed product |download of sources 
@@ -88,7 +88,7 @@
 com-atlassian-connector-eclipse-jira-core.jar |link:https://netbeans.osuosl.org/binaries/9C00174B5B496DE1C79EDAA0B0C226CB38085DE6-com.atlassian.connector.eclipse.commons.core-3.0.4.zip[c.a.c.e.commons.core-sources] link:https://netbeans.osuosl.org/binaries/ADB3C1F66A094A6BC0B8DA8DC90244F2FE607D36-com.atlassian.connector.eclipse.jira.core-3.0.4.zip[c.a.c.e.jira.core-sources] 
 |===
 
-=== Older components used in previous releases
+== Older components used in previous releases
 
 |===
 |3rd party component |binaries in installed product |download of sources 
@@ -153,6 +153,7 @@
 |org.eclipse.mylyn.wikitext.textile.core 1.7.1 |ide/modules/org-eclipse-mylyn-wikitext-textile-core.jar |link:https://netbeans.osuosl.org/binaries/44F35A62CAD11C0DC6B6DEA6C798AFCD43B500B3-org.eclipse.mylyn.wikitext.textile.core.source_1.7.1.v20120725-0100.jar[sources] 
 |===
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -164,3 +165,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExecutableIcon.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExecutableIcon.adoc
index e5214d9..324a1e9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExecutableIcon.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExecutableIcon.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExecutableIcon
-:jbake-type: wiki
+= How can I change the executable's icon?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExecutableIcon
@@ -26,18 +26,18 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I change the executable's icon?
+:wikidevsection: _window_system
+:position: 12
 
 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 `<your branding name>.exe`, nor does it provide a way to specify an `.icns` file for Mac OS X. There is already an enhancement request for Windows icon support: link:https://bz.apache.org/netbeans/show_bug.cgi?id=64612[issue #64612].
 
-=== 'Application Icon' Images
+== 'Application Icon' Images
 
 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's `branding/core/core.jar/org/netbeans/core/startup` folder: `frame.gif` and `frame48.gif`. 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.
 
 Similar to toolbar icons, these files always use the `.gif` extension, regardless of their actual format. The `frame.gif` file is used for the smallest icon size of 16x16, which shows up in three places: the taskbar (Windows/Linux), in the upper-left corner of the application's title bar (Windows/Linux), and in the upper-left corner of most dialog windows (Windows/Linux). Another file called `frame32.gif` (which is not generated by the NetBeans Project Properties dialog) provides a 32x32 icon that shows up in the Alt-Tab menu on Windows. Lastly, the `frame48.gif` file provides a 48x48 icon that shows up in the Alt-Tab menu on Linux.
 
-=== Windows Icons
+== Windows Icons
 
 This refers to the icon of the Windows launcher executable as seen in Windows Explorer or when you make a shortcut to it on your Windows desktop. The Windows executable is found within `<your project>\build\launcher\bin\` and is an identical copy of `<NetBeans install location>\harness\launchers\app.exe` that has simply been renamed to the branding name that you have specified within the Project Properties dialog on the Build screen (which is actually saved as the `app.name` property in `project.properties`). Although the NetBeans IDE can't change this icon, you can use a third-party utility program to replace the exe's icon with an `.ico` of your own.
 
@@ -79,7 +79,7 @@
 
 If you need an editor for creating/converting both Windows `.ico` files and Mac `.icns` files, try the excellent, program link:http://icofx.ro/[IcoFX] (no longer free). 
 
-=== Mac Icons
+== Mac Icons
 
 The "Build Mac OS X Application" command in NetBeans uses a default icon from `<NetBeans install location>/harness/etc/applicationIcon.icns`.
 You can change this icon after a Mac build by simply replacing the file `<your project>/dist/<your branding name>.app/Contents/Resources/<your branding name>.icns` with your own `.icns` file of the same name.
@@ -111,10 +111,10 @@
    <property name="app.icon.icns" value="${basedir}/myappicon.icns"/>
 ----
 
-=== Related links
+== Related links
 
 * xref:../blogs/geertjan/icons_for_netbeans_platform_applications.adoc[Icons for NetBeans Platform Applications on Windows]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -126,3 +126,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExpandAndSelectSpecificNode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExpandAndSelectSpecificNode.adoc
index 3c54b88..7a7c007 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExpandAndSelectSpecificNode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExpandAndSelectSpecificNode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExpandAndSelectSpecificNode
-:jbake-type: wiki
+= How do I make a particular node visible in the Explorer, and maybe select it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExpandAndSelectSpecificNode
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 12
 
-== How do I make a particular node visible in the Explorer, and maybe select it?
 
 In general you cannot. See link:https://bz.apache.org/netbeans/show_bug.cgi?id=7551[issue #7551.]
 
@@ -40,7 +41,7 @@
 ---
 
 Applies to: NetBeans 5.0, 5.5, 6.x
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -52,3 +53,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExplorer.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExplorer.adoc
index 85e1ee0..cfae777 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExplorer.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExplorer.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExplorer
-:jbake-type: wiki
+= What is "explorer"?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExplorer
@@ -26,12 +26,13 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 2
 
-== What is "explorer"?
 
 There is thing that is explorer;  the name is historical - very old versions of NetBeans had a window named "Explorer" that contained a tree of files and other components.  Colloquially, the term is still used to refer to the area in the left side of the main window where the Files and Projects tabs live in the IDE - but NetBeans has long since stopped having names for or frames around tabbed containers.
 There is an API in NetBeans which contains Swing components that can render xref:DevFaqWhatIsANode.adoc[Nodes ], which is called the Explorer API.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -43,3 +44,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExplorerConnectNode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExplorerConnectNode.adoc
index 497e380..6e3cc42 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExplorerConnectNode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExplorerConnectNode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExplorerConnectNode
-:jbake-type: wiki
+= How do I show a Node to my Explorer View?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExplorerConnectNode
@@ -26,13 +26,13 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I show a Node to my Explorer View?
+:wikidevsection: _nodes_and_explorer
+:position: 5
 
 Once you have a component to show xref:DevFaqWhatIsANode.adoc[Nodes ], you will need to set the _root node_ whose children it will display (some views show the root node, some don't, in some cases you can set whether it does or not).
 
 Presumably you have an xref:DevFaqExplorerManager.adoc[ExplorerManager ] set up for your view - just get that and call `setRootContext (someNode)` and the view will display it.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +44,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExplorerManager.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExplorerManager.adoc
index 320e194..638814b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExplorerManager.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExplorerManager.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExplorerManager
-:jbake-type: wiki
+= What is an ExplorerManager?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExplorerManager
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 3
 
-== What is an ExplorerManager?
 
 You do not directly set the Node that is displayed by an xref:DevFaqExplorerViews.adoc[Explorer view ] component (Swing components that display xref:DevFaqWhatIsANode.adoc[Nodes ]) by calling a method on that component.  Rather, you set that kind of information by finding the _manager_ for that component - it's what is in charge of what node is displayed, selected, etc.
 
@@ -36,7 +37,7 @@
 While this may seem like an unnecessary layer of indirection, it is actually quite powerful:  It makes it possible to very simply create master-detail views ala Windows Explorer:  Just add two views to a JPanel subclass that implements link:https://bits.netbeans.org/dev/javadoc/orgOpenideOxplorer/org/openide/explorer/ExplorerManager.Provider.html[ExplorerManager.Provider ].  It is very easy to set it up so changing the selection in one causes the other one to show the children of the selected object - just the way selecting a folder in Windows Explorer does.
 
 See also the link:https://bits.netbeans.org/dev/javadoc/orgOpenideOxplorer/org/openide/explorer/ExplorerManager.html[ExplorerManager javadoc ].  The xref:DevFaqCreateExplorerPanel.adoc[FAQ about showing explorer views in the main window ] includes sample usage of ExplorerManager.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +49,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExplorerViews.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExplorerViews.adoc
index a81c570..55f3bd6 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExplorerViews.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExplorerViews.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExplorerViews
-:jbake-type: wiki
+= What is an Explorer view?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExplorerViews
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What is an Explorer view?
+:wikidevsection: _nodes_and_explorer
+:position: 4
 
 An explorer view is a GUI component which can display a xref:DevFaqWhatIsANode.adoc[Node ] and (optionally) its child nodes.  While Nodes are, by definition, a tree structure, explorer views are much more than just JTrees.  Here is a list of the components available:
 
@@ -54,7 +54,7 @@
 * there is a lot of logic built into NetBeans for creating Nodes simply and easily, for example, from link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/BeanNode.html[any POJO JavaBean] and persisting the things they represent, so you can do a lot with very little code by using Nodes and Explorer Views
 
 A common usage is to get a Node for some folder on disk or in the xref:DevFaqSystemFilesystem.adoc[configuration filesystem], optionally create a `FilterNode` to filter out some child nodes of it or its children, and display that.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -66,3 +66,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExplorerViewsInMantisse.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExplorerViewsInMantisse.adoc
index 29a73c5..c923ed9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExplorerViewsInMantisse.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExplorerViewsInMantisse.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExplorerViewsInMantisse
-:jbake-type: wiki
+= How can I design explorer views in Mantisse GUI editor?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExplorerViewsInMantisse
@@ -26,12 +26,12 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I design explorer views in Mantisse GUI editor?
+:wikidevsection: _nodes_and_explorer
+:position: 28
 
 There is an open RFE [1] to include explorer views in the GUI designer palettes by default, but until it is implemented, you can follow the following procedure. (digested from the mailing list)
 
-=== Add explorer views to palette manually
+== Add explorer views to palette manually
 
 As suggested in several articles [2]/[3], adding the .jar
 file to the palette exposes the containers. Here the exact procedure to add the containers to the palette
@@ -44,7 +44,7 @@
 
 After all that, the containers are all listed in the palette.
 
-=== More explanations
+== More explanations
 
 (originally by Eirik Bakke)
 
@@ -97,14 +97,14 @@
 }
 ----
 
-=== Resources
+== Resources
 
 [1] link:https://bz.apache.org/netbeans/show_bug.cgi?id=20851[https://bz.apache.org/netbeans/show_bug.cgi?id=20851]
 
 [2] link:https://netbeans.org/projects/platform/lists/dev/archive/2008-01/message/370[https://netbeans.org/projects/platform/lists/dev/archive/2008-01/message/370]
 
 [3] link:http://netbeansrcp.wordpress.com/2009/04/01/adding-explorer-components-into-the-netbeans-palette/[http://netbeansrcp.wordpress.com/2009/04/01/adding-explorer-components-into-the-netbeans-palette/]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -116,3 +116,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
index c90d335..cccd3cc 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExportImport
-:jbake-type: wiki
+= How to register options for export/import to module's layer?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExportImport
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _settings
+:position: 3
 
-== How to register options for export/import to module's layer?
 
 The idea is to register patterns for export/import into module's layer. 
 
@@ -35,6 +36,7 @@
 
 For historical interests the design document can be found at xref:ExportImportOptions.adoc#section-ExportImportOptions-ImplementationDetails[Export/Import Options in NetBeans - Proposal].
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -46,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsSearch.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsSearch.adoc
index 06eba15..d9bf594 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsSearch.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsSearch.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExtendOptionsSearch
-:jbake-type: wiki
+= How can configure my options panel to be found by global quicksearch or options search?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExtendOptionsSearch
@@ -26,10 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _settings
+:position: 5
 
-== How can configure my options panel to be found by global quicksearch or options search?
 
-=== Quicksearch
+== Quicksearch
 
 Use the `keywords` attribute of the `@OptionsPanelController.SubRegistration`/`@OptionsPanelController.TopLevelRegistration`
 
@@ -51,7 +52,7 @@
 
 `
 
-=== Options search
+== Options search
 
 Use the `keywords` attribute of the `@OptionsPanelController.Keywords`. Place the annotation at the OptionPanel and *NOT* at the OptionsPanelController.
 
@@ -68,7 +69,7 @@
 
 `
 
-=== Further resources
+== Further resources
 
 [1] link:http://bits.netbeans.org/8.0/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.SubRegistration.html[http://bits.netbeans.org/8.0/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.SubRegistration.html]
 
@@ -76,6 +77,8 @@
 
 [3] link:http://bits.netbeans.org/8.0/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.Keywords.html[http://bits.netbeans.org/8.0/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.Keywords.html]
 
+
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -87,3 +90,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsWindow.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsWindow.adoc
index 27e740c..aec2b2c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsWindow.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsWindow.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExtendOptionsWindow
-:jbake-type: wiki
+= Can I add new panels to the Options window?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExtendOptionsWindow
@@ -26,13 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _settings
+:position: 2
 
-== Can I add new panels to the Options window?
 
 Use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html[Options Dialog and SPI] as explained in the xref:../tutorials/nbm-options.adoc[NetBeans Options Window Module Tutorial].
 
 There are wizards for creating primary and secondary options panels. Use `New File.../Module Development/Options Panel` and follow the wizard.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +46,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExternalLibraries.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExternalLibraries.adoc
index b8f79b1..fb46d14 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExternalLibraries.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExternalLibraries.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqExternalLibraries
-:jbake-type: wiki
+=  How to store external libraries in the NetBeans Hg repository
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqExternalLibraries
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 13
 
-== How to store external libraries in the NetBeans Hg repository
 
 In the spirit of building on the shoulders of giants,
 NetBeans takes advantage of external libraries which are not developed on netbeans.org.
@@ -70,7 +71,7 @@
 * All license files should be in UTF-8 encoding with appropriate line and paragraph breaks. The license file must end with a newline. Lines should not exceed 80 characters.
 * The license file should follow a specific format. Details below.
 
-=== License file format
+== License file format
 
 License files should be in the following format:
 
@@ -101,7 +102,7 @@
 The header fields are read during the build process and removed.
 Therefore this information will not appear in the final build or NBMs.
 
-=== Template-based licenses
+== Template-based licenses
 
 If there is template-based license (like BSD one link:http://www.opensource.org/licenses/bsd-license.php[http://www.opensource.org/licenses/bsd-license.php]),
 e.g. the license file has several ad hoc places to be updated accordingly.
@@ -178,7 +179,7 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----
 
-=== NBM build, managing correct license for NBMs
+== NBM build, managing correct license for NBMs
 
 Required licenses should be listed in `project.properties`.
 (There still must be a license along with the binary in Hg.)
@@ -228,7 +229,7 @@
 release.external/stuff-1.0.zip!/stuff.jar=modules/ext/stuff-1.0.jar
 ----
 
-=== Normalized names
+== Normalized names
 
 There will be a license repository under `nbbuild/licenses`
 where all licenses in use should be available.
@@ -239,7 +240,7 @@
 Make sure that the license for a new binary is correctly included under `nbbuild/licenses`.
 If there is no existing license of the same type, it must be reviewed prior to committing.
 
-=== NetBeans Samples
+== NetBeans Samples
 
 If a sample is created for NetBeans itself,
 it can be packaged into ZIP file and should not be in the `external/` folder.
@@ -394,7 +395,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -406,3 +407,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileAttributes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileAttributes.adoc
index 2d66d09..149ad3a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileAttributes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileAttributes.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileAttributes
-:jbake-type: wiki
+=  What are File Attributes?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileAttributes
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What are File Attributes?
+:wikidevsection: _files_and_data_objects
+:position: 4
 
 xref:DevFaqFileObject.adoc[FileObjects] have _attributes_.  These are ad-hoc key-value
 pairs which can be associated with a file and persist across shutdown and restart.
@@ -40,7 +40,7 @@
 
 See `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html#getAttribute(java.lang.String)[FileObject.getAttribute]` and
 `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html#setAttribute(java.lang.String,%20java.lang.Object)[FileObject.setAttribute]`.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -52,3 +52,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileChoosers.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileChoosers.adoc
index e6f1679..363f980 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileChoosers.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileChoosers.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileChoosers
-:jbake-type: wiki
+=  I need to show a file chooser when my action runs. Can I remember the most recently used directories?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileChoosers
@@ -26,13 +26,13 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I need to show a file chooser when my action runs. Can I remember the most recently used directories?
+:wikidevsection: _files_and_data_objects
+:position: 18
 
 As of NetBeans 6.7, `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileChooserBuilder.html[org.openide.filesystems.FileChooserBuilder]` makes this easy.
 Pass a `Class` or unique `String` key to the constructor of a `FileChooserBuilder`.
 The next time the same key is passed, the new file chooser will automatically be rooted on the directory selected the last time.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +44,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileContextMenuAddition.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileContextMenuAddition.adoc
index 4d1e301..6830c88 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileContextMenuAddition.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileContextMenuAddition.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileContextMenuAddition
-:jbake-type: wiki
+= Can I add a menu item to the context menu of every Java source file?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileContextMenuAddition
@@ -26,11 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Can I add a menu item to the context menu of every Java source file?
+:wikidevsection: _files_and_data_objects
+:position: 10
 
 Yes. In NetBeans 5.0 and later there is a wizard available for NetBeans modules which does this for you. Just run *New File | Module Development | Action*, as an action type choose *Conditionally Enabled*. Choose "*Data Object*" in Cookie Class(es) combobox. On the next step select "*File Type Context Menu Item*" and choose `text/x-java` in the *File Type Context Menu Item* combobox, finish the wizard and you are done. For more information you may press the *Help* button available at the bottom of each step of the wizard.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -42,3 +42,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileEditorContextMenuAddition.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileEditorContextMenuAddition.adoc
index bfc1d23..441c74d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileEditorContextMenuAddition.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileEditorContextMenuAddition.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileEditorContextMenuAddition
-:jbake-type: wiki
+= Can I add a menu item to the context menu of the Java source editor?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileEditorContextMenuAddition
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 18
 
-== Can I add a menu item to the context menu of the Java source editor?
 
 Yes. In NetBeans 5.0 and later there is a wizard available for NetBeans modules which does this for you. Just run *New File | NetBeans Module Development | Action*, as an action type choose *Conditionally Enabled*. On the next step choose `text/x-java` in the *Editor Context Menu Item* combobox, finish the wizard and you are done. For more information you may press the *Help* button available at the bottom of each step of the wizard.
 
@@ -38,7 +39,7 @@
 Applies to: all versions of NetBeans
 
 Related: xref:DevFaqFileContextMenuAddition.adoc[DevFaqFileContextMenuAddition]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -50,3 +51,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileFileObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileFileObject.adoc
index 33c0312..a939386 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileFileObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileFileObject.adoc
@@ -17,32 +17,21 @@
 //     under the License.
 //
 
-= DevFaqFileFileObject
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
+= How do I get a java.io.File for a FileObject?
+:jbake-type: wikidev
+:jbake-tags: wiki, devfaq
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileFileObject
 :description: Apache NetBeans wiki DevFaqFileFileObject
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 3
 
-== How do I get a java.io.File for a FileObject?
 
 [source,java]
 ----
 
 FileUtil.toFile(FileObject fo)
 ----
-
-== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/DevFaqFileFileObject[http://wiki.netbeans.org/DevFaqFileFileObject] , 
-that was last modified by NetBeans user Admin 
-on 2009-11-06T15:42:57Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileObject.adoc
index e920fc8..d82fa00 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileObject.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileObject
-:jbake-type: wiki
+= What is a FileObject?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileObject
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 2
 
-== What is a FileObject?
 
 FileObjects are _virtual files_ which live inside a xref:DevFaqFileSystem.adoc[FileSystem ].  They
 may represent a file on disk - or anything else walks and talks like a file, or can be made to - such as a file
@@ -41,7 +42,7 @@
 
 They are part of the link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[Filesystems API];
 the javadoc for FileObject can be found link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html[here].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -53,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileObjectDataObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileObjectDataObject.adoc
index 0913b15..6b1fff5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileObjectDataObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileObjectDataObject.adoc
@@ -17,32 +17,21 @@
 //     under the License.
 //
 
-= DevFaqFileObjectDataObject
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
+= How do I get a FileObject for a DataObject?
+:jbake-type: wikidev
+:jbake-tags: wiki, devfaq
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileObjectDataObject
 :description: Apache NetBeans wiki DevFaqFileObjectDataObject
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 6
 
-== How do I get a FileObject for a DataObject?
 
 [source,java]
 ----
 
 theDataObject.getPrimaryFile()
 ----
-
-== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/DevFaqFileObjectDataObject[http://wiki.netbeans.org/DevFaqFileObjectDataObject] , 
-that was last modified by NetBeans user Admin 
-on 2009-11-06T15:43:01Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileObjectFile.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileObjectFile.adoc
index 5244f4d..fc91c91 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileObjectFile.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileObjectFile.adoc
@@ -17,32 +17,21 @@
 //     under the License.
 //
 
-= DevFaqFileObjectFile
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
+=  How do I get a FileObject for a File?
+:jbake-type: wikidev
+:jbake-tags: wiki, devfaq
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileObjectFile
 :description: Apache NetBeans wiki DevFaqFileObjectFile
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 4
 
-== How do I get a FileObject for a File?
 
 [source,java]
 ----
 
 FileUtil.toFileObject (FileUtil.normalizeFile(theFile));
 ----
-
-== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/DevFaqFileObjectFile[http://wiki.netbeans.org/DevFaqFileObjectFile] , 
-that was last modified by NetBeans user Tboudreau 
-on 2010-02-12T20:35:46Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileObjectInMemory.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileObjectInMemory.adoc
index adea93a..28745af 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileObjectInMemory.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileObjectInMemory.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileObjectInMemory
-:jbake-type: wiki
+= How can I create a FileObject in memory?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileObjectInMemory
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I create a FileObject in memory?
+:wikidevsection: _files_and_data_objects
+:position: 14
 
 Sometimes it's desirable to work with a file (or call code that expects to operate on files), but you don't want to commit it permanently to disk.  It's easy to do this in NetBeans by using the in-memory filesystem.  The first two lines in the following code will create a new text file and the next three will open it in an editor.  You can easily change this to handle other types of files provided that their DataObject's also have an OpenCookie.
 
@@ -42,7 +42,7 @@
     cookie.open();
 
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileSystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileSystem.adoc
index 8ac9002..99ca206 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileSystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileSystem.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileSystem
-:jbake-type: wiki
+=  What is a FileSystem?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileSystem
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 3
 
-== What is a FileSystem?
 
 If you use a Unix-based operating system, this concept will be familiar;  if not, it may require some explanation.
 
@@ -50,7 +51,7 @@
 Especially in the case of the System Filesystem, it can be useful to think of a Filesystem as a "namespace" in which objects (which may contain data or represent Java objects) live - for the System Filesystem, the fact that the entries in it are referred to as files is incidental.
 
 As of NetBeans 4.0 you will rarely work directly with the `FileSystem` class. `FileUtil.toFileObject` is the normal way of getting a file object from a disk file. `FileUtil.getArchiveRoot` is the normal way of getting file objects from a JAR or ZIP file. In NetBeans 4.x `FileSystem` implementations are also used for version control integration but the 5.0 CVS support no longer uses this system.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -62,3 +63,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFilesFromNodes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFilesFromNodes.adoc
index 87f874d..64d3bdd 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFilesFromNodes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFilesFromNodes.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFilesFromNodes
-:jbake-type: wiki
+= How do I get at the file that a particular node represents?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFilesFromNodes
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I get at the file that a particular node represents?
+:wikidevsection: _nodes_and_explorer
+:position: 13
 
 In general, it shall be enough to request a xref:FileObject.adoc[FileObject] via xref:Lookup.adoc[Lookup]:
 
@@ -72,7 +72,7 @@
 to get a node representing a file object.
 
 Also see xref:DevFaqFileVsFileObject.adoc[DevFaqFileVsFileObject] if you need `java.io.File` for some reason.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -84,3 +84,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFilesystemSee.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFilesystemSee.adoc
index 7e21f79..7cbdf21 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFilesystemSee.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFilesystemSee.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFilesystemSee
-:jbake-type: wiki
+= How can I see the system filesystem (`FileUtil.getConfigRoot()`)?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFilesystemSee
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I see the system filesystem (`FileUtil.getConfigRoot()`)?
+:wikidevsection: _configuration_how_modules_install_things
+:position: 6
 
 The layer file browser in NetBeans project support shows the default file system.
 
@@ -55,7 +55,7 @@
 -
 
 Applies to: NetBeans 6.7 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -67,3 +67,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFindCaretPositionInEditor.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFindCaretPositionInEditor.adoc
index 7b129f6..91a0421 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFindCaretPositionInEditor.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFindCaretPositionInEditor.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFindCaretPositionInEditor
-:jbake-type: wiki
+= How can I get the position of the caret in the currently selected editor window?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFindCaretPositionInEditor
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I get the position of the caret in the currently selected editor window?
+:wikidevsection: _editor_and_edited_files
+:position: 4
 
 You need to first get the selected node (which if the Editor is selected, should correspond to the file being edited); get the most recent editor pane open on it; and then access the caret:
 
@@ -85,7 +85,7 @@
 ---
 
 Applies to: NetBeans 4.0 and newer
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -97,3 +97,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFindInstance.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFindInstance.adoc
index 44b2950..220c118 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFindInstance.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFindInstance.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFindInstance
-:jbake-type: wiki
+= I have a .instance file. How do I get an actual object instance?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFindInstance
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I have a .instance file. How do I get an actual object instance?
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 10
 
 Using `InstanceCookie` (note that if you have an entire folder of `.instance` files, there's a xref:DevFaqFolderOfInstances.adoc[more efficient way ] to get all of them):
 
@@ -42,7 +42,7 @@
 
 (you can and should call `ck.instanceClass()` to ensure the type cast is correct ahead of time)
 
-=== Alternative:
+== Alternative:
 
 [source,java]
 ----
@@ -53,7 +53,7 @@
 Action action=FileUtil.getConfigObject("Actions/Window/org-netbeans-core-windows-actions-ResetWindowsAction.instance", Action.class) 
 
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -65,3 +65,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFindSfs.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFindSfs.adoc
index cb6eb6d..d85d028 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFindSfs.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFindSfs.adoc
@@ -17,17 +17,18 @@
 //     under the License.
 //
 
-= DevFaqFindSfs
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
+= How do I get a reference to the system filesystem?
+:jbake-type: wikidev
+:jbake-tags: wiki, devfaq
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFindSfs
 :description: Apache NetBeans wiki DevFaqFindSfs
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 9
 
-== How do I get a reference to the system filesystem?
 
 [source,java]
 ----
@@ -38,15 +39,3 @@
 Repository.getDefault().getDefaultFileSystem()
 
 ----
-
-== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/DevFaqFindSfs[http://wiki.netbeans.org/DevFaqFindSfs] , 
-that was last modified by NetBeans user Jtulach 
-on 2010-07-24T19:42:03Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFixDependencies.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFixDependencies.adoc
index 4a71164..0a5cf81 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFixDependencies.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFixDependencies.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFixDependencies
-:jbake-type: wiki
+= How fix module dependencies automatically?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFixDependencies
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _module_system
+:position: 11
 
 The harness already has a fixdependencies task with only one purpose: replace obsoleted modules with new ones like it happened when Lookup was separated into its own module. In normal applications you might need to manually modify or remove then add the module you changed version for. If the project is really big and complex this can be a nightmare. I went ahead and enhanced the task so it can be more useful.
 
@@ -175,7 +177,7 @@
 Doesn't look like much but it's a lot of work. 
 
 *Note:* You need to have defined the if task (from ant-contrib) to use the targets above. Also you'll need antelope library: link:http://antelope.tigris.org/[http://antelope.tigris.org/]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -187,3 +189,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFolderOfInstances.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFolderOfInstances.adoc
index ad30bae..a017c7a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFolderOfInstances.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFolderOfInstances.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFolderOfInstances
-:jbake-type: wiki
+= I have a folder full of .instance files. How do I get any/all of the object instances?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFolderOfInstances
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I have a folder full of .instance files. How do I get any/all of the object instances?
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 11
 
 Often registries of objects are created by placing files with the extension `.instance` into some folder in the xref:DevFaqSystemFilesystem.adoc[system filesystem].  The task, then, is to turn a folder full of files into a collection of objects, and make sure we only get objects of the type we are interested in.  In NetBeans 6 it is very simple to do that:
 
@@ -42,7 +42,7 @@
 (note the separator is always / with NetBeans filesystems).
 
 If you have a single `.instance` file and need to get an object for that, xref:DevFaqFindInstance.adoc[see this FAQ entry].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqGetNameOfProjectGroup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqGetNameOfProjectGroup.adoc
index e031109..2eade4c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGetNameOfProjectGroup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGetNameOfProjectGroup.adoc
@@ -17,7 +17,7 @@
 //     under the License.
 //
 
-= DevFaqGetNameOfProjectGroup
+= How to get the name of the active project group ?
 :jbake-type: wiki
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
@@ -26,10 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _project_handling
+:position: 4
 
-== How to get the name of the active project group
 
-=== Variant I: "use OpenProjects API" (since NB7.3)
+== Variant I: "use OpenProjects API" (since NB7.3)
 
 [source,java]
 ----
@@ -41,7 +42,7 @@
 
 See link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/api/project/ui/OpenProjects.html#getActiveProjectGroup([http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/api/project/ui/OpenProjects.html#getActiveProjectGroup(])
 
-=== Variant II: "direct access to properties"-hack
+== Variant II: "direct access to properties"-hack
 
 Note: this is rather a hack. It is not guaranteed that this will work for newer NetBeans versions. But this approach is known to work at least with NB 6.9.1 to 7.3.
 
@@ -86,6 +87,7 @@
 
 ----
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -97,3 +99,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqGetNameOrIconForProject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqGetNameOrIconForProject.adoc
index af126de..5a05b45 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGetNameOrIconForProject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGetNameOrIconForProject.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqGetNameOrIconForProject
-:jbake-type: wiki
+= How to get the name or icon of a project?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqGetNameOrIconForProject
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How to get the name or icon of a project?
+:wikidevsection: _project_handling
+:position: 3
 
 [source,java]
 ----
@@ -36,6 +36,7 @@
 org.netbeans.api.project.ProjectUtils.getInformation(project).getIcon()
 ----
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -47,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqGetProjectForFileInEditor.adoc b/netbeans.apache.org/src/content/wiki/DevFaqGetProjectForFileInEditor.adoc
index a1213de..e1f1762 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGetProjectForFileInEditor.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGetProjectForFileInEditor.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqGetProjectForFileInEditor
-:jbake-type: wiki
+= How to get the project for the actual file in the editor?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqGetProjectForFileInEditor
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _project_handling
+:position: 2
 
-== How to get the project for the actual file in the editor?
 
 * get the project from the lookup of the active TopComponent AND/OR
 * get the project from the lookup of the active DataObject 
@@ -45,6 +46,7 @@
 
 Taken from platform-dev mailing list / Tim Boudreau
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -56,3 +58,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqGetShortCutForAction.adoc b/netbeans.apache.org/src/content/wiki/DevFaqGetShortCutForAction.adoc
index ddc09e9..d431027 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGetShortCutForAction.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGetShortCutForAction.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqGetShortCutForAction
-:jbake-type: wiki
+= How to get the shortcut/shortkey of an action at runtime?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqGetShortCutForAction
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How to get the shortcut/shortkey of an action at runtime?
+:wikidevsection: _key_bindings
+:position: 8
 
 For example
 
@@ -42,7 +42,7 @@
 org.openide.util.Utilities.keyToString() // or
 org.netbeans.core.options.keymap.api.KeyStrokeUtils.getKeyStrokeAsText() // if a friend of org.netbeans.modules.options.keymap
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqGlobalVsEditorKeybindings.adoc b/netbeans.apache.org/src/content/wiki/DevFaqGlobalVsEditorKeybindings.adoc
index df66293..6af065d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGlobalVsEditorKeybindings.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGlobalVsEditorKeybindings.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqGlobalVsEditorKeybindings
-:jbake-type: wiki
+= What are editor-specific keybindings and how are they different from global ones?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqGlobalVsEditorKeybindings
@@ -26,13 +26,14 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _key_bindings
+:position: 5
 
-== What are editor-specific keybindings and how are they different from global ones?
 
 The editor has its own mechanism for registering keybindings, which is separate from global keybindings (in essence, they belong to the Swing EditorKit for the editor, but there are some registration mechanisms in the editor for this).  So if you want to register a keyboard shortcut only against the editor when editing a certain type of file (as opposed to a keyboard shortcut that is a shortcut for an action on the main menu), you'll be using editor-based keybindings.
 
 If there is a global shortcut bound to a key combination, and also an editor-specific one defined for the type of file being edited, the editor wins if the editor has focus.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +45,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqGraphicalChoiceView.adoc b/netbeans.apache.org/src/content/wiki/DevFaqGraphicalChoiceView.adoc
index 0d1f598..8b8c730 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGraphicalChoiceView.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGraphicalChoiceView.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqGraphicalChoiceView
-:jbake-type: wiki
+= How can I graphically create a ChoiceView in using the GUI designer?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqGraphicalChoiceView
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I graphically create a ChoiceView in using the GUI designer?
+:wikidevsection: _nodes_and_explorer
+:position: 27
 
 It is possible to use a ChoiceView graphically during the design of your interface in the Form Editor. As ChoiceView extends JComboBox, you can design the interface with the help of a JComboBox which is the placeholder for your ChoiceView and customize the creation code of the combo to instantiate a ChoiceView instead. 
 
@@ -55,7 +55,7 @@
 
 Finally switch to the "Source" view and fix the import errors.
 --xref:User:Tboudreau.adoc[Tboudreau] 02:40, 24 January 2010 (UTC)
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -67,3 +67,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHelpGuidelines.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHelpGuidelines.adoc
index 794bb64..939b22f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHelpGuidelines.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHelpGuidelines.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqHelpGuidelines
-:jbake-type: wiki
+= Module Helpset Integration FAQs
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqHelpGuidelines
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _javahelp
+:position: 1
 
 == Module Helpset Integration FAQs
 
@@ -315,7 +317,7 @@
 3. Now, on the build.xml file again, choose Run Target > check-javahelpbin.
 
 *NOTE* - This latter check is based on built modules. If you make or update changes in the files, you have to rebuild the modules before the changes will be recognized by the link check. Running the check-javahelp target for the module that you have updated does the trick (you do not necessarily have to rebuild the whole IDE).
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -327,3 +329,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHowPackageLibraries.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHowPackageLibraries.adoc
index f3a4347..a4dfbd3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHowPackageLibraries.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHowPackageLibraries.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqHowPackageLibraries
-:jbake-type: wiki
+= I need to package some third party libraries with my module. How do I do that?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqHowPackageLibraries
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 6
 
-== I need to package some third party libraries with my module. How do I do that?
 
 Generally if it's a third party library
 (you didn't write it, you can't or don't want to change it),
@@ -40,7 +41,7 @@
 
 Since NetBeans 6.8 you can add, remove and assign sources and Javadoc to wrapped libraries in Project Properties dialog, Libraries / Wrapped JARs tab.
 
-=== Advanced stuff
+== Advanced stuff
 
 Before NB 6.8 you _could_ add libraries manually to a standard module;
 or add additional libraries to an existing library wrapper module.
@@ -66,7 +67,7 @@
 
 * xref:PackagingADistributableJavaApp.adoc[Packaging A Distributable Java App]
 * xref:DevFaqHowPackageLibraries_DE.adoc[German version]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -78,3 +79,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeSettingsFromAnExternalModules.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeSettingsFromAnExternalModules.adoc
index e84ae5f..f1b09ac 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeSettingsFromAnExternalModules.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeSettingsFromAnExternalModules.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqHowToChangeSettingsFromAnExternalModules
-:jbake-type: wiki
+= How do you change the configuration of other modules?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqHowToChangeSettingsFromAnExternalModules
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _settings
+:position: 7
 
-== How do you change the configuration of other modules?
 
 Without adding a dependency to the other module?
 
@@ -41,8 +42,10 @@
 NbPreferences.root().node("org/netbeans/modules/subversion")....
 `
 
-b) Or use the branding approach from link:http://wiki.netbeans.org/DevFaqPropertySheetHideDescription[http://wiki.netbeans.org/DevFaqPropertySheetHideDescription]
+b) Or use the branding approach from xref:DevFaqPropertySheetHideDescription.adoc[DevFaqPropertySheetHideDescription]
 
+
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +57,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeUpdateCenterURL.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeUpdateCenterURL.adoc
index e2545b0..8d23261 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeUpdateCenterURL.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeUpdateCenterURL.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqHowToChangeUpdateCenterURL
-:jbake-type: wiki
+= How to change the update center URL via code?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqHowToChangeUpdateCenterURL
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 11
 
-== How to change the update center URL via code?
 
 Use UpdateUnitProviderFactory link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/api/autoupdate/UpdateUnitProviderFactory.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/api/autoupdate/UpdateUnitProviderFactory.html]
 
@@ -51,7 +52,7 @@
 link:https://github.com/testmycode/tmc-netbeans/blob/master/tmc-plugin/src/fi/helsinki/cs/tmc/actions/TmcModuleInstall.java#L105-L129[https://github.com/testmycode/tmc-netbeans/blob/master/tmc-plugin/src/fi/helsinki/cs/tmc/actions/TmcModuleInstall.java#L105-L129]
 
 Taken from platform-dev-mailing list 14.04.2016
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -63,3 +64,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHowToFixDependencies.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHowToFixDependencies.adoc
index ebeef44..5475c1c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHowToFixDependencies.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHowToFixDependencies.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqHowToFixDependencies
-:jbake-type: wiki
+= My `project.xml` lists more dependencies than I really need. How can I fix it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqHowToFixDependencies
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== My `project.xml` lists more dependencies than I really need. How can I fix it?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 19
 
 As your code evolves, you may find that it no longer needs dependencies on some modules that it used to require.
 In this case, you can run the `fix-dependencies` Ant target on your module to remove any unnecessary dependencies from your `project.xml`.
@@ -36,7 +36,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHowToReuseModules.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHowToReuseModules.adoc
index cedad9a..b07e273 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHowToReuseModules.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHowToReuseModules.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqHowToReuseModules
-:jbake-type: wiki
+= I want to reuse some of my modules in several RCP applications. How to do it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqHowToReuseModules
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 19
 
-== I want to reuse some of my modules in several RCP applications. How to do it?
 
 Assuming you are using version 6.8 or later, this is supported by the module development infrastructure:
 
@@ -124,7 +125,7 @@
 . Create an instance of `org.netbeans.spi.autoupdate.AutoupdateClusterCreator` as a service provider. Unless you have an appropriate `AutoupdateClusterCreator` service in your platform application, these properties have no effect and all updates will always be installed in the user dir! Unfortunately, this is poorly documented. 
 
 The easy way to create one such `AutoupdateClusterCreator` was for me to adapt the source file of the default IDE implementation (link:http://hg.netbeans.org/main/file/tip/updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansClusterCreator.java[http://hg.netbeans.org/main/file/tip/updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansClusterCreator.java] ) to my own needs. Basically, all you have to do is replace one file name: "`netbeans.clusters`" must become "`yourbrandingappname.clusters`". You'll find the respective file in "`install-dir/etc`" of your application.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -136,3 +137,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqI18nFileEncodingQueryObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqI18nFileEncodingQueryObject.adoc
index 3fc94db..7f9cb51 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqI18nFileEncodingQueryObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqI18nFileEncodingQueryObject.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqI18nFileEncodingQueryObject
-:jbake-type: wiki
+= Project Encoding vs. File Encoding - What are the precedence rules used in NetBeans 6.x?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqI18nFileEncodingQueryObject
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 16
 
-== Project Encoding vs. File Encoding - What are the precedence rules used in NetBeans 6.x?
 
 NetBeans implements the FileEncodingQuery object (FEQ) to determine the language encoding for projects and files. The *FEQ* is an interface for obtaining information about which encoding should be used for reading from/writing to a particular file. It can be best defined as a _layer model_ that adheres to the following precedence rules (level of importance from top to bottom):
 
@@ -43,13 +44,13 @@
 
 For JSP pages, the JSP parser is responsible for determining the encoding value. For example: if the file itself doesn't contain the encoding declaration, the parser looks in `web.xml`. If there is no declaration there either, it returns ISO-8859-1.
 
-=== What if the project encoding is not set (i.e. for projects that have not implemented the FEQ)?
+== What if the project encoding is not set (i.e. for projects that have not implemented the FEQ)?
 
 The fallback FEQ is applied (i.e. the encoding of the system locale).  This applies to imported projects and projects created in NetBeans versions 5.x and prior.
 
 *Note*: This does not have any impact on the global project encoding value, which is still used for the creation of new NetBeans 6.x projects, and is by default UTF-8. Nor does this affect the encoding value of previously created NetBeans 6.x projects created during the same session, or opened projects created from previous sessions.
 
-=== What project or file types have/have not implemented FEQ for NetBeans 6.x?
+== What project or file types have/have not implemented FEQ for NetBeans 6.x?
 
 *Project Types*
 
@@ -69,7 +70,7 @@
 
 See also:
 xref:FaqI18nProjectEncoding.adoc[How do I set or modify the language encoding for a project?]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -81,3 +82,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqIdeWelcome.adoc b/netbeans.apache.org/src/content/wiki/DevFaqIdeWelcome.adoc
index cc0c43a..5ac9a59 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqIdeWelcome.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqIdeWelcome.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqIdeWelcome
-:jbake-type: wiki
+= How do I fix problems about 'ide.welcome'?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqIdeWelcome
@@ -26,13 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _javahelp
+:position: 2
 
-== How do I fix problems about 'ide.welcome'?
 
 'ide.welcome' is the map ID of the first help topic shown in the JavaHelp window. It is defined in the 'userguide' module. If you have excluded this module, you need to define this map ID yourself, otherwise you will encounter unexpected/unpleasant behavior:
 
 link:https://bz.apache.org/netbeans/show_bug.cgi?id=153793[https://bz.apache.org/netbeans/show_bug.cgi?id=153793]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +46,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqIdentifyMain.adoc b/netbeans.apache.org/src/content/wiki/DevFaqIdentifyMain.adoc
index 16b20e0..39ea535 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqIdentifyMain.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqIdentifyMain.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqIdentifyMain
-:jbake-type: wiki
+= How do I identify the "main project"?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqIdentifyMain
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I identify the "main project"?
+:wikidevsection: _project_types
+:position: 5
 
 [source,java]
 ----
@@ -79,6 +79,7 @@
 }
 ----
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -90,3 +91,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqImplementFilesystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqImplementFilesystem.adoc
index 22b194a..a1a2211 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqImplementFilesystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqImplementFilesystem.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqImplementFilesystem
-:jbake-type: wiki
+= I'm having trouble implementing this filesystem....
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqImplementFilesystem
@@ -26,13 +26,14 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 11
 
-== I'm having trouble implementing this filesystem....
 
 Be sure that what you really want to be doing is implement link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileSystem.html[FileSystem].  Unless you really need to access objects in a database, remote server, or some other such storage as if they were files, you are probably heading in the wrong direction.
 
 If you do need to implement a FileSystem, you should probably start with link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/AbstractFileSystem.html[AbstractFileSystem] - it handles a lot of knotty locking semantics correctly and will save you a lot of time, effort and bugs.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +45,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqImplementationDependency.adoc b/netbeans.apache.org/src/content/wiki/DevFaqImplementationDependency.adoc
index 019a517..caa4c9c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqImplementationDependency.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqImplementationDependency.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqImplementationDependency
-:jbake-type: wiki
+= What is an implementation dependency and when should I use one?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqImplementationDependency
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 15
 
-== What is an implementation dependency and when should I use one?
 
 Normally modules interact with one another using _public packages_: a module can (indeed, must) declare which, if any, of its Java packages are intended to be visible to other modules. When you declare a specification dependency on another module, you only get access to the public packages. This kind of dependency looks like this in the JAR manifest (which is normally constructed from `nbproject/project.xml` in sources):
 
@@ -67,7 +68,7 @@
 
 Implementation dependencies are to be avoided unless you _really_ need access to all the classes in another module, for the following reason:  If your module has an implementation dependency on module A, and module A is upgraded, your module probably must be upgraded as well, or the system will not load it (assuming module A's implementation version has changed with the upgrade - it should have).  It is a particularly bad idea to use implementation dependencies if you do not know what the other module's author's intentions are for keeping the classes you use available and compatible.  It is always possible to make an enhancement request asking for the other module to make the classes you want to use available publicly.  Do not use implementation dependencies just to have access to one or two some convenience or utility classes in another module - copy them instead, and file a bug report asking for an API for doing what you're trying to do.
 
-=== Friend dependencies
+== Friend dependencies
 
 _Friend dependencies_ are a little different. A module may have an API which its author is not yet comfortable exposing to just anyone - it might not be fully stabilized yet. In this case, the module with the API can declare some public packages, but also stipulate that only a predefined list of "friend modules" are permitted to use them. The friend modules just declare a regular specification version dependency, but unknown modules are not permitted to use any packages from the API module without an implementation dependency.
 
@@ -75,7 +76,7 @@
 
 _Always prefer friend APIs to implementation dependencies where there is a choice._
 
-=== Implementation dependencies, Auto Update, and <verifyupdatecenter>
+== Implementation dependencies, Auto Update, and <verifyupdatecenter>
 
 Implementation dependencies cause special problems for Auto Update. (Some background information is available in link:http://openide.netbeans.org/versioning-policy.html#3[NetBeans API &amp;amp; Module Versioning Policy / Numbering Scheme for Updates].)
 
@@ -218,7 +219,7 @@
 Applies to: NetBeans 5.x, 6.x
 
 Platforms: all
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -230,3 +231,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqIndex.adoc b/netbeans.apache.org/src/content/wiki/DevFaqIndex.adoc
index abd2711..c378b3d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqIndex.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqIndex.adoc
@@ -39,354 +39,14 @@
 //== Tasks and Progressbar
 // ow to use progress api?
 // cancellable tasks and progress indicators
-
-
-- xref:FaqIndex.adoc[list of other FAQs]
-Here's xref:HowToAddFAQEntries.adoc[How To Add FAQ Entries].
-
-
-== Configuration: How Modules Install Things
-
-- xref:DevFaqDotSettingsFiles.adoc[What are .settings files?]
-- xref:DevFaqDotShadowFiles.adoc[What are .shadow files?]
-- xref:DevFaqDynamicSystemFilesystem.adoc[Can I dynamically change the contents of the System Filesystem at runtime?]
-- xref:DevFaqFilesystemSee.adoc[How can I see the filesystem?]
-- xref:DevFaqInstalledFileLocator.adoc[Can I bundle some additional files with my module?  If so, how can I find those files to use them from my module?]
-- xref:DevFaqInstanceDataObject.adoc[What are .instance files?]
-- xref:DevFaqModulesLayerFile.adoc[What is an XML layer?]
-- xref:DevFaqModulesStartupActions.adoc[How do I run some code when my module starts/loads/unloads?]
-- xref:DevFaqOrderAttributes.adoc[How do I specify the order for my menu items/toolbar buttons/files in the system filesystem?]
-- xref:DevFaqSystemFilesystem.adoc[What is the system filesystem?]
-- xref:DevFaqUserDir.adoc[What is the user directory, what is in it, and why do I need one?]
-
-== Converting between common data types and finding things
-
-- xref:DevFaqDataObjectFileObject.adoc[How do I get a DataObject for a FileObject?]
-- xref:DevFaqDataObjectNode.adoc[How do I get a DataObject for a Node?]
-- xref:DevFaqFileFileObject.adoc[How do I get a java.io.File for a FileObject?]
-- xref:DevFaqFileObjectDataObject.adoc[How do I get a FileObject for a DataObject?]
-- xref:DevFaqFileObjectFile.adoc[How do I get a FileObject for a File?]
-- xref:DevFaqFindInstance.adoc[I have a .instance file.  How do I get an actual object instance?]
-- xref:DevFaqFindSfs.adoc[How do I get a reference to the system filesystem?]
-- xref:DevFaqFolderOfInstances.adoc[I have a folder full of .instance files.  How do I get any/all of the object instances?]
-- xref:DevFaqNodeDataObject.adoc[How do I get a Node for a DataObject?]
-- xref:DevFaqUriVsUrl.adoc[URIs and URLs]
-
-== Deploying Changes through AutoUpdate and using Autoupdate API
-
-- xref:DevFaqAutoUpdateAPIJavadoc.adoc[How can I find Javadoc of Autoupdate API with hints to use it?]
-- xref:DevFaqAutoUpdateBranding.adoc[How can I update the splash screen, title bar and other branding items via AutoUpdate?]
-- xref:DevFaqAutoUpdateCheckEveryStartup.adoc[How to force to check for updates at every startup?]
-- xref:DevFaqHowToChangeUpdateCenterURL.adoc[How to change the update center URL via code?]
-- xref:DevFaqNBMPack200.adoc[How to deal with pack200 compression in NBM?]
-- xref:DevFaqNbmPostInstall.adoc[How to specify post-install code in NBM?]
-- xref:DevFaqUseNativeInstaller.adoc[How can I run the installer for something else during module installation?]
-- xref:FaqPluginManagerCustomization.adoc[What other documentation is available about AutoUpdate?]
-
-== Development issues, module basics and classpath issues, and information about RCP/Platform application configuration
-
-- xref:DevFaqModuleDependencies.adoc[How do module dependencies/classloading work?]
-- xref:DevFaq2SrcPaths.adoc[How do I have two source directories within one module?]
-- xref:DevFaqClassLoaders.adoc[What classloaders are created by the module system?]
-- xref:DevFaqUiDefaultsPropsNotFound.adoc[Why can't I load properties using UIDefaults?]
-- xref:DevFaqAnnotationDevelopDebug.adoc[How do I develop and debug annotations for NetBeans platform apps?]
-- xref:DevFaqApiSpi.adoc[What is an SPI?  How is it different from an API?]
-- xref:DevFaqAutomaticPlatformDownload.adoc[How can I have my application compiled in a specific version of the platform?]
-- xref:DevFaqCustomizeBuild.adoc[How can I customize the build process?]
-- xref:DevFaqDependOnCore.adoc[There is a class under org.netbeans.core that does what I need.  Can I depend on it?]
-- xref:DevFaqExternalLibraries.adoc[How to store external libraries in the NetBeans Hg repository]
-- xref:DevFaqHowPackageLibraries.adoc[I need to package some third party libraries with my module.  How do I do that?]
-- xref:DevFaqHowToFixDependencies.adoc[My project.xml lists more dependencies than I really need. How can I fix it?]
-- xref:DevFaqHowToReuseModules.adoc[Can I use modules from update center in my RCP application?]
-- xref:DevFaqImplementationDependency.adoc[What is an implementation dependency and what/how/when should I use one?]
-- xref:DevFaqJavaHelp.adoc[Is there a standard way to provide user documentation (help) for my module?]
-- xref:DevFaqMemoryLeaks.adoc[How can I fix memory leaks?]
-- xref:DevFaqMigratingToNewerPlatform.adoc[Migrating to a newer version of the Platform]
-- xref:DevFaqModulePatching.adoc[How do I create a patch for a preexisting NetBeans module?]
-- xref:DevFaqModuleReload.adoc[Do I need to restart NetBeans every time to debug new changes?]
-- xref:DevFaqNativeLibraries.adoc[How do I add native libraries?]
-- xref:DevFaqNbIdiosyncracies.adoc[Common calls that should be done slightly differently in NetBeans than standard Swing apps (loading images, localized strings, showing dialogs)]
-- xref:DevFaqNbPlatformAndHarnessMixAndMatch.adoc[I want to use one version of the Platform with another version of the build harness. Can I?]
-- xref:DevFaqNetBeansFullHack.adoc[Can I test changes to the IDE without going through the license check and so on?]
-- xref:DevFaqNetBeansProjectsDirectory.adoc[How can I customize the default project directory for my application, replacing "NetBeansProjects"?]
-- xref:DevFaqNoClassDefFound.adoc[My module uses class XYZ from NetBeans' APIs.  It compiles, but I get a NoClassDefFoundError at runtime. Why?]
-- xref:DevFaqOrphanedNetBeansOrgModules.adoc[Can I work on just one or two modules from the NetBeans source base by themselves?]
-- xref:DevFaqPlatformRuntimeProperties.adoc[I want to set some flags or CLI arguments for running my NB RCP/Platform based application (such as disable assertions). How do I do that?]
-- xref:DevFaqProfiling.adoc[How can I profile NetBeans?]
-- xref:DevFaqRuntimeMemory.adoc[How to run module with more PermGen and Heap memory?]
-- xref:DevFaqSignNbm.adoc[Can I sign NBMs I create?]
-- xref:DevFaqSpecifyJdkVersion.adoc[My module requires JDK 6 - how do I keep it from being loaded on an older release?]
-- xref:DevFaqSuitesVsClusters.adoc[What is the difference between a suite and a cluster?]
-- xref:DevFaqTopManager.adoc[Where is TopManager?  I'm trying to do the examples from the O'Reilly book]
-- xref:DevFaqUIResponsiveness.adoc[I am developing a NetBeans module. What performance criteria should it satisfy?]
-- xref:DevFaqWeakListener.adoc[What is a WeakListener?]
-- xref:DevFaqWeakListenerWhen.adoc[When should I use a WeakListener?]
-- xref:DevFaqWhatIsACluster.adoc[What is a module cluster?]
-- xref:DevFaqWhatIsNbm.adoc[What is an "NBM"?]
-- xref:DevFaqWhenUseWrapperModule.adoc[When should I use a library wrapper module and when should I just package the library into my module?]
-- xref:DevFaqWrapperModules.adoc[What is a library wrapper module and how do I use it?]
-- xref:FaqRunSameTargetOnAllModules.adoc[How can I launch an Ant Task on all modules of my suite?]
-
-== Editor and Edited Files
-
-- xref:DevFaqEditorCodeCompletionAnyJEditorPane.adoc[How to add code completion to any JEditorPane]
-- xref:DevFaqEditorGetCurrentDocument.adoc[How can I get the currently open document in the selected editor?]
-- xref:DevFaqEditorHowIsMimeLookupComposed.adoc[How is MimeLookup composed?]
-- xref:DevFaqEditorHowToAddCodeTemplates.adoc[How to add code templates?]
-- xref:DevFaqEditorHowToAddDiffView.adoc[How to use the diff view in my own application/plugin?]
-- xref:DevFaqEditorHowToGetMimeTypeFromDocumentOrJTextComponent.adoc[How to get mime type from Document or JTextComponent?]
-- xref:DevFaqEditorHowToReuseEditorHighlighting.adoc[How to reuse XML syntax highlighting in your own editor]
-- xref:DevFaqEditorJEPForMimeType.adoc[How can I create JEditorPane for a specific document type?]
-- xref:DevFaqEditorWhatIsMimeLookup.adoc[What is MimeLookup?]
-- xref:DevFaqEditorWhatIsMimePath.adoc[What is MimePath?]
-- xref:DevFaqFileEditorContextMenuAddition.adoc[Can I add a menu item to the context menu of the Java source editor?]
-- xref:DevFaqFindCaretPositionInEditor.adoc[How can I get the position of the caret/line in the selected editor?]
-- xref:DevFaqI18nFileEncodingQueryObject.adoc[Project Encoding vs. File Encoding - What are the precedence rules used in NetBeans 6.0?]
-- xref:DevFaqListenEditorChanges.adoc[How can I track what file the user is currently editing?]
-- xref:DevFaqModifyOpenFile.adoc[Is it safe to programmatically modify a file which is open in the editor?]
-- xref:DevFaqMultipleProgrammaticEdits.adoc[I want to make some programmatic changes to the edited file.  How can I do it so one Undo undoes it all?]
-- xref:DevFaqOpenFileAtLine.adoc[How can I open a file in the editor at a particular line number and column?]
-- xref:DevFaqOpenReadOnly.adoc[How can I open a file in the editor in read-only mode?]
-- xref:DevFaqSyntaxColoring.adoc[Can I add syntax coloring for my own data object/MIME type?]
-
-== Files and Data Objects
-
-- xref:DevFaqDataLoader.adoc[What is a DataLoader?]
-- xref:DevFaqDataObject.adoc[What is a DataObject?]
-- xref:DevFaqDataObjectInItsCookieSet.adoc[The next button is never enabled when I create my DataObject from a template.  Help!]
-- xref:DevFaqDataSystemsAddPopupToAllFolders.adoc[How do I add a menu item to the popup menu of every folder in the system?]
-- xref:DevFaqFileAttributes.adoc[What are file attributes?]
-- xref:DevFaqFileChoosers.adoc[I need to show a file chooser.  How can I remember most-recently-used directories?]
-- xref:DevFaqFileContextMenuAddition.adoc[Can I add a menu item to the context menu of every Java source file?]
-- xref:DevFaqFileObject.adoc[What is a FileObject?]
-- xref:DevFaqFileObjectInMemory.adoc[How can I create a FileObject in memory?]
-- xref:DevFaqFileSystem.adoc[What is a FileSystem?]
-- xref:DevFaqImplementFilesystem.adoc[I'm having trouble implementing this filesystem....]
-- xref:DevFaqListenForChangesInNonExistentFile.adoc[I want to listen for changes in a file that may not exist or may be deleted and re-created]
-- xref:DevFaqListenForOpenEvents.adoc[How can I be notified when a file is opened?]
-- xref:DevFaqListenForSaveEvents.adoc[How can I be notified when a file is modified and saved?]
-- xref:DevFaqListeningForFileChanges.adoc[I am listening for changes in a folder/file but when there are changes I do not receive an event]
-- xref:DevFaqMIMEResolver.adoc[How can I create declarative MIMEResolver and add new file type?]
-- xref:DevFaqNewXMLFileType.adoc[How do I add support for an XML type with a different extension?]
-
-== JavaHelp
-
-- xref:DevFaqHelpGuidelines.adoc[JavaHelp integration guide]
-- xref:DevFaqIdeWelcome.adoc[How do I fix problems about 'ide.welcome'?]
-- xref:DevFaqJavaHelpForNodeProperties.adoc[How can I hook up JavaHelp to property sets or individual properties?]
-- xref:DevFaqJavaHelpNotDisplayed.adoc[Why doesn't my JavaHelp content show up?]
-- xref:DevFaqJavaHelpOverrideCustom.adoc[How can I override JavaHelp to display my own custom help or documentation?]
-
-== Key Bindings
-
-- xref:DevFaqAddDefaultActionShortcuts.adoc[How do I add default shortcuts for SystemActions (like cut, paste, etc)?]
-- xref:DevFaqAddShortCutForAction.adoc[How to set the shortcut of an action outside of your own module?]
-- xref:DevFaqGetShortCutForAction.adoc[How to get the shortcut/shortkey of an action at runtime?]
-- xref:DevFaqGlobalVsEditorKeybindings.adoc[What about editor-specific keybindings?]
-- xref:DevFaqKeybindings.adoc[How do key bindings work?]
-- xref:DevFaqKeybindingsInUse.adoc[Which keybindings are already being used?]
-- xref:DevFaqLogicalKeybindings.adoc[Why should I use D- for Ctrl and O- for Alt? I thought C- stood for Ctrl and A- stood for Alt!]
-- xref:DevFaqOrderActions.adoc[I want my action to appear between two existing items/in a specific place in the menu.  Can I do that?]
-- xref:DevFaqRebindingKeys.adoc[Binding one key to more than one action]
-
-== Licensing Issues
-
-- xref:DevFaqEpl3rdPartySources.adoc[Where to download sources of EPL third-party components?]
-- xref:DevFaqLgpl3rdPartySources.adoc[Where to download sources of LGPL third-party components?]
-- xref:DevFaqLic3rdPartyComponents.adoc[NetBeans Platform and 3rd party components]
-- xref:DevFaqMpl3rdPartySources.adoc[Where to download sources of MPL third-party components?]
-
-== Logging and Error Handling
-
-- xref:DevFaqAddTimestampToLogs.adoc[How can I add a timestamp to the logs?]
-- xref:DevFaqCustomizingUnexpectedExceptionDialog.adoc[How can I customize the Unexpected Exception dialog?]
-- xref:DevFaqLogging.adoc[Using java.util.logging in NetBeans]
-- xref:DevFaqUIGestures.adoc[UI Logging through Gestures Collector]
-- xref:DevFaqUnexpectedExceptionDialog.adoc[How can I suppress the Unexpected Exception dialog?]
-
-== Lookup
-
-- xref:DevFaqLookup.adoc[What is a Lookup?]
-- xref:DevFaqLookupContents.adoc[How can I find out what is in a Lookup]
-- xref:DevFaqLookupCookie.adoc[What is the difference between getCookie(Class), SharedClassObject.findObject(Class) and Lookup.lookup(Class)?]
-- xref:DevFaqLookupDefault.adoc[What is the "default Lookup"?]
-- xref:DevFaqLookupEventBus.adoc[Event Bus in NetBeans]
-- xref:DevFaqLookupForDataNode.adoc[How can I add support for lookups on nodes representing my file type?]
-- xref:DevFaqLookupGenerics.adoc[How do I use Java generics with Lookup?]
-- xref:DevFaqLookupHowToOverride.adoc[How can I override an instance in the Lookup?]
-- xref:DevFaqLookupImplement.adoc[How do I implement my own lookup or proxy another one?]
-- xref:DevFaqLookupLazyLoad.adoc[How do I lazy-load an item in the lookup?]
-- xref:DevFaqLookupNonSingleton.adoc[If there is more than one of a type in a Lookup, which instance will I get?]
-- xref:DevFaqLookupPackageNamingAndLookup.adoc[After adding my class to Lookup I get a "ClassNotFoundException" when trying to look it up, why?]
-- xref:DevFaqLookupVsHashmap.adoc[Why use Lookup - wouldn't a Map be good enough?]
-- xref:DevFaqLookupWhere.adoc[What uses Lookup?]
-- xref:DevFaqSysFsLookupRegistration.adoc[How can I register services into the lookup using the system filesystem?]
-- xref:DevFaqWhenLookup.adoc[When should I use Lookup in my own APIs?]
-
-== Mavenized Builds
-
-- xref:DevFaqMavenHowToMigrateFromANT.adoc[How to convert an ANT-based NetBeans Module to a Maven-based NetBeans Module?]
-- xref:DevFaqMavenL10N.adoc[How can I create localization modules using Maven?]
-- xref:DevFaqMavenPlatformRebel.adoc[Can I use JRebel to speed up development?]
-- xref:DevFaqMavenSystemScope.adoc[Why can't I use system scope for a library wrapper module?]
-
-== Module System
-
-- xref:Autoload.adoc[What is an autoload module?]
-- xref:DevFaqChangeRestartSplash.adoc[How can I change the NetBeans splash screen shown when an installed module requires restart?]
-- xref:DevFaqDisableAutoupdate.adoc[Can I disable Auto Update (for example, while running tests)?]
-- xref:DevFaqFixDependencies.adoc[How fix module dependencies automatically?]
-- xref:DevFaqModuleCCE.adoc[Why am I getting a ClassCastException when the class is clearly of the right type?]
-- xref:DevFaqModuleDupePackages.adoc[Can two or more modules contain the same package?]
-- xref:DevFaqModuleLoadUnloadNotification.adoc[How can code in one module be notified when other modules are loaded or unloaded?]
-- xref:DevFaqModuleObfuscation.adoc[How can I obfuscate a module?]
-- xref:DevFaqNonGuiPlatformApp.adoc[Can I create a console or server (non-GUI) app with the NetBeans Platform?]
-- xref:DevFaqSuppressExistingModule.adoc[I want my module to disable some of the modules that would normally be enabled. Possible?]
-- xref:DevFaqTutorialsDebugging.adoc[How do I debug a module I'm building?]
+// Saving as per https://web.archive.org/web/20170110010149/http://wiki.netbeans.org/NetBeansDeveloperFAQ#Saving
+// 
+//== Project Types
+//Also see BuildSystemDesign and ProjectGroups.
 
 //== NetBeans Developer FAQ
 
-== Nodes and Explorer
-
-- xref:DevFaqAddDoingEvilThingsToForeignNodes.adoc[I have a reference to an existing Node from some other module.  Can I add cookies/properties/children?]
-- xref:DevFaqAddingRemovingChildrenDynamically.adoc[Can I add, remove or reorder children of a node on the fly?]
-- xref:DevFaqChangeNodeAppearance.adoc[How can I change my node's appearance?]
-- xref:DevFaqCreateExplorerPanel.adoc[How do I create a TopComponent (tab in the main window) to show some Nodes?]
-- xref:DevFaqCutCopyPaste.adoc[How do I handle cut, copy and paste?]
-- xref:DevFaqExpandAndSelectSpecificNode.adoc[How do I make a particular node visible in the Explorer, and maybe select it?]
-- xref:DevFaqExplorer.adoc[What is "explorer"?]
-- xref:DevFaqExplorerConnectNode.adoc[How do I show a Node in my explorer view?]
-- xref:DevFaqExplorerManager.adoc[What is an ExplorerManager?]
-- xref:DevFaqExplorerViews.adoc[What is an Explorer View?]
-- xref:DevFaqExplorerViewsInMantisse.adoc[How can I design explorer views in Mantisse GUI editor?]
-- xref:DevFaqFilesFromNodes.adoc[How do I get at the file that a particular node represents?]
-- xref:DevFaqGraphicalChoiceView.adoc[How can I graphically create a ChoiceView?]
-- xref:DevFaqNodeChildrenDotLeaf.adoc[Why do my nodes in the Explorer always have an expand-box by them, even though they have no children?]
-- xref:DevFaqNodeDeletionDialog.adoc[How can I prevent (or override) the node deletion dialog?]
-- xref:DevFaqNodeInjectingLookupContents.adoc[I want to allow other modules to inject objects into my Node's Lookup, or Actions into its actions]
-- xref:DevFaqNodePropertyForFiles.adoc[I have a Node.Property for a file. How can I control the file chooser that is the custom editor?]
-- xref:DevFaqNodeSelectAll.adoc[How can I implement "Select all/Deselect all/Invert selection" features?]
-- xref:DevFaqNodeSerialize.adoc[How to serialize my nodes?]
-- xref:DevFaqNodeSubclass.adoc[I need to create my own Nodes. What should I subclass?]
-- xref:DevFaqNodeViewCapability.adoc[How can I add a "View" capability for data my node represents?]
-- xref:DevFaqNodesChildFactory.adoc[I need to show Nodes for objects that are slow to create.  How do I compute Node children on a background thread?]
-- xref:DevFaqNodesCustomLookup.adoc[I need to add to/remove from/customize the content of my Node/DataObject/TopComponent's Lookup.  How do I do it?]
-- xref:DevFaqNodesDecorating.adoc[How do I "decorate" nodes that come from another module (i.e. add icons, actions)?]
-- xref:DevFaqOutlineViewHorizontalScrolling.adoc[How can I add horizontal scrolling support to the OutlineView component?]
-- xref:DevFaqPropertyEditorHints.adoc[I have a Node.Property. I want to control its appearance or custom editor somehow.  Can I do that without writing my own property editor?]
-- xref:DevFaqSortableTTVColumns.adoc[How can I make sortable columns in a TreeTableView?]
-- xref:DevFaqSuppressEditTTVColumns.adoc[How do I remove the "..." buttons of a TreeTableView?]
-- xref:DevFaqTrackGlobalSelection.adoc[I need to write some code that tracks the global selection.  What should I do?]
-- xref:DevFaqTrackingExplorerSelections.adoc[Tracking selections in the Explorer]
-- xref:DevFaqViewSaveTTVColumns.adoc[How do I preserve the column attributes of a TreeTableView?]
-- xref:DevFaqWhatIsANode.adoc[What is a Node?]
-
-== Output Window
-
-- xref:DevFaqCustomIOProvider.adoc[How to implement custom IOProvider?]
-- xref:DevFaqInput.adoc[How to get user input in the Output Window?]
-- xref:DevFaqOWColorText.adoc[How to use color text in Output Window?]
-- xref:DevFaqOWTabEmbedding.adoc[How do I embed output window tab to another component?]
-- xref:DevFaqOutputWindow.adoc[How do I create my own tab in the output window and write to it?]
-- xref:DevFaqOutputWindowExternalProcess.adoc[How do I route the output from an external process to the output window?]
-
-== Programmatic access to Java Sources
-
-- xref:DevFaqObtainSourcesOfAJavaClass.adoc[How to obtain a source file for a Java class and open in the editor?]
-- xref:DevFaqScanForClasses.adoc[How can I scan a classpath to find all classes of a particular type?]
-- xref:JavaHT_GetAllMembers.adoc[How do I Get All Methods/Fields/Constructors of a Class?]
-- xref:JavaHT_Modification.adoc[How can I programmatically modify a Java source file?]
-- xref:Java_DevelopersGuide.adoc[Java_DevelopersGuide]
-
-== Project Handling
-
-- xref:DevFaqGetNameOfProjectGroup.adoc[How to get the name of the active project group?]
-- xref:DevFaqGetNameOrIconForProject.adoc[How to get the name or icon of a project?]
-- xref:DevFaqGetProjectForFileInEditor.adoc[How to get the project of the active file in the editor?]
-- xref:DevFaqListenForOpeningClosingProject.adoc[How to listen for projects to be opened/closed?]
-- xref:DevFaqOpenProjectProgramatically.adoc[How can I open a Project programatically?]
-
-== Project Types
-
-- xref:DevFaqActionAddProjectCustomizer.adoc[How to add a new panel to a Project Properties dialog?]
-- xref:DevFaqActionAddProjectCustomizerToMultipleTypes.adoc[How do I register a "ProjectCustomizer" to multiple project types?]
-- xref:DevFaqActionAddProjectPopUp.adoc[How do I add an action to a project popup menu?]
-- xref:DevFaqActionAddProjectTypePopUp.adoc[How do I add an action to a project popup menu of a specific project type?]
-- xref:DevFaqActionAllAvailableProjectTypes.adoc[How determine all available project types?]
-- xref:DevFaqAddFileTemplateToNewFileContentMenu.adoc[How can I define the available File types when the user right-clicks the project folder and chooses "New"?]
-- xref:DevFaqIdentifyMain.adoc[How do I identify the "main project"?]
-- xref:DevFaqPossibleToExtend.adoc[Is it possible to extend an existing project type?]
-
-== Running and Writing tests
-
-- xref:DevFaqTestDataObject.adoc[Writing Tests for DataObjects and DataLoaders]
-- xref:DevFaqTestUsingSystemFileSystem.adoc[How do I test something which uses the System Filesystem?]
-- xref:DevFaqUsingSimpletests.adoc[Using NbModuleSuite &amp; friends]
-- xref:DevRunningTestsPlatformApp.adoc[Running tests on a platform application]
-- xref:NetBeansDeveloperTestFAQ.adoc[NetBeans Developer Test FAQ]
-- xref:TestingThingsThatUseFileObjectDataObjectDataFolder.adoc[Testing things that use FileObjects]
-
-== Settings
-
-- xref:DevFaqExportImport.adoc[How to register options for export/import to module's layer?]
-- xref:DevFaqExtendOptionsSearch.adoc[How can I configure my options panel to be found by global quicksearch or options search?]
-- xref:DevFaqExtendOptionsWindow.adoc[Can I add new panels to the Options window?]
-- xref:DevFaqHowToChangeSettingsFromAnExternalModules.adoc[How do you change the configuration of other modules?]
-- xref:DevFaqJavaStartParms.adoc[How do I change the application's Java start parameters?]
-- xref:DevFaqOpenOptionsAtCategory.adoc[How do you open the option dialog with a preselected category?]
-- xref:DevFaqSetPrefs.adoc[How do I let the user set preferences/options/customization/configuration for my module/application?]
-
-== Threading
-
-- xref:DevFaqBackgroundThread.adoc[What is a background thread and why do I need one?]
-- xref:DevFaqRequestProcessor.adoc[When should I use RequestProcessor.getDefault() and when should I create my own RequestProcessor?]
-- xref:DevFaqRequestProcessorTask.adoc[How can I run an operation occasionally on a background thread, but reschedule it if something happens to delay it?]
-- xref:DevFaqThreading.adoc[I need to run some code on a background thread.  Can the platform help me?]
-- xref:DevFaqThreadingBuiltIn.adoc[What APIs come with built-in background thread handling?]
-
-== Using Enterprise Resources from NetBeans module
-
-- xref:DevFaqAppClientOnNbPlatformTut.adoc[Java EE Application Client on top of NetBeans Platform Tutorial]
-- xref:DevFaqCallEjbFromNbm.adoc[How to call EJB from NetBeans module]
-
-== When There Are Multiple Ways To Do Something...
-
-- xref:DevFaqModulesDeclarativeVsProgrammatic.adoc[Installing things declaratively vs. installing things programmatically]
-- xref:DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc[Should I register an object in my layer file using .instance or .settings files?  What about .shadow files?]
-- xref:DevFaqWaysToRegisterInDefaultLookup.adoc[Which way should I register an object in the default Lookup?]
-- xref:DevFaqWhenToUseWhatRegistrationMethod.adoc[I need to register some object to be found at runtime, or run some code on startup.  Which way should I use?]
-
-== When things go wrong: Troubleshooting
-
-- xref:DevFaqTroubleshootClassNotFound.adoc[I've got a class not found error/exception.  How can I fix it?]
-- xref:DevFaqTroubleshootMissingItemsInZippedSources.adoc[I find files missing from the source ZIP file]
-
-== Window System
-
-- xref:DevFaqCustomWindowMode.adoc[How to create a custom window mode?]
-- xref:DevFaqCustomizeWindowSystem.adoc[How can I customize the window system via the latest 7.1 techniques/enhancements?]
-- xref:DevFaqEditorTopComponent.adoc[I want to create a TopComponent class to use as an editor, not a singleton]
-- xref:DevFaqExecutableIcon.adoc[How can I change the executable's icon?]
-- xref:DevFaqInitialMainWindowSize.adoc[How do I set the initial size of the main window?]
-- xref:DevFaqMainTitle.adoc[How to change main title contents?]
-- xref:DevFaqMixingLightweightHeavyweight.adoc[How to mix lightweight (Swing) and heavyweight (AWT) components?]
-- xref:DevFaqMultipleTopComponentAction.adoc[I have a non-singleton TopComponent. Can I write actions which show all available instances in the main menu?]
-- xref:DevFaqNonSingletonTopComponents.adoc[How can I change my TopComponent to not be a singleton?]
-- xref:DevFaqOverrideDefaultWindowSize.adoc[How to override the default size of an existing window?]
-- xref:DevFaqReplaceWindowSystem.adoc[How can I replace the Window System?]
-- xref:DevFaqWindowsAndDialogs.adoc[Windows and dialogs]
-- xref:DevFaqWindowsComponentHowTo.adoc[I want to show my own component(s) in the main window - where do I start?]
-- xref:DevFaqWindowsGeneral.adoc[What is the window system]
-- xref:DevFaqWindowsInternals.adoc[How does the window system _really_ work?]
-- xref:DevFaqWindowsMatisse.adoc[How do I use Matisse/GroupLayout (new form editor/layout manager in 5.0) in my windowing system components]
-- xref:DevFaqWindowsMaximizeViaCode.adoc[How to maximize a TopComponent?]
-- xref:DevFaqWindowsMode.adoc[What are Modes?]
-- xref:DevFaqWindowsNoActionsOnToolbars.adoc[I want to disable the popup menu on the toolbars in the main window.  How do I do that?]
-- xref:DevFaqWindowsOpenInMode.adoc[My TopComponent always opens in the editor area, but I want it to open in the same place as XYZ]
-- xref:DevFaqWindowsOpenTopComponents.adoc[Which TopComponents are open?]
-- xref:DevFaqWindowsTopComponent.adoc[What are TopComponents?]
-- xref:DevFaqWindowsTopComponentLookup.adoc[Why does TopComponent have a getLookup() method?  What is it for?]
-- xref:DevFaqWindowsWstcrefAndFriends.adoc[How do I use .wstcrf/.wsmode/.settings files to install my module's components in the window system?]
-- xref:DevFaqWindowsXmlApi.adoc[How does the XML API for installing window system components work?]
+- xref:FaqIndex.adoc[list of other FAQs]
+Here's xref:HowToAddFAQEntries.adoc[How To Add FAQ Entries].
 
 -NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqInitialMainWindowSize.adoc b/netbeans.apache.org/src/content/wiki/DevFaqInitialMainWindowSize.adoc
index 21a44cb..724d441 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqInitialMainWindowSize.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqInitialMainWindowSize.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqInitialMainWindowSize
-:jbake-type: wiki
+= How do I adjust the initial size/position of the main window?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqInitialMainWindowSize
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 15
 
-== How do I adjust the initial size/position of the main window?
 
 The default initial size of an application based on NetBeans platform is 90% of the whole screen area and the main window is also centered. These defaults can be redefined quite easily:
 
@@ -75,7 +76,7 @@
 * keep the rest of _windowmanager.wswmgr_ as it was
 
 *Note:* This way you can also define the default main window state - maximized/minimized/restored, see link:http://java.sun.com/j2se/1.5.0/docs/api/java/awt/Frame.html#setExtendedState(int)[JavaDoc] for possible values.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -87,3 +88,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqInput.adoc b/netbeans.apache.org/src/content/wiki/DevFaqInput.adoc
index 976316d..648bf1a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqInput.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqInput.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqInput
-:jbake-type: wiki
+= How to get user input in the Output Window?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqInput
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _output_window
+:position: 6
 
 This is an example on how to get inout from the Output Window. Just change what's done on the read method (listener implementation) to customize the behavior. Things that come to mind: chat client, text based games, etc...
 
@@ -131,7 +133,7 @@
 ----
 
 *Note:* The module that contains this class depends on Window System API (org.openide.windows).
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -143,3 +145,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqInstalledFileLocator.adoc b/netbeans.apache.org/src/content/wiki/DevFaqInstalledFileLocator.adoc
index 86f8b40..de2e92e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqInstalledFileLocator.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqInstalledFileLocator.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqInstalledFileLocator
-:jbake-type: wiki
+= Can I bundle some additional files with my module? If so, how can I find those files to use them from my module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqInstalledFileLocator
@@ -26,12 +26,14 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 13
 
-== Can I bundle some additional files with my module? If so, how can I find those files to use them from my module?
+
 
 Sometimes you need to bundle some additional files with your module (for example native libraries or native executables).  
 
-=== Bundling External File With Your Module
+== Bundling External File With Your Module
 
 NetBeans provides a simple and straightforward way to bundle whatever files you want into a module project:
 
@@ -49,7 +51,7 @@
 
 _Note:_ If you are bundling third party software which *has its own installer* there is xref:DevFaqUseNativeInstaller.adoc[a way to run that installer during module installation].
 
-=== Finding External Files At Runtime
+== Finding External Files At Runtime
 
 Now your module includes the files you need.  You still need to get access to them at runtime.
 
@@ -67,7 +69,7 @@
 Always handle the case that the user (or disk crash, whatever) might have deleted it.
 
 If you are wondering why you don't just find the directory NetBeans is installed in and look in that directory, see the xref:DevFaqWhatIsACluster#Why_Have_Clusters.3F.adoc[background information about clusters]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -79,3 +81,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqInstanceDataObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqInstanceDataObject.adoc
index 124010f..a62978e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqInstanceDataObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqInstanceDataObject.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqInstanceDataObject
-:jbake-type: wiki
+= What are `*.instance` files?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqInstanceDataObject
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What are `*.instance` files?
+:wikidevsection: _configuration_how_modules_install_things
+:position: 7
 
 `*.instance` files represent an "instance", i.e. arbitrary Java object.
 
@@ -84,7 +84,7 @@
 
 
 Applies to: NetBeans 6.7 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -96,3 +96,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelp.adoc b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelp.adoc
index 297259c..5bbe5fe 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelp.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqJavaHelp
-:jbake-type: wiki
+= Is there a standard way to provide user documentation for my module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqJavaHelp
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 21
 
-== Is there a standard way to provide user documentation for my module?
 
 Yes. See the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/overview-summary.html[JavaHelp Integration API]
 which describes how to include JavaHelp documentation in a module under *Help > Contents*;
@@ -38,7 +39,7 @@
 
 Applies to: NetBeans 5.x, 6.x
 Platforms: all
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -50,3 +51,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpForNodeProperties.adoc b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpForNodeProperties.adoc
index 947712d..ba0e9e3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpForNodeProperties.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpForNodeProperties.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqJavaHelpForNodeProperties
-:jbake-type: wiki
+= How Can I Hook Up JavaHelp to Property Sets or Individual Properties?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqJavaHelpForNodeProperties
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _javahelp
+:position: 7
 
-== How Can I Hook Up JavaHelp to Property Sets or Individual Properties?
 
 Generally speaking, you can implement HelpCtx.Provider for objects in your platform application to associate them with a JavaHelp context (page).  For some reason, this approach does not work with node properties.  You can set the "helpID" value to associate JavaHelp with an individual property or an entire set, as shown below:
 
@@ -70,7 +71,7 @@
     return s;
 }
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -82,3 +83,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpNotDisplayed.adoc b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpNotDisplayed.adoc
index 0d56c2f..79f1f95 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpNotDisplayed.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpNotDisplayed.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqJavaHelpNotDisplayed
-:jbake-type: wiki
+= Why doesn't my JavaHelp content show up?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqJavaHelpNotDisplayed
@@ -26,13 +26,13 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Why doesn't my JavaHelp content show up?
+:wikidevsection: _javahelp
+:position: 6
 
 The first thing to check is that your JavaHelp configuration files are correct. Since these files contain IDs and file paths, it is easy to make a mistake. Unfortunately, the JavaHelp system does not provide you with much warning when such an error occurs.
 
 It is also worth noting that the JavaHelp implementation in NetBeans IDE 6.5.x and earlier link:https://bz.apache.org/netbeans/show_bug.cgi?id=160276[seems to require the .html file extension].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +44,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpOverrideCustom.adoc b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpOverrideCustom.adoc
index 2a4b670..7e32d1b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpOverrideCustom.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpOverrideCustom.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqJavaHelpOverrideCustom
-:jbake-type: wiki
+= How can I override JavaHelp to display my own help or documentation?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqJavaHelpOverrideCustom
@@ -26,10 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _javahelp
+:position: 8
 
-== How can I override JavaHelp to display my own help or documentation?
 
-=== Step 1: HelpCtx.Displayer
+== Step 1: HelpCtx.Displayer
 
 First, you must create a HelpCtx.Displayer that is capable of displaying your help and register it as a service provider
 
@@ -53,7 +54,7 @@
 }
 ----
 
-=== Step 2: Help.class
+== Step 2: Help.class
 
 An instance of org.netbeans.api.javahelp.Help determines what to do with a particular HelpCtx. In order to use your custom help displayer, you need to create an instance of Help that can display using your custom help displayer. In this case, you want to override the Help class provided with the NetBeans platform, so you set the 'position' attribute low. The purpose of this class is two-fold:
 
@@ -115,11 +116,11 @@
 }
 ----
 
-=== Step 3: Connecting UI To JavaHelp
+== Step 3: Connecting UI To JavaHelp
 
 See link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/org/netbeans/api/javahelp/doc-files/help-guide.html[Connecting Help In NetBeans].
 
-=== Step 4: Add the JavaHelp Integration Module
+== Step 4: Add the JavaHelp Integration Module
 
 This module is not "eager", so to force it to load, at least one module must depend on it. Simply make JavaHelp Integeration a dependency of one your modules to make Help available. The JavaHelp Integration module is in the 'platform' library.
 
@@ -132,7 +133,7 @@
 
 Applies to: NetBeans IDE 7.2
 Platforms: All
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -144,3 +145,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqJavaStartParms.adoc b/netbeans.apache.org/src/content/wiki/DevFaqJavaStartParms.adoc
index bdb1660..1271248 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqJavaStartParms.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqJavaStartParms.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqJavaStartParms
-:jbake-type: wiki
+= How do I change the application's Java start parameters?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqJavaStartParms
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _settings
+:position: 4
 
 This is simple to do but hard to figure out.
 
@@ -47,6 +49,7 @@
 
 NOTE: The above will work with any distribution method (i.e. zip, installer, etc...)
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -58,3 +61,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqKeybindings.adoc b/netbeans.apache.org/src/content/wiki/DevFaqKeybindings.adoc
index 0834c94..09b56ce 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqKeybindings.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqKeybindings.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqKeybindings
-:jbake-type: wiki
+= How do keybindings work?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqKeybindings
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _key_bindings
+:position: 1
 
-== How do keybindings work?
 
 Keybindings are specified in yet another folder in the xref:DevFaqSystemFilesystem.adoc[system filesystem ].  The folder Shortcuts/ contains xref:DevFaqInstanceDataObject.adoc[.instance files] or xref:DevFaqDotShadowFiles.adoc[.shadow files] (shadow files are like symlinks to another file in the system fs) - these map to Actions.
 
@@ -68,6 +69,7 @@
 
 ----
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -79,3 +81,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqKeybindingsInUse.adoc b/netbeans.apache.org/src/content/wiki/DevFaqKeybindingsInUse.adoc
index 7070d44..796217c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqKeybindingsInUse.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqKeybindingsInUse.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqKeybindingsInUse
-:jbake-type: wiki
+= How do I find out which keybindings are already in use?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqKeybindingsInUse
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I find out which keybindings are already in use?
+:wikidevsection: _key_bindings
+:position: 6
 
 For an existing release you can look at e.g. xref:KeymapProfileFor60.adoc[KeymapProfileFor60] to see the specification.
 
@@ -49,7 +49,7 @@
 Linux window manager shortcuts, etc.
 If at all possible, use a multistroke binding:
 for example, `Shortcuts/D-J R C.shadow` binds the 3-stroke sequence `Ctrl-J R C`.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -61,3 +61,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLgpl3rdPartySources.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLgpl3rdPartySources.adoc
index 3884abb..b5111b9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLgpl3rdPartySources.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLgpl3rdPartySources.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLgpl3rdPartySources
-:jbake-type: wiki
+= Where to download sources of LGPL third-party components?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLgpl3rdPartySources
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _licensing_issues
+:position: 3
 
-== Where to download sources of LGPL third-party components?
 
 The following third-party components licensed under LGPL license have the sources available for download from netbeans.org:
 
@@ -70,6 +71,7 @@
 platform/modules/ext/jna-platform-4.0.0.jar |link:https://netbeans.osuosl.org/binaries/6C7D7616D86B35623DA5E590B54EB95448D7117C-jna-4.0.0-src.zip[jna-4.0.0-src.zip] 
 |===
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -81,3 +83,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLic3rdPartyComponents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLic3rdPartyComponents.adoc
index 9115942..4063670 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLic3rdPartyComponents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLic3rdPartyComponents.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLic3rdPartyComponents
-:jbake-type: wiki
+= What third party libraries are in the Platform and what are their licenses?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLic3rdPartyComponents
@@ -26,15 +26,16 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _licensing_issues
+:position: 1
 
-== What third party libraries are in the Platform and what are their licenses?
 
 You can find the information about NetBeans code license at link:http://netbeans.org/about/legal/index.html[http://netbeans.org/about/legal/index.html].
 
 Matrix of third-party libraries can be found in Third Party License link for the particular version at link:http://netbeans.org/about/legal/product-licences.html[http://netbeans.org/about/legal/product-licences.html].
 
 Note that if your application depends not only on Platform (modules from 'platform' cluster) but also on other parts of the NetBeans IDE (e.g. modules from the 'ide', or 'java' clusters) there may be derived dependencies on other 3rd party libraries.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -46,3 +47,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListenEditorChanges.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListenEditorChanges.adoc
index adf0d60..a56f40e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListenEditorChanges.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListenEditorChanges.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqListenEditorChanges
-:jbake-type: wiki
+=  How can I track what file the user is currently editing?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqListenEditorChanges
@@ -26,10 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 3
 
-== How can I track what file the user is currently editing?
 
-=== EditorRegistry
+== EditorRegistry
 
 The editor keeps a registry of open editors;  you can track the active editor using the following code:
 
@@ -55,7 +56,7 @@
 
 Please read javadoc on `EditorRegistry` to see details about the properties delivered through the listener used in the above code. There are many property changes fired and if an event comes it does *not* necessarily mean that the active editor has changed.
 
-=== NbDocument.findRecentEditorPane
+== NbDocument.findRecentEditorPane
 
 If you have a `EditorCookie` you can use `NbDocument.findRecentEditorPane`
 
@@ -64,7 +65,7 @@
 Applies to: Netbeans 6.x and later
 
 Platforms: All
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -76,3 +77,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListenForChangesInNonExistentFile.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListenForChangesInNonExistentFile.adoc
index d2459e1..1d7a7ec 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListenForChangesInNonExistentFile.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListenForChangesInNonExistentFile.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqListenForChangesInNonExistentFile
-:jbake-type: wiki
+= I want to listen for changes in a file that may not exist or may be deleted and re-created
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqListenForChangesInNonExistentFile
@@ -26,13 +26,14 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 17
 
-== I want to listen for changes in a file that may not exist or may be deleted and re-created
 
 There are some cases where you want to listen for changes in a file or folder that does not exist, or may be created and deleted on the fly.
 
 As of NetBeans 6.7, you can use link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#addFileChangeListener(org.openide.filesystems.FileChangeListener,%20java.io.File)[FileUtil.addFileChangeListener(FileChangeListener, File)] to listen for such changes. There is also FileUtil.addRecursiveListener
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +45,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListenForOpenEvents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListenForOpenEvents.adoc
index ccea414..5bd3c7b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListenForOpenEvents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListenForOpenEvents.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqListenForOpenEvents
-:jbake-type: wiki
+= How can I be notified when a file is opened?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqListenForOpenEvents
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 8
 
-== How can I be notified when a file is opened?
 
 [source,java]
 ----
@@ -84,7 +85,7 @@
 See also link:http://java.net/projects/nbwicketsupport/sources/nbwicketsupport/content/WicketSuite/WicketCore/src/org/netbeans/modules/web/wicket/installer/Installer.java[http://java.net/projects/nbwicketsupport/sources/nbwicketsupport/content/WicketSuite/WicketCore/src/org/netbeans/modules/web/wicket/installer/Installer.java] 
 
 Taken from nbdev-mailing list - thanks to Geertjan.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -96,3 +97,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListenForOpeningClosingProject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListenForOpeningClosingProject.adoc
index 412b6ce..a673bb3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListenForOpeningClosingProject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListenForOpeningClosingProject.adoc
@@ -17,7 +17,7 @@
 //     under the License.
 //
 
-= DevFaqListenForOpeningClosingProject
+= How to listen for projects to be opened/closed?
 :jbake-type: wiki
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
@@ -26,10 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _project_handling
+:position: 5
 
-== How to listen for projects to be opened/closed?
 
-=== Specific for a project-type
+== Specific for a project-type
 
 Implement a ProjectOpenedHook and register it to a project-type
 `
@@ -65,10 +66,11 @@
 `
 Inspired by link:https://github.com/shannah/mirah-nbm/blob/695afe895553bbcae0a2f3ad8bfc38f48963de9b/src/ca/weblite/netbeans/mirah/antproject/web/WebMirahProjectOpenedHook.java[https://github.com/shannah/mirah-nbm/blob/695afe895553bbcae0a2f3ad8bfc38f48963de9b/src/ca/weblite/netbeans/mirah/antproject/web/WebMirahProjectOpenedHook.java]
 
-=== For all project-types
+== For all project-types
 
 See xref:../blogs/geertjan/org_netbeans_spi_project_ui.adoc[Geertjan blog: ProjectOpenedHook]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -80,3 +82,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListenForSaveEvents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListenForSaveEvents.adoc
index b5ed833..df7b22b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListenForSaveEvents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListenForSaveEvents.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqListenForSaveEvents
-:jbake-type: wiki
+= How can I be notified when a file is modified and saved??
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqListenForSaveEvents
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I be notified when a file is modified and saved??
+:wikidevsection: _files_and_data_objects
+:position: 7
 
 The link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.Registry.html[DataObject.Registry] in link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders[LoadersAPI] gives you a set of modified DataObjects. You can also add a listener and be notified when the set of modified objects changes.
 
@@ -37,7 +37,7 @@
 
 Note that listening for something to be saved is _not the same as listening for any changes in the file_ - you are really listening only for (directly or indirectly) user-initiated save events, as in the user pressing CTRL-S when the file is modified and opened in the editor.  For notifications about any changes in a file, instead attach a `xref:DevFaqListenForChangesInNonExistentFile.adoc[FileChangeListener]` to the underlying `xref:DevFaqFileObject.adoc[FileObject]`.
 
-=== Track the currently modified files by DataObject Registry listening - Sample code
+== Track the currently modified files by DataObject Registry listening - Sample code
 
 [source,java]
 ----
@@ -70,7 +70,7 @@
 * File System API
 * Nodes API
 * Utilities API
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -82,3 +82,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListeningForFileChanges.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListeningForFileChanges.adoc
index 8bc9af0..5f28400 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListeningForFileChanges.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListeningForFileChanges.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqListeningForFileChanges
-:jbake-type: wiki
+= I am listening for changes in a folder/file but when there are changes I do not receive an event
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqListeningForFileChanges
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I am listening for changes in a folder/file but when there are changes I do not receive an event
+:wikidevsection: _files_and_data_objects
+:position: 16
 
 If you are adding/deleting/changes using the FileSystems API - i.e. adding using link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#createData(org.openide.filesystems.FileObject,%20java.lang.String)[FileUtil.createData()] then it should work.
 
@@ -41,7 +41,7 @@
 2. We used to use a system that polled on a timer, but this is a bad idea because the user can be using, say, email, and most of the in-memory copy of NetBeans can have been swapped out to disk by the OS - but to check for modified files, it has to be dragged back into memory out of the swap file to see if some files have changed, even though the user is using another application.  That hurts performance of the user's other applications.
 
 If you are creating files or folders programmatically, use link:https://bits.netbeans.org/dev/javadoc/index.html[FileObject], not java.io.File and any nodes your UI shows for those files will automatically update.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -53,3 +53,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLogging.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLogging.adoc
index 4490bd7..7bd5773 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLogging.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLogging.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLogging
-:jbake-type: wiki
+= Using java.util.logging in NetBeans
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLogging
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Using java.util.logging in NetBeans
+:wikidevsection: _logging_and_error_handling
+:position: 1
 
 The logging system in NetBeans is based on the standard JDK's java.util.logging and complies to it as much as possible. This document sumarizes the basic usecases and shall be treated as a guide for writing good NetBeans ready logging code. The info given here is valid for default configuration of the logger as it is used in NetBeans. However it is possible to fully replace the system by providing own logging properties as in any other JDK application. Then of course the behaviour may get completely different.
 
@@ -37,7 +37,7 @@
 
 It is possible to use global logger but it is preferred to create named and shared instances of loggers. The latter has the advantage of finer control of what is going to be logged or not, as each named instance can be turned on/off individually by using a command line property.
 
-=== Turning Logging On and Off
+== Turning Logging On and Off
 
 As the logging system is completely JDK based, one can use the traditional properties of LogManager and customize logging completely by themselves.
 
@@ -56,9 +56,9 @@
 
 Of course this only works if the default NetBeans logger is in place. Sometimes however it may make sence to provide completely different logger. This can be done by one of two JDK standard properties: java.util.logging.config.file or java.util.logging.config.class as described at LogManager's javadoc. If these properties are provide during the startup of the system, then the logging is fully dedicated to the configured custom loggers and of course no NetBeans standard configuration properties work.
 
-=== How to Write Logging Friendly Code
+== How to Write Logging Friendly Code
 
-==== Handling Exceptions
+=== Handling Exceptions
 
 To handle an exception and send it to the log file (and possibly show a blinking icon to the user in bottom right corner of the main window):
 
@@ -102,7 +102,7 @@
 
 This code will present a dialog box with warning message extracted from the exception ex sometime in the "future" - e.g. when the AWT event queue is empty and can show the dialog. Use of notifyLater to plain notify is recommended in order to prevent deadlocks and starvations
 
-==== Retain nested stacktraces / change exception type
+=== Retain nested stacktraces / change exception type
 
 To rethrow an exception use standard JDK's Throwable.initCause(Throwable) method. It is going to be properly annotated and printed when sent to logger:
 
@@ -126,7 +126,7 @@
 }
 ----
 
-==== Logging a warning and debug messages
+=== Logging a warning and debug messages
 
 Logging shall usually be done with a named loggers, as that allows proper turning on and off from the command line. To log something into the log file one should use Level.INFO or higher:
 
@@ -164,11 +164,11 @@
 }
 ----
 
-==== Annotate Exceptions
+=== Annotate Exceptions
 
 There is an easy way how to annotate exceptions with localized and non-localized messages in NetBeans. One can use Exceptions.attachMessage or Exceptions.attachLocalizedMessage . The non-localized messages are guaranteed to be printed when one does ex.printStackTrace(), to extract associated localized message one can use Exceptions.findLocalizedMessage .
 
-=== Using Structured Logging for Communication
+== Using Structured Logging for Communication
 
 In spite of what one might think the JDK logging API is not just about sending textual messages to log files, but it can also be used as a communication channel between two pieces of the application that need to exchange structured data. What is even more interesting is that this kind of extended usage can coexist very well with the plain old good writing of messages to log files. This is all possible due to a very nice design of the single "logging record" - the LogRecord.
 
@@ -274,6 +274,7 @@
 
 From: link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html[Logging in NetBeans].
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -285,3 +286,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLogicalKeybindings.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLogicalKeybindings.adoc
index 36fc0b4..3962616 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLogicalKeybindings.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLogicalKeybindings.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLogicalKeybindings
-:jbake-type: wiki
+=  Why should I use D- for Ctrl and O- for Alt - I thought C stood for Ctrl and A stood for alt?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLogicalKeybindings
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _key_bindings
+:position: 3
 
-== Why should I use D- for Ctrl and O- for Alt - I thought C stood for Ctrl and A stood for alt?
 
 (Wondering what this is about?  See the xref:DevFaqKeybindings.adoc[general FAQ item on keybindings]).
 
@@ -40,7 +41,7 @@
 Any alt-bound keybinding on mac is a bug.  If you use the logical syntax for keybindings, your app will always work intuitively on any platform.
 
 Note that the mapping handling does skip key combinations that simply can't work on Mac - for example, Command-H and Command-Q are always consumed by the OS, so D-H and D-Q map to Ctrl-H and Ctrl-Q, respectively, everywhere.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -52,3 +53,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookup.adoc
index ce0442e..d374c6d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookup.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookup
-:jbake-type: wiki
+=  What is a Lookup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookup
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 1
 
-== What is a Lookup?
 
 link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[Lookup] is a mechanism for finding instances of objects.  It is pervasively used in NetBeans APIs.  The general pattern is that you pass a Class object and get back an instance of that class or null.  See the Javadoc for links to articles describing its inspiration and purpose.
 
@@ -101,7 +102,7 @@
 
 Some other module entirely actually registers an implementation of this interface in the xref:DevFaqLookupDefault.adoc[default Lookup].  link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/StatusDisplayer.html[StatusDisplayer] is a good example of this pattern.
 
-=== What if multiple objects of the same type should be available?
+== What if multiple objects of the same type should be available?
 
 A `Lookup` is not limited to containing one singleton of any type.  If there may be more than one of a given type in a Lookup, the syntax is slightly different:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupContents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupContents.adoc
index 41eca2e..2b8b126 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupContents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupContents.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupContents
-:jbake-type: wiki
+= How can I find out what is in a Lookup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupContents
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I find out what is in a Lookup?
+:wikidevsection: _lookup
+:position: 10
 
 The simplest way is to call `Lookup.toString()`.  If you want the output in a more readable form, do the following and print/format the resulting collection as you wish:
 
@@ -42,7 +42,7 @@
 ----
 
 *<u>Do not</u> do either of these things in production code!*
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupCookie.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupCookie.adoc
index 022b988..2914cce 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupCookie.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupCookie.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupCookie
-:jbake-type: wiki
+= What is the difference between getCookie(Class), SharedClassObject.get(Class) and Lookup.lookup(Class)?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupCookie
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 7
 
-== What is the difference between getCookie(Class), SharedClassObject.get(Class) and Lookup.lookup(Class)?
 
 All of these are really historical variations on the same theme.  In all cases, you pass a `Class` object and get back null or an instance of that class.  You can see the progression in genericness:
 
@@ -41,7 +42,7 @@
 
 1. Its return type is `java.lang.Object`, so it can be used directly with anything
 2. Having objects _own_ a lookup rather than directly providing a `lookup(Class c)` method makes it easier to replace or proxy the Lookup of some object
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -53,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupDefault.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupDefault.adoc
index 6635a90..73adb1f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupDefault.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupDefault.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupDefault
-:jbake-type: wiki
+= What is the "default lookup"?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupDefault
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What is the "default lookup"?
+:wikidevsection: _configuration_how_modules_install_things _lookup
+:position: 2 5
 
 The default lookup is `Lookup.getDefault()`.
 It is the registry for global singletons and instances of objects which have been registered in the system by modules.
@@ -82,7 +82,7 @@
 
 ----
 
-=== More About Lookup
+== More About Lookup
 
 * xref:DevFaqLookup.adoc[DevFaqLookup]
 * link:https://bits.netbeans.org/dev/javadoc/usecases.html#usecase-Utilities[Extension Points Tutorial] 
@@ -91,7 +91,7 @@
 
 
 Applies to: NetBeans 6.7 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -103,3 +103,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupEventBus.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupEventBus.adoc
index 6118dd2..3d23b70 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupEventBus.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupEventBus.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupEventBus
-:jbake-type: wiki
+= Using Event Bus in NetBeans
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupEventBus
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Using Event Bus in NetBeans
+:wikidevsection: _lookup
+:position: 15
 
 [source,java]
 ----
@@ -130,7 +130,7 @@
  http://sourceforge.net/projects/werx/
 
 Jasper-Potts - Why Spaghetti Is Not Tasty: Architecting Full-Scale 
-Swing AppsĀ, 2007 JavaOne Conference, TS-3316
+Swing Apps, 2007 JavaOne Conference, TS-3316
 http://developers.sun.com/learning/javaoneonline/j1sessn.jsp?sessn=TS-3316&amp;yr=2007&amp;track=2
 
 (Also see the JMS API and the OMG COS Notification Service API.)
@@ -142,7 +142,7 @@
 Thanks!
 Rob
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -154,3 +154,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupForDataNode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupForDataNode.adoc
index a1432f2..39642bf 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupForDataNode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupForDataNode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupForDataNode
-:jbake-type: wiki
+= How can I add support for `Lookup`s on nodes representing my file type?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupForDataNode
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 11
 
-== How can I add support for `Lookup`s on nodes representing my file type?
 
 Any object you create can implement `Lookup.Provider`. The simplest way to create a mutable lookup is by using `InstanceContent` and `AbstractLookup`.  Simplified typical usage:
 
@@ -52,7 +53,7 @@
 This is how you create a lookup with dynamic content of your choosing.  See also Tom Wheeler's  link:http://www.tomwheeler.com/netbeans/[TodoListManager] for an example of some code that illustrates how to do this.
 
 If you are using `link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html[ProxyLookup]` to proxy another (or multiple) lookups, and you want to change the set of Lookups you are proxying on the fly, you will need to subclass `ProxyLookup` and call the protected method [link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html#setLookups(org.openide.util.Lookup[http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html#setLookups(org.openide.util.Lookup]...) `setLookups(Lookup... lookups)`].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -64,3 +65,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupGenerics.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupGenerics.adoc
index 403b8f1..ae0fff0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupGenerics.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupGenerics.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupGenerics
-:jbake-type: wiki
+= How do I use Java Generics with Lookup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupGenerics
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 4
 
-== How do I use Java Generics with Lookup?
 
 As of NetBeans 6, a number of convenience methods have been added to lookup, and support for Java generics has been added to Lookup.  The following are differences (assume that `lkp` is a [[DevFaqLookup| `Lookup`]]):
 
@@ -81,7 +82,7 @@
     // ...
 }
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -93,3 +94,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupHowToOverride.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupHowToOverride.adoc
index a8906ed..13b639f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupHowToOverride.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupHowToOverride.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupHowToOverride
-:jbake-type: wiki
+= How can I override an instance in the Default Lookup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupHowToOverride
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 6
 
-== How can I override an instance in the Default Lookup?
 
 As a result of NetBeans design for extensibility, you'll find a lot of code like this:
 
@@ -72,7 +73,7 @@
 ----
 
 More information about this and other Lookup-related topics, including how to set the order of registered services, can be link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/api.html[found in the Utilities API documentation].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -84,3 +85,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupImplement.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupImplement.adoc
index fe54ad6..cb4d7d4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupImplement.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupImplement.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupImplement
-:jbake-type: wiki
+= How do I implement my own lookup or proxy another one?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupImplement
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 8
 
-== How do I implement my own lookup or proxy another one?
 
 It is not uncommon to be subclassing a class, such as xref:DevFaqWindowsTopComponent.adoc[TopComponent] or xref:DevFaqWhatIsANode.adoc[Node] which has a method `getLookup()`, and to need to add to or filter the original Lookup's contents.  There are a number of convenience factories and classes which make it easy to do this:
 
@@ -37,7 +38,7 @@
 * link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/AbstractLookup.html[AbstractLookup] - a Lookup which can have dynamic content - use it in conjunction with link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent], which you can add/remove things from
 
 If you need to customize a Node's lookup, read xref:DevFaqNodesCustomLookup.adoc[the FAQ item on how to do that].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -49,3 +50,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupLazyLoad.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupLazyLoad.adoc
index 8f38288..395d7aa 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupLazyLoad.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupLazyLoad.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupLazyLoad
-:jbake-type: wiki
+= How do I lazy-load an item in the Lookup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupLazyLoad
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 15
 
-== How do I lazy-load an item in the Lookup?
 
 A node is typically used to represent some business object and it's a common idiom to place that business object in the node's lookup so that, for example, a context-sensitive action can operate on it.  Sometimes fully initializing that business object can involve an expensive operation that would be wasted effort if the user never invoked the action that used it anyway.  
 
@@ -35,11 +36,11 @@
 
 There are probably several ways, but two common ones are:
 
-=== Override the `beforeLookup(Lookup.Template<?> template)` method
+== Override the `beforeLookup(Lookup.Template<?> template)` method
 
 If you are using the `AbstractLookup` class to create the lookup, you can override the `beforeLookup(Lookup.Template<?> template)`.  By doing this, you will be notified just before a lookup query is processed and you could check to see if the template would match the objects for which you've deferred loading, giving you an opportunity to load them now and add them to the `InstanceContent` used by the `AbstractLookup`.
 
-=== Use `InstanceContent.Convertor` to create a placeholder object
+== Use `InstanceContent.Convertor` to create a placeholder object
 
 The `InstanceContent.Convertor` class can be registered in an `AbstractLookup` such that it provides a typesafe placeholder until the actual object type is requested, and at that point, the convertor can create and return the actual object.
 
@@ -96,7 +97,7 @@
 
 ----
 
-=== Code that creates a Lookup and registers the InstanceContent:
+== Code that creates a Lookup and registers the InstanceContent:
 
 [source,java]
 ----
@@ -129,10 +130,10 @@
 
 ----
 
-=== Lifecycle With InstanceContent.Converter
+== Lifecycle With InstanceContent.Converter
 
 Objects created using an InstanceContent.Converter are only weakly cached by default.  That means that, after AnExpensiveClass is instantiated, it can be garbage collected if no object holds a reference to it in a field.  If the object is going to be queried for repeatedly, you may want your InstanceContent.Converter to cache the last-created value, either for some period of time, or using a SoftReference or hard reference or other caching strategy.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -144,3 +145,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupNonSingleton.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupNonSingleton.adoc
index 4baebd2..517fec4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupNonSingleton.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupNonSingleton.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupNonSingleton
-:jbake-type: wiki
+= If there is more than one of a type in a Lookup, which instance will I get?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupNonSingleton
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 9
 
-== If there is more than one of a type in a Lookup, which instance will I get?
 
 As noted in xref:DevFaqLookup.adoc[the overview of Lookup], a Lookup can contain more than one instance of a given class;  Lookup is often used for singletons, but not exclusively for singletons.  For example, in the link:https://bits.netbeans.org/dev/javadoc/ProjectAPI/overview-summary.html[Projects API], there is a class called link:https://bits.netbeans.org/dev/javadoc/ProjectAPI/org/netbeans/spi/project/ProjectFactory.html[ProjectFactory] that recognizes different types of user projects on disk;  each module that provides a project type registers another factory in the system.
 
@@ -38,7 +39,7 @@
 A Lookup makes no assumptions about what's in it, or what you might want to put in it, or how many of anything there should be.  That contract is an agreement between whoever tells you that you should get an instance of X from some Lookup and you.  If they document that there will only be one, use `Lookup.lookup(Class)`.  If they document that there can be more than one, use `Lookup.lookupAll(Class)` and iterate the results.
 
 In practice this is a non-problem - anything you are going to try to find in a `Lookup` is going to document whether it is supposed to be a singleton or not.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -50,3 +51,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupPackageNamingAndLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupPackageNamingAndLookup.adoc
index 7fef94f..a3933ca 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupPackageNamingAndLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupPackageNamingAndLookup.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupPackageNamingAndLookup
-:jbake-type: wiki
+= After adding my class to Lookup I get a "ClassNotFoundException" when trying to look it up, why?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupPackageNamingAndLookup
@@ -26,13 +26,14 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 13
 
-== After adding my class to Lookup I get a "ClassNotFoundException" when trying to look it up, why?
 
 Q: After adding my class to lookup I get a `ClassNotFoundException` when trying to look it up, why?
 
 A: You might have tried to place the interface and the implementation class in different modules but used the same package name. NetBeans prohibits two or more modules to define classes in the same package. Choose a distinctive package name (or package name prefix) for each module.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +45,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupVsHashmap.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupVsHashmap.adoc
index 9dfd61c..48b2a4c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupVsHashmap.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupVsHashmap.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupVsHashmap
-:jbake-type: wiki
+= Why use this strange convention - wouldn't a Map be good enough?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupVsHashmap
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 3
 
-== Why use this strange convention - wouldn't a Map be good enough?
 
 Other platforms do use string-keyed maps for this sort of thing, but there are some weaknesses with that approach:
 
@@ -41,7 +42,7 @@
 `Lookup` is very powerful, yet simple and generic;  people quickly learn to love it, once they realize what it can do.
 
 See also the javadoc: [link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html] `org.openide.util.Lookup`]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -53,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupWhere.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupWhere.adoc
index f366864..ddc0963 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupWhere.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupWhere.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqLookupWhere
-:jbake-type: wiki
+= What uses Lookup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqLookupWhere
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What uses Lookup?
+:wikidevsection: _lookup
+:position: 2
 
 There are a number of places xref:DevFaqLookup.adoc[Lookup ] is commonly found/used in NetBeans.  Generally, if you have found some class and you are wondering where on earth you get an actual instance of one of those, the answer is probably "from something-or-other's Lookup".
 
@@ -39,6 +39,7 @@
 * `xref:DevFaqWindowsTopComponent.adoc[TopComponent.getLookup()]` - if you are writing a UI component, and want to affect the global selection, but your component doesn't display nodes and you don't have any use for Nodes, you probably want to provide your own Lookup here with whatever you want to include in it (things like link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/OpenCookie.html[OpenCookie], link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/SaveCookie.html[SaveCookie], objects your other UI code may want to track if you're doing a master-detail view, etc.)
 * `link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/Utilities.html#actionsGlobalContext()[Utilities.actionsGlobalContext()]` returns a `Lookup` which represents the global "selection context" in NetBeans.  It is a `ProxyLookup` which proxies the lookup of whichever `xref:DevFaqWindowsTopComponent.adoc[TopComponent]` currently has focus.  So if you listen for changes in the presence or absence of a particular type in this lookup, you will receive appropriate changes whenever the backing `Lookup` being proxied changes.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -50,3 +51,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMIMEResolver.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMIMEResolver.adoc
index 3879eee..3aabdaa 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMIMEResolver.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMIMEResolver.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMIMEResolver
-:jbake-type: wiki
+= How can I create declarative MIMEResolver and add new file type?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMIMEResolver
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 15
 
-== How can I create declarative MIMEResolver and add new file type?
 
 There is a wizard available for NetBeans modules which does this for you. Just run *New File | Module Development | File Type*. Fill in the *MIME Type* text field and choose whether to recognize file by extension or XML root element. If you want more sophisticated recognition, choose "*by Filename Extension*" and edit created resolver xml after you finish the wizard. In the next step type in "*Class Name Prefix*" your preferred prefix and finish the wizard.
 
@@ -45,7 +46,7 @@
 
   Related: xref:DevFaqFileRecognition.adoc[DevFaqFileRecognition]
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +58,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMainTitle.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMainTitle.adoc
index de9c57d..37166c4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMainTitle.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMainTitle.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMainTitle
-:jbake-type: wiki
+= How to change main title contents?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMainTitle
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 23
 
 By default, the main title shows the branding name plus the build number.
 
@@ -107,7 +109,7 @@
 
 * link:http://blogs.kiyut.com/tonny/2007/08/06/netbeans-platform-branding-and-version-info/[Branding version numbers using Ant]
 * xref:DevFaqVersionNumber.adoc[DevFaqVersionNumber]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -119,3 +121,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMavenHowToMigrateFromANT.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMavenHowToMigrateFromANT.adoc
index 0f7e211..42db0c8 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMavenHowToMigrateFromANT.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMavenHowToMigrateFromANT.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMavenHowToMigrateFromANT
-:jbake-type: wiki
+= How to convert an ANT-based NetBeans Module to a Maven-based NetBeans Module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMavenHowToMigrateFromANT
@@ -26,10 +26,12 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _mavenized_builds
+:position: 5
 
 The following list was created while converting a simple plugin with less than 20 classes, so the migration steps of large projects might vary. But you should get the basic idea.
 
-* create a new maven based NBM using the “New Project”-wizard (to reuse a working configuration)
+* create a new maven based NBM using the "New Project"-wizard (to reuse a working configuration)
 * copy the folder src and pom.xml to the old project
 * in pom.xml
 * define a groupId
@@ -46,7 +48,7 @@
 * move your sources (*.java) to src/main/java (or src/test/java) (GIT is very useful here, the commit history isn’t lost)
 * move your resources (not *.java) to src/main/resources (or src/test/resources) (especially Bundle.properties)
 * add dependencies (the most annoying part)
-* foreach dependency entry (code-name-base) in nbproject/project.xml add a dependency via the “Add dependency” dialog OR add a dependency manually to pom.xml
+* foreach dependency entry (code-name-base) in nbproject/project.xml add a dependency via the "Add dependency" dialog OR add a dependency manually to pom.xml
 
 For example use
 
@@ -110,6 +112,7 @@
 
 Copied from link:http://benkiew.wordpress.com/2013/10/21/how-convert-an-ant-based-netbeans-module-to-a-maven-based-netbeans-module/[http://benkiew.wordpress.com/2013/10/21/how-convert-an-ant-based-netbeans-module-to-a-maven-based-netbeans-module/]. Tested with NB7.4
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -121,3 +124,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMavenL10N.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMavenL10N.adoc
index 83efd61..f47bb16 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMavenL10N.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMavenL10N.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMavenL10N
-:jbake-type: wiki
+= How can I create localization modules using Maven?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMavenL10N
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _mavenized_builds
+:position: 2
 
-== How can I create localization modules using Maven?
 
 If you have localized versions of resources _in your own modules_, you can simply place them alongside the base version; for example, `src/main/resources/my/module/Bundle_de.properties` would provide a German translation of `src/main/resources/my/module/Bundle.properties`.
 
@@ -44,6 +45,7 @@
 
 The module bundling the localizations can now be included in your app, or distributed by any other means. When the specified locale is active, your localizations will be applied.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -55,3 +57,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMavenPlatformRebel.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMavenPlatformRebel.adoc
index 88545c8..659e2f5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMavenPlatformRebel.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMavenPlatformRebel.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMavenPlatformRebel
-:jbake-type: wiki
+=  Can I use JRebel to speed up development?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMavenPlatformRebel
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Can I use JRebel to speed up development?
+:wikidevsection: _mavenized_builds
+:position: 4
 
 Yes, you can. Once you have obtained JRebel and installed it locally, paste the following snippet into your application's root pom (parent of both the NetBeans application project and any NetBeans module projects you want to have reloaded upon change).
 
@@ -84,6 +84,7 @@
 
 The solution was tested with nbm-maven-plugin 3.8 and JRebel 5.0.1
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -95,3 +96,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMavenSystemScope.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMavenSystemScope.adoc
index 6a5ded9..5da2f1b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMavenSystemScope.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMavenSystemScope.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMavenSystemScope
-:jbake-type: wiki
+= Why can't I use system scope for a library wrapper module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMavenSystemScope
@@ -26,13 +26,14 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Why can't I use system scope for a library wrapper module?
+:wikidevsection: _mavenized_builds
+:position: 3
 
 System-scope dependencies, like provided scope, are never packaged with a project's artifacts.
 
 See link:http://jira.codehaus.org/browse/MNBMODULE-120[MNBMODULE-120] for discussion and alternative solutions.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +45,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMemoryLeaks.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMemoryLeaks.adoc
index 829c41f..eeef362 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMemoryLeaks.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMemoryLeaks.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMemoryLeaks
-:jbake-type: wiki
+= How can I fix memory leaks?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMemoryLeaks
@@ -26,17 +26,18 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 29
 
-== How can I fix memory leaks?
 
 The first problem is to identify what is the root problem causing memory to not be used effectively.
 The usual approach for this is to analyze the complete contents of memory when the problem appears, using one of a number of appropriate tools, and ideally then find a solution.
 
 Below are some hints on how to analyze the content of memory:
 
-=== `jmap` and built-in dumpers in JDK
+== `jmap` and built-in dumpers in JDK
 
-==== Obtain the dump.
+=== Obtain the dump.
 
 If the problem causes `OutOfMemoryError`, it is possible to customize the JVM to provide a memory dump automatically whenever an `OutOfMemoryError` is thrown.
 xref:FaqNetBeansAndOOME.adoc[FaqNetBeansAndOOME] describes what options can be used for this.
@@ -47,7 +48,7 @@
 You can do this by turning memory toolbar on (do a right click in toolbar area and check *Memory*).
 Repeating this several times can even collect large amounts of data held in various caches through soft or weak references and make it easier to browse the dump.
 
-==== Analyze the problem.
+=== Analyze the problem.
 
 Once you have the dump of the heap in a file, it is possible to open it using
 the NetBeans profiler.
@@ -59,7 +60,7 @@
 finding of reference chains from GC root to certain objects.
 JavaScript can be used to express more complex queries.
 
-=== Other tools
+== Other tools
 
 INSANE is a home-grown tool that is useful for analysis of memory content and also can be used in automated tests - so once you have fixed a memory leak, you can write a test that will fail if the memory leak is ever recreated.
 `NbTestCase.assertGC` is all you need to know. See also xref:FitnessMemoryLeaks.adoc[FitnessMemoryLeaks].
@@ -68,9 +69,9 @@
 
 Advanced: link:http://www.opensolaris.org/os/community/dtrace/[DTrace] can be used to monitor object allocation and garbage collection. Nice article about using DTrace with the HotSpot provider: link:http://www.solarisinternals.com/wiki/index.php/DTrace_Topics_Java[Java and DTrace].
 
-=== Tips and tricks
+== Tips and tricks
 
-==== Common leaking objects
+=== Common leaking objects
 
 There are some typical classes where it should be easily possible to tell
 what the appropriate number of their instances in memory should be,
@@ -83,7 +84,7 @@
 * `ClassLoader` - we need to be very careful and check that class loaders created dynamically during runtime can be GC'ed when they are no longer used. Without this the result is OOME signaling that perm gen area is full.
 * `CompilationInfo` (`java.source` module) - related to Java infrastructure. An important class where you can start is `com.sun.tools.javac.code.Symtab`, which is a singleton in a javac instance.
 
-==== Leaks vs. retained memory
+=== Leaks vs. retained memory
 
 There are two different ways how memory can be wasted: leaks and improper retention of memory.
 
@@ -112,7 +113,7 @@
 Platforms: All
 
 xref:Category:Performance:HowTo.adoc[Category:Performance:HowTo]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -124,3 +125,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMigratingToNewerPlatform.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMigratingToNewerPlatform.adoc
index 6631d05..25b8f4d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMigratingToNewerPlatform.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMigratingToNewerPlatform.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMigratingToNewerPlatform
-:jbake-type: wiki
+= Migrating to a newer version of the Platform
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMigratingToNewerPlatform
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Migrating to a newer version of the Platform
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 37
 
 When migrating a module suite application to use a newer version of the platform you may want to be aware of the following issues:
 
@@ -76,7 +76,7 @@
 == Further Resources
 
 * link:http://bruehlicke.blogspot.com/2016/10/porting-my-nb-65-rcp-app-to-nb-82.html[http://bruehlicke.blogspot.com/2016/10/porting-my-nb-65-rcp-app-to-nb-82.html]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -88,3 +88,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMixingLightweightHeavyweight.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMixingLightweightHeavyweight.adoc
index 933cf53..61f47ac 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMixingLightweightHeavyweight.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMixingLightweightHeavyweight.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMixingLightweightHeavyweight
-:jbake-type: wiki
+= How to mix lightweight (Swing) and heavyweight (AWT) components?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMixingLightweightHeavyweight
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 25
 
-== How to mix lightweight (Swing) and heavyweight (AWT) components?
 
 Since JDK 6 update 12 and JDK 7, support for mixing of AWT (heavyweight, native widgets) and Swing (lightweight, pure Java widgets) is available and usually works quite well. However, placing a native AWT Component within a Swing container hierarchy with customizations may cause unwanted side-effects and can therefor be disabled.
 
@@ -52,7 +53,7 @@
 
 
 Applies to: NetBeans 7.3 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -64,3 +65,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModifyOpenFile.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModifyOpenFile.adoc
index 7f6e71b..f9764c2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModifyOpenFile.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModifyOpenFile.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModifyOpenFile
-:jbake-type: wiki
+= Is it safe to programmatically modify a file which is open in the editor?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModifyOpenFile
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 8
 
-== Is it safe to programmatically modify a file which is open in the editor?
 
 It is not safe to modify a `FileObject` (via `getOutputStream`) which is open and _modified_ in the editor. In fact, it is not possible: calling `FileObject.lock()` will fail. If you modify the `java.io.File` (bypassing the Filesystems API) you may cause a conflict.
 
@@ -36,7 +37,7 @@
 If the file _is_ modified you can make changes to the open editor buffer: use `EditorCookie` to acquire the Swing `Document` and make changes through that. It may be considered impolite to then save the file if it was modified before.
 
 Applies to: NetBeans 4.0 and newer
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +49,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModuleCCE.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModuleCCE.adoc
index d915e9a..83f792f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModuleCCE.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModuleCCE.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModuleCCE
-:jbake-type: wiki
+= Why am I getting a `ClassCastException` when the class is clearly of the right type?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModuleCCE
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Why am I getting a `ClassCastException` when the class is clearly of the right type?
+:wikidevsection: _module_system
+:position: 6
 
 Q: I am getting an exception when I run my module, such as
 
@@ -89,7 +89,7 @@
 
 
 Applies to: NetBeans 6.5 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -101,3 +101,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModuleDependencies.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModuleDependencies.adoc
index 3c97c6d..7506bf4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModuleDependencies.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModuleDependencies.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModuleDependencies
-:jbake-type: wiki
+= How do module dependencies and class loading work?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModuleDependencies
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do module dependencies and class loading work?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 2
 
 The nuts and bolts of module dependencies are as follows:
 
@@ -67,7 +67,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -79,3 +79,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModuleDupePackages.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModuleDupePackages.adoc
index 4bad335..16b25e2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModuleDupePackages.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModuleDupePackages.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModuleDupePackages
-:jbake-type: wiki
+= Can two or more modules contain the same package?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModuleDupePackages
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _module_system
+:position: 7
 
-== Can two or more modules contain the same package?
 
 Yes, NetBeans does permit multiple modules to load from a single package.
 However, this should be considered poor style and avoided whenever possible.
@@ -36,7 +37,7 @@
 (e.g. classes contained in different modules).
 
 Applies to: NetBeans 6.1 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +49,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModuleLoadUnloadNotification.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModuleLoadUnloadNotification.adoc
index 6ee3b9d..225d6f7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModuleLoadUnloadNotification.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModuleLoadUnloadNotification.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModuleLoadUnloadNotification
-:jbake-type: wiki
+= How can code in one module be notified when other modules are loaded or unloaded?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModuleLoadUnloadNotification
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can code in one module be notified when other modules are loaded or unloaded?
+:wikidevsection: _module_system
+:position: 9
 
 Let's begin by stating that you probably do not _need_ to know when other modules are loaded or unloaded.
 The module system takes care of dependency management for you,
@@ -94,7 +94,7 @@
 
 
 Applies to: NetBeans 6.7 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -106,3 +106,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModuleObfuscation.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModuleObfuscation.adoc
index 4ef35db..c5d1f4e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModuleObfuscation.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModuleObfuscation.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModuleObfuscation
-:jbake-type: wiki
+= Can I obfuscate a module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModuleObfuscation
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Can I obfuscate a module?
+:wikidevsection: _module_system
+:position: 5
 
 If you want to protect a NetBeans module from disassembly, you can obfuscate it.
 For example you can use link:http://proguard.sourceforge.net/[ProGuard], an open-source obfuscator.
@@ -222,7 +222,7 @@
 
 
 This is verified to work on NB 6.5 running Solaris or Windows using Proguard 4.1. (`proguard.jar` 548 Kb) Issues were found with 4.2. Others versions (current Feb 2010) the 4.5 beta is out has not been tested yet. For Mac OS X you will need to softlink the classes.jar to rt.jar as described in link:http://bruehlicke.blogspot.com/search/label/Mac%20OS%20X[ This blog entry]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -234,3 +234,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModulePatching.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModulePatching.adoc
index 74f5b9d..62821cf 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModulePatching.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModulePatching.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModulePatching
-:jbake-type: wiki
+= How do I create a patch for a preexisting NetBeans module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModulePatching
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 25
 
-== How do I create a patch for a preexisting NetBeans module?
 
 If you need to patch an existing module, you can place a JAR file relative to the original.
 For example, to patch `ide/modules/org-openide-example.jar`
@@ -49,7 +50,7 @@
 
 
 Applies to: NetBeans 6.x
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -61,3 +62,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModuleReload.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModuleReload.adoc
index 8834892..c4f95b9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModuleReload.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModuleReload.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModuleReload
-:jbake-type: wiki
+= Do I need to restart NetBeans every time to debug new changes?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModuleReload
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 39
 
-== Do I need to restart NetBeans every time to debug new changes?
 
 Q: I am going to develop something on the NetBeans platform, and the question is - do I need to restart NetBeans every time to debug new changes?
 
@@ -42,7 +43,7 @@
 5. Do not run the project; just select Reload in Development IDE from the context menu. Similar to #3 but reloads inside the current IDE, not in a separate target platform.
 
 Procedure #2 is safest. #1 is fine for minor tweaks. #4 basically supersedes #3 if you do not mind using an added tool, and is most convenient when you are making a lot of nontrivial changes in rapid succession. #5 is not recommended except for demos.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +55,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
index 25ea108..b3d080a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModulesDeclarativeVsProgrammatic
-:jbake-type: wiki
+= Installing things declaratively as opposed to programmatically
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModulesDeclarativeVsProgrammatic
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Installing things declaratively as opposed to programmatically
+:wikidevsection: _when_there_are_multiple_ways_to_do_something
+:position: 1
 
 Long ago, in a galaxy far far away, most objects in NetBeans were created during startup.  That works fine for a small application.  It is disaster for a large application - with each new component in the system, startup time gets longer, garbage collections get more frequent and memory requirements rise.
 
@@ -45,7 +45,7 @@
 
 
 Applies to: NetBeans 6.7 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +57,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModulesLayerFile.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModulesLayerFile.adoc
index b452f40..1ce0a1e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModulesLayerFile.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModulesLayerFile.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModulesLayerFile
-:jbake-type: wiki
+= What is a layer file, or "module layer"?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModulesLayerFile
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 4
 
-== What is a layer file, or "module layer"?
 
 Layer files are small XML files provided by modules, which define a virtual filesystem (xref:DevFaqFileSystem.adoc[DevFaqFileSystem]).
 The layer file defines folders and files that will be merged into the system filesystem (xref:DevFaqSystemFilesystem.adoc[DevFaqSystemFilesystem])
@@ -58,7 +59,7 @@
 
 
 Applies to: NetBeans 6.7 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -70,3 +71,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModulesStartupActions.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModulesStartupActions.adoc
index 7475d1d..7530041 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModulesStartupActions.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModulesStartupActions.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModulesStartupActions
-:jbake-type: wiki
+= How do I run some code when my module starts/loads/unloads?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModulesStartupActions
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I run some code when my module starts/loads/unloads?
+:wikidevsection: _configuration_how_modules_install_things
+:position: 3
 
 To run some code when your module is loaded, and basically every time the IDE starts and your module is enabled, simply create a subclass of `org.openide.modules.ModuleInstall` and override the `restored()` method. Bear in mind that this is being executing during the time the IDE/platform is starting up. You should limit the work you do here to that which is absolutely necessary.
 
@@ -45,7 +45,7 @@
 
 
 Applies to: NetBeans 6.5 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +57,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMpl3rdPartySources.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMpl3rdPartySources.adoc
index 438ed69..4c12916 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMpl3rdPartySources.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMpl3rdPartySources.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMpl3rdPartySources
-:jbake-type: wiki
+= Where to download sources of MPL third-party components?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMpl3rdPartySources
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Where to download sources of MPL third-party components?
+:wikidevsection: _licensing_issues
+:position: 2
 
 The following third-party components licensed under MPL license have the sources available for download from netbeans.org:
 
@@ -39,6 +39,7 @@
 |Saxon-B 9.1.0.8 |ide/modules/ext/saxon9B.jar |link:https://netbeans.osuosl.org/binaries/185ACF7DA49C4A925C45472138E46A397835B44B-saxonb9-1-0-8source.zip[saxonb9-1-0-8source.zip] 
 |===
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -50,3 +51,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMultipleProgrammaticEdits.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMultipleProgrammaticEdits.adoc
index 80c5697..bb642f0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMultipleProgrammaticEdits.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMultipleProgrammaticEdits.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMultipleProgrammaticEdits
-:jbake-type: wiki
+=  I want to make some programmatic changes to the edited file. How can I do it so one Undo undoes it all?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMultipleProgrammaticEdits
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I want to make some programmatic changes to the edited file. How can I do it so one Undo undoes it all?
+:wikidevsection: _editor_and_edited_files
+:position: 9
 
 Create a `Runnable` that will do all of the code generation/munging you want to do.  Pass it to `org.openide.text.NbDocument.runAtomic(doc, runnable)`.
 
@@ -77,7 +77,7 @@
 Applies to: All Netbeans versions
 
 Platforms: All
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -89,3 +89,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMultipleTopComponentAction.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMultipleTopComponentAction.adoc
index 964d093..23f47eb 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMultipleTopComponentAction.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMultipleTopComponentAction.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMultipleTopComponentAction
-:jbake-type: wiki
+=  I have a non-singleton TopComponent. Can I write actions which show all available instances in the main menu?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMultipleTopComponentAction
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I have a non-singleton TopComponent. Can I write actions which show all available instances in the main menu?
+:wikidevsection: _window_system
+:position: 19
 
 Some people applications where there is one primary kind of window component - an editor of some kind, or something that visualizes some data.  There may be several such components open at any time, and they all are just instances of the same TopComponent subclass which are showing different data.
 
@@ -37,7 +37,7 @@
 2. Write an Action which provides an array of menu items, one for each TopComponent instance
 3. Register that action in one of the main window menus
 
-=== Tracking TopComponents And Creating Actions For Them
+== Tracking TopComponents And Creating Actions For Them
 
 Keeping track of all of the instances of our TopComponent subclass is simple.  Whenever a new one is constructed, we will just add it to a list.  There are only two caveats:
 
@@ -132,7 +132,7 @@
 
 This class contains _persistence_ code - particularly the `link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-settings/org/netbeans/api/settings/ConvertAsProperties.html[@ConvertAsProperties]` annotation and the methods `readProperties()``writeProperties()` and `getPersistenceType()`.  These methods save some information about our TopComponent to disk on shutdown, in the form of a `link:http://java.sun.com/javase/6/docs/api/java/util/Properties.html[Properties]` object.  If we do not want our components to be reopened after an application restart, we can just return `PERSISTENCE_NEVER` from `getPersistenceType()`, and delete the other persistence-related methods and the annotation.  Note that you can omit the `*Properties()` methods and the annotation, and the components _will_ be reopened on startup&mdash;but without persistence code, this is done by serializing the whole component to disk, which is both slower and stores more data than necessary.  Typically, for an editor component, just storing the path to the file being edited is enough.
 
-=== Writing an Action which provides an array of menu items
+== Writing an Action which provides an array of menu items
 
 The `link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/DynamicMenuContent.html[DynamicMenuContent]` interface allows an Action to act as a factory for menu items - to control what components are shown in a menu to represent it.  It also allows a single action to produce multiple menu items.
 
@@ -181,7 +181,7 @@
         return new JComponent[] { menu };
 ----
 
-=== Registering The Action
+== Registering The Action
 
 Now we just need to actually add our multi-item action to the main menu, by registering it in our module's xref:DevFaqModulesLayerFile.adoc[XML layer].
 
@@ -214,7 +214,7 @@
     &amp;lt;/folder&amp;gt;
 &amp;lt;/filesystem&amp;gt;
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -226,3 +226,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNBMPack200.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNBMPack200.adoc
index c31c717..df40edf 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNBMPack200.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNBMPack200.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNBMPack200
-:jbake-type: wiki
+= Using pack200 compression for NBM files
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNBMPack200
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 9
 
-== Using pack200 compression for NBM files
 
 Starting with NetBeans 6.9 we have possibility to significantly decrease NBM file size by using pack200 compression. By default, all modules are now compressed during the build. 
 There are several options to override that behaviour :
@@ -37,7 +38,7 @@
 * Set _pack200.excludes=modules/somecodename.jar_ (supports standard Ant's patterns) to exclude particular module jar files. This can be used to disable compression for some jars in case pack200 cause troubles for there jars after installation.
 
 More info: xref:FitnessForNBMs.adoc[FitnessForNBMs]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -49,3 +50,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNativeLibraries.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNativeLibraries.adoc
index 20a8002..b0bdbe8 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNativeLibraries.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNativeLibraries.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNativeLibraries
-:jbake-type: wiki
+= How do I add native libraries to my module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNativeLibraries
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 14
 
-== How do I add native libraries to my module?
 
 DLLs or SOs can be placed in the folder `release/modules/lib/` in a module project's sources (look in the *Files* tab). This will make them appear in the final NBM or application in a `lib` subdirectory beneath where the module's JAR resides. Then just use `System.loadLibrary` as usual.
 
@@ -35,7 +36,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -47,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNbIdiosyncracies.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNbIdiosyncracies.adoc
index 45823f4..b12ff7f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNbIdiosyncracies.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNbIdiosyncracies.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNbIdiosyncracies
-:jbake-type: wiki
+=  Common calls that should be done slightly differently in NetBeans than standard Swing apps (loading images, localized strings, showing dialogs)
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNbIdiosyncracies
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Common calls that should be done slightly differently in NetBeans than standard Swing apps (loading images, localized strings, showing dialogs)
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 24
 
 There are a few cases where NetBeans has convenience classes or facilities that you should use, instead of doing them the way you may be used to.  They are:
 
@@ -44,7 +44,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -56,3 +56,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNbPlatformAndHarnessMixAndMatch.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNbPlatformAndHarnessMixAndMatch.adoc
index 8a82730..0be86e0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNbPlatformAndHarnessMixAndMatch.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNbPlatformAndHarnessMixAndMatch.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNbPlatformAndHarnessMixAndMatch
-:jbake-type: wiki
+= I want to use one version of the Platform with another version of the build harness. Can I?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNbPlatformAndHarnessMixAndMatch
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 26
 
-== I want to use one version of the Platform with another version of the build harness. Can I?
 
 Yes, you can use a pristine platform download (or platform built from sources)
 and use an external harness from another platform version without sacrificing repeatable builds.
@@ -48,6 +49,7 @@
 harness.dir=${suite.dir}/../special-harness
 ----
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -59,3 +61,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNbmPostInstall.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNbmPostInstall.adoc
index 65ac4ca..52d1ed5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNbmPostInstall.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNbmPostInstall.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNbmPostInstall
-:jbake-type: wiki
+= How to specify post-install code in xref:NBM.adoc[NBM]
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNbmPostInstall
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 6
 
-== How to specify post-install code in xref:NBM.adoc[NBM]
 
 xref:NBM.adoc[NBM] allows to declare its own custom code in xref:NBM.adoc[NBM] archive. This code is called-back by `Autoupdate/Updater` at the end of installation of xref:NBM.adoc[NBM] into IDE.
 
@@ -88,7 +89,7 @@
 |%JAVA_HOME% |the current Java home 
 |===
 
-=== Example
+== Example
 
 * Download and unzip a project xref:Media:samplepostinstall_DevFaqNbmPostInstall.zip.adoc[samplepostinstall_DevFaqNbmPostInstall.zip]
 * Go into `samplepostinstall/main` directory
@@ -111,7 +112,7 @@
 _I'm not author of this feature, it's only my investigation._
 
 Do not hesitate to contact me on mailto:jrechtacek@netbeans.org if you have any question.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -123,3 +124,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNetBeansFullHack.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNetBeansFullHack.adoc
index 273ac4c..9828e5e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNetBeansFullHack.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNetBeansFullHack.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNetBeansFullHack
-:jbake-type: wiki
+= Can I test changes to the IDE without going through the license check and so on?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNetBeansFullHack
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 34
 
-== Can I test changes to the IDE without going through the license check and so on?
 
 If you set the system property `netbeans.full.hack` to `true`,
 the following IDE behaviors will be disabled
@@ -64,7 +65,7 @@
 ----
 
 to `nbbuild/user.build.properties` or `~/.nbbuild.properties`.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -76,3 +77,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNetBeansProjectsDirectory.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNetBeansProjectsDirectory.adoc
index 72f087f..7a48a98 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNetBeansProjectsDirectory.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNetBeansProjectsDirectory.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNetBeansProjectsDirectory
-:jbake-type: wiki
+= How can I customize the default project directory for my application, replacing "NetBeansProjects"?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNetBeansProjectsDirectory
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 36
 
-== How can I customize the default project directory for my application, replacing "NetBeansProjects"?
 
 You configure such things either in the launcher (netbeans.conf for the NB IDE, some other *.conf for a custom app), or at runtime in a ModuleInstall. 
 
@@ -48,6 +49,7 @@
 
 link:http://osdir.com/ml/java.netbeans.modules.openide.devel/2007-12/msg00195.html[http://osdir.com/ml/java.netbeans.modules.openide.devel/2007-12/msg00195.html]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -59,3 +61,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNewXMLFileType.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNewXMLFileType.adoc
index a58c742..bbbe821 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNewXMLFileType.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNewXMLFileType.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNewXMLFileType
-:jbake-type: wiki
+= How do I add support for an XML type with a different extension?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNewXMLFileType
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 12
 
 > I want to add some special
 
@@ -260,7 +262,7 @@
 ----
 
 
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -272,3 +274,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNoClassDefFound.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNoClassDefFound.adoc
index 3f9ac5c..dae4138 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNoClassDefFound.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNoClassDefFound.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNoClassDefFound
-:jbake-type: wiki
+= My module uses some class from NetBeans' APIs. It compiles, but I get a NoClassDefFoundError at runtime. Why?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNoClassDefFound
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 16
 
-== My module uses some class from NetBeans' APIs. It compiles, but I get a NoClassDefFoundError at runtime. Why?
 
 Normally this should not happen because the module build harness tries to protect you from such cases. Still, if it does happen, it could mean
 
@@ -47,7 +48,7 @@
 Problem #3 may happen if you change your modules name. If some module declared yours as a friend
 it will no longer recognize it.
 
-=== Checking for errors eagerly
+== Checking for errors eagerly
 
 For a nice way to resolve all module dependencies at once, to force all of the errors to be exposed simultaneously, just add the following to the command line when starting NetBeans:
 
@@ -55,7 +56,7 @@
 
 The message displayed states that when using this flag, you should _not_ use the `-J-Xverify:none` flag (often specified in the IDE configuration file), so you may need to edit the `.conf` file to remove the -Xverify option before using the pre-resolve option.
 
-=== More tips
+== More tips
 
 For help on working with class paths, please see
 
@@ -64,7 +65,7 @@
 Applies to: NetBeans 6.x
 
 Platforms: all
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -76,3 +77,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeChildrenDotLeaf.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeChildrenDotLeaf.adoc
index 7114fe7..5e87fc3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeChildrenDotLeaf.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeChildrenDotLeaf.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodeChildrenDotLeaf
-:jbake-type: wiki
+= Why do my nodes in the Explorer always have an expand-box by them, even though they have no children?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodeChildrenDotLeaf
@@ -26,12 +26,13 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 23
 
-== Why do my nodes in the Explorer always have an expand-box by them, even though they have no children?
 
 Nodes are not asked for their child nodes until the user tries to expand them - to do otherwise would be very bad for performance.  If your Node is not supposed to have child nodes, use `Children.LEAF` as the children object passed to the constructor.  That will eliminate the expand handle.
 
-=== Remove the expander, if you know the parent-/child-hierarchy at creation time
+== Remove the expander, if you know the parent-/child-hierarchy at creation time
 
 (Taken from platform-dev mailinglist - author Mark J.Koch - mark@maehem.com)
 
@@ -58,7 +59,7 @@
     }
 } 
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -70,3 +71,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeDataObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeDataObject.adoc
index cb0880b..3c8837d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeDataObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeDataObject.adoc
@@ -17,17 +17,17 @@
 //     under the License.
 //
 
-= DevFaqNodeDataObject
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
+= How do I get a Node for a DataObject?
+:jbake-type: wikidev
+:jbake-tags: wiki, devfaq
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodeDataObject
 :description: Apache NetBeans wiki DevFaqNodeDataObject
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I get a Node for a DataObject?
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 7
 
 Very simply: 
 
@@ -36,15 +36,3 @@
 
 theDataObject.getNodeDelegate()
 ----
-
-== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/DevFaqNodeDataObject[http://wiki.netbeans.org/DevFaqNodeDataObject] , 
-that was last modified by NetBeans user Admin 
-on 2009-11-06T15:55:55Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeDeletionDialog.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeDeletionDialog.adoc
index 0f4d886..2eb30f3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeDeletionDialog.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeDeletionDialog.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodeDeletionDialog
-:jbake-type: wiki
+= How can I prevent (or override) the node deletion dialog?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodeDeletionDialog
@@ -26,15 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I prevent (or override) the node deletion dialog?
+:wikidevsection: _nodes_and_explorer
+:position: 24
 
 By default, you will be prompted to confirm your intention whenever you try to delete a node from within an explorer manager view (for example, the projects tab).  You can prevent this dialog from being shown, which is handy if the node is not important enough to warrant confirmation or if you want to instead show your own confirmation.
 
 To do this, call `setValue("customDelete", Boolean.TRUE)` on the node on which you want to suppress confirmation.  This can be done at any time before the `destroy()` method is invoked.
 
 The above will suffice if you just want to suppress the aforementioned dialog which is sufficient for most customization cases.  But if you need *total* control over node deletion, you can implement the link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExtendedDelete.html[ExtendedDelete] interface.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -46,3 +46,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
index 8f62deb..0f94aaa 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodeInjectingLookupContents
-:jbake-type: wiki
+= I want to allow other modules to inject objects into my Node's Lookup or elsewhere (Actions, Properties...)
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodeInjectingLookupContents
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 31
 
-== I want to allow other modules to inject objects into my Node's Lookup or elsewhere (Actions, Properties...)
 
 There is a simple general method for allowing you to define your own registry of objects as a folder in the System Filesystem, and look them up on demand.  
 
@@ -46,7 +47,7 @@
 
 You can use this pattern for properties, or whatever.  If you want your Node to respond to new modules being loaded on the fly, you may want to get a Lookup.Result and listen for changes on it (not necessary in the example above, but necessary for things like Lookup contents or Properties, which are cached).
 
-=== Injecting Lookup Contents
+== Injecting Lookup Contents
 
 First, be sure this is something you really need.  Typically, you expose some model object from your Node, and xref:DevFaqActionContextSensitive.adoc[write Actions that are sensitive to it].
 
@@ -153,7 +154,7 @@
 ----
 
 Note that objects created by such factories will be _weakly cached_ by the lookup - if no object is holding a reference to the object, it can be garbage collected.  If such objects are expensive to create, or if you expect callers to attach listeners to the factory-created objects, you may want to cache them in your implementation of `InstanceContent.Converter`.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -165,3 +166,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodePropertyForFiles.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodePropertyForFiles.adoc
index 6962728..4582dfe 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodePropertyForFiles.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodePropertyForFiles.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodePropertyForFiles
-:jbake-type: wiki
+= I have a Node.Property for a file. How can I control the file chooser that is the custom editor?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodePropertyForFiles
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I have a Node.Property for a file. How can I control the file chooser that is the custom editor?
+:wikidevsection: _nodes_and_explorer
+:position: 29
 
 A number of the built-in property editors in NetBeans can have their behavior controlled by passing "hints" to them.  Hints are providing by calling link:http://java.sun.com/j2se/1.5.0/docs/api/java/beans/FeatureDescriptor.html?is-external=true#setValue(java.lang.String,%20java.lang.Object)[setValue("something", someValue)] on the Node.Property.  For example, to suppress the custom editor button for a property, use
 
@@ -58,7 +58,7 @@
 |===
 
 The built-in bean property editors in NetBeans are found in the package `org.netbeans.beaninfo` editors in the module `o.n.core` in NetBeans' sources.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -70,3 +70,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeSelectAll.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeSelectAll.adoc
index 7da8dd1..fe77795 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeSelectAll.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeSelectAll.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodeSelectAll
-:jbake-type: wiki
+= How can I implement "Select all/Deselect all/Invert selection" features?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodeSelectAll
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 22
 
-== How do I select/deselect `Node`s?
 
 Applications which manage sets of data items often offer to users the capability of selecting and deselecting all the items currently on the screen with a single menu (or key shortcut). In some cases even a "Invert selection" option could be useful which selects all unselected nodes an vice versa.
 
@@ -235,7 +236,7 @@
 -- Main.fabriziogiudici - 06 Jul 2006
 
 xref:CategoryNeedCleanup.adoc[PENDING: Review/cleanup]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -247,3 +248,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeSerialize.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeSerialize.adoc
index 1c3c854..d3c2c79 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeSerialize.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeSerialize.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodeSerialize
-:jbake-type: wiki
+= How do I serialize my nodes?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodeSerialize
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I serialize my nodes?
+:wikidevsection: _nodes_and_explorer
+:position: 7
 
 When you serialize your nodes, you save them to disk so that when the application restarts, they can be used again in the application in the state that they were when the application shut down.
 
@@ -43,7 +43,7 @@
 
 * xref:../blogs/geertjan/serializing_nodes.adoc[Serializing Nodes]
 * xref:../blogs/geertjan/multiple_nodes_serialization.adoc[Serializing Marilyn Monroe]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -55,3 +55,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeSubclass.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeSubclass.adoc
index be9a0b5..900c87d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeSubclass.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeSubclass.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodeSubclass
-:jbake-type: wiki
+= I need to create my own Nodes. What should I subclass?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodeSubclass
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Creating Node Subclasses
+:wikidevsection: _nodes_and_explorer
+:position: 6
 
 Nodes are useful for many things beyond just representing files.  If you just need a placeholder `Node`, you do not need a subclass - just instantiate an `AbstractNode` - despite its name, `AbstractNode` is not an abstract class.  For example:
 
@@ -48,7 +48,7 @@
 * link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataNode.html[DataNode] - a Node subclass specific to editing files.  If you are writing a module that adds support for a new file type (such as `.svg` files), you will write a `DataNode` subclass to give files of that type icons, display names, and possibly provide access to the file's content
 
 Note that if you just want to write context sensitive code, not provide your own Nodes, you may be able to do it without a dependency on the Nodes API, using xref:DevFaqTrackGlobalSelection.adoc[Utilities.actionsGlobalContext()].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -60,3 +60,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeViewCapability.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeViewCapability.adoc
index 7ebff02..1261ad8 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeViewCapability.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeViewCapability.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodeViewCapability
-:jbake-type: wiki
+= How can I add a "View" capability for data my node represents
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodeViewCapability
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I add a "View" capability for data my node represents
+:wikidevsection: _nodes_and_explorer
+:position: 21
 
 Let's say that you've added support for a new file type in your application.  You want to be able to provide an action by which users can "view" the file, which might open it up in the source editor (for text-based files) or a custom editor you've created in Swing.  How can you add this view action?
 
@@ -46,7 +46,7 @@
 == See also:
 
 * xref:DevFaqActionContextSensitive.adoc[How do I create an Action that is automatically enabled and disabled depending on the selection?]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -58,3 +58,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodesChildFactory.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodesChildFactory.adoc
index 521c619..eaff1ed 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodesChildFactory.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodesChildFactory.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodesChildFactory
-:jbake-type: wiki
+= I need to show Nodes for objects that are slow to create. How do I compute Node children on a background thread? 
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodesChildFactory
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 8
 
-== Computing Node Children Asynchronously
 
 If you have a Node that needs to provide child Nodes, and computing the objects the child nodes represent is slow or expensive (i.e. you need to parse a file, connect to a database, or do some sort of I/O), you do not want to compute the child nodes in the event thread (which is what happens by default).
 
@@ -48,7 +49,7 @@
 ----
 
 ChildFactory can also simplify creating Nodes synchronously, and has the convenience that by using generics, your code can be type safe with respect to key objects.  Generally it can be used anywhere `Children.Keys` would be used (it uses `Children.Keys` under the hood).
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -60,3 +61,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodesCustomLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodesCustomLookup.adoc
index 57772a1..88132d7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodesCustomLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodesCustomLookup.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodesCustomLookup
-:jbake-type: wiki
+= I need to add-to/remove-from/customize the content of my Node/DataObject/TopComponent's Lookup.  How do I do it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodesCustomLookup
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I need to add-to/remove-from/customize the content of my Node/DataObject/TopComponent's Lookup.  How do I do it?
+:wikidevsection: _nodes_and_explorer
+:position: 15
 
 If it's just adding something, use
 
@@ -81,7 +81,7 @@
 
 Your lookup will be updated to include all items in the InstanceContent.
 
-=== Custom Lookup Contents with DataObjects
+== Custom Lookup Contents with DataObjects
 
 DataObjects have a Lookup, but also use an older variant on the Lookup pattern, called a `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/CookieSet.html[CookieSet]`.  Since this is a somewhat bewildering term, and `CookieSet` will eventually be deprecated, you may want to avoid using it.  A `CookieSet` ordinarily provides the `Lookup` for a DataObject;  and certain APIs such as `DataEditorSupport` require it.
 
@@ -117,7 +117,7 @@
 *Caveat 1: You really must override `createNodeDelegate()`* or otherwise (in your `DataNode` subclass) pass your `DataObject`'s `Lookup` to your `DataNode`'s constructor.  Otherwise its lookup will be `getCookieSet().getLookup()` and nothing added to your `InstanceContent` will appear in the `Lookup` of your `Node`.  So, _if you use AbstractLookup in a DataObject, make sure its Node is really using your DataObject's Lookup_.
 
 *Caveat 2: A DataObject should always appear in its own Lookup* &mdash; If you are _really sure_ that nothing is going to use your `DataObject`'s `CookieSet` at all, you can omit merging `getCookieSet().getLookup()` into the `ProxyLookup` in the constructor.  However, many things will not work correctly if _the DataObject itself_ cannot be found in its own `Lookup`.  If you are going to do that, replace `getCookieSet().getLookup()` with `Lookups.singleton(this)` to ensure it is present and cannot be removed or replaced.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -129,3 +129,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodesDecorating.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodesDecorating.adoc
index 1e05fea..0fdb0c2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodesDecorating.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodesDecorating.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNodesDecorating
-:jbake-type: wiki
+= How do I "decorate" nodes that come from another module (i.e. add icons, actions)?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNodesDecorating
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 17
 
-== Decorating an entire tree of Nodes
 
 Say you have a reference to the root of a tree of `Node` instances, and you want to add icons or actions to those nodes.  First, what you *do not* do is call `setDisplayName` or any other setter on that Node (unless you created it - the point here is that it is rude and can have bad side effects to call setters on random Nodes somebody else created - setters in APIs are bugs - the fact that Node has them is a historical artifact, not proper design).
 
@@ -147,7 +148,7 @@
 ----
 
 Note that if you're showing the filtered nodes in a tree view according to the code above, you might find expansion handles on leaf nodes.  link:http://openide.netbeans.org/servlets/ReadMsg?listName=dev&msgNo=11595[This thread from the dev@openide list] discusses some solutions to this problem.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -159,3 +160,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNonGuiPlatformApp.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNonGuiPlatformApp.adoc
index 753e54e..bf8bf1e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNonGuiPlatformApp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNonGuiPlatformApp.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNonGuiPlatformApp
-:jbake-type: wiki
+= Can I create a console or server (non-GUI) app with the NetBeans Platform?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNonGuiPlatformApp
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _module_system
+:position: 8
 
-== Can I create a console or server (non-GUI) app with the NetBeans Platform?
 
 While most documentation explains the NetBeans Platform in terms of Java desktop applications, it is possible to build a non-GUI application on the NetBeans Platform.  This might be useful, for example, when creating a platform-based application which will distribute computationally expensive work among a group of machines.  Note that this explains how to develop an application which is only ever meant to run headless, not how to develop a single application which can run in either GUI _or_ command line mode (which is described in the second half of this page).
 
@@ -72,7 +73,7 @@
 Finally, note that prior to NetBeans 6.10, the current working directory available from the Env object was set to the directory of the application's installation, not the directory from which the command was executed.  The consequence of this is that resolving relative file paths did not work as expected on Microsoft Windows systems, although it does work correctly on all versions of UNIX I tested.  This has been resolved (link:http://netbeans.org/bugzilla/show_bug.cgi?id=189791[http://netbeans.org/bugzilla/show_bug.cgi?id=189791]), but the suggested workaround for affected versions of the platform is to introduce an additional batch file which invokes the NetBeans executable by passing in a Java system property that specifies the current (execution) directory.
 
 Applies to: NetBeans 6.5 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -84,3 +85,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
index 4346bca..988c6b6 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNonSingletonTopComponents
-:jbake-type: wiki
+= How can I change my TopComponent to not be a singleton (NB version up to 6.9)?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNonSingletonTopComponents
@@ -26,14 +26,14 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 18
 include::../inc/database.adoc[]
 
 
-== How can I change my TopComponent to not be a singleton (NB version up to 6.9)?
-
 The "New Window Component" wizard in the NetBeans IDE generates a link:{wikipedia}Singleton_pattern[singleton] TopComponent.  That's fine for windows that there should only be one of.  Particularly if you are xref:DevFaqEditorTopComponent.adoc[creating some kind of editor], you will want to create multiple instances of your TopComponent.
 
-=== The really easy way
+== The really easy way
 
 If you have not already used the *New Window* template to create your TopComponent subclass, don't.
 
@@ -49,7 +49,7 @@
 * `void writeProperties(Properties p)` - here we will call `p.put()` passing enough information to reconstruct your component on restart.  If we are editing a file, we might save the path to the file.  If we are viewing a URL, we might save the URL.  If we want to be particularly fastidious, we might save the scroll position, or what line the editor caret was on , or anything else useful to restore the state of our component.
 * `void readProperties(Properties p)` - here we will reading whatever keys we wrote out in `writeProperties` and (re)initializing the component to its pre-shutdown state.  This method will be called on startup to restore our component to its pre-shutdown state as best can be done.  If we were, say, editing a file that no longer exists, the appropriate thing to do is throw an exception.  
 
-=== If you already have a generated singleton TopComponent subclass
+== If you already have a generated singleton TopComponent subclass
 
 The good news is that you won't have to write any code -- you'll just have to delete some of the code that was generated for you.
 
@@ -88,7 +88,7 @@
 * Look for an `<file>` registered in `Actions/Window`in the XML file.  It will be a `<file>` whose name is the munged fully-qualified class name of the `Action` you just deleted, e.g. `com-foo-MyWindowAction.instance`.  Delete the `<file>` entry for it
 * Look for `<file>` entry for a `.shadow` file in `Actions/Menu` in the XML, with its `originalFile` pointing to the file entry you just deleted.  Delete the `.shadow` `<file>` too.
 
-=== Creating And Opening Your TopComponents
+== Creating And Opening Your TopComponents
 
 Now that you have deleted the actions for your TopComponent, presumably they will be created some other way (for example, from a file's popup menu).  You can create new instances of your TopComponent, open them and give them focus as follows:
 
@@ -102,7 +102,7 @@
 
 If you wrote your persistence code correctly, your components will magically reopen on restart with no further work.
 
-=== What About PERSISTENCE_ALWAYS?
+== What About PERSISTENCE_ALWAYS?
 
 There is one other value you can return from `link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#getPersistenceType()[TopComponent.getPersistenceType()]`.  That value is `TopComponent.PERSISTENCE_ALWAYS`.
 
@@ -119,12 +119,12 @@
 
 `PERSISTENCE_ALWAYS` is for singleton components that need to be remembered forever across restarts. Don't use it for non-singletons.
 
-=== If you do not have any persistence code, but your components are reopening on restart...
+== If you do not have any persistence code, but your components are reopening on restart...
 
 You are returning either `PERSISTENCE_ONLY_OPENED` or `PERSISTENCE_ALWAYS` from `getPersistenceType()`.  If there is no persistence code, but you _are_ returning one of these values, NetBeans will use plain old Java serialization to store and reload your component.
 
 Either use `PERSISTENCE_NEVER` or write persistence code as described above.  Serialization is slower and more fragile than proper persistence, and is never a good option for production code.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -136,3 +136,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOWColorText.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOWColorText.adoc
index b8f4d16..61c24cc 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOWColorText.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOWColorText.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOWColorText
-:jbake-type: wiki
+= How to use color text in Output Window
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOWColorText
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How to use color text in Output Window
+:wikidevsection: _output_window
+:position: 5
 
 You can use IO extension classes like `IOColorPrint`, `IOColorLines`. Default colors can be changed via `IOColors`.
 
@@ -63,7 +63,7 @@
 
 
 Applies to: NetBeans 6.7 or later, (IOColorPrint 6.8 or later).
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -75,3 +75,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOWTabEmbedding.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOWTabEmbedding.adoc
index e583bbc..5a28ac7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOWTabEmbedding.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOWTabEmbedding.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOWTabEmbedding
-:jbake-type: wiki
+= How do I embed output window tab to another component?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOWTabEmbedding
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _output_window
+:position: 4
 
-== How do I embed output window tab to another component?
 
 You have to create `IOContainer` which provides access (for `IOProvider`) to your component where you want to embed OW tab (IO tab). Then you need to pass `IOContainer` instance to `IOProvider.getIO(String name, Actionlink:_.asciidoc[ ] actions, IOContainer ioContainer)`. `IOContainer` is created by `IOContainer.create(IOContainer.Provider)`. The following code demonstrates how to add OW to custom TopComponent.:
 
@@ -124,7 +125,7 @@
 
 
 Applies to: NetBeans 6.7
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -136,3 +137,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqObtainSourcesOfAJavaClass.adoc b/netbeans.apache.org/src/content/wiki/DevFaqObtainSourcesOfAJavaClass.adoc
index ac78d73..1828acd 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqObtainSourcesOfAJavaClass.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqObtainSourcesOfAJavaClass.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqObtainSourcesOfAJavaClass
-:jbake-type: wiki
+= How do I obtain a source file for a Java class and open it in the editor?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqObtainSourcesOfAJavaClass
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _programmatic_access_to_java_sources
+:position: 3
 
-== How do I obtain a source file for a Java class and open it in the editor?
 
 Sometimes it is necessary to open source code for a Java file from your NetBeans plug-in.
 The source code may be located in the currently open projects, in a library or in the platform JRE.
@@ -55,6 +56,7 @@
 For example, you can open it in the Java editor.
 xref:DevFaqOpenFileAtLine.adoc[DevFaqOpenFileAtLine] describes how.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -66,3 +68,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOpenFileAtLine.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOpenFileAtLine.adoc
index de1d178..ce18130 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOpenFileAtLine.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOpenFileAtLine.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOpenFileAtLine
-:jbake-type: wiki
+= How can I open a particular file at a particular line number and column?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOpenFileAtLine
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I open a particular file at a particular line number and column?
+:wikidevsection: _editor_and_edited_files
+:position: 6
 
 Here is the basic idea (there are variations depending on your needs, so read the Javadoc):
 
@@ -95,7 +95,7 @@
     Line line = lc.getLineSet().getOriginal(lineNumber);
     line.show(Line.ShowOpenType.OPEN, Line.ShowVisibilityType.FRONT, colNumber);
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -107,3 +107,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOpenOptionsAtCategory.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOpenOptionsAtCategory.adoc
index 7359291..ba82194 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOpenOptionsAtCategory.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOpenOptionsAtCategory.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOpenOptionsAtCategory
-:jbake-type: wiki
+= How do you open the option dialog with a preselected category?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOpenOptionsAtCategory
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _settings
+:position: 6
 
-== How do you open the option dialog with a preselected category?
 
 See link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/api/options/OptionsDisplayer.html#open-java.lang.String-[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/api/options/OptionsDisplayer.html#open-java.lang.String-]
 
@@ -35,7 +36,7 @@
 `
 OptionsDisplayer.getDefault().open("Java"+ "/de.markiewb.netbeans.plugins.eclipse.formatter.options");
 `
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -47,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOpenProjectProgramatically.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOpenProjectProgramatically.adoc
index 5655a1f..9edb409 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOpenProjectProgramatically.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOpenProjectProgramatically.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOpenProjectProgramatically
-:jbake-type: wiki
+= How can I open a Project programatically?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOpenProjectProgramatically
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _project_handling
+:position: 1
 
 Here's the link:http://wiki.netbeans.org/OpenProjectsProgramaticallyInNetBeansIDE[source] of this FAQ: 
 
@@ -46,6 +48,7 @@
 
 Go to the link:http://wiki.netbeans.org/OpenProjectsProgramaticallyInNetBeansIDE[link] to see the explanation of the code.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +60,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOpenReadOnly.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOpenReadOnly.adoc
index d4c09a4..6f56529 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOpenReadOnly.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOpenReadOnly.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOpenReadOnly
-:jbake-type: wiki
+= How can I open a file in the editor in read-only mode?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOpenReadOnly
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 5
 
-== How can I open a file in the editor in read-only mode?
 
 You will need to make a special file editor which refuses to take a write lock:
 
@@ -74,7 +75,7 @@
 ----
 
 Applies to: NetBeans 4.0 and newer
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -86,3 +87,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOrderActions.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOrderActions.adoc
index d2d24e6..696a93b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOrderActions.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOrderActions.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOrderActions
-:jbake-type: wiki
+= I want my action to appear between to existing items/in a specific place in the menu. Can I do that?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOrderActions
@@ -26,13 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _key_bindings
+:position: 4
 
-== I want my action to appear between to existing items/in a specific place in the menu. Can I do that?
 
 Yes.  Use xref:DevFaqOrderAttributes.adoc[ordering attributes] in the xref:DevFaqModulesLayerFile.adoc[layer file] for your module.
 
 If you are using the IDE's module project, the new *Action* template will let you specify a location for the action in the wizard and generate the right attribute for you.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +46,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOrderAttributes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOrderAttributes.adoc
index 857ff98..dbe3355 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOrderAttributes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOrderAttributes.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOrderAttributes
-:jbake-type: wiki
+=  How do I specify the order for my menu items/toolbar buttons/files in the system filesystem?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOrderAttributes
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 11
 
-== How do I specify the order for my menu items/toolbar buttons/files in the system filesystem?
 
 If you are using module development support the IDE,
 you can manage the order of menu or toolbar items
@@ -45,7 +46,7 @@
 
 
 Applies to: NetBeans 6.5 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +58,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOrphanedNetBeansOrgModules.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOrphanedNetBeansOrgModules.adoc
index bfd6081..f4e91f7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOrphanedNetBeansOrgModules.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOrphanedNetBeansOrgModules.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOrphanedNetBeansOrgModules
-:jbake-type: wiki
+= Can I work on just one or two modules from the NetBeans source base by themselves?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOrphanedNetBeansOrgModules
@@ -26,10 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 20
 
-== Can I work on just one or two modules from the NetBeans source base by themselves?
 
-=== Introduction
+== Introduction
 
 Normally to work on modules versioned in the NetBeans `main` Mercurial repository you need to clone the entire repository.
 (For modules in `contrib`, you need `contrib` cloned as a subdirectory of `main`.)
@@ -40,7 +41,7 @@
 1. Mercurial link:http://www.selenic.com/mercurial/bts/issue515[currently] does not let you clone or check out just a subdirectory of a repository, so you will need to get module sources some other way (we are still considering some possibilities).
 2. Since "upstream" modules (that the module of interest depends on) are not available in source form, you need to have a recent development build of NetBeans available to compile against.
 
-=== Quick usage guide
+== Quick usage guide
 
 1. Create an `nb_all` dir wherever you like. It must have at least the `nbbuild` dir from the netbeans.org source tree.
 2. Create `nbbuild/user.build.properties` and in it set the property `netbeans.dest.dir` to the full path to a NetBeans IDE installation you would like to both compile against and build into (you should not use your real development IDE, rather a copy).
@@ -48,7 +49,7 @@
 4. Add subdirs for any netbeans.org module projects you would like to work on. (The modules may be already present in the target platform. If they are not, you need to check out sources for any transitive dependencies not in the target platform too.)
 5. Using the IDE, open the desired projects and work normally.
 
-=== What works
+== What works
 
 Source projects should open without error and without displaying error badges, assuming all dependencies are available in either source or binary form.
 
@@ -68,7 +69,7 @@
 4. Create a new platform; select the same dir as you specified for `netbeans.dest.dir`.
 5. In the new platform, add `NetBeansAPIDocs.zip` to the Javadoc tab.
 
-=== Caveats
+== Caveats
 
 * If you want to work on unit or functional tests, you need to have all test-to-test dependencies available as source projects, because we do not distribute test libraries. Sometimes the transitive dependency tree can get a bit big. For example, if the functional tests use `org.netbeans.junit.ide.ProjectSupport`, then you need to check out `java.j2seproject` (in whose unit test dir this class resides), then its dependencies in turn: `projectapi`, `projectui`, `openide.filesystems`, and `openide.util`. Test-to-module dependencies (e.g. `nbjunit`, `jellytools`, ...) can however be satisfied from the target platform's binaries.
 
@@ -85,7 +86,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -97,3 +98,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOutlineViewHorizontalScrolling.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOutlineViewHorizontalScrolling.adoc
index d45e3ee..be9ab52 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOutlineViewHorizontalScrolling.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOutlineViewHorizontalScrolling.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOutlineViewHorizontalScrolling
-:jbake-type: wiki
+= How do I add horizontal scrolling support in the OutlineView component?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOutlineViewHorizontalScrolling
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I add horizontal scrolling support in the OutlineView component?
+:wikidevsection: _nodes_and_explorer
+:position: 32
 
 The OutlineView component already contains a JScrollPane, but the component's default behavior is to fit all the columns in the available space.  If you have a large number of columns, say twenty or more, you may find that the horizontal space allocated to any one column is insufficient.  In this case, you will likely want to disable table column resizing so that you can scroll left or right to see the data.  This can be accomplished by adding one line of code:
 
@@ -37,7 +37,7 @@
 outlineView.getOutline().setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -49,3 +49,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOutputWindow.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOutputWindow.adoc
index b9936d4..d793f0d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOutputWindow.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOutputWindow.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOutputWindow
-:jbake-type: wiki
+= How do I create my own tab in the output window and write to it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOutputWindow
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I create my own tab in the output window and write to it?
+:wikidevsection: _output_window
+:position: 1
 
 NetBeans contains classes that make writing to the output window very simple - you don't have to worry about components, you just get an instance of a thing called `InputOutput`, which has methods `getOut()` and `getErr()` that return `OutputStream`s.  There is a utility class, `IOProvider` that can supply `InputOutput` objects - you pass it a string name that should be shown on the output tab, and a boolean (whether or not it should reuse an existing tab with the same name if there is one).  So, hello world code for the output window looks like this:
 
@@ -80,6 +80,7 @@
 
 See link:http://plugins.netbeans.org/plugin/39695/?show=true[here] for a plugin that has a convenient class for all output purposes.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -91,3 +92,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOutputWindowExternalProcess.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOutputWindowExternalProcess.adoc
index 373a639..dfe4932 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOutputWindowExternalProcess.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOutputWindowExternalProcess.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOutputWindowExternalProcess
-:jbake-type: wiki
+= How do I route the output from an external process to the output window?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOutputWindowExternalProcess
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I route the output from an external process to the output window?
+:wikidevsection: _output_window
+:position: 2
 
 *NetBeans 6.8 and up:* Use the External Execution API.  Implement a Callable which will actually start the process:
 
@@ -117,6 +117,7 @@
 
 The OutputHandler referenced above has been transformed into a plugin for easier use. See link:http://plugins.netbeans.org/plugin/39695/?show=true[here] for more details.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -128,3 +129,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOverrideDefaultWindowSize.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOverrideDefaultWindowSize.adoc
index 601f5f2..1af1f28 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOverrideDefaultWindowSize.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOverrideDefaultWindowSize.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOverrideDefaultWindowSize
-:jbake-type: wiki
+= How to override the default size of an existing window?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOverrideDefaultWindowSize
@@ -26,15 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How to override the default size of an existing window?
+:wikidevsection: _window_system
+:position: 21
 
 Since the window already exists and has a default size, it must be registered under a specific mode in the filesystem.
 
 Find the file defining the size, i.e., the "wsmode" file that defines the mode under which it is registered, and change it. Then register the changed mode under the same name as the original mode in the layer. If you want to make sure that yours overrides the default, set a dependency in your module on the module that defines the original mode.
 
 Generally it is better to create a whole new mode, since you then will never have a conflict between two different definitions.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -46,3 +46,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqPlatformRuntimeProperties.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPlatformRuntimeProperties.adoc
index b11816e..ca3b402 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPlatformRuntimeProperties.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPlatformRuntimeProperties.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqPlatformRuntimeProperties
-:jbake-type: wiki
+= I want to set some flags or CLI arguments for running my NB RCP/Platform based application (such as disable assertions).  How do I do that?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqPlatformRuntimeProperties
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 28
 
-== I want to set some flags or CLI arguments for running my NB RCP/Platform based application (such as disable assertions).  How do I do that?
 
 To disable assertions or set some other VM property for your application, there are two places to pay attention to.  First, `$APP_HOME/etc/*.conf` in your distribution should set things for users of your application - do this for things that should be set for any user.
 
@@ -37,7 +38,7 @@
 
 
 Applies to: NetBeans 6.5 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -49,3 +50,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqPossibleToExtend.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPossibleToExtend.adoc
index daea568..2c09757 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPossibleToExtend.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPossibleToExtend.adoc
@@ -17,30 +17,18 @@
 //     under the License.
 //
 
-= DevFaqPossibleToExtend
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
+= Is it possible to extend an existing project type?
+:jbake-type: wikidev
+:jbake-tags: wiki, devfaq
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqPossibleToExtend
 :description: Apache NetBeans wiki DevFaqPossibleToExtend
 :toc: left
 :toc-title:
 :syntax: true
-
-== Is it possible to extend an existing project type?
+:wikidevsection: _project_types
+:position: 1
 
 Yes.
 
 You can add new actions, tabs, nodes, and lookups to an existing project type. See the xref:../tutorials/nbm-projectextension.adoc[NetBeans Project Type Extension Module Tutorial] for details.
-
-== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/DevFaqPossibleToExtend[http://wiki.netbeans.org/DevFaqPossibleToExtend] , 
-that was last modified by NetBeans user Geertjan 
-on 2010-03-03T17:28:58Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqProfiling.adoc b/netbeans.apache.org/src/content/wiki/DevFaqProfiling.adoc
index 3a818a1..3062847 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqProfiling.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqProfiling.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqProfiling
-:jbake-type: wiki
+= How can I profile NetBeans?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqProfiling
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I profile NetBeans?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 33
 
 There are many possibilities how to profile Java applications and that can be applied to NetBeans profiling.
 For different task it can be good to select different ways because each of them has its strengths and weaknesses.
@@ -38,7 +38,7 @@
 that typically adds some (JVMPI or JVMTI) libraries, some classes to (boot)classpath, specifies 
 options for profiling and often initializes profiling support before the application starts to run its code.
 
-=== NetBeans profiler
+== NetBeans profiler
 
 The NB module development support is integrated with the NB Profiler.
 Just select a module and click *Profile* to start.
@@ -50,7 +50,7 @@
 * use of editor including tracking what happens in background
 * startup
 
-=== Analyzer
+== Analyzer
 
 It is a sampling profiler working on Solaris and Linux (with limited functionality) that collects data during runtime.
 These data are later available for offline processing.
@@ -58,12 +58,12 @@
 It provides some capabilities that are not available in other Java profilers namely timeline view.
 This view shows timeline for each thread visualizing if the thread actually executes some code or not.
 
-==== Download and install Analyzer tool
+=== Download and install Analyzer tool
 
 Performance Analyzer that is part of Sun Studio tools and can be downloaded
 from the link:http://developers.sun.com/sunstudio/downloads/express.jsp[developers' site].
 
-==== Run the Analyzer
+=== Run the Analyzer
 
 * Set the environment. `PATH` should contain `bin` directory of Analyzer installation. `LD_LIBRARY_PATH` should similarly contain `lib` dir (and also `/usr/lib/lwp` if you want to run it on Solaris 2.8). Optionally you can also set `MAN_PATH`. Set the `_NB_PROFILE_CMD`:
 [source,java]
@@ -84,12 +84,12 @@
 * Shut down the IDE.
 * Run the analyzer to evaluate the experiment in GUI environment: `analyzer /export/home/radim/analyzer/NetBeans.x.er`
 
-==== Profiling hints
+=== Profiling hints
 
 Startup: start with profiling enabled, send a signal when startup is completed. 
 When sampling every 1ms it takes 70 seconds instead of 40.
 
-=== Other tools
+== Other tools
 
 Quite simple way how to measure time spent in some code is to wrap the code with 
 
@@ -112,11 +112,11 @@
 Because there are also probes provided by Java VM and function like `jstack` it is also possible to map 
 observed actions to parts of Java code in running application.
 
-=== Tips and trick
+== Tips and trick
 
 Node pop-ups: interesting starting point is `o.o.awt.MouseUtils$PopupMouseAdapter.mousePressed()`
 
-=== How to measure performance/responsiveness?
+== How to measure performance/responsiveness?
 
 See link:http://performance.netbeans.org/responsiveness/whatisresponsiveness.html[What is UI responsiveness] for overview.
 
@@ -138,7 +138,7 @@
 Applies to: NetBeans 6.5 and above
 
 xref:Category:Performance:HowTo.adoc[Category:Performance:HowTo]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -150,3 +150,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqPropertyEditorHints.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertyEditorHints.adoc
index 38cf956..607d8c2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertyEditorHints.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertyEditorHints.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqPropertyEditorHints
-:jbake-type: wiki
+= I have a Node.Property. I want to control its appearance or custom editor somehow.  What options are available?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqPropertyEditorHints
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 30
 
-== I have a Node.Property. I want to control its appearance or custom editor somehow.  What options are available?
 
 NetBeans built-in property editors support a number of "hints" which will affect how the property editor behaves.  A few are global to all property editors;  the rest are specific to property editors for specific types.
 
@@ -84,6 +85,9 @@
 
 |`java.lang.Object` |`lookup` |`org.openide.util.Lookup` |A specific lookup for this editor to query for possible values, instead of using the default lookup
 
+|===
+
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -94,6 +98,7 @@
 on 2015-02-05T15:53:11Z.
 
  
-|===
+
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqRebindingKeys.adoc b/netbeans.apache.org/src/content/wiki/DevFaqRebindingKeys.adoc
index 6a69b04..d64882a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqRebindingKeys.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqRebindingKeys.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqRebindingKeys
-:jbake-type: wiki
+= Can I bind one key to more than one action?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqRebindingKeys
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Can I bind one key to more than one action?
+:wikidevsection: _key_bindings
+:position: 2
 
 The simple answer is no:  The
 global keymap (get `Keymap` from Lookup)
@@ -36,7 +36,7 @@
 run, you must create a "wrapper" action that runs them all in turn
 (or in parallel).
 
-=== What about binding a key differently in different windows?
+== What about binding a key differently in different windows?
 
 You may bind a key differently in different windows, by using
 the normal Swing techniques of binding keystrokes to components. In
@@ -62,7 +62,7 @@
 `CallbackSystemAction`s such as *Find* or
 *Delete* can easily have different bindings in each component,
 using `ActionMap`.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -74,3 +74,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc b/netbeans.apache.org/src/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc
index 9852382..fd9c4c5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqRegisterObjectsViaInstanceOrSettingsFiles
-:jbake-type: wiki
+= Should I register an object in my layer file using .instance or .settings files? What about .shadow files or serialization?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqRegisterObjectsViaInstanceOrSettingsFiles
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _when_there_are_multiple_ways_to_do_something
+:position: 4
 
-== Should I register an object in my layer file using .instance or .settings files? What about .shadow files or serialization?
 
 There are a number of kinds of files which are treated (and can be transformed into) instances of objects.
 
@@ -56,6 +57,7 @@
 This mechanism may be useful if you have existing code which reads and writes files in some format, and you cannot change that code. 
 |===
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -67,3 +69,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqReplaceWindowSystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqReplaceWindowSystem.adoc
index 4a2c8d8..e1a783c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqReplaceWindowSystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqReplaceWindowSystem.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqReplaceWindowSystem
-:jbake-type: wiki
+= How Can I Replace the Window Manager?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqReplaceWindowSystem
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 14
 
-== How Can I Replace the Window Manager?
 
 Perhaps your users are a bit confused by the ability to close, slide or dock windows or maybe you're trying to retain the behavior of some existing application's window system.  There are times, however rare, in which you want to replace the typical NetBeans Window Manager `org.netbeans.core.windows.WindowManagerImpl` with a different one.
 
@@ -45,7 +46,7 @@
 * Do not include the `Core - Windows` or `Core` modules in your application.  Including `Core` will result in an error message from the NonGui class because it seems to expect an implementation of the `NbTopManager.WindowManager` class which you cannot (easily) provide.  
 
 * No windows will be shown by default on startup.  Use a `ModuleInstall` class' `restored()` method to display your TopComponent.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +58,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessor.adoc b/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessor.adoc
index 17769da..599affc 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessor.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessor.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqRequestProcessor
-:jbake-type: wiki
+= When should I use RequestProcessor.getDefault() and when should I create my own RequestProcessor?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqRequestProcessor
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _threading
+:position: 3
 
-== When should I use RequestProcessor.getDefault() and when should I create my own RequestProcessor?
 
 `RequestProcessor.getDefault()` is tempting to use, but it is also dangerous.  This FAQ item will tell you when *not* to use it.
 
@@ -47,7 +48,7 @@
 Now here is the *anti-example*:  You are creating a `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html[Node]` that represents a file.  It needs to mark itself with an error badge and color its text in red if the file contains errors.  You can't read the file when you create the Node - that takes too long.  So when the node is created, it runs a background task to check its status, and updates its icon and display name after it has read the file.  Now imagine you did this with `RequestProcessor.getDefault()`.  What happens when the user expands a folder that contains 1000 of your files?  1000 threads get created, and the whole application gets very, very slow.  For that, you are much better off creating one new `RequestProcessor` and using it for all your nodes.  The FAQ entry about `xref:DevFaqRequestProcessorTask.adoc[RequestProcessor.Task]` shows how to do this correctly.
 
 If you create your own RequestProcessor, please always use a name. If you get a deadlock it makes debugging much easier.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -59,3 +60,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessorTask.adoc b/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessorTask.adoc
index 86bed67..24feb66 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessorTask.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessorTask.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqRequestProcessorTask
-:jbake-type: wiki
+= How can I operation occasionally on a background thread, but reschedule it if something happens to delay it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqRequestProcessorTask
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _threading
+:position: 5
 
-== How can I operation occasionally on a background thread, but reschedule it if something happens to delay it?
 
 There are a lot of reasons you might want to reschedule a background operation.  For example, you want to re-parse a file 3 seconds after the user stops typing, so you can show errors.  But at 2 seconds she starts typing again.  You don't want that task to run a second from now anymore.  You can either cancel the task, or even simpler, call `task.schedule(3000)` every time a key is pressed.  If it was already scheduled, it will be rescheduled for 3 seconds from now again.
 
@@ -75,6 +76,7 @@
 }
 ----
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -86,3 +88,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqRuntimeMemory.adoc b/netbeans.apache.org/src/content/wiki/DevFaqRuntimeMemory.adoc
index 1c5ee90..6682e9a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqRuntimeMemory.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqRuntimeMemory.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqRuntimeMemory
-:jbake-type: wiki
+=  How to run a module with more memory settings
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqRuntimeMemory
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How to run a module with more memory settings
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 30
 
 When we run the module from NetBeans IDE and we want to pass JVM options to increase PermGen and Heap Memory then add the following settings to the project.properties file of your module, or module suite.
 
@@ -42,7 +42,7 @@
 ----
 
 Please write the complete setting in one line.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqScanForClasses.adoc b/netbeans.apache.org/src/content/wiki/DevFaqScanForClasses.adoc
index c330901..61dc62e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqScanForClasses.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqScanForClasses.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqScanForClasses
-:jbake-type: wiki
+= How can I scan a classpath to find all classes of a particular type?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqScanForClasses
@@ -26,15 +26,16 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _programmatic_access_to_java_sources
+:position: 4
 
-== How can I scan a classpath to find all classes of a particular type?
 
-=== Prerequisites
+== Prerequisites
 
 * find the ClassPath on which the subtypes should be found. Use e.g. ClassPath.getClassPath(<file>, ClassPath.SOURCE)
 * if the supertype is given as a FQN, convert to ElementHandle<TypeElement> via ElementHandle.create inside a Task or CancellableTask.
 
-=== Finding all subtypes of given type
+== Finding all subtypes of given type
 
 All subtypes of a given type on a given ClassPath can be found using ClassIndex. As ClassIndex contains only direct subtypes, the indirect subtypes need to be found on the client side:
 
@@ -65,10 +66,11 @@
 }
 ----
 
-=== Getting FileObjects corresponding to ElementHandles
+== Getting FileObjects corresponding to ElementHandles
 
 The FileObject corresponding to a given ElementHandle<TypeElement> can be found using SourceUtils.getFile.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -80,3 +82,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSetPrefs.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSetPrefs.adoc
index fe55cd2..9c86e17 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSetPrefs.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSetPrefs.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSetPrefs
-:jbake-type: wiki
+= How do I let the user set preferences/options/customization/configuration for my module/application?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSetPrefs
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _settings
+:position: 1
 
-== How do I let the user set preferences/options/customization/configuration for my module/application?
 
 From 6.0 onwards, you can use the link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences API].
 
@@ -36,6 +37,7 @@
 * xref:../blogs/geertjan/preferences_api_and_netbeans_ide.adoc[Preferences API and NetBeans IDE (Part 1)]
 * xref:../blogs/geertjan/preferences_api_and_netbeans_ide1.adoc[Preferences API and NetBeans IDE (Part 2)]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -47,3 +49,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSignNbm.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSignNbm.adoc
index cd004ba..75e0897 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSignNbm.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSignNbm.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSignNbm
-:jbake-type: wiki
+= Can I sign NBMs I create?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSignNbm
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 8
 
 . xref:DevFaqSignNbm.adoc#_can_i_sign_ant_based_nbms_i_create[Can I sign Ant based NBMs I create?]
 . xref:DevFaqSignNbm.adoc#_isnt_there_an_easier_way[Isn't there an easier way?]
@@ -268,7 +270,7 @@
 [2] link:http://www.mojohaus.org/nbm-maven-plugin/[http://www.mojohaus.org/nbm-maven-plugin/]
 
 [3] link:http://www.mojohaus.org/nbm-maven-plugin/nbm-mojo.html[http://www.mojohaus.org/nbm-maven-plugin/nbm-mojo.html]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -280,3 +282,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSortableTTVColumns.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSortableTTVColumns.adoc
index 0e965b6..4db773a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSortableTTVColumns.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSortableTTVColumns.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSortableTTVColumns
-:jbake-type: wiki
+= How can I make sortable columns in a TreeTableView?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSortableTTVColumns
@@ -26,14 +26,14 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I make sortable columns in a TreeTableView?
+:wikidevsection: _nodes_and_explorer
+:position: 20
 
 See "How to Sort Columns in a TreeTableView" in Geertjan's blog:
 
 * xref:../blogs/geertjan/enriching_your_treetableview.adoc[How to Sort Columns in a TreeTableView]
 * xref:../blogs/geertjan/how_to_suppress_editing_in.adoc[How to Suppress Editing in a TreeTableView]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -45,3 +45,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSpecifyJdkVersion.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSpecifyJdkVersion.adoc
index a873db2..eb5ffd4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSpecifyJdkVersion.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSpecifyJdkVersion.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSpecifyJdkVersion
-:jbake-type: wiki
+= My module requires JDK 6; how do I keep it from being loaded in JDK 5?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSpecifyJdkVersion
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== My module requires JDK 6; how do I keep it from being loaded in JDK 5?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 10
 
 Add a line to your manifest, specifying which version of Java you need. E.g. to only run on JDK 6 and higher, not 5:
 
@@ -58,7 +58,7 @@
 Applies to: NetBeans 6.x
 
 Platforms: all
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -70,3 +70,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSuitesVsClusters.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSuitesVsClusters.adoc
index 2dbc1ce..4ae794d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSuitesVsClusters.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSuitesVsClusters.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSuitesVsClusters
-:jbake-type: wiki
+= What is the difference between a suite and a cluster?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSuitesVsClusters
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 18
 
-== What is the difference between a suite and a cluster?
 
 A suite is a project which bundles together a number of xref:DevFaqWhatIsAModule.adoc[module] projects, lets you build them all together, and puts the resulting JARs in a directory structure the NetBeans Platform understands.
 
@@ -35,7 +36,7 @@
 
 While it is common to think of a suite as _being_ a cluster (the build product of a suite _is_ a cluster, after all), they are not the same thing.
 
-=== Suites
+== Suites
 
 A suite is a container project used to group _module projects_ into a unit whose members can depend on one another, and also depend on a copy of the NetBeans platform.
 
@@ -45,7 +46,7 @@
 
 You can always start with a stand-alone module project and later create a suite project and add your module to the suite.  If you are going to bundle multiple third-party libraries, and want the ability to provide updates of those libraries, you probably want a suite.
 
-=== Inter-suite Dependencies
+== Inter-suite Dependencies
 
 A suite may depend on
 
@@ -55,7 +56,7 @@
 
 See xref:DevFaqHowToReuseModules.adoc[DevFaqHowToReuseModules] for more details.
 
-=== Clusters
+== Clusters
 
 A cluster is typically a subdirectory of a NB-based application's binary installation. Every module in the installation lives in one (and only one) cluster. For details on the structure of clusters, see xref:DevFaqWhatIsACluster.adoc[DevFaqWhatIsACluster].
 
@@ -84,7 +85,7 @@
 * the *Help > Contents* pages on modules and applications
 * xref:../projects/platform/articles/installation.adoc[Installation Structure]
 
-==== No Suites In NetBeans IDE Sources
+=== No Suites In NetBeans IDE Sources
 
 The NetBeans IDE build (from sources on `hg.netbeans.org`) _does not use suites._
 
@@ -93,7 +94,7 @@
 Module projects physically inside the netbeans.org source tree cannot be "standalone" modules nor "suite component" modules.  They are simply netbeans.org modules, and as such use a (slightly) different format for metadata, and have access to somewhat different facilities specific to netbeans.org practices.  
 
 The resulting build artifacts are, nonetheless, clusters. These clusters are simply built using a different build-infrastructure, where the cluster names and contents are defined in `.properties` files in `$NB_SRC/nbbuild/`.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -105,3 +106,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSuppressEditTTVColumns.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSuppressEditTTVColumns.adoc
index 8bdc315..0429290 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSuppressEditTTVColumns.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSuppressEditTTVColumns.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSuppressEditTTVColumns
-:jbake-type: wiki
+= How do I remove the "..." buttons of a TreeTableView?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSuppressEditTTVColumns
@@ -26,13 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 19
 
 == How can I add support for a new language via ANTLR?
 
 See the blog entry "How to Suppress Editing in a TreeTableView" in Geertjan's blog:
 
 xref:../blogs/geertjan/how_to_suppress_editing_in.adoc[How to Suppress Editing in a TreeTableView]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -44,3 +46,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSuppressExistingModule.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSuppressExistingModule.adoc
index 76aa3eb..00f8273 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSuppressExistingModule.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSuppressExistingModule.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSuppressExistingModule
-:jbake-type: wiki
+= I want my module to disable some of the modules that would normally be enabled. Possible?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSuppressExistingModule
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _module_system
+:position: 1
 
-== I want my module to disable some of the modules that would normally be enabled. Possible?
 
 If you're building a complete application (for example, selecting the *Standalone Application* option for a module suite) just use the *Libraries* panel of the suite's *Properties* dialog to exclude modules you don't need from clusters you are otherwise including.
 
@@ -46,6 +47,7 @@
 
 Applies to: NetBeans 6.5 and later
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +59,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSyntaxColoring.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSyntaxColoring.adoc
index 333d2a5..e126595 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSyntaxColoring.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSyntaxColoring.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSyntaxColoring
-:jbake-type: wiki
+= Can I add syntax coloring for my own data object/MIME type?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSyntaxColoring
@@ -26,15 +26,16 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 10
 
-== Can I add syntax coloring for my own data object/MIME type?
 
 Yes, but it is not trivial. There is a tutorial on the subject: link:http://wiki.netbeans.org/How_to_create_support_for_a_new_language[http://wiki.netbeans.org/How_to_create_support_for_a_new_language]
 
 
 
 Applies to: NetBeans 6.7 and later, but most concepts (not the exact APIs) have been available since 6.0
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -46,3 +47,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSysFsLookupRegistration.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSysFsLookupRegistration.adoc
index f929534..82532b5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSysFsLookupRegistration.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSysFsLookupRegistration.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSysFsLookupRegistration
-:jbake-type: wiki
+= How can I register services into the default lookup using the system filesystem?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSysFsLookupRegistration
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 16
 
-== How can I register services into the default lookup using the system filesystem?
 
 In short, you probably do not want to.
 The typical way of registering services is via `META-INF/services` registration: xref:DevFaqLookupDefault.adoc[DevFaqLookupDefault].
@@ -96,7 +97,7 @@
 // now do something with intf...
 
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -108,3 +109,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSystemFilesystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSystemFilesystem.adoc
index 7a1deb3..2ca283c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSystemFilesystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSystemFilesystem.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSystemFilesystem
-:jbake-type: wiki
+= What is the System Filesystem?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSystemFilesystem
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 5
 
-== What is the System Filesystem?
 
 The system filesystem is the central repository for configuration data in NetBeans.
 It is composed at runtime of a stack of XML layers (xref:DevFaqModulesLayerFile.adoc[DevFaqModulesLayerFile])
@@ -72,7 +73,7 @@
 * The type of the file - very often you will install `*.instance` files that represent Java objects; typically the module will specify what classes or interfaces objects in a folder should be assignable from.
 * File attributes (xref:DevFaqFileAttributes.adoc[DevFaqFileAttributes]) - for cases where additional information is required to describe what to do with the files that client modules add to the folder, some optional or mandatory key/value attributes may be specified.
 
-=== Available documentation on System Filesystem contents
+== Available documentation on System Filesystem contents
 
 link:https://bits.netbeans.org/dev/javadoc/layers.html[List of files and folders in the system filesystem]
 in NetBeans API Javadoc lists some locations.
@@ -81,7 +82,7 @@
 
 
 Applies to: NetBeans 6.5 and newer
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -93,3 +94,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTestDataObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTestDataObject.adoc
index 31856b7..3d4a69e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTestDataObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTestDataObject.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTestDataObject
-:jbake-type: wiki
+= Writing Tests For DataObjects and DataLoaders
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTestDataObject
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _running_and_writing_tests
+:position: 6
 
-== Writing Tests For DataObjects and DataLoaders
 
 Quite easy. At least in NetBeans 6.5 and newer. Everything shall work as 
 declarative MIME resolvers are loaded automatically from unit tests and 
@@ -70,7 +71,7 @@
 
 In the somewhat unusual case in which your unit test resides in a different module from that which contains your file support code (DataLoader, DataObject, etc.), you will need to add a `<test />` dependency on the module which contains the file support code.  Currently this can only be done by editing the `project.xml` file for the module containing your unit tests.  See the build harness' README for more information; you can find the relevant section by searching for `test-dependencies` in that file.
 
-=== Older versions than 6.5
+== Older versions than 6.5
 
 If you are writing a test for a `DataObject`,
 you need to set up enough of the `DataLoader` infrastructure
@@ -101,6 +102,7 @@
 by creating the correct file in `test/unit/META-INF/services`.
 (Or you can get better control by using `org.openide.util.test.MockLookup`.)
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -112,3 +114,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTestUsingSystemFileSystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTestUsingSystemFileSystem.adoc
index 306f780..7eb096f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTestUsingSystemFileSystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTestUsingSystemFileSystem.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTestUsingSystemFileSystem
-:jbake-type: wiki
+= How do I test something which uses the System Filesystem?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTestUsingSystemFileSystem
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _running_and_writing_tests
+:position: 7
 
-== How do I test something which uses the System Filesystem?
 
 There is a fake System FileSystem provided by as soon as FileSystem xref:API_Design.adoc[API] is on classpath. It understands xref:../index.adoc[NetBeans] layer definitions and is generally suitable for running unit tests.
 
@@ -35,7 +36,7 @@
 
 * Try to run tests in xref:DevFaqUsingSimpletests.adoc[real mode]
 * Report xref:../index.adoc[NetBeans] a bug (product platform/filesystems) with a test case
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -47,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqThreading.adoc b/netbeans.apache.org/src/content/wiki/DevFaqThreading.adoc
index ca4275d..caae448 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqThreading.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqThreading.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqThreading
-:jbake-type: wiki
+= I need to run some code on a background thread. Can the platform help me?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqThreading
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _threading
+:position: 2
 
-== I need to run some code on a background thread. Can the platform help me?
 
 First, ask yourself why you need to do this and if it is really necessary.  Generally there is only one reason: _You are doing something takes some time (file I/O, computing something large and complicated, talking to a network socket) that will block the UI._
 
@@ -36,7 +37,7 @@
 Note that if you are doing something in the background, you may want to use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-progress/org/netbeans/api/progress/ProgressHandleFactory.html[Progress API] to show a progress indicator in the status-bar (or use it to put up a modal progress dialog if the UI really needs to be blocked - use with care, only when really necessary).
 
 Remember that if you are running more threads than you have processors (or cores) - and your OS is probably using some as well - then when you ask to multi-thread, you are asking your CPU to divide the time of the CPUs you have between more virtual threads.  And switching the context a CPU is working in - sending it off to some other memory space and set of instructions, and then another - takes time.  So heavy use of multi-threading, especially on single CPU machines, can slow things down rather than speed them up.  If you can make your code run faster, do that first.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +49,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc b/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
index a1cf46a..cb0221b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqThreadingBuiltIn
-:jbake-type: wiki
+= What APIs come with built-in background thread handling?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqThreadingBuiltIn
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _threading
+:position: 4
 
-== What APIs come with built-in background thread handling
 
 A few APIs come with built in multi-threading - if you want your code to run on a background thread, you don't have to do any special set up to do that.
 
@@ -37,7 +38,7 @@
 * The Nodes API - to compute node children that are expensive to create, use `xref:DevFaqNodesChildFactory.adoc[ChildFactory]` and specify `true` as the boolean argument to `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Children.html#create(org.openide.nodes.ChildFactory,%20boolean)[Children.create()]`
 * Various parsing APIs - for syntax highlighting languages and so forth - usually you just provide a task to do, and it will automatically call you in the background when a reparse is being done
 * QuickSearch API - searchers are typically called in background thread by infrastructure in  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/SearchProvider.html#evaluate%28org.netbeans.spi.quicksearch.SearchRequest,%20org.netbeans.spi.quicksearch.SearchResponse%29[SearchProvider.evaluate(...)]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -49,3 +50,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTopManager.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTopManager.adoc
index 3441357..e65358a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTopManager.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTopManager.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTopManager
-:jbake-type: wiki
+= Where is `TopManager`? I'm trying to do the examples from the O'Reilly book
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTopManager
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 22
 
-== Where is `TopManager`? I'm trying to do the examples from the O'Reilly book
 
 The O'Reilly book is old (written between 2001 and 2002) - the chapters on architectural background will still work, but many of the examples won't.
 
@@ -40,7 +41,7 @@
 
 
 Applies to: NetBeans 4.0+
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -52,3 +53,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTrackGlobalSelection.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTrackGlobalSelection.adoc
index a8bb72b..7078ad2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTrackGlobalSelection.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTrackGlobalSelection.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTrackGlobalSelection
-:jbake-type: wiki
+= I need to write some code that tracks the global selection. What should I do?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTrackGlobalSelection
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 16
 
-== I need to write some code that tracks the global selection. What should I do?
 
 If you are writing an action, consider using one of the 
 xref:DevFaqActionContextSensitive.adoc[context sensitive action classes in the apis].
@@ -62,7 +63,7 @@
 Source: link:http://emilian-bold.blogspot.com/2006/11/netbeans-platform-lookupresult-garbage.html[Lookup.Result garbage collection trick]
 
 See also: xref:DevFaqAddGlobalContext.adoc[How to Add Content to the Global Context]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -74,3 +75,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTrackingExplorerSelections.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTrackingExplorerSelections.adoc
index fd5b6c0..2fc1461 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTrackingExplorerSelections.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTrackingExplorerSelections.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTrackingExplorerSelections
-:jbake-type: wiki
+= How should I keep track of what the current nodeselection in the Explorer window is? Should I use the `ExplorerManager` ?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTrackingExplorerSelections
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How should I keep track of what the current nodeselection in the Explorer window is? Should I use the `ExplorerManager` ?
+:wikidevsection: _nodes_and_explorer
+:position: 14
 
 You can use the `ExplorerManager` if you created the explorer window, or you can programmatically get a reference to it.  If you can somehow find a class implementing `ExplorerManager.Provider` then you can get the Explorer manager. This provider might in fact be a `TopComponent` in the `TopComponent.Registry`, if for example it was actually a `ExplorerPanel`.  
 
@@ -46,14 +46,14 @@
 
 If you just want to write some code that is sensitive to the global selection (not an action), you probably want to use xref:DevFaqTrackGlobalSelection.adoc[Utilities.actionsGlobalContext()].
 
-=== Multiple nodes selection - gotcha
+== Multiple nodes selection - gotcha
 
 If you allow multiple nodes to be selected you also have to keep in mind that certain other Netbeans components may only operate on single nodes.
 
 One example is the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-navigator/overview-summary.html[Navigator]. Let's suppose you have a navigator window associated with your selected node. What you will notice is that while your multiple selection is in focus, your xref:DevFaqTrackGlobalSelection.adoc[code for acquiring] the selected nodes returns all the selected nodes. If the focus is then switched to the Navigator window, only one node is retrieved, all that while the multiple selection is still there, in the un-focused window.
 
 The reason is because along with the focus change, the (single) node represented by the Navigator and stored in its lookup becomes the global selection which your retrieval code will then grab.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -65,3 +65,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTroubleshootClassNotFound.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTroubleshootClassNotFound.adoc
index 533247e..38cd033 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTroubleshootClassNotFound.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTroubleshootClassNotFound.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTroubleshootClassNotFound
-:jbake-type: wiki
+= I got a `ClassNotFoundException` or `NoClassDefFoundError`. How can I fix it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTroubleshootClassNotFound
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I got a `ClassNotFoundException` or `NoClassDefFoundError`. How can I fix it?
+:wikidevsection: _when_things_go_wrong_troubleshooting
+:position: 1
 
 The most likely explanation is that you have a problem in your dependencies.
 In order for a class in one module to reference a class/interface defined in another module,
@@ -61,6 +61,7 @@
 
 For more background, see .
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -72,3 +73,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTroubleshootMissingItemsInZippedSources.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTroubleshootMissingItemsInZippedSources.adoc
index aa6217f..88e553e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTroubleshootMissingItemsInZippedSources.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTroubleshootMissingItemsInZippedSources.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTroubleshootMissingItemsInZippedSources
-:jbake-type: wiki
+= I find files missing from the source ZIP file
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTroubleshootMissingItemsInZippedSources
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I find files missing from the source ZIP file
+:wikidevsection: _when_things_go_wrong_troubleshooting
+:position: 2
 
 If you've downloaded and unpacked the ZIP file containing NetBeans sources but find that it seems incomplete, try using another application to unpack the ZIP file.  It seems that the popular WinZip application cannot properly handle this file.
 
@@ -37,6 +37,7 @@
 
 Alternatively, you could write a simple Ant script to use the `unzip` task for decompressing the archive, or use a ported version of a Unix unzip utility for Windows.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +49,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTutorialsDebugging.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTutorialsDebugging.adoc
index 6b04705..95dbb39 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTutorialsDebugging.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTutorialsDebugging.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTutorialsDebugging
-:jbake-type: wiki
+= How do I debug a module I'm building?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTutorialsDebugging
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _module_system
+:position: 2
 
-== Debugging modules
 
 Once your module is installed all error messages are sent to your `(NetBeans user directory)/var/log/messages.log`; use that for watching what's going on.
 
@@ -57,7 +58,7 @@
 
 
 Applies to: NetBeans 6.5+
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -69,3 +70,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUIGestures.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUIGestures.adoc
index 352a7bf..db4d69e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUIGestures.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUIGestures.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqUIGestures
-:jbake-type: wiki
+= UI Logging through Gestures Collector
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqUIGestures
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _logging_and_error_handling
+:position: 2
 
-== DevFaqUIGestures
 
 A perfect tool to get you know users of your application. xref:UIGesturesCollector.adoc[Read more...].
 
@@ -44,7 +45,7 @@
 == How to find out existing logger
 
 They are listed at xref:UIGesturesCollector.adoc[UIGesturesCollector].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -56,3 +57,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUIResponsiveness.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUIResponsiveness.adoc
index 3491932..16ea50b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUIResponsiveness.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUIResponsiveness.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqUIResponsiveness
-:jbake-type: wiki
+= I am developing a NetBeans module. What performance criteria should it satisfy?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqUIResponsiveness
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 27
 
-== I am developing a NetBeans module. What performance criteria should it satisfy?
 
 All NetBeans modules should behave responsibly with regard to performance. They must not affect startup time negatively, they must not increase memory footprint significantly, and they must be responsive at all times.
 
@@ -39,7 +40,7 @@
 Applies to: NetBeans 6.5 and above
 
 Platforms: All
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -51,3 +52,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUiDefaultsPropsNotFound.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUiDefaultsPropsNotFound.adoc
index 94f7346..d8ab684 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUiDefaultsPropsNotFound.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUiDefaultsPropsNotFound.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqUiDefaultsPropsNotFound
-:jbake-type: wiki
+= Why can't I load properties using UIDefaults?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqUiDefaultsPropsNotFound
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Why can't I load properties using UIDefaults?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 5
 
 You may encounter this problem while porting a Swing application to the NetBeans platform or when using a third-party library like SwingX.  While the following code works in a standalone Swing application, it does not load the property in a platform-based application:
 
@@ -64,7 +64,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -76,3 +76,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUnexpectedExceptionDialog.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUnexpectedExceptionDialog.adoc
index e3fe7a8..2c25d69 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUnexpectedExceptionDialog.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUnexpectedExceptionDialog.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqUnexpectedExceptionDialog
-:jbake-type: wiki
+= How can I suppress the Unexpected Exception dialog?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqUnexpectedExceptionDialog
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I suppress the Unexpected Exception dialog?
+:wikidevsection: _logging_and_error_handling
+:position: 3
 
 If your code generates an uncaught exception at runtime or uses `Logger.log(Level l, String s, Throwable t)` with level => 900 (`Level.WARNING`), NetBeans will display a dialog box which can show the details of that exception to the user.
 This is a welcome alternative to simply crashing the application,
@@ -45,7 +45,7 @@
 The above on its own doesn't suppress the exception dialog entirely - the dialog will still be shown if the user clicks on the error icon. To suppress that too, set `netbeans.exception.alert.min.level` to a high value as well (i.e. `99999`). This means your users will not even know there was a problem, and will have no opportunity to find out (or report it) unless they scan their log file.
 
 See link:http://forums.netbeans.org/ptopic16746.html[http://forums.netbeans.org/ptopic16746.html] for details on how to set properties within NetBeans and in final applications.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -57,3 +57,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUriVsUrl.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUriVsUrl.adoc
index 831d51d..0587d6a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUriVsUrl.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUriVsUrl.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqUriVsUrl
-:jbake-type: wiki
+= URIs and URLs
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqUriVsUrl
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 2
 
-== URIs and URLs
 
 *Q:* What is the difference?
 
@@ -99,7 +100,7 @@
 Also note that, unlike `java.net.URL`, `URI.equals()` does not make a network connection to determine equality.  Never put URLs into a HashSet or similar equality-testing collection for this reason.
 
 Applies to: NetBeans 4.0, 4.1, 5.0, 5.5, 6.0, 6.1, 6.5, 6.7
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -111,3 +112,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUseNativeInstaller.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUseNativeInstaller.adoc
index fe0b0f4..5779e31 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUseNativeInstaller.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUseNativeInstaller.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqUseNativeInstaller
-:jbake-type: wiki
+= How can I run the installer for something else during module installation?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqUseNativeInstaller
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 7
 
-== How can I run the installer for something else during module installation?
 
 Sometimes you are distributing some software with your module which has its own installer, or some other similar code which needs to be run once to get everything needed installed on the user's system.  If you are distributing some software (which perhaps you did not write), and it has its own installer, it is 
 less work to just run its installer to be sure it is set up correctly, than to have your module do everything which that installer does too (and possibly get something wrong).
@@ -44,7 +45,7 @@
 * A custom installer can be assigned to the component which performs installation particular component into NetBeans
 * The ability to register that link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/UpdateProvider.html[special provider] among other of providers - a common Update Center
 
-=== How to setup a Update Provider providing custom components?
+== How to setup a Update Provider providing custom components?
 
 Implement interface link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/UpdateProvider.html[UpdateProvider] to make a provider for your component that has its own installer. This provider has to:
 
@@ -55,7 +56,7 @@
 * assign a specific *uninstaller* which can uninstall such component if is already installed
 * Register the application (i.e. store a path to the installed copy of the application) so that, at runtime, code that needs to use the custom-installed software can find it
 
-=== A code snippet showing that provider
+== A code snippet showing that provider
 
 [source,java]
 ----
@@ -210,7 +211,7 @@
 
 -
 Do not hesitate to contact me on mailto:jrechtacek@netbeans.org if you have any question.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -222,3 +223,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUserDir.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUserDir.adoc
index 689070a..04dc84b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUserDir.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUserDir.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqUserDir
-:jbake-type: wiki
+= What is the user directory, what is in it, and why do I need one?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqUserDir
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 10
 
-== What is the user directory, what is in it, and why do I need one?
 
 The userdir is a directory passed to NetBeans on startup by the launch script.
 You can specify it on the command line, e.g.:
@@ -67,7 +68,7 @@
 
 
 Applies to: NetBeans 6.7 and later
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -79,3 +80,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
index 69db0ea..2b3af5d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqUsingSimpletests
-:jbake-type: wiki
+= Using NbModuleSuite & friends
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqUsingSimpletests
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _running_and_writing_tests
+:position: 1
 
 During development of the 6.5 series, an effort was made to improve testing by inherent support for tests in NetBeans build scripts (also known as the _build harness_).  Therefore, unit and functional tests for platform applications are now supported _out of the box_ in NetBeans 6.5 and later.  This effort is sometimes called "simpletests" because it greatly simplifies the work necessary to do such tests on your application.  xref:FitnessTestsWithoutX.adoc[More information about simpletests] can be found in the Wiki.
 
@@ -92,7 +94,7 @@
 == Converting Tests for Applications Which Previously Used XTest
 
 Essentially, you need only remove the XTest build and configuration files from your modules and replace them with a few lines of code in your tests' `suite()` method.  More information is available in the xref:XTestReplacementCookBook.adoc[XTest Replacement Cookbook]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -104,3 +106,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqViewSaveTTVColumns.adoc b/netbeans.apache.org/src/content/wiki/DevFaqViewSaveTTVColumns.adoc
index 48c29ae..80a5583 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqViewSaveTTVColumns.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqViewSaveTTVColumns.adoc
@@ -17,7 +17,7 @@
 //     under the License.
 //
 
-= DevFaqViewSaveTTVColumns
+= How do I preserve the column attributes of a TreeTableView?
 :jbake-type: wiki
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _nodes_and_explorer
+:position: 18
 
-== Saving Column Attributes of a TreeTableView
 
 Assuming you are embedding a `TreeTableView` (TTV) inside a `TopComponent`, you can override the `readExternal(ObjectInput)` and `writeExternal(ObjectOutput)` methods for preserving the attributes of the columns in your TTV (e.g. the column ordering, sorted-ness, sorting order, visibility, and width).
 
@@ -135,7 +136,7 @@
     }
 
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -147,3 +148,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWaysToRegisterInDefaultLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWaysToRegisterInDefaultLookup.adoc
index c5cc95e..91fc8e0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWaysToRegisterInDefaultLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWaysToRegisterInDefaultLookup.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWaysToRegisterInDefaultLookup
-:jbake-type: wiki
+= Which Way Should I Use To Register an Object in the Default Lookup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWaysToRegisterInDefaultLookup
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _when_there_are_multiple_ways_to_do_something
+:position: 3
 
-== Which Way Should I Use To Register an Object in the Default Lookup?
 
 There are two ways to put something in the xref:DevFaqLookupDefault.adoc[default Lookup]:
 
@@ -39,6 +40,7 @@
 |Put an `.instance` file in your module layer in `Services/Hidden` |Rarely - useful if you are making services available dynamically on the fly, for example when xref:DevFaqDynamicSystemFilesystem.adoc[dynamically changing layer contents], or when xref:DevFaqFileAttributes.adoc[specialized registration metadata] or factory methods are needed |Declare a xref:DevFaqInstanceDataObject.adoc[.instance file], a xref:DevFaqDotSettingsFiles.adoc[.settings file] or similar, or a xref:DevFaqDotShadowFiles.adoc[.shadow file] in your module's xref:DevFaqModulesLayerFile.adoc[layer.xml file] 
 |===
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -50,3 +52,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWeakListener.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWeakListener.adoc
index a481b86..717ed86 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWeakListener.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWeakListener.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWeakListener
-:jbake-type: wiki
+= What is a WeakListener ?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWeakListener
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 31
 
-== What is a WeakListener
 
 When you attach a listener to another object, via, for example, an `addPropertyChangeListener()` method, that other object now holds a _reference_ to that listener.
 
@@ -50,7 +51,7 @@
 ----
 
 in fact you _are not listening_ on someObject for any amount of time - the anonymous PropertyChangeListener you created will be instantly garbage-collected.  So keep a reference to your listener when using WeakListeners.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -62,3 +63,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWeakListenerWhen.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWeakListenerWhen.adoc
index da225c7..64d4684 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWeakListenerWhen.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWeakListenerWhen.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWeakListenerWhen
-:jbake-type: wiki
+= When should I use a WeakListener ?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWeakListenerWhen
@@ -26,15 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== When should I use a WeakListener
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 32
 
 You should use a xref:DevFaqWeakListener.adoc[WeakListener] any time you are adding a listener to an object, but there is no code - and possibly no opportunity - to explicitly remove it.
 
 If the thing you are listening to does have some kind of observable life-cycle, it is preferable to explicitly add and detach listeners.
 
 But in the case that you are adding a listener which is never explicitly removed, it is good form to use `link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/WeakListeners.html[WeakListeners]`
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -46,3 +46,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
index 724c864..422941a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWhatIsACluster
-:jbake-type: wiki
+= What is a Cluster?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWhatIsACluster
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What is a Cluster?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 17
 
 A cluster is a directory on disk.  A cluster contains xref:DevFaqWhatIsAModule.adoc[modules].  If you are writing a small NetBeans-based application, you probably do not need to be too concerned about clusters, although you may encounter the concept if you need to bundle additional files (native executables, for example) with a module.  Clusters become important if you are writing an extensible application (or multiple applications) of your own, where you are sharing some common modules between multiple applications.
 
@@ -52,11 +52,11 @@
   "phone/bin/emulator.exe", "com.foo.my.module.code.name", false);
 ----
 
-=== Suites vs. Clusters
+== Suites vs. Clusters
 
 The _result of_ compiling a module suite is typically a cluster. A cluster is something the runtime understands; a suite is a a project you develop.  For more information see xref:DevFaqSuitesVsClusters.adoc[the suite-versus-cluster FAQ].
 
-=== Why Have Clusters?
+== Why Have Clusters?
 
 Here's the history of clusters:
 
@@ -71,7 +71,7 @@
 
 In short, while it is typical for all of the parts of an application to be under a common parent directory, that is neither required nor guaranteed.
 
-=== What Does A Cluster Look Like?
+== What Does A Cluster Look Like?
 
 Here is the structure of the (comparatively small - it contains only one module) `ergonomics` cluster in a NetBeans 6.9 development build.
 
@@ -88,7 +88,7 @@
 
 In a larger cluster, all of the child directories described above would contain one file for each module (i.e. module JAR file, etc.).
 
-==== Metadata
+=== Metadata
 
 The metadata in `$CLUSTER/config/Modules/$MODULE.xml` is fairly simple and straightforward - it enables the NetBeans module-system to determine when a module should be loaded:
 
@@ -126,13 +126,13 @@
 
 This data allows the *Tools > Plugins* updater functionality to determine if the version of the module on an update server is a newer version than the copy which the user has installed, so that it can decide if it should offer an update.  More importantly, since this is done with checksums, it can do this check without sending data about what is on the user's machine to a remote server, users privacy is maintained.
 
-=== Clusters and Compatibility
+== Clusters and Compatibility
 
 A _cluster_ is a compatibility unit and has a version. It is set of modules that is developed by the same group of people, built and released at one time.
 
 Most of the reasoning that lead to creation of the concept can be found in:
 xref:../projects/platform/articles/installation.adoc[Installation Structure]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -144,3 +144,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsANode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsANode.adoc
index 6968cc3..282bad3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsANode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsANode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWhatIsANode
-:jbake-type: wiki
+= What is a Node?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWhatIsANode
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What is a Node?
+:wikidevsection: _nodes_and_explorer
+:position: 1
 
 Nodes are presentation objects.  They have actions, properties and localized display names - they are the place where the architecture meets the human.  Nodes typically wrap some model object and provide human-readable names, icons, etc.  They are at the heart of a lot of NetBeans selection and user interface systems.
 
@@ -43,6 +43,7 @@
 
 Read about xref:DevFaqNodeSubclass.adoc[how to implement your own Nodes ]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +55,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsNbm.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsNbm.adoc
index 3e9150a..3a02a39 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsNbm.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsNbm.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWhatIsNbm
-:jbake-type: wiki
+= What is an NBM?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWhatIsNbm
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What is an NBM?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 7
 
 An NBM file is a NetBeans module packaged for delivery via the web.
 The principal differences between it and a module JAR are:
@@ -43,7 +43,7 @@
 just let the standard Ant task for NBM creation take care of it for you.
 For those interested in gory details, read on.
 
-=== Structure of an NBM
+== Structure of an NBM
 
 Below is an example of the contents of one -
 this is from the `hexedit_integration` module in `contrib`,
@@ -55,7 +55,7 @@
 
 For more info about pack200 usage see xref:DevFaqNBMPack200.adoc[DevFaqNBMPack200].
 
-=== Runtime module XML metadata
+== Runtime module XML metadata
 
 The `org-netbeans-modules-hexeditor.xml` runtime metadata file looks like this:
 
@@ -81,7 +81,7 @@
 
 ----
 
-=== Module installation metadata - Info.xml
+== Module installation metadata - Info.xml
 
 The `Info/Info.xml` file that NetBeans uses to figure out if it _can_ install a module,
 dependencies, etc.  looks like this
@@ -123,7 +123,7 @@
 
 
 Applies to: NetBeans 6.5 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -135,3 +135,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhenLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhenLookup.adoc
index 22d3900..8a9c694 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhenLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhenLookup.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWhenLookup
-:jbake-type: wiki
+= When should I use Lookup in my own APIs?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWhenLookup
@@ -26,14 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _lookup
+:position: 12
 
-== When should I use Lookup in my own APIs?
 
 For most things in NetBeans coding, you will want to write normal Java code - if you need an object of a particular type, just call it.
 
 When you need to use any of the following patterns, Lookup can be helpful:
 
-=== System-level-decoupling
+== System-level-decoupling
 
 You provide some interface. Some other module will actually implement the interface. You want modules to be able to use your API, without caring who implements it, just that some implementation is there. Example: The status line.
 
@@ -46,7 +47,7 @@
 
 returns some implementation of StatusDisplayer. In NetBeans typically it is provided by the window system. But I once wrote an implementation that would instead hide the status bar and instead show the message in a translucent popup that appears over the main window. That would not have been possible if all code that wanted to display status messages was tied at compile-time to the implementation class provided by the window system.
 
-=== Designing an API for a not-well-defined problem space
+== Designing an API for a not-well-defined problem space
 
 An example of this is Project.getLookup(). In the case of projects, when that API was designed, the only things that could be known for sure about a project were that:
 
@@ -58,7 +59,7 @@
 
 The uses of Lookup in Node and TopComponent: Here, you have some API type. You make it available in the Lookup of files of a certain type. You don't necessarily know all the ways your UI will change in the future. Other modules want to add actions (to popup menus, toolbars, whatever) that can operate on your type. Those actions should be enabled whenever the selection contains one (or more) of your object. By writing actions sensitive to your type in the global selection lookup (Utilities.actionsGlobalContext()), no rewrite of those actions is required if, at some point, you write a new window component that shows, say, virtual files or some random tree of objects that contain your type.
 
-=== Mutable Capabilities
+== Mutable Capabilities
 
 You are designing an API for an object whose capabilities are actually mutable. Listening for a particular type in a Lookup is much less code, and much clearer, than defining a bunch of event types, listener classes and addThisListener(), addThatListener(). Example: In the Java Card modules, there is a class Card. A Card has a lookup. Now a card might be a physical device plugged into your computer. Or it might be a virtual card definition used by an emulator for testing. A virtual card has capabilities like Stop, Start and Resume. When you call StartCapability.start(), the StartCapability disappears from the Card's lookup and a StopCapability appears. But if it is a physical card, Start and Stop make no sense whatsoever - so for a real card they are not there. Other capabilities, such as PortProvider, which will tell you what TCP ports to use to send code to, attach a debugger to, etc., are present for both virtual cards and some real cards, if HTTP is the mechanism to deploy code to them - but other cards may have you run a native executable to deploy code and use no ports. So PortProvider is another optional capability.
 
@@ -73,7 +74,7 @@
 
 which delegates to Lookup but guarantees the return value is a subtype of something you can search on. I don't recommend that for all situations (part of the birth of Lookup was that Node.getCookie() returned something that implemented the marker interface Node.Cookie, and for things that wanted lookup-like functionality but had no connection to Nodes whatsoever, it made no sense to make them drag around a JAR with the Nodes API just for a marker interface). But in restricted situations, it can make an API more usable.
 
-=== Composable Objects
+== Composable Objects
 
 Some NetBeans-based applications use Lookup as a mechanism to allow modules to plug in _aspects_ that are applied to existing objects.  For example, say you write an extensible Node whose display name is implemented as
 
@@ -88,14 +89,14 @@
 
 Some other module can then contribute (most likely via a xref:DevFaqModulesLayerFile.adoc[layer file] and Lookups.forPath()) a Displayable for that object.  This is a rather extreme form of extensibility and can be hard to debug, but if you need it, Lookup can be used for that.
 
-=== Conclusion
+== Conclusion
 
 These cover most of the typical cases. If you're not doing something like these examples - if using Lookup adds complexity to your code without adding needed flexibility or future-proofing - then it's the wrong tool for the job.
 
 For a more detailed discussion, which this FAQ entry was assembled from, see link:http://netbeans.org/projects/platform/lists/dev/archive/2010-01/message/315[this thread on the dev@platform mailing list]
 
 See also: xref:DevFaqWhenToUseWhatRegistrationMethod.adoc[When To Use Various Declarative Registration Mechanisms]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -107,3 +108,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhenToUseWhatRegistrationMethod.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhenToUseWhatRegistrationMethod.adoc
index 3b4d844..159731a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhenToUseWhatRegistrationMethod.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhenToUseWhatRegistrationMethod.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWhenToUseWhatRegistrationMethod
-:jbake-type: wiki
+= When do I use which registration method?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWhenToUseWhatRegistrationMethod
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _when_there_are_multiple_ways_to_do_something
+:position: 2
 
-== When do I use which registration method?
 
 As described in xref:DevFaqModulesGeneral.adoc[DevFaqModulesGeneral], there are several different declarative registration mechanisms:
 
@@ -37,7 +38,7 @@
 
 If you are implementing some API from another module, that module should tell you what to do.  If it tells you something should be in the xref:DevFaqLookupDefault.adoc[default lookup], that means to use [link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ServiceProvider.html[http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ServiceProvider.html] `@ServiceProvider`] (see caveats in xref:DevFaqWaysToRegisterInDefaultLookup.adoc[DevFaqWaysToRegisterInDefaultLookup]).
 
-=== Deciding On A Registration Mechanism For Clients Of Your Module
+== Deciding On A Registration Mechanism For Clients Of Your Module
 
 If you are defining an xref:DevFaqApiSpi.adoc[SPI] in your module, and other modules will implement it and provide their own classes, provide a declarative (plain text, no code) way to register them.
 
@@ -67,7 +68,7 @@
 |Define a single folder in the xref:DevFaqModulesLayerFile.adoc[system filesystem] where objects should be registered, and optionally a factory method which will create the object.  |<ol><li>Other modules are not really registering their own subclasses, they are registering files.  You want to read the files and create the objects in your code.</li><li>Other modules are registering objects;  however, there is useful metadata that can be used without ever creating the object.</li><li>Other modules are registering objects.  Creating those objects requires additional metadata which can be specified declaratively using xref:DevFaqFileAttributes.adoc[file attributes]</li></ol> |<ul><li>Define a static, public factory method which takes a `Map`.</li><li>Document that all registered files should list this factory method as their `instanceCreate` attribute (e.g. `<attr name=&quot;instanceCreate&quot; methodvalue=&quot;com.XClass.factoryMethod&quot; />`.</li><li>Find registered objects using `Lookups.forPath("path/to/my/folder")`).</li></ul>   |Examples for the cases defined under _When To Use It_: <ol><li>The `simple.project.templates` module defines a spec for using `.properties` files to list everything that should be created when the user wants a new project.  It does not need a special file type or object instances - it will read the file and make the object it needs.</li><li>The Services tab in the IDE allows objects to be registered, which are shown as nodes in its UI.  The icon and localized display name of these nodes can be declaratively specified as file attributes, so no classes need to be loaded until the first time the user selects one of these nodes.</li><li>As mentioned in 1., `simple.project.templates` defines a spec for describing a project template inside a regular `.properties` file.  The `javacard.project` module reads defines several template files. But ''it also needs to know what "flavor" of project (applet, web, library, etc.) each file defines, so that it will ask the user the right questions in the New Project Wizard.  It defines an additional file attribute to indicate what "flavor" of project a template represents.</li></ol> 
 |===
 
-=== Why Declarative Registration and Lazy Loading Is Important
+== Why Declarative Registration and Lazy Loading Is Important
 
 For best performance and scalability, avoid actually instantiating the objects other modules register until the first time your code needs to call them. Avoid programmatic registration mechanisms, and delay instantiating declaratively registered objects until they really need to be used. This is for several reasons:
 
@@ -115,6 +116,7 @@
 
 This was a serious problem in older versions of the NetBeans IDE - for example, opening the Options dialog (which used to be a tree of Nodes and a property sheet - modules that had settings provided their own Node, and you changed settings by changing properties) - simply trying to paint it for the first time originally triggered loading, literally, thousands of classes from many different JAR files.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -126,3 +128,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhenUseWrapperModule.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhenUseWrapperModule.adoc
index ca7609a..96bf209 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhenUseWrapperModule.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhenUseWrapperModule.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWhenUseWrapperModule
-:jbake-type: wiki
+= When should I use a library wrapper module and when should I just package the library into my module?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWhenUseWrapperModule
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== When should I use a library wrapper module and when should I just package the library into my module?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 12
 
 The New Module Wizard offers easy support for creating a wrapper module:
 *File > New Project > NetBeans Modules > Library Wrapper Module* and since NetBeans 6.8 it is similarly easy to either edit Library Wrapper Module after it has been created or package library directly to your module via *Project Properties > Libraries > Wrapped JARs*. 
@@ -65,7 +65,7 @@
 
 
 Applies to: NetBeans 6.8 and above
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -77,3 +77,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsAndDialogs.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsAndDialogs.adoc
index 861175d..014184b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsAndDialogs.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsAndDialogs.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsAndDialogs
-:jbake-type: wiki
+= Windows &amp; dialogs
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsAndDialogs
@@ -26,10 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 6
 
-== Windows &amp; dialogs
 
-=== Can I just open up my own frames and dialogs?
+== Can I just open up my own frames and dialogs?
 
 * Yes, you could; but please instead use the standard windowing system to do these sorts of things. Then you will properly handle docking, separated floating windows, context help, various keyboard shortcuts, and many other things contributing to the IDE's appearance and functionality.
 
@@ -37,22 +38,22 @@
 
 * You can also use `DialogDisplayer.notify(NotifyDescriptor)` to show dialogs that interact well with the IDE's window system, and have a number of bits of prebuilt UI. You can use various standard subclasses of `NotifyDescriptor` to represent simple messages; exceptions; general-purpose dialogs with content panels; or even multi-stage wizards.
 
-=== What are the steps to create a simple Wizard?
+== What are the steps to create a simple Wizard?
 
 __Easiest way is to use File -> New File wizard, Module Development category and Wizard item, which will generate all needed boilerplate
 code for you. Essentially what wizard does is described below:__
 
-==== Create Panels:
+=== Create Panels:
 
 You should start with creating a set (at least one) on WizardDescriptor.Panel objects (see link:http://performance.netbeans.org/howto/dialogs/wizard-panels.html[Wizard Panel Performance Guide] for more information about the best way to create a panel).
 
-==== Create WizardDescriptor
+=== Create WizardDescriptor
 
 Use the panels to tell the a WizardDescriptor instance the sequence of panels it should display.
 This you can do either directly by `WizardDescriptor wd = WizardDescriptor(wizardPanelArray)`
 Or you can create a `WizardDescriptor.Iterator` with these panels, which gives you more control over the sequencing.
 
-==== Set Properties
+=== Set Properties
 
 Set certain properties on the WizardDescriptor which can influence the appearence of the wizard. If you like to add a help pane for example you call:
 `wd.putProperty("WizardPanel_autoWizardStyle",Boolean.TRUE);
@@ -62,7 +63,7 @@
 
 `putClientProperty("WizardPanel_helpURL",new URL("link:http://path/to/help/html/file/panelHelp.html[http://path/to/help/html/file/panelHelp.html]"));`
 
-==== Show Wizard
+=== Show Wizard
 
 Finally you set the Wizard to screen using the `DialogDisplayer`
 
@@ -75,7 +76,7 @@
 
         d.toFront();
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -87,3 +88,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsComponentHowTo.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsComponentHowTo.adoc
index df20c04..589f721 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsComponentHowTo.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsComponentHowTo.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsComponentHowTo
-:jbake-type: wiki
+= I want to show my own component(s) in the main window - where do I start?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsComponentHowTo
@@ -26,12 +26,12 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I want to show my own component(s) in the main window - where do I start?
+:wikidevsection: _window_system
+:position: 5
 
 Use File -> New File wizard, Module Development category and Window Component item. It will generate all necessary background code for you and open GUI Builder to design UI of your own component.
 
-=== But what is behind the scenes, created by wizard?
+== But what is behind the scenes, created by wizard?
 
 * Subclass of xref:DevFaqWindowsTopComponent.adoc[TopComponent] is created. Design it just as you would a JPanel.
 * Simple subclass of `javax.swing.AbstractAction` in created and xref:DevFaqActionAddMenuBar.adoc[added to main menu]. It's implemented it to open your component like follows:
@@ -52,7 +52,7 @@
 * Declarative XML descriptions of component are created following xref:DevFaqWindowsWstcrefAndFriends.adoc[declarative XML API] principles.
 
 TopComponents are part of the link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[Windows API].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -64,3 +64,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsGeneral.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsGeneral.adoc
index 93ebdf8..61b6f1d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsGeneral.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsGeneral.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsGeneral
-:jbake-type: wiki
+= What is the Window System?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsGeneral
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What is the Window System?
+:wikidevsection: _window_system
+:position: 1
 
 The windowing system is what creates the main application window, and makes it
 possible to open components in the UI.  The API for the windowing system is in the package
@@ -49,6 +49,7 @@
 * Singletonization:  You wouldn't want to have 5 Projects tabs in the IDE.  Using the XML API correctly, you can easily refer to the singleton instance of your component once it's instantiated (almost) for free.
 * Persistence: The window system associates components with unique IDs;  to properly persist your component across sessions, you need to use the XML APIs
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -60,3 +61,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsInternals.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsInternals.adoc
index e0eb888..4a718e9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsInternals.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsInternals.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsInternals
-:jbake-type: wiki
+= NetBeans Window System - what happens during startup
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsInternals
@@ -26,12 +26,12 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== NetBeans Window System - what happens during startup
+:wikidevsection: _window_system
+:position: 13
 
 Below is a blow-by-blow account of what actually goes on during NetBeans startup, put together by, well, reading the code.  It's here as much for the author's edification (if you read through it and document it, you understand it) as yours.
 
-=== The three and a half models model
+== The three and a half models model
 
 The NetBeans window system is extremely defensively coded - one of the main goals of rewriting it for 3.6 was robustness in the face of components that throw exceptions, do evil things to other components, and so forth.  The way the robustness of the current system is achieved is by very cleanly separating the model of how the UI should be, the model of how the UI actually is and the AWT component hierarchy, which is a model of sorts itself, but cannot be relied upon, because in an extensible application any component may do something evil.  On top of this is the persistence model.
 
@@ -50,7 +50,7 @@
 
 In its essence, though it's simple:  all changes in the window system simply mean synchronizing the two runtime models.  It's only the number of classes that requires that make it look complex.
 
-=== The Window System Startup Sequence
+== The Window System Startup Sequence
 
 Loading the window system is a distinct phase in NetBeans startup.  A set of model objects representing the window manager (data like SDI vs. MDI, frame size/location/state), its Modes (docking containers - bounds, contents), and references to `TopComponent`s by ID (not the components themselves, but unique String ids for them).
 
@@ -118,7 +118,7 @@
 
 We now have a singleton instance of `WindowManagerImpl`, with its model fully initialized from persisted data (or a semi-sane default if de-persisting failed).  It will be available from `WindowManager.getDefault();`
 
-=== Showing/creating the UI
+== Showing/creating the UI
 
 The next phase happens when setVisible(true) is called on the window system.  A thing to know here if you read the code is that all requests to do anything in the window system are funneled through one class called `Central` (yes, Central is the _God Object_ anti-pattern).  So pretty much any method that you look at in the model objects will call back through a method in Central, sometimes to itself, sometimes to some other object.
 
@@ -197,7 +197,7 @@
 Q: Why are `TopComponents` treated so differently and what's this reference stuff in the de-persisting process?  
 
 A: In the pre-3.5 window system, a component could be open in more than one tabbed container at the same time.  What???  It is because of workspaces, which we got rid of.  A workspace was a switchable window system configuration or set of windows.  The interface is still there, but there is only ever one workspace in the post 3.5 winsys.  So any given Mode, for legacy reasons, is not sole owner of a `TopComponent`, it just has a handle for one.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -209,3 +209,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsMatisse.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsMatisse.adoc
index 5f121b9..7e4d6f0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsMatisse.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsMatisse.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsMatisse
-:jbake-type: wiki
+=  How do I use Matisse/GroupLayout (new form editor/layout manager in 5.0) in my window system components?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsMatisse
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I use Matisse/GroupLayout (new form editor/layout manager in 5.0) in my window system components?
+:wikidevsection: _window_system
+:position: 4
 
 When you create a new window system component (xref:DevFaqWindowsTopComponent.adoc[TopComponent]) using the template wizard in NB 5.0 or greater, the default layout manager is `GroupLayout` (the new, super-easy-to-design-with layout manager in NB 5.0). So you do not need to do anything special. Your module will have a declared dependency on the corresponding library module which is in the NB Platform as of 5.0.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsMaximizeViaCode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsMaximizeViaCode.adoc
index 5d07c95..04d38f7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsMaximizeViaCode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsMaximizeViaCode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsMaximizeViaCode
-:jbake-type: wiki
+= How to maximize a TopComponent?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsMaximizeViaCode
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 26
 
-== How to maximize a TopComponent?
 
 Example: How to open the output window in maximized state?
 
@@ -59,7 +60,7 @@
 ----
 
 Taken from platform-dev mailing list
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -71,3 +72,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsMode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsMode.adoc
index 8cc3702..824ce2d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsMode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsMode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsMode
-:jbake-type: wiki
+= What is a Mode in the Windowing System?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsMode
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 2
 
-== What is a Mode in the Windowing System?
 
 "Mode" refers to "docking mode".  A Mode is a place in a main window, a place between splitters. Separate "floating" window is also backed by Mode. Mode is usually visually represented by a tabbed container.  Programmatically it is represented by the class `org.openide.windows.Mode`
 
@@ -39,7 +40,7 @@
 
 The xref:DevFaqCustomWindowMode.adoc[DevFaqCustomWindowMode] page has a visual representation of the available modes, and link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html] has details about the contents of wstcref and settings files.
 
-=== Pre-Defined Modes
+== Pre-Defined Modes
 
 NetBeans defines six modes in core.ui:
 
@@ -58,7 +59,7 @@
 * editor
 * CssPreviewTCWsmode
 
-=== Docking a TopComponent into a Mode
+== Docking a TopComponent into a Mode
 
 To dock a TopComponent into the 'editor' mode:
 
@@ -72,7 +73,7 @@
 
 ''The ID string of the TopComponent can usually be found in that TopComponent's Java file where it gets registered using annotations, or in the layer.xml.
 ''
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -84,3 +85,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsNoActionsOnToolbars.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsNoActionsOnToolbars.adoc
index 48031f9..d59bad8 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsNoActionsOnToolbars.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsNoActionsOnToolbars.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsNoActionsOnToolbars
-:jbake-type: wiki
+=  I want to disable the popup menu on the toolbars in the main window. How do I do that?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsNoActionsOnToolbars
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I want to disable the popup menu on the toolbars in the main window. How do I do that?
+:wikidevsection: _window_system
+:position: 11
 
 There is no canonical (or pretty) way to do this, but there is a hack you can do - it works in NetBeans 5.0, 5.5 and 6.x (and probably earlier versions but this wasn't tested).  
 
@@ -147,7 +147,7 @@
   }
 }
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -159,3 +159,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsOpenInMode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsOpenInMode.adoc
index 0477c75..f169013 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsOpenInMode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsOpenInMode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsOpenInMode
-:jbake-type: wiki
+= My TopComponent always opens in the editor area, but I want it to open in the same place as XYZ?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsOpenInMode
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== My TopComponent always opens in the editor area, but I want it to open in the same place as XYZ?
+:wikidevsection: _window_system
+:position: 9
 
 By default, `TopComponent.open()` opens all components in the central editor area of the
 main window.  Overriding this is simple:
@@ -49,7 +49,7 @@
 You need to know the ID of the xref:DevFaqWindowsMode.adoc[Mode ] you want to put the component in.  Common IDs are "output" for the bottom of the screen, and "explorer" for the left side.  For other Modes, you may need to find a module that puts something there and read its layer files, or xref:DevFaqFilesystemSee.adoc[browse] the xref:DevFaqSystemFilesystem.adoc[System Filesystem].
 
 Eventually you will probably want to specify what mode to dock your component into using the xref:DevFaqWindowsXmlApi.adoc[XML API for installing components], but the above technique works for simple modules, testing, etc.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -61,3 +61,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsOpenTopComponents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsOpenTopComponents.adoc
index 7410096..a8817df 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsOpenTopComponents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsOpenTopComponents.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsOpenTopComponents
-:jbake-type: wiki
+= Which TopComponents are open?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsOpenTopComponents
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Which TopComponents are open?
+:wikidevsection: _window_system
+:position: 20
 
 If you need to know which TopComponents are opened use the following:
 
@@ -38,7 +38,7 @@
 	//Code here
 }
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -50,3 +50,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponent.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponent.adoc
index f3d388b..e043caa 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponent.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponent.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsTopComponent
-:jbake-type: wiki
+=  What is a TopComponent in the Window System?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsTopComponent
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _window_system
+:position: 3
 
-== What is a TopComponent in the Window System?
 
 [link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html] `org.openide.windows.TopComponent`] is a `JComponent` subclass which knows how to work with
 the NetBeans window system.  If you want to add components to the main window, typically you will subclass TopComponent, using it the same way you would a `JPanel`.
@@ -47,7 +48,7 @@
 TopComponents that were already open may be deserialized and reopened on restart.  The template that NetBeans 5.0 provides includes code for this - it is actually using saved using the Externalizable interface.  Whether or not it is saved is determined by what you return from `getPersistenceType()`.
 
 For information on how and when these are reconstructed on startup, see the xref:DevFaqWindowsInternals.adoc[gory details of the window system on startup].
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -59,3 +60,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponentLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponentLookup.adoc
index df5702a..c7aa6a7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponentLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponentLookup.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsTopComponentLookup
-:jbake-type: wiki
+= Why does `TopComponent` have a `getLookup()` method? What is it for?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsTopComponentLookup
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Why does `TopComponent` have a `getLookup()` method? What is it for?
+:wikidevsection: _window_system
+:position: 10
 
 The windowing system is what manages xref:DevFaqTrackGlobalSelection.adoc[global selection].  In olden times, selection meant the activated xref:DevFaqWhatIsANode.adoc[Node].
 
@@ -36,7 +36,7 @@
 Rather than thinking of the selection as some specific object or Node, it is more useful to think of it as a grab bag of stuff provided by whatever component happens to have focus.  If you use `xref:DevFaqTrackGlobalSelection.adoc[Utilities.actionsGlobalContext()]`, you do not have to track all the different grab-bags of stuff provided by different components - you can get one grab bag of stuff which whose content will simply change (notifying you in the process) when focus moves to a different component.
 
 So the `TopComponent`'s `Lookup` is a way to provide your particular grab bag of stuff - it can be the lookup of a `Node` if you want, or it can be/contain whatever else or in addition you'd like to put there.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,3 +48,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsWstcrefAndFriends.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsWstcrefAndFriends.adoc
index 3d70a59..6fdd7f6 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsWstcrefAndFriends.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsWstcrefAndFriends.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsWstcrefAndFriends
-:jbake-type: wiki
+= What are the various window system file formats like `.wstcref` and how do I use them?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsWstcrefAndFriends
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What are the various window system file formats like `.wstcref` and how do I use them?
+:wikidevsection: _window_system
+:position: 8
 
 The window system on screen is composed of tabbed areas called "modes" (originally this was intended as "docking mode" as in the way a component is docked into the main window - yes, it's a lousy name).  These correspond to the class org.openide.windows.Mode.  In the xref:DevFaqSystemFilesystem.adoc[system filesystem], each Mode is represented by a folder.
 
@@ -42,7 +42,7 @@
 One handy way to generate all of those files, rather than doing it by hand, is to just create an action in your module that will open your `TopComponent`.  Run it on a clean userdir, open your TopComponent, and put it where you want it to appear.  Shut down.  Go into your xref:DevFaqUserDir.adoc[user dir], and copy the files the IDE persisted into your module.  Edit to taste, add references in your module's layer file (any module that opens a component is a good example - try core/navigation) and voila.
 
 You may want to look at the xref:DevFaqSampleCode.adoc[samples] - there are example modules that use all of the declarative window system APIs and file formats.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -54,3 +54,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsXmlApi.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsXmlApi.adoc
index 065798a..cb318a1 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsXmlApi.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsXmlApi.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWindowsXmlApi
-:jbake-type: wiki
+= How does the declarative XML API for the window system work?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWindowsXmlApi
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How does the declarative XML API for the window system work?
+:wikidevsection: _window_system
+:position: 7
 
 The API is not hard, just a bit baroque.
 
@@ -54,7 +54,7 @@
 
 * xref:DevFaqWindowsWstcrefAndFriends.adoc[How to use .wstcrf and other files]
 * link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[The Window System API]
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -66,3 +66,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWrapperModules.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWrapperModules.adoc
index 20bcb08..08799b3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWrapperModules.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWrapperModules.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWrapperModules
-:jbake-type: wiki
+= What is a library wrapper module and how do I use it?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWrapperModules
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== What is a library wrapper module and how do I use it?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 11
 
 If your module uses some external library,
 you will probably use a wrapper module to make classes from that library available to your module at runtime.
diff --git a/netbeans.apache.org/src/content/wiki/DevRunningTestsPlatformApp.adoc b/netbeans.apache.org/src/content/wiki/DevRunningTestsPlatformApp.adoc
index d89a35d..73716fe 100644
--- a/netbeans.apache.org/src/content/wiki/DevRunningTestsPlatformApp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevRunningTestsPlatformApp.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevRunningTestsPlatformApp
-:jbake-type: wiki
+= Running Tests on a Platform Application
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevRunningTestsPlatformApp
@@ -26,36 +26,38 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _running_and_writing_tests
+:position: 2
 
-== Running Tests on a Platform Application
 
 The following article describes some of the ways you can run tests (whether unit or functional) on a NetBeans Platform application.
 
-=== What is a unit test versus a functional test?
+== What is a unit test versus a functional test?
 
 _Unit test_ is a test on a method not on the overall functionality of a tool or application. Example of unit test if testing of a method than should return always positive integer. _Functional test_ is testing the overall encryption algorithm that uses that method.
 
-==== From the NetBeans IDE
+=== From the NetBeans IDE
 
 * You can run a single test from the IDE by right-clicking the test's node within the project explorer and choosing 'Test' from the context menu.  If you have the test source file (or the class which corresponds to the test case) open in the editor, you can run it by pressing Ctrl+F6 or its equivalent for your operating system.
 * You can run all tests within a single module by right-clicking the module in the project explorer and choosing 'Test' from the context menu.  The default shortcut for this on Windows and most Unix systems is Alt+F6.
 * You can run all tests for the entire application by right-clicking the suite node in the project explorer and choosing 'Test All' from the context menu.  
 
-==== From the Command Line Using Ant
+=== From the Command Line Using Ant
 
 * You can run a single unit test by by typing `ant test-unit -Dtest.class=com.tomwheeler.example.MyTestClass` in the module's directory (where `com.tomwheeler.example.MyTestClass` is the name of the unit test class you want to execute).  You can add additional JVM arguments by specifying them in the `test.run.args` system property, but be sure to quote them as appropriate for your operating system.
 * You can run a single functional (GUI) test from the command line by typing `ant test-qa-functional -Dtest.class=com.tomwheeler.example.MyTestClass` in the module's directory.  As with unit tests, you can specify additional JVM arguments using the `test.run.args` system property.
 * You can run all unit tests for a module by running the `ant test` command from the module's directory.
 * You can run all unit tests for the entire suite by running the `ant test` command from the suite directory.
 
-==== Unit Test Code Coverage
+=== Unit Test Code Coverage
 
 The NetBeans Platform has inherently supported unit test code coverage (using Cobertura) since version 6.7.  To generate a report which measures unit test code coverage for a single module, type `ant display-coverage-report` from that module's directory.  Likewise, you can generate a report which measures unit test code coverage for all unit tests in the entire suite by typing `ant display-coverage-report` from the suite's directory. See also xref:CodeCoverage.adoc[Code Coverage].
 
-==== Debugging Unit Tests From the Command Line
+=== Debugging Unit Tests From the Command Line
 
 Debugging tests from using the NetBeans IDE should be pretty straightforward, but if you want to debug a unit test from the command line (i.e. because you want to attach the debugger in a different IDE), then you simply need to run the test from the command line as described above but specify `-Dtest.run.args="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"`.  The test will compile and start to run, but will pause execution until you attach the debugger on port 5005.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -67,3 +69,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/FaqPluginManagerCustomization.adoc b/netbeans.apache.org/src/content/wiki/FaqPluginManagerCustomization.adoc
index 3b35bd9..ca612b5 100644
--- a/netbeans.apache.org/src/content/wiki/FaqPluginManagerCustomization.adoc
+++ b/netbeans.apache.org/src/content/wiki/FaqPluginManagerCustomization.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= FaqPluginManagerCustomization
-:jbake-type: wiki
+= How to customize Plugin Manager?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki FaqPluginManagerCustomization
@@ -26,28 +26,29 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 3 
 
-== How to customize Plugin Manager?
 
 There are several possibilities to customize behavior of Plugin Manager (*Tools|Plugins*) to show more items or to change its behavior.
 
 *Note:* for NetBeans expert only. Use of these options at your own risk.
 
-=== Show all modules
+== Show all modules
 
 In default view, Plugin Manager shows all plugins unless specify its visibility flag to `false` (`AutoUpdate-Show-In-Client=false`) - in other words, Plugin Manager filters out most of like service modules as hidden in plugin infrastructure. To make Plugin Manager to be showing all modules being run in your IDE with switch `plugin.manager.modules.only` set to `true` (i.e.`-J-Dplugin.manager.modules.only=true`).
 
 * system property `plugin.manager.modules.only`
 * the default value: `false`
 
-=== Show plugin's code name base
+== Show plugin's code name base
 
 Each NetBeans plugin has own *code name* what should be unique in NetBeans distribution, this code name will not show in plugin's details. To show this code name just run your IDE with switch `plugin.manager.extended.description` set to `true` (i.e.`-J-Dplugin.manager.extended.description=true`)
 
 * system property `plugin.manager.extended.description`
 * the default value: `false`
 
-=== Install all plugins into NetBeans installation directory
+== Install all plugins into NetBeans installation directory
 
 How to Plugin Manager chooses a directory where NBM will install?
 
@@ -62,21 +63,21 @@
 * system property `plugin.manager.install.global`
 * the default value: `false`
 
-=== Check for new plugins just after IDE startup
+== Check for new plugins just after IDE startup
 
 Plugin Manager checks for *updates* of *already installed* plugins right after IDE startup, not for *new plugins*. To force Plugin Manager to check for new plugins as well, just run IDE with a option `-J-Dplugin.manager.check.new.plugins=true`. New plugins will be notified in IDE status line.
 
 * system property `plugin.manager.check.new.plugins`
 * the default value: `false`
 
-=== Check for updates just after IDE startup
+== Check for updates just after IDE startup
 
 As was written above, Plugin Manager is checking for *updates* of *already installed* plugins right after IDE startup. If you would like to suppress it, just run IDE with a option `-J-Dplugin.manager.check.updates=false`.
 
 * system property `plugin.manager.check.updates`
 * the default value: `true`
 
-=== To customize Interval of Automatically Check for Updates (*_since NB6.1_*)
+== To customize Interval of Automatically Check for Updates (*_since NB6.1_*)
 
 Use a launcher option `plugin.manager.check.interval` with possible values: `EVERY_STARTUP`, `EVERY_DAY`,
 `EVERY_WEEK`, `EVERY_2WEEKS`, `EVERY_MONTH` or `NEVER` or also it's possible set the interval in minutes, like this `-J-Dplugin.manager.check.interval=60` - to check it every hour.
@@ -87,14 +88,14 @@
 * system property `plugin.manager.check.interval`
 * the default value: `EVERY_WEEK`
 
-=== To give precedence to dedicated module while updating (*_since NB6.1_*)
+== To give precedence to dedicated module while updating (*_since NB6.1_*)
 
 If Plugin Manager does install all available updates, it's possible to determinate set of modules which must be handled in exclusive mode before others. For example, update of Plugin Manager plugin should be installed as the first, in preference of common plugins because its update might be important for handling update of rest of plugins. In that case, Plugin Manager will notify users about availability of update Plugin Manager only (swallows down updates of rest) and when Plugin Manager is up-to-date, it will handle update of other plugins.
 
 * system property `plugin.manager.first.class.modules`
 * the default value: `org.netbeans.modules.autoupdate.services, org.netbeans.modules.autoupdate.ui`
 
-=== To make Autoupdate/Plugin Manager high verbose in console
+== To make Autoupdate/Plugin Manager high verbose in console
 
 Just use a common logging capability for force Autoupdate/Plugin Manager to be running in high verbose mode, like this `-J-Dorg.netbeans.modules.autoupdate.level=FINEST`, you also can specify the scope for logging in more detail (`-J-Dorg.netbeans.modules.autoupdate.ui.actions.AutoupdateSettings.level=FINE`). Do not forget to switch on logging into console `-J-Dnetbeans.logger.console=true`.
 
@@ -106,7 +107,7 @@
 
 -
 Do not hesitate to contact me on link:mailto:jrechtacek@netbeans.org[jrechtacek@netbeans.org] if you have any question.
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -118,3 +119,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/FaqRunSameTargetOnAllModules.adoc b/netbeans.apache.org/src/content/wiki/FaqRunSameTargetOnAllModules.adoc
index 3d961b9..65bf382 100644
--- a/netbeans.apache.org/src/content/wiki/FaqRunSameTargetOnAllModules.adoc
+++ b/netbeans.apache.org/src/content/wiki/FaqRunSameTargetOnAllModules.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= FaqRunSameTargetOnAllModules
-:jbake-type: wiki
+= How can I launch an Ant Task on all modules of my suite?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki FaqRunSameTargetOnAllModules
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I launch an Ant Task on all modules of my suite?
+:wikidevsection: _development_issues_module_basics_and_classpath_issues_and_information_about_rcpplatform_application_configuration
+:position: 38
 
 I needed to launch the fix-dependencies target on all the modules of my suite, but doing manually is very boring. So I added this target into my suite build.xml that runs the target in each module
 
@@ -43,7 +43,7 @@
 
 Applies to: NetBeans IDE 6.5 and newer
 Platforms: All
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -55,3 +55,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/JavaHT_GetAllMembers.adoc b/netbeans.apache.org/src/content/wiki/JavaHT_GetAllMembers.adoc
index 8e600a8..bcaf69a 100644
--- a/netbeans.apache.org/src/content/wiki/JavaHT_GetAllMembers.adoc
+++ b/netbeans.apache.org/src/content/wiki/JavaHT_GetAllMembers.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= JavaHT_GetAllMembers
-:jbake-type: wiki
+= How do I Get All Methods/Fields/Constructors of a Class?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki JavaHT_GetAllMembers
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I Get All Methods/Fields/Constructors of a Class?
+:wikidevsection: _programmatic_access_to_java_sources
+:position: 1
 
 * First, you need to be in a Javac context, see xref:JavaHT_GetIntoJavacContext.adoc[previous section] for more information.
 * Then, you need to find `javax.lang.model.element.TypeElement` you want to analyze. See `com.sun.source.tree.Trees.getElement(TreePath)` and `javax.lang.model.util.Elements.getTypeElement(String)`. You can get `Trees` and `Elements` from `org.netbeans.api.java.source.CompilationInfo`.
@@ -83,7 +83,7 @@
 
 }
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -95,3 +95,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/JavaHT_Modification.adoc b/netbeans.apache.org/src/content/wiki/JavaHT_Modification.adoc
index d71afc9..e0bfa4d 100644
--- a/netbeans.apache.org/src/content/wiki/JavaHT_Modification.adoc
+++ b/netbeans.apache.org/src/content/wiki/JavaHT_Modification.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= JavaHT_Modification
-:jbake-type: wiki
+= JavaHT_How can I programmatically modify a Java source file?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki JavaHT_Modification
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _programmatic_access_to_java_sources
+:position: 2
 
-== How can I programmatically modify a Java source file?
 
 Most modifications are done through the API. Direct document changes are not recommended. Editing source through the API has many advantages, for instance it respects formatting settings. 
 
@@ -39,7 +40,7 @@
 
 TODO: link to example, describe what the example does.
 
-=== Find the JavaSource
+== Find the JavaSource
 
 There are more ways to do it. For our demonstration, we use a straightforward solution, often used in tests. We omit the details of getting fileObject and we expect successful behaviour of called methods.
 
@@ -52,7 +53,7 @@
 
 The JavaSource represents the file `Tutorial1.java` in package `org.netbeans.test.codegen`.
 
-=== Create a 'modify' task
+== Create a 'modify' task
 
 `Task` is a parameterized interface with type parameter `WorkingCopy`. This type is requested in the next step. This next code snippet shows how to create an anonymous `Task`:
 
@@ -80,7 +81,7 @@
 
 The run method contains all staff describing modification and we will dive in to the details later.
 
-=== Post the task to process and commit the changes
+== Post the task to process and commit the changes
 
 Because we want to modify the source, we have to use runModificationTask (see its javadoc). At the end, we have to commit changes to propagate all the work to the source file - our `Tutorial1.java` file. This can fail, so ensure you correctly handle exceptions. The method `runModificationTask()` returns the modification result. This class contains all the prepared changes which haven't been propagated yet. This is good especially when someone wants to review the details of modification and decide about propagating changes to the source on the basis of `result`. For our demonstration, we will omit it. When `result` is collected, we have to call the `commit()` method to propagate the changes to the source code:
 
@@ -90,7 +91,7 @@
     ModificationResult result = tutorialSource.runModificationTask(task);
     result.commit();
 ----
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -102,3 +103,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/Java_DevelopersGuide.adoc b/netbeans.apache.org/src/content/wiki/Java_DevelopersGuide.adoc
index e135b39..17024f0 100644
--- a/netbeans.apache.org/src/content/wiki/Java_DevelopersGuide.adoc
+++ b/netbeans.apache.org/src/content/wiki/Java_DevelopersGuide.adoc
@@ -18,7 +18,7 @@
 //
 
 = Java Infrastructure Developer's guide (AKA Concepts & HowTos)
-:jbake-type: wiki
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki Java_DevelopersGuide
@@ -26,7 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
+:wikidevsection: _programmatic_access_to_java_sources
+:position: 5
 
 == Concepts
 
diff --git a/netbeans.apache.org/src/content/wiki/NetBeansDeveloperTestFAQ.adoc b/netbeans.apache.org/src/content/wiki/NetBeansDeveloperTestFAQ.adoc
index 18fdd6c..b47f81d 100644
--- a/netbeans.apache.org/src/content/wiki/NetBeansDeveloperTestFAQ.adoc
+++ b/netbeans.apache.org/src/content/wiki/NetBeansDeveloperTestFAQ.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= NetBeansDeveloperTestFAQ
-:jbake-type: wiki
+= NetBeans Developer Test FAQ
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki NetBeansDeveloperTestFAQ
@@ -26,41 +26,41 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _running_and_writing_tests
+:position: 4
 
-== NetBeans Developer Test FAQ
-
-=== Abstract
+== Abstract
 
 Contains info how to develop tests for NetBeans plugin.
 
-=== Starting to writing tests for NetBeans
+== Starting to writing tests for NetBeans
 
 * xref:FirstTests.adoc[First tests]
 * xref:UnitVersusQaFunctionalTests.adoc[Unit versus qa-functional tests]
 * xref:ModuleDependenciesForTests.adoc[Module dependencies for tests]
 * xref:DebuggingTests.adoc[Debugging tests] 
 
-=== NetBeans Testing Infrastructure
+== NetBeans Testing Infrastructure
 
 * xref:DevFaqUsingSimpletests.adoc[How do I test platform-based application?]
 * xref:TestDistribution.adoc[Test distribution] (NOTE: applies to 6.1 and earlier) 
 * xref:CodeCoverage.adoc[Code coverage] (NOTE: updated for NB 6.7) 
 
-=== Test patterns
+== Test patterns
 
 * link:http://openide.netbeans.org/tutorial/test-patterns.html[Test Patterns In Java] - very useful for testing NetBeans
 
-=== Test API
+== Test API
 
 xref:UsefulTestClassesInModules.adoc[Useful test classes in modules]
 
-=== Frequently used patterns
+== Frequently used patterns
 
 * xref:InitializationOfDefaultLookup.adoc[Initialization of default Lookup]
 * xref:LayerInitialization.adoc[Layer initialization]
 * xref:UsingFileSystems,Masterfs.adoc[Using FileSystems, Masterfs]
 
-=== Testing NetBeans Projects
+== Testing NetBeans Projects
 
 * xref:ClasspathAndQueriesTesting.adoc[Classpath and queries testing]
 * xref:TestingThingsThatUseFileObjectDataObjectDataFolder.adoc[Testing things that use FileObjects]
@@ -68,33 +68,34 @@
 * xref:ExecutingAntScriptsInTests.adoc[Executing ant scripts in tests]
 * xref:DevFaqTestUnitTestFailsNoSuchMethodError.adoc[How to fix NoSuchMethodError in com/sun/tools/javac/ when running unit tests]
 
-=== Test Editor
+== Test Editor
 
 * xref:CodeCompletionProvider.adoc[Code completion provider]
 * xref:Lexer.adoc[Lexer]
 
-=== Testing  new Java infrastructure
+== Testing  new Java infrastructure
 
 * xref:Java_DevelopersGuide.adoc[Java Developers Guide] - introduction to  new java infrastructure
 * TODO
 
-=== Testing J2EE
+== Testing J2EE
 
 * TODO
 
-=== Performance tests
+== Performance tests
 
 * TODO
 
-=== UI Tests
+== UI Tests
 
 * xref:FirstUITests.adoc[First UI tests]
 * xref:VisualLibraryAndUITests.adoc[VisualLibraryAndUITests]
 * xref:JemmyAndJellytools.adoc[Jemmy and Jellytools]
 
-===Wr
+==Wr
 requires.nb.javac=true
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -106,3 +107,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/wiki/TestingThingsThatUseFileObjectDataObjectDataFolder.adoc b/netbeans.apache.org/src/content/wiki/TestingThingsThatUseFileObjectDataObjectDataFolder.adoc
index 610e84d..de692b8 100644
--- a/netbeans.apache.org/src/content/wiki/TestingThingsThatUseFileObjectDataObjectDataFolder.adoc
+++ b/netbeans.apache.org/src/content/wiki/TestingThingsThatUseFileObjectDataObjectDataFolder.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= TestingThingsThatUseFileObjectDataObjectDataFolder
-:jbake-type: wiki
+= Testing Things That Use FileObject/DataObject/DataFolder
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki TestingThingsThatUseFileObjectDataObjectDataFolder
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _running_and_writing_tests
+:position: 5
 
-== Testing Things That Use FileObject/DataObject/DataFolder
 
 If your unit tests use `FileObject` (including `DataObject` or `DataFolder`), then you may be suprised that `FileUtil.toFileObject(java.util.File)` returns `null`. This is because the MasterFS filesystem implementation is what maps `FileObject`s to your local disk and it needs to be on the classpath when tests are run.
 
@@ -63,6 +64,7 @@
 
 If you want to write tests for a `DataObject` or `DataLoader`, you may also want to set the mime type correctly: xref:DevFaqTestDataObject.adoc[DevFaqTestDataObject]
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -74,3 +76,4 @@
 
 
 *NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
+////
\ No newline at end of file