Merge pull request #664 from ebarboni/wikiindex3

more wiki reordering
diff --git a/netbeans.apache.org/src/content/templates/wikidevindex.gsp b/netbeans.apache.org/src/content/templates/wikidevindex.gsp
index b996ec6..20e41fb 100644
--- a/netbeans.apache.org/src/content/templates/wikidevindex.gsp
+++ b/netbeans.apache.org/src/content/templates/wikidevindex.gsp
@@ -53,6 +53,7 @@
                 '_nodes_and_explorer':'Nodes and Explorer',
                 '_tasks_and_progressbar':'Tasks and Progressbar',
                 '_command_line_parsing':'Command Line Parsing',
+                '_creating_a_custom_programming_language':'Creating a Custom Programming Language',
                 '_settings':'Settings',
                 '_window_system':'Window System',
                 '_dialogs_api':'Dialogs API',
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqChangeLookAndFeel.adoc b/netbeans.apache.org/src/content/wiki/DevFaqChangeLookAndFeel.adoc
index fbf0159..f1c82d9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqChangeLookAndFeel.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqChangeLookAndFeel.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqChangeLookAndFeel
-:jbake-type: wiki
+= How can I set the Swing look and feel on startup?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqChangeLookAndFeel
@@ -26,14 +26,16 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _look_and_design
+:position: 1
 
-== How can I set the Swing look and feel on startup?
 
 Generally, you can change the look and feel either by passing command line arguments, e.g. ``netbeans --laf javax.swing.plaf.metal.MetalLookAndFeel``
 or do so programmatically on startup in a module's `xref:DevFaqModulesGeneral.adoc[ModuleInstall]` class. Generally if you're installing a custom look and feel, you probably want to have a separate module to do that. Some look and feels provide NetBeans modules to make it easy to use them.
 
 If you want to test running with a different look and feel during development of your application, and you know it will be on the application's classpath, see the example in xref:HowToPassCommandLineArgumentsToANetBeansPlatformApplicationWhenRunInsideTheIDE.adoc[HowToPassCommandLineArgumentsToANetBeansPlatformApplicationWhenRunInsideTheIDE] for how to include `--laf` in the runtime arguments to your module suite.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -45,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/DevFaqCustomDebugger.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomDebugger.adoc
index 5f7d1f5..d50aee9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomDebugger.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomDebugger.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCustomDebugger
-:jbake-type: wiki
+= How can I create a custom Debugger for my language?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCustomDebugger
@@ -26,13 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _creating_a_custom_programming_language
+:position: 2
 
-== How can I create a custom Debugger for my language?
 
 Problem: I have a debugger built for my custom programming language. How do I integrate it into the NetBeans Platform?
 
 Solution: Here is a tutorial on integrating a custom Debugger: link:http://netbeans.dzone.com/how-reuse-netbeans-debugger[http://netbeans.dzone.com/how-reuse-netbeans-debugger]
 
+////
 == 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/DevFaqCustomFontSize.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomFontSize.adoc
index 67cefc2..3a4c1b6 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomFontSize.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomFontSize.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCustomFontSize
-:jbake-type: wiki
+= I have a custom component. How can I make it respond to --fontsize like the rest of NetBeans?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCustomFontSize
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== I have a custom component. How can I make it respond to --fontsize like the rest of NetBeans?
+:wikidevsection: _look_and_design
+:position: 2
 
 [source,java]
 ----
@@ -46,6 +46,7 @@
 The code in core.swing.plaf processes the --fontsize argument and sets the
 UIManager key/value pair if it was passed on startup.
 
+////
 == 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/DevFaqCustomUpdateCenter.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomUpdateCenter.adoc
index 6afac16..19dbbd2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomUpdateCenter.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomUpdateCenter.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqCustomUpdateCenter
-:jbake-type: wiki
+= How can I use AutoUpdate to deploy updates and new modules for my application?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqCustomUpdateCenter
@@ -26,26 +26,26 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How can I use AutoUpdate to deploy updates and new modules for my application?
+:wikidevsection: _deploying_changes_through_autoupdate_and_using_autoupdate_api
+:position: 1
 
 An AutoUpdate server (also called an AutoUpdate Center or AUC) it not as complicated as it sounds.  It's just a server which contains a set of modules and an XML file that describes them all (the autoupdate XML descriptor).
 
 There are four main steps in setting up your AUC, all of which are quite simple:
 
-=== 1. Deciding where you will host it.
+== 1. Deciding where you will host it.
 
 This is typically just a Web server (Tomcat, Apache, etc.) which has a directory that's writable by you.  You will need to know how to map that directory to the URL which will be used to request the files you add there; for example, you might put a file `com-example-foo.nbm` in the `/var/www/html/mysite` directory and that will map to `link:http://www.example.com/mysite/com-example-foo.nbm[http://www.example.com/mysite/com-example-foo.nbm]`.
 
-=== 2. Creating your NBM files and autoupdate XML descriptor.
+== 2. Creating your NBM files and autoupdate XML descriptor.
 
 Just right-click on your suite and choose "Create NBMs", or if you prefer the command line, type `ant nbms` from a command prompt in the root directory of your suite.  This will create an NBM file for every module in your suite and will also generate the autoupdate XML descriptor which describes each module.
 
-=== 3. Uploading your NBM files and autoupdate XML descriptor to the server.
+== 3. Uploading your NBM files and autoupdate XML descriptor to the server.
 
 You can do this manually at first, but later you might wish to automate this using Ant's support for FTP or scp, or simply copy files via shares or NFS mounts.  Which method you choose will largely be dictated by what your Web server's operating system supports.
 
-=== 4. Making sure your application knows about it.
+== 4. Making sure your application knows about it.
 
 *a) Using wizards*: 
 There is a wizard for this in recent versions of the NetBeans IDE.  Right-click on one of the modules in your suite (or add a new one, if you prefer) and choose New -> Other.  Select "Module development" in the dialog, choose "Update Center" and then click the Next button.  Specify the URL of the update center descriptor (i.e. the URL of the file you uploaded in step 3) and a display name of your choice, and then click Finish.
@@ -72,6 +72,7 @@
 
 *Note:* Whenever you need to deploy an update, be sure you have incremented the module's specification version number and then repeat steps 2 and 3 above.  Users should be able to easily install the updates you've published.  There is more xref:DevFaqImplementationDependency.adoc[explanation of module versioning and dependencies] elsewhere in this FAQ.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -83,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/DevFaqFileBug.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileBug.adoc
index d398d7b..975c52e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileBug.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileBug.adoc
@@ -27,7 +27,7 @@
 :toc-title:
 :syntax: true
 :wikidevsection: _getting_support_where_to_find_examples
-:position: 1
+:position: 4
 
 If you think you have found a bug in the NetBeans Platform or IDE which affects your module development, please file it so it can be fixed. Generally exceptions coming from platform code are bugs in NetBeans (unless it is e.g. an `IllegalArgumentException` thrown after your code called a method with invalid arguments). Other things can of course be bugs if NetBeans is not behaving according to its documentation, or if something just looks wrong.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
index 895d82d..5e89cb7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileRecognition
-:jbake-type: wiki
+= How does NetBeans recognize files?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileRecognition
@@ -26,10 +26,11 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _files_and_data_objects
+:position: 1
 include::../inc/database.adoc[]
 
 
-== How does NetBeans recognize files?
 
 A lot of applications show some UI that displays folders of files;  also a lot of NetBeans UI is created by showing virtual files in the xref:DevFaqSystemFilesystem.adoc[configuration filesystem].  When a folder is expanded in the UI, files of known types have their own icons, menu items, actions, properties, child nodes and behavior.
 
@@ -70,6 +71,7 @@
 
 _Note:  As of NetBeans 6.9, it is often not necessary to subclass DataLoader - a generic DataLoader can be created by the system, which knows the DataObject subclass to create.  Simply use _'New File > Module Development > File Type'_ to generate such code._
 
+////
 == 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/DevFaqFileVsFileObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileVsFileObject.adoc
index 56efbe9..2513c6c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileVsFileObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileVsFileObject.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqFileVsFileObject
-:jbake-type: wiki
+= Files vs. file objects
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqFileVsFileObject
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Files vs. file objects
+:wikidevsection: _converting_between_common_data_types_and_finding_things
+:position: 1
 
 What exactly is the difference between a filename on disk and a
 `FileObject`? How do I convert them?
@@ -51,6 +51,7 @@
 * To look for a `FileObject` representing a `File`, use `FileUtil.toFileObject(File)`.
 * To look for a `File` from a `FileObject`, you may use `FileUtil.toFile(FileObject)`.
 
+////
 == 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/DevFaqGetOpenEditorWindows.adoc b/netbeans.apache.org/src/content/wiki/DevFaqGetOpenEditorWindows.adoc
index 291a649..389cbce 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGetOpenEditorWindows.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGetOpenEditorWindows.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqGetOpenEditorWindows
-:jbake-type: wiki
+= How can I get a list of open editor windows?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqGetOpenEditorWindows
@@ -26,10 +26,10 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _editor_and_edited_files
+:position: 1
 
-== How can I get a list of open editor windows?
-
-=== To obtain a reference to the currently selected editor
+== To obtain a reference to the currently selected editor
 
 [source,java]
 ----
@@ -48,7 +48,7 @@
 
 Note that EditorCookie.getOpenPanes() is deprecated (link:https://bz.apache.org/netbeans/show_bug.cgi?id=223383[https://bz.apache.org/netbeans/show_bug.cgi?id=223383]). Use `org.openide.text.NbDocument.findRecentEditorPane(EditorCookie)` instead.
 
-=== To obtain references to all opened editors
+== To obtain references to all opened editors
 
 [source,java]
 ----
@@ -68,9 +68,9 @@
 }
 ----
 
-=== Variants to get the Editor TopComponents
+== Variants to get the Editor TopComponents
 
-==== Variant A)
+=== Variant A)
 
 [source,java]
 ----
@@ -89,7 +89,7 @@
 
 ----
 
-==== Variant B)
+=== Variant B)
 
 [source,java]
 ----
@@ -114,7 +114,7 @@
 
 *Reference-* link:http://nbguru.wordpress.com/2008/07/25/tat-editor-windows-reactivated-8/[Editor Windows Reactivated]
 
-
+////
 == 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/DevFaqImagesForDarkLaf.adoc b/netbeans.apache.org/src/content/wiki/DevFaqImagesForDarkLaf.adoc
index 384d6f0..24c38cb 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqImagesForDarkLaf.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqImagesForDarkLaf.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqImagesForDarkLaf
-:jbake-type: wiki
+= How to provide non-inverted images for dark LookAndFeels like DarkMetal/Darcula?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqImagesForDarkLaf
@@ -26,22 +26,22 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _look_and_design
+:position: 3
 
-== How to provide non-inverted images for dark LookAndFeels like DarkMetal/Darcula?
-
-=== In short
+== In short
 
 * All images will be inverted, when using a DarkLaF with an image filter applied and ImageUtilities is used
 * If you don't like the inverted image/icon, then provide a image using "_dark" in its name. It will be used without any filter applied.
 
-=== Details
+== Details
 
 LaFs like DarkMetal/Darcula "invert" the colors of all the images/icons via an image filter set like `UIManager.put("nb.imageicon.filter", new DarkIconFilter())`
 
 This filter is used when loading images/icons via
 `org.openide.util.ImageUtilities#loadImageIcon` and `org.openide.util.ImageUtilities#loadImage`. 
 
-=== You do not like the inverted colors? Provide your own images!
+== You do not like the inverted colors? Provide your own images!
 
 But there are cases, you don't want to get your image inverted. 
 
@@ -55,7 +55,7 @@
 * `about.png` -> `about_dark.png`
 * But be aware of brandings! Then it must be `about_dark_BRANDING.png`
 
-=== It still does not work? Migrate from ImageIcon...
+== It still does not work? Migrate from ImageIcon...
 
 Check that your code really loads the images via `org.openide.util.ImageUtilities#loadImageIcon` and `org.openide.util.ImageUtilities#loadImage`!
 
@@ -84,7 +84,7 @@
 
 ----
 
-=== Examples
+== Examples
 
 Without Invert: 
 
@@ -122,7 +122,7 @@
 ----
 
 `
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -134,3 +134,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 1eb0b33..abd2711 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqIndex.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqIndex.adoc
@@ -17,7 +17,7 @@
 //     under the License.
 //
 
-= Apache NetBeans NetBeans Developer FAQ
+= Apache NetBeans Developer FAQ
 :jbake-type: wikidevindex
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
@@ -53,7 +53,6 @@
 - 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:DevFaqModulesGeneral.adoc[What are the ways a module can influence the system?]
 - 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?]
@@ -67,24 +66,17 @@
 - 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:DevFaqFileVsFileObject.adoc[FileObjects versus Files]
 - 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]
 
-== Creating a Custom Programming Language
-
-- xref:DevFaqCustomDebugger.adoc[How can I create a custom Debugger for my language?]
-- xref:DevFaqSyntaxHighlight.adoc[How do I add syntax highlighting for my language?]
-
 == 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:DevFaqCustomUpdateCenter.adoc[How can I use AutoUpdate to deploy updates and new modules for my application?]
 - 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?]
@@ -93,12 +85,10 @@
 
 == Development issues, module basics and classpath issues, and information about RCP/Platform application configuration
 
-- xref:DevFaqNetBeansClasspath.adoc[My module uses some libraries. I've tried setting CLASSPATH but it doesn't work. Help!]
 - 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?]
-//5 
 - 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?]
@@ -151,7 +141,6 @@
 - 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:DevFaqGetOpenEditorWindows.adoc[How can I get a list of open editors/documents?]
 - 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?]
@@ -171,7 +160,6 @@
 - 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:DevFaqFileRecognition.adoc[How does NetBeans recognize files?]
 - 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]
@@ -181,13 +169,6 @@
 - 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?]
 
-== Getting support, where to find examples
-
-- xref:DevFaqFileBug.adoc[Filing a bug report]
-- xref:DevFaqMoreDocsOnCertainAPIs.adoc[Where can I find more documentation on certain APIs?]
-- xref:DevFaqSampleCode.adoc[Examples of how to use various APIs]
-- xref:NetBeansCertifiedEngineerCourse.adoc[Can I get training material for the NetBeans Certification course?]
-
 == JavaHelp
 
 - xref:DevFaqHelpGuidelines.adoc[JavaHelp integration guide]
@@ -223,12 +204,6 @@
 - xref:DevFaqUIGestures.adoc[UI Logging through Gestures Collector]
 - xref:DevFaqUnexpectedExceptionDialog.adoc[How can I suppress the Unexpected Exception dialog?]
 
-== Look and Design
-
-- xref:DevFaqChangeLookAndFeel.adoc[How can I set the Swing look and feel on startup?]
-- xref:DevFaqCustomFontSize.adoc[I have a custom component.  How can I make it respond to --fontsize like the rest of NetBeans?]
-- xref:DevFaqImagesForDarkLaf.adoc[How to provide non-inverted images for dark LookAndFeels like DarkMetal/Darcula?]
-
 == Lookup
 
 - xref:DevFaqLookup.adoc[What is a Lookup?]
@@ -342,14 +317,6 @@
 - xref:DevFaqIdentifyMain.adoc[How do I identify the "main project"?]
 - xref:DevFaqPossibleToExtend.adoc[Is it possible to extend an existing project type?]
 
-== Properties and PropertySheet
-
-- xref:DevFaqPropertySheetEditors.adoc[How do I change the default behavior of PropertySheet editors?]
-- xref:DevFaqPropertySheetHideDescription.adoc[How do I hide the description area in property window?]
-- xref:DevFaqPropertySheetNodes.adoc[How do I show my node's properties in the Properties view?]
-- xref:DevFaqPropertySheetReadonlyProperty.adoc[How do I add a readonly property?]
-- xref:DevFaqPropertySheetTabs.adoc[How do I display different groups of properties on buttons in the property sheet the way Matisse does?]
-
 == Running and Writing tests
 
 - xref:DevFaqTestDataObject.adoc[Writing Tests for DataObjects and DataLoaders]
@@ -422,13 +389,4 @@
 - 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?]
 
-== Wizards and Templates
-
-- xref:DevFaqMakeGroupTemplate.adoc[How do I make a file template which actually creates a set of files at once?]
-- xref:DevFaqOpenFilesAfterProjectCreation.adoc[How to open files in editor after project creation?]
-- xref:DevFaqTemplatesInNonIdeApp.adoc[I am creating a non-IDE application.  How do I enable/control templates?]
-- xref:DevFaqWizardChangeLabelsOfDefaultButtons.adoc[How to customize the button text of default buttons of a wizard (Finish, Cancel, etc.)?]
-- xref:DevFaqWizardPanelError.adoc[How do I show that a user has filled an invalid input into my wizard?]
-
-
 -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/DevFaqMakeGroupTemplate.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMakeGroupTemplate.adoc
index 7ac2690..5a60446 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMakeGroupTemplate.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMakeGroupTemplate.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMakeGroupTemplate
-:jbake-type: wiki
+= How do I make a file template which actually creates a set of files at once?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMakeGroupTemplate
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I make a file template which actually creates more than one file?
+:wikidevsection: _wizards_and_templates
+:position: 1
 
 For example, say you want to make a template which will appear in *File | New File* which will prompt the user for a name and location but then actually create several related files.
 
@@ -45,6 +45,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
@@ -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/DevFaqModulesGeneral.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModulesGeneral.adoc
index c8382f5..faf5f2f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModulesGeneral.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModulesGeneral.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqModulesGeneral
-:jbake-type: wiki
+= What are the ways a module can influence the system?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqModulesGeneral
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _configuration_how_modules_install_things
+:position: 1
 
-== What are the ways a module can influence the system?
 
 There are four basic ways a module can install configuration data or objects.
 Three of the ways are
@@ -35,7 +36,7 @@
 
 If you are writing a module that has an API you want other modules to plug in to, you probably want to read xref:DevFaqWhenToUseWhatRegistrationMethod.adoc[DevFaqWhenToUseWhatRegistrationMethod].
 
-=== `@ServiceProvider`
+== `@ServiceProvider`
 
 For global services, singletons and such, using this annotation is the preferred technique.
 
@@ -96,12 +97,12 @@
 More and more layer registrations can be made by using various source code annotations.
 If you use these exclusively, you will not need to declare a layer in your module's sources at all.
 
-=== Registering objects in the module's manifest
+== Registering objects in the module's manifest
 
 Some types of objects used to be installed by adding a section to the module manifest.
 This is now deprecated.
 
-=== Programmatic registration - `ModuleInstall` classes
+== Programmatic registration - `ModuleInstall` classes
 
 The module system allows you to provide a `ModuleInstall` class, which runs some code during startup or when the module is loaded, and can run cleanup code when it is uninstalled or disabled.  This is the least desirable way to do things, because running code on startup means slowing down startup.
 Before you use such a class, be sure there is no declarative way to do what you're trying to do;
@@ -120,7 +121,7 @@
 
 
 Applies to: NetBeans 6.7 and later
-
+////
 == 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/DevFaqMoreDocsOnCertainAPIs.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMoreDocsOnCertainAPIs.adoc
index 2f47d1e..42c580e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMoreDocsOnCertainAPIs.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMoreDocsOnCertainAPIs.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqMoreDocsOnCertainAPIs
-:jbake-type: wiki
+= Where can I find more documentation on certain APIs?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqMoreDocsOnCertainAPIs
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== Where can I find more documentation on certain APIs?
+:wikidevsection: _getting_support_where_to_find_examples
+:position: 7
 
 The NetBeans Javadoc has some additional documentation about using certain APIs.  Unfortunately, the index page does not link to these and so they can be difficult to find.  Here are direct links to these documents from the most recent builds:
 
@@ -40,6 +40,7 @@
 * link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/api.html[Utilities API]
 * link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[Window System API]
 
+////
 == 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/DevFaqNetBeansClasspath.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNetBeansClasspath.adoc
index a206f84..13a45b4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNetBeansClasspath.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNetBeansClasspath.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqNetBeansClasspath
-:jbake-type: wiki
+= My module uses some libraries. I've tried setting CLASSPATH but it doesn't work. Help!
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqNetBeansClasspath
@@ -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: 1
 
-== My module uses some libraries. I've tried setting CLASSPATH but it doesn't work. Help!
 
 Setting `$CLASSPATH` or `%CLASSPATH%` on the command line will not affect anything -
 NetBeans uses its own class loader system to find classes from modules.
@@ -37,7 +38,7 @@
 
 
 Applies to: NetBeans 6.8 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/DevFaqOpenFilesAfterProjectCreation.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOpenFilesAfterProjectCreation.adoc
index 634eb61..c016431 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOpenFilesAfterProjectCreation.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOpenFilesAfterProjectCreation.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqOpenFilesAfterProjectCreation
-:jbake-type: wiki
+= How to open files in editor after project creation?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqOpenFilesAfterProjectCreation
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _wizards_and_templates
+:position: 5
 
-== How to open files in editor after project creation?
 
 Q: I have created my own project type for my platform application. After project being created I would like to open a file contained in this project. Just like it is done when you create new java application in netbeans. After project creation your main java class is opened in editor.
 
@@ -36,6 +37,7 @@
 
 Taken from nbdev mailing list. April 2013
 
+////
 == 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/DevFaqPropertySheetEditors.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetEditors.adoc
index 99e7b46..a9b1062 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetEditors.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetEditors.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqPropertySheetEditors
-:jbake-type: wiki
+= How do I change the default behavior of PropertySheet editors?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqPropertySheetEditors
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _properties_and_propertysheet
+:position: 1
 
-== How do I change the default behavior of PropertySheet editors?
 
 *Issue:* How do I specify the kind of renderer which will represent the look of property value cell (in the same manner as it usually does for JTable)? For example, I want a string property not to be shown in grey if it's not editable.
 *Solution:* If you specify a custom inplace editor it will also be used for rendering.
@@ -70,6 +71,7 @@
 }
 ----
 
+////
 == 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/DevFaqPropertySheetHideDescription.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetHideDescription.adoc
index 158e724..11d5648 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetHideDescription.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetHideDescription.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqPropertySheetHideDescription
-:jbake-type: wiki
+= How do I hide the description area in property window
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqPropertySheetHideDescription
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _properties_and_propertysheet
+:position: 6
 
-== How do I hide the description area in property window
 
 By tweaking the preferences of the "showDescriptionArea". In any layer.xml file (for example the one of branding) add
 
@@ -55,7 +56,7 @@
 I found this by looking at the PropUtils class in the NBP sources.
 
 Taken from mailing list, contributed by Jean-Marc Borer
-
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -67,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/DevFaqPropertySheetNodes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetNodes.adoc
index e1e3a17..e7c2bb0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetNodes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetNodes.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqPropertySheetNodes
-:jbake-type: wiki
+= How do I show my node's properties in the Properties view?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqPropertySheetNodes
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _properties_and_propertysheet
+:position: 2
 
-== How do I show my node's properties in the Properties view?
 
 I want to have the properties of my custom nodes displayed in the Properties view when they are selected in my tree view. How do I go about doing that?
 
@@ -61,6 +62,7 @@
 
 Note that the example above is not a complete `TopComponent` implementation with a tree view and nodes. It is simply demonstrating how to have the selected node's properties shown in the Properties view.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -72,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/DevFaqPropertySheetReadonlyProperty.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetReadonlyProperty.adoc
index bfa5fe8..5f7dba4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetReadonlyProperty.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetReadonlyProperty.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqPropertySheetReadonlyProperty
-:jbake-type: wiki
+= How do I add a readonly property?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqPropertySheetReadonlyProperty
@@ -26,8 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I add a readonly property?
+:wikidevsection: _properties_and_propertysheet
+:position: 7
 
 You can customize your properties by using the setValue method.
 
@@ -51,6 +51,7 @@
 
 Taken from mailing list, contributed by Jean-Marc Borer
 
+////
 == 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/DevFaqPropertySheetTabs.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetTabs.adoc
index 65339a1..8642e84 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetTabs.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetTabs.adoc
@@ -17,8 +17,9 @@
 //     under the License.
 //
 
-= DevFaqPropertySheetTabs
-:jbake-type: wiki
+= How do I display different groups of properties on buttons in the property sheet the way Matisse does?
+
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqPropertySheetTabs
@@ -26,8 +27,8 @@
 :toc: left
 :toc-title:
 :syntax: true
-
-== How do I display different groups of properties on buttons in the property sheet the way Matisse does?
+:wikidevsection: _properties_and_propertysheet
+:position: 3
 
 This is only really useful if you have a *lot* of properties - and having lots of properties is usually not a great idea, as the user has to search for the things they want to change.
 
@@ -43,6 +44,7 @@
 
 All `PropertySet`s that have the same value will be included under the same button/tab in the property sheet.
 
+////
 == 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/DevFaqSampleCode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSampleCode.adoc
index 9cdac26..22a08ed 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSampleCode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSampleCode.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSampleCode
-:jbake-type: wiki
+= Where can I find examples of how to use various APIs?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSampleCode
@@ -26,13 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _getting_support_where_to_find_examples
+:position: 5
 
-== Where can I find examples of how to use various APIs?
 
 There are a large number of samples. Many of these correspond to the tutorials. You can find the samples in module `platform` in `main/misc` repository at `hg.netbeans.org`. They are in the `samples/` subdirectory.
 
 The `platform/samples/` folder can be link:http://hg.netbeans.org/main/misc/file/tip/platform/samples/[browsed online here]. But for really trying things out it is usually more useful to xref:HgHowTos.adoc[have a local copy] - then you can open them as projects in the IDE.
 
+////
 == 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/DevFaqSyntaxHighlight.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSyntaxHighlight.adoc
index c099c49..f137885 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSyntaxHighlight.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSyntaxHighlight.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqSyntaxHighlight
-:jbake-type: wiki
+= How do I add syntax highlighting for my language?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqSyntaxHighlight
@@ -26,13 +26,15 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _creating_a_custom_programming_language
+:position: 1
 
-== How do I add syntax highlighting for my language?
 
 Problem: I have a custom programming language that I want to make available in the NetBeans platform. How do I add syntax highlighting for my language?
 
 Solution: Here is a tutorial on syntax highlighting for custom languages: link:http://wiki.netbeans.org/SyntaxColoringANTLR[http://wiki.netbeans.org/SyntaxColoringANTLR]
 
+////
 == 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/DevFaqTemplatesInNonIdeApp.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTemplatesInNonIdeApp.adoc
index f1bbc03..3c25744 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTemplatesInNonIdeApp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTemplatesInNonIdeApp.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqTemplatesInNonIdeApp
-:jbake-type: wiki
+=  I am creating a non-IDE application.  How do I enable/control templates?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqTemplatesInNonIdeApp
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _wizards_and_templates
+:position: 2
 
-== I am creating a non-IDE application.  How do I enable/control templates?
 
 If the projectui module is installed, templates are only made available inside projects.
 
@@ -37,6 +38,7 @@
 
 See Tom Wheeler's  link:http://www.tomwheeler.com/netbeans/[TodoListManager] for an example of code that does these things.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -48,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/DevFaqWizardChangeLabelsOfDefaultButtons.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWizardChangeLabelsOfDefaultButtons.adoc
index 119a54d..e62f0aa 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWizardChangeLabelsOfDefaultButtons.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWizardChangeLabelsOfDefaultButtons.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWizardChangeLabelsOfDefaultButtons
-:jbake-type: wiki
+= How to customize the text of default buttons in wizard dialog (Finish, Cancel, etc)?
+:jbake-type: wikidec
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWizardChangeLabelsOfDefaultButtons
@@ -26,8 +26,9 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _wizards_and_templates
+:position: 6
 
-== Customize the text of default buttons in wizard dialog
 
 Need to customize the button text of the default buttons of a wizard (Finish, Cancel, etc.)?
 
@@ -36,6 +37,7 @@
 
 See posts from mailing list link:http://forums.netbeans.org/topic55192.html[http://forums.netbeans.org/topic55192.html]
 
+////
 == 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/DevFaqWizardPanelError.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWizardPanelError.adoc
index dea4699..5344434 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWizardPanelError.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWizardPanelError.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= DevFaqWizardPanelError
-:jbake-type: wiki
+= How do I show that a user has filled an invalid input into my wizard?
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki DevFaqWizardPanelError
@@ -26,10 +26,12 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _wizards_and_templates
+:position: 4
 
-== Q: How do I show that a user has filled an invalid input into my wizard?
 
-A: Set the `WizardPanel_errorMessage` property in the WizardPanel instance that is related to the displayed panel. 
+
+Set the `WizardPanel_errorMessage` property in the WizardPanel instance that is related to the displayed panel. 
 
 Example:
 
@@ -48,6 +50,7 @@
 
 Two new methods in `NotifyDescriptor` were added to allow API client to create link:http://bits.nbextras.org/dev/javadoc/org-openide-dialogs/org/openide/NotificationLineSupport.html[NotificationLineSupport] which allow handling error/warning/info messages in dialogs. If a dialog descriptor creates this support, `DialogDisplayer`  allocates necessary space at the bottom of dialog where API clients can set info/warning/error messages with appropriate icons.
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -59,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/NetBeansCertifiedEngineerCourse.adoc b/netbeans.apache.org/src/content/wiki/NetBeansCertifiedEngineerCourse.adoc
index 2a8700e..c6394c3 100644
--- a/netbeans.apache.org/src/content/wiki/NetBeansCertifiedEngineerCourse.adoc
+++ b/netbeans.apache.org/src/content/wiki/NetBeansCertifiedEngineerCourse.adoc
@@ -17,8 +17,8 @@
 //     under the License.
 //
 
-= NetBeansCertifiedEngineerCourse
-:jbake-type: wiki
+= NetBeans Certified Engineer Course
+:jbake-type: wikidev
 :jbake-tags: wiki, devfaq, needsreview
 :jbake-status: published
 :keywords: Apache NetBeans wiki NetBeansCertifiedEngineerCourse
@@ -26,24 +26,25 @@
 :toc: left
 :toc-title:
 :syntax: true
+:wikidevsection: _getting_support_where_to_find_examples
+:position: 8
 
-== NetBeans Certified Engineer Course
 
 This is a wiki page for link:http://edu.netbeans.org/courses/nbplatform-certified-training/[NetBeans Certified Engineer Course], read more at
 link:http://edu.netbeans.org/courses/nbplatform-certified-training/[our main website].
 
-=== Exercises/Assignments
+== Exercises/Assignments
 
 * xref:NetBeansCertifiedEngineerExercises.adoc[NetBeansCertifiedEngineerExercises]
 * link:http://wiki.netbeans.org/wiki/view/NetBeansDeveloperFAQ/RCP60Tutorials[Link to Tutorials You Can Write]
 * link:http://wiki.netbeans.org/wiki/view/Java_HintsFest.adoc[Link to Hints You Can Provide ]
 
-=== Papers
+== Papers
 
 * link:http://www.netbeans.org/books/rcp.html.adoc[Rich Client Programming ]
 * link:http://platform.netbeans.org.adoc[NetBeans Platform ]
 
-=== Slides from the Training on the First Day
+== Slides from the Training on the First Day
 
 * link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/nbp-outline_NetBeansCertifiedEngineerCourse.odp[ Presentation 1: NetBeans Platform] (link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/nbp-outline_NetBeansCertifiedEngineerCourse.pdf[ PDF Version])
 * link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/first-application_NetBeansCertifiedEngineerCourse.odp[ Presentation 2: A First NetBeans Platform Application] (link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/first-application_NetBeansCertifiedEngineerCourse.pdf[ PDF Version])
@@ -51,13 +52,14 @@
 * link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/systemfs_NetBeansCertifiedEngineerCourse.odp[ Presentation 4: An Introduction to the System FileSystem]  (link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/systemfs_NetBeansCertifiedEngineerCourse.pdf[ PDF Version])
 * link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/nbp-javabeans_NetBeansCertifiedEngineerCourse.odp[ Presentation 5: NetBeans JavaBeans] (link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/nbp-javabeans_NetBeansCertifiedEngineerCourse.pdf[ PDF Version])
 
-=== Slides from the Training on the Second Day
+== Slides from the Training on the Second Day
 
 * xref:NbpLoaders.odp.adoc[Presentation 1: NetBeans ~ OS/2 ] (link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/nbp-loaders_NetBeansCertifiedEngineerCourse.pdf[ PDF Version])
 * link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/window-system_NetBeansCertifiedEngineerCourse.odp[ Presentation 2: An Introduction to the Window System] (link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/window-system_NetBeansCertifiedEngineerCourse.pdf[ PDF Version])
 * xref:NbpContribute.odp.adoc[Presentation 3: Contributing to Open Source Projects ] (link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/nbp-contribute_NetBeansCertifiedEngineerCourse.pdf[ PDF Version])
 * link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/ideas-for-modules_NetBeansCertifiedEngineerCourse.odp[ Presentation 4: Ideas for Modules] (link:http://wiki.netbeans.org/wiki/attach/NetBeansCertifiedEngineerCourse/ideas-for-modules_NetBeansCertifiedEngineerCourse.pdf[ PDF Version])
 
+////
 == Apache Migration Information
 
 The content in this page was kindly donated by Oracle Corp. to the
@@ -69,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