You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2022/10/18 16:38:59 UTC

[netbeans-website] branch master updated: more xref (#621)

This is an automated email from the ASF dual-hosted git repository.

skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git


The following commit(s) were added to refs/heads/master by this push:
     new 7d20e3384 more xref (#621)
7d20e3384 is described below

commit 7d20e3384d0e71400a3a926052a8396459d1a740
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Tue Oct 18 18:38:54 2022 +0200

    more xref (#621)
    
    * tutorial xref + apidoc to https + 404 back to absolute link
---
 netbeans.apache.org/src/content/404.adoc           |  20 +--
 .../kb/docs/javaee/ecommerce/conclusion.adoc       |  54 +++----
 .../kb/docs/javaee/ecommerce/connect-db.adoc       |  22 +--
 .../kb/docs/javaee/ecommerce/data-model.adoc       |  26 ++--
 .../content/kb/docs/javaee/ecommerce/design.adoc   |   2 +-
 .../kb/docs/javaee/ecommerce/entity-session.adoc   |  52 +++----
 .../content/kb/docs/javaee/ecommerce/index.adoc    |  32 ++---
 .../content/kb/docs/javaee/ecommerce/intro.adoc    |  32 ++---
 .../content/kb/docs/javaee/ecommerce/language.adoc |  24 ++--
 .../kb/docs/javaee/ecommerce/manage-sessions.adoc  |  46 +++---
 .../javaee/ecommerce/page-views-controller.adoc    |  56 ++++----
 .../content/kb/docs/javaee/ecommerce/section.adoc  |  32 ++---
 .../content/kb/docs/javaee/ecommerce/security.adoc |  42 +++---
 .../docs/javaee/ecommerce/setup-dev-environ.adoc   |  42 +++---
 .../content/kb/docs/javaee/ecommerce/setup.adoc    |  28 ++--
 .../kb/docs/javaee/ecommerce/test-profile.adoc     |  44 +++---
 .../kb/docs/javaee/ecommerce/transaction.adoc      |  46 +++---
 .../src/content/kb/docs/platform.adoc              | 158 ++++++++++-----------
 .../src/content/kb/docs/platform/index.adoc        |  52 +++----
 .../templates/{README.adoc => README.asciidoc}     |   0
 .../src/content/tutorials/index.adoc               | 148 +++++++++----------
 .../src/content/tutorials/nbm-ant.adoc             |   2 +-
 .../src/content/tutorials/nbm-code-completion.adoc |  16 +--
 .../src/content/tutorials/nbm-code-generator.adoc  |   8 +-
 .../src/content/tutorials/nbm-code-template.adoc   |   8 +-
 .../src/content/tutorials/nbm-copyfqn.adoc         |  12 +-
 .../src/content/tutorials/nbm-crud.adoc            |  30 ++--
 .../src/content/tutorials/nbm-dukescript.adoc      |   8 +-
 .../src/content/tutorials/nbm-emf.adoc             |  16 +--
 .../src/content/tutorials/nbm-feedreader.adoc      |  68 ++++-----
 .../src/content/tutorials/nbm-filetemplates.adoc   |   6 +-
 .../src/content/tutorials/nbm-filetype.adoc        |  16 +--
 .../src/content/tutorials/nbm-geospatial.adoc      |   8 +-
 .../src/content/tutorials/nbm-gesture.adoc         |   8 +-
 .../src/content/tutorials/nbm-glossary.adoc        |   4 +-
 .../src/content/tutorials/nbm-google.adoc          |  12 +-
 .../src/content/tutorials/nbm-htmleditor.adoc      |   8 +-
 .../src/content/tutorials/nbm-hyperlink.adoc       |   8 +-
 .../src/content/tutorials/nbm-ide.adoc             |   6 +-
 .../src/content/tutorials/nbm-java-hint.adoc       |   6 +-
 .../src/content/tutorials/nbm-javacc-lexer.adoc    |  28 ++--
 .../src/content/tutorials/nbm-javacc-parser.adoc   | 128 ++++++++---------
 .../src/content/tutorials/nbm-javafx.adoc          |   2 +-
 .../content/tutorials/nbm-mark-occurrences.adoc    |  56 ++++----
 .../content/tutorials/nbm-maven-commandline.adoc   |  10 +-
 .../src/content/tutorials/nbm-maven-crud.adoc      |  18 +--
 .../content/tutorials/nbm-maven-modulesingle.adoc  |  14 +-
 .../content/tutorials/nbm-maven-modulesuite.adoc   |  22 +--
 .../content/tutorials/nbm-maven-quickstart.adoc    |  24 ++--
 .../src/content/tutorials/nbm-nbi.adoc             |  10 +-
 .../src/content/tutorials/nbm-nodesapi.adoc        |  36 ++---
 .../src/content/tutorials/nbm-nodesapi2.adoc       |  12 +-
 .../src/content/tutorials/nbm-nodesapi3.adoc       |   8 +-
 .../src/content/tutorials/nbm-options.adoc         |  20 +--
 .../src/content/tutorials/nbm-paintapp.adoc        |  30 ++--
 .../src/content/tutorials/nbm-palette-api1.adoc    |  24 ++--
 .../src/content/tutorials/nbm-palette-api2.adoc    |  48 +++----
 .../src/content/tutorials/nbm-porting-basic.adoc   |  44 +++---
 .../src/content/tutorials/nbm-povray-1.adoc        |  32 ++---
 .../src/content/tutorials/nbm-povray-10.adoc       |  28 ++--
 .../src/content/tutorials/nbm-povray-2.adoc        |   6 +-
 .../src/content/tutorials/nbm-povray-3.adoc        |   6 +-
 .../src/content/tutorials/nbm-povray-4.adoc        |   4 +-
 .../src/content/tutorials/nbm-povray-5.adoc        |   8 +-
 .../src/content/tutorials/nbm-povray-6.adoc        |   8 +-
 .../src/content/tutorials/nbm-povray-7.adoc        |   6 +-
 .../src/content/tutorials/nbm-povray-8.adoc        |   4 +-
 .../src/content/tutorials/nbm-povray-9.adoc        |   4 +-
 .../content/tutorials/nbm-projectextension.adoc    |  20 +--
 .../src/content/tutorials/nbm-projectsamples.adoc  |   8 +-
 .../src/content/tutorials/nbm-projecttype.adoc     |  66 ++++-----
 .../src/content/tutorials/nbm-projecttypeant.adoc  |  42 +++---
 .../content/tutorials/nbm-property-editors.adoc    |  10 +-
 .../tutorials/nbm-propertyeditors-integration.adoc |   2 +-
 .../src/content/tutorials/nbm-quick-search.adoc    |  16 +--
 .../content/tutorials/nbm-quick-start-visual.adoc  |   8 +-
 .../src/content/tutorials/nbm-quick-start.adoc     |   8 +-
 .../src/content/tutorials/nbm-ribbonbar.adoc       |   4 +-
 .../content/tutorials/nbm-runtime-container.adoc   |  10 +-
 .../src/content/tutorials/nbm-selection-1.adoc     |  10 +-
 .../src/content/tutorials/nbm-selection-2.adoc     |   8 +-
 .../src/content/tutorials/nbm-server-plugin.adoc   |   8 +-
 .../src/content/tutorials/nbm-test.adoc            |  38 ++---
 .../src/content/tutorials/nbm-visual_library.adoc  |  18 +--
 .../src/content/tutorials/nbm-visual_library2.adoc |  26 ++--
 .../src/content/tutorials/nbm-visual_library3.adoc |   4 +-
 .../src/content/tutorials/nbm-visual_library4.adoc |   8 +-
 .../src/content/tutorials/nbm-wizard.adoc          |  26 ++--
 .../src/content/tutorials/nbm-workflow.adoc        |  32 ++---
 .../src/content/tutorials/nbm-xmleditor.adoc       |   8 +-
 .../src/content/wiki/APIDevelopment.adoc           |   4 +-
 .../src/content/wiki/Authenticator.adoc            |   2 +-
 .../content/wiki/BackwardCompatibilityPatches.adoc |   2 +-
 .../src/content/wiki/BugtrackingCookbook.adoc      |  24 ++--
 .../src/content/wiki/CompatibilityPolicy.adoc      |   4 +-
 .../src/content/wiki/DefFaqMapApisToTasks.adoc     |  24 ++--
 .../wiki/DevFaqActionAddProjectOwnTypePopUp.adoc   |   2 +-
 .../src/content/wiki/DevFaqActionAddTools.adoc     |   2 +-
 .../content/wiki/DevFaqActionContextSensitive.adoc |   6 +-
 .../DevFaqAddFileTemplateToNewFileContentMenu.adoc |   2 +-
 .../content/wiki/DevFaqAnnotationDevelopDebug.adoc |   2 +-
 .../src/content/wiki/DevFaqAnnotationList.adoc     |  74 +++++-----
 .../src/content/wiki/DevFaqApisBasics.adoc         |   2 +-
 .../src/content/wiki/DevFaqAppLifecycleHooks.adoc  |   4 +-
 .../wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc       |   2 +-
 .../src/content/wiki/DevFaqBecomingProficient.adoc |   2 +-
 .../content/wiki/DevFaqChangeNodeAppearance.adoc   |   2 +-
 .../DevFaqCheckableActionPreferenceOption.adoc     |   2 +-
 .../src/content/wiki/DevFaqClassLoaders.adoc       |   2 +-
 .../content/wiki/DevFaqCustomizeWindowSystem.adoc  |   8 +-
 .../src/content/wiki/DevFaqCutCopyPaste.adoc       |   2 +-
 .../src/content/wiki/DevFaqDataLoader.adoc         |   4 +-
 .../src/content/wiki/DevFaqDataObject.adoc         |   2 +-
 .../content/wiki/DevFaqDialogControlOKButton.adoc  |   2 +-
 .../src/content/wiki/DevFaqDialogsApiIntro.adoc    |   4 +-
 .../src/content/wiki/DevFaqDotSettingsFiles.adoc   |   8 +-
 .../src/content/wiki/DevFaqDotShadowFiles.adoc     |   2 +-
 .../content/wiki/DevFaqDropdownMenuAddToolbar.adoc |   2 +-
 .../wiki/DevFaqDropdownMenuAddToolbarEnabled.adoc  |   2 +-
 .../wiki/DevFaqDynamicSystemFilesystem.adoc        |   4 +-
 .../src/content/wiki/DevFaqEditorTopComponent.adoc |   8 +-
 .../content/wiki/DevFaqEditorWhatIsMimePath.adoc   |   2 +-
 .../src/content/wiki/DevFaqExportImport.adoc       |   2 +-
 .../content/wiki/DevFaqExtendOptionsWindow.adoc    |   2 +-
 .../src/content/wiki/DevFaqExternalExecution.adoc  |   4 +-
 .../src/content/wiki/DevFaqFileAttributes.adoc     |   4 +-
 .../src/content/wiki/DevFaqFileChoosers.adoc       |   2 +-
 .../src/content/wiki/DevFaqFileObject.adoc         |   4 +-
 .../src/content/wiki/DevFaqFileRecognition.adoc    |   2 +-
 .../wiki/DevFaqGeneralWhereIsJavadoc.asciidoc      |   2 +-
 .../content/wiki/DevFaqGetNameOfProjectGroup.adoc  |   2 +-
 .../src/content/wiki/DevFaqHelpGuidelines.adoc     |   4 +-
 .../wiki/DevFaqHowToChangeUpdateCenterURL.adoc     |   2 +-
 .../src/content/wiki/DevFaqHowToOpenURL.adoc       |   2 +-
 .../src/content/wiki/DevFaqHowToPrint.adoc         |   2 +-
 .../content/wiki/DevFaqInstalledFileLocator.adoc   |   2 +-
 .../wiki/DevFaqInvokeActionProgrammatically.adoc   |   4 +-
 .../src/content/wiki/DevFaqJavaHelp.adoc           |   2 +-
 .../content/wiki/DevFaqJavaHelpOverrideCustom.adoc |   2 +-
 .../content/wiki/DevFaqListenEditorChanges.adoc    |   2 +-
 .../DevFaqListenForChangesInNonExistentFile.adoc   |   2 +-
 .../content/wiki/DevFaqListenForSaveEvents.adoc    |   4 +-
 .../wiki/DevFaqListeningForFileChanges.adoc        |   4 +-
 .../src/content/wiki/DevFaqLogging.adoc            |   2 +-
 .../src/content/wiki/DevFaqLookup.adoc             |   8 +-
 .../src/content/wiki/DevFaqLookupDefault.adoc      |   6 +-
 .../src/content/wiki/DevFaqLookupForDataNode.adoc  |   2 +-
 .../content/wiki/DevFaqLookupHowToOverride.adoc    |   2 +-
 .../src/content/wiki/DevFaqLookupImplement.adoc    |   8 +-
 .../src/content/wiki/DevFaqLookupLazyLoad.adoc     |   2 +-
 .../src/content/wiki/DevFaqLookupVsHashmap.adoc    |   2 +-
 .../src/content/wiki/DevFaqMIMEResolver.adoc       |   2 +-
 .../src/content/wiki/DevFaqMakeGroupTemplate.adoc  |   2 +-
 .../src/content/wiki/DevFaqMavenL10N.adoc          |   2 +-
 .../wiki/DevFaqMigratingToNewerPlatform.adoc       |   2 +-
 .../src/content/wiki/DevFaqModuleDependencies.adoc |   2 +-
 .../wiki/DevFaqModuleLoadUnloadNotification.adoc   |   6 +-
 .../DevFaqModulesDeclarativeVsProgrammatic.adoc    |   4 +-
 .../content/wiki/DevFaqMoreDocsOnCertainAPIs.adoc  |  16 +--
 .../wiki/DevFaqMultiViewChangeTabInCode.adoc       |   2 +-
 .../wiki/DevFaqMultipleTopComponentAction.adoc     |   4 +-
 .../src/content/wiki/DevFaqNativeLibraries.adoc    |   2 +-
 .../src/content/wiki/DevFaqNbIdiosyncracies.adoc   |  12 +-
 .../src/content/wiki/DevFaqNoClassDefFound.adoc    |   2 +-
 .../src/content/wiki/DevFaqNodeDeletionDialog.adoc |   2 +-
 .../wiki/DevFaqNodeInjectingLookupContents.adoc    |   4 +-
 .../src/content/wiki/DevFaqNodeSerialize.adoc      |   2 +-
 .../src/content/wiki/DevFaqNodeSubclass.adoc       |   8 +-
 .../src/content/wiki/DevFaqNodesCustomLookup.adoc  |   2 +-
 .../src/content/wiki/DevFaqNonGuiPlatformApp.adoc  |   2 +-
 .../wiki/DevFaqNonSingletonTopComponents.adoc      |   4 +-
 .../content/wiki/DevFaqOpenOptionsAtCategory.adoc  |   2 +-
 .../wiki/DevFaqPlatformAppAuthStrategies.adoc      |   4 +-
 .../content/wiki/DevFaqPropertyEditorHints.adoc    |   4 +-
 .../content/wiki/DevFaqPropertySheetEditors.adoc   |   2 +-
 .../src/content/wiki/DevFaqPropertySheetNodes.adoc |   2 +-
 .../wiki/DevFaqPropertySheetReadonlyProperty.adoc  |   2 +-
 ...qRegisterObjectsViaInstanceOrSettingsFiles.adoc |   6 +-
 .../src/content/wiki/DevFaqRenamingMenuItem.adoc   |   2 +-
 .../src/content/wiki/DevFaqRequestProcessor.adoc   |   4 +-
 .../src/content/wiki/DevFaqSetPrefs.adoc           |   2 +-
 .../content/wiki/DevFaqSuppressExistingModule.adoc |   2 +-
 .../wiki/DevFaqSwitchingMenusByContext.adoc        |   6 +-
 .../wiki/DevFaqSysFsLookupRegistration.adoc        |   2 +-
 .../src/content/wiki/DevFaqSystemFilesystem.adoc   |   2 +-
 .../src/content/wiki/DevFaqThreading.adoc          |   2 +-
 .../src/content/wiki/DevFaqThreadingBuiltIn.adoc   |   4 +-
 .../wiki/DevFaqToggleActionAddToEditorToolbar.adoc |   2 +-
 .../src/content/wiki/DevFaqTutorialsAPI.adoc       |   4 +-
 .../src/content/wiki/DevFaqUIGestures.adoc         |   2 +-
 .../src/content/wiki/DevFaqUseNativeInstaller.adoc |  12 +-
 .../src/content/wiki/DevFaqUserDir.adoc            |   2 +-
 .../src/content/wiki/DevFaqUsingSimpletests.adoc   |   2 +-
 .../src/content/wiki/DevFaqWeakListener.adoc       |   2 +-
 .../src/content/wiki/DevFaqWeakListenerWhen.adoc   |   2 +-
 .../src/content/wiki/DevFaqWhatIsACluster.adoc     |   4 +-
 .../DevFaqWhenToUseWhatRegistrationMethod.adoc     |  12 +-
 .../content/wiki/DevFaqWindowsComponentHowTo.adoc  |   2 +-
 .../src/content/wiki/DevFaqWindowsMode.adoc        |   2 +-
 .../content/wiki/DevFaqWindowsTopComponent.adoc    |   4 +-
 .../src/content/wiki/DevFaqWindowsXmlApi.adoc      |   2 +-
 .../src/content/wiki/DevFaqWrapperModules.adoc     |   2 +-
 .../src/content/wiki/FitnessViaTimersCounter.adoc  |   2 +-
 .../src/content/wiki/HtmlUIForTemplates.adoc       |   2 +-
 .../src/content/wiki/MavenBestPractices.adoc       |   2 +-
 .../src/content/wiki/NbmIdioms.adoc                |  36 ++---
 .../src/content/wiki/ParsingAPI.adoc               |   2 +-
 .../src/content/wiki/RunConfigurations49636.adoc   |   2 +-
 .../src/content/wiki/VersioningPolicy.adoc         |   2 +-
 209 files changed, 1382 insertions(+), 1382 deletions(-)

diff --git a/netbeans.apache.org/src/content/404.adoc b/netbeans.apache.org/src/content/404.adoc
index f0ea6d0a1..f2aca820b 100644
--- a/netbeans.apache.org/src/content/404.adoc
+++ b/netbeans.apache.org/src/content/404.adoc
@@ -30,7 +30,7 @@
 
 We regret having to say that the page you requested does not longer exist.
 
-This may be a problem of ours, if so please feel free to xref:participate/report-issue.adoc[report an issue].
+This may be a problem of ours, if so please feel free to link:https://netbeans.apache.org/participate/report-issue.html[report an issue].
 
 == Main sections
 
@@ -38,18 +38,18 @@ This website is structured in these main sections:
 
 === Documentation
 
-* The main xref:help/index.adoc[documentation section].
-** xref:kb/docs/java/index.adoc[The Java SE Learning Trail].
-** xref:kb/docs/php/index.adoc[PHP and HTML5 Learning Trail].
-** xref:kb/docs/platform/index.adoc[The NetBeans Platform Learning Trail].
+* The main link:https://netbeans.apache.org/help/index.html[documentation section].
+** link:https://netbeans.apache.org/kb/docs/java/index.html[The Java SE Learning Trail].
+** link:https://netbeans.apache.org/kb/docs/php/index.html[PHP and HTML5 Learning Trail].
+** link:https://netbeans.apache.org/kb/docs/platform/index.html[The NetBeans Platform Learning Trail].
 
 === Other pages of interest:
 
-* Our xref:wiki/index.adoc[wiki is here].
-* See how to xref:community/index.adoc[participate in Apache NetBeans].
-** Join our xref:community/mailing-lists.adoc[mailing lists].
-** See how you can xref:participate/submit-pr.adoc[contribute code].
-** See how you can xref:kb/docs/contributing.adoc[contribute documentation].
+* Our link:https://netbeans.apache.org/wiki/index.html[wiki is here].
+* See how to link:https://netbeans.apache.org/community/index.html[participate in Apache NetBeans].
+** Join our link:https://netbeans.apache.org/community/mailing-lists.html[mailing lists].
+** See how you can link:https://netbeans.apache.org/participate/submit-pr.html[contribute code].
+** See how you can link:https://netbeans.apache.org/kb/docs/contributing.html[contribute documentation].
 ** Contribute a link:https://plugins.netbeans.apache.org/[plugin] in our website.
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/conclusion.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/conclusion.adoc
index 778a7b8fc..65578cdd8 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/conclusion.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/conclusion.adoc
@@ -32,18 +32,18 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
-3. link:setup-dev-environ.html[+Setting up the Development Environment+]
-4. link:data-model.html[+Designing the Data Model+]
-5. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
-6. link:connect-db.html[+Connecting the Application to the Database+]
-7. link:entity-session.html[+Adding Entity Classes and Session Beans+]
-8. link:manage-sessions.html[+Managing Sessions+]
-9. link:transaction.html[+Integrating Transactional Business Logic+]
-10. link:language.html[+Adding Language Support+]
-11. link:security.html[+Securing the Application+]
-12. link:test-profile.html[+Testing and Profiling+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
+3. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
+4. xref:data-model.adoc[+Designing the Data Model+]
+5. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
+6. xref:connect-db.adoc[+Connecting the Application to the Database+]
+7. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
+8. xref:manage-sessions.adoc[+Managing Sessions+]
+9. xref:transaction.adoc[+Integrating Transactional Business Logic+]
+10. xref:language.adoc[+Adding Language Support+]
+11. xref:security.adoc[+Securing the Application+]
+12. xref:test-profile.adoc[+Testing and Profiling+]
 13. *Conclusion*
 * <<deliver,Delivering your Work>>
 * <<framework,Using the JavaServer Faces Framework>>
@@ -54,7 +54,7 @@
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
-Congratulations! You have now finished developing the `AffableBean` application. By following this tutorial, you incrementally built a simple e-commerce application using Java-based technologies. In the process, you became familiar with the NetBeans IDE, and have learned how to use it for the development of Java EE and web projects. Referring back to the link:design.html#requirements[+customer requirements+], you can confirm that each requirement has been fully implemented, and through c [...]
+Congratulations! You have now finished developing the `AffableBean` application. By following this tutorial, you incrementally built a simple e-commerce application using Java-based technologies. In the process, you became familiar with the NetBeans IDE, and have learned how to use it for the development of Java EE and web projects. Referring back to the xref:design.adoc#requirements[+customer requirements+], you can confirm that each requirement has been fully implemented, and through c [...]
 
 You can view a live demo of the `AffableBean` application: link:http://services.netbeans.org/AffableBean/[+NetBeans E-commerce Tutorial Demo Application+].
 
@@ -67,14 +67,14 @@ The completed `AffableBean` project is also link:https://netbeans.org/projects/s
 
 When delivering your work, you should prepare both a WAR (web archive) file, which is a compiled, ready-to-deploy version of your project, and a source distribution, which contains all the source files you created during the development phase.
 
-1. *WAR File Distribution:* A WAR file is basically a compressed collection of classes, files and other artifacts that constitute the web application. You can create a WAR file for your project using the IDE. In the Projects window, right-click your project node and choose Clean and Build. When your project is built, a WAR file is generated and placed in a `dist` folder in your project. You can verify this by examining your project in the Files window (Ctrl-2; ⌘-2 on Mac). (Refer back to [...]
+1. *WAR File Distribution:* A WAR file is basically a compressed collection of classes, files and other artifacts that constitute the web application. You can create a WAR file for your project using the IDE. In the Projects window, right-click your project node and choose Clean and Build. When your project is built, a WAR file is generated and placed in a `dist` folder in your project. You can verify this by examining your project in the Files window (Ctrl-2; ⌘-2 on Mac). (Refer back to [...]
 2. *Source Distribution:* A package containing all source and configuration files, typically in an archive file format (e.g., ZIP, TAR). You can use your NetBeans project as part of your source distribution. Before compressing your project, make sure to clean it (In the Projects window, right-click the project node and choose Clean) in order to delete `build` and `dist` folders, if they exist. You should also remove any of your environment-specific details included in the project. To do  [...]
 
-As part of your source distribution, you would need to also provide any scripts or artifacts that are necessary for setup, configuration, and population of the database. In this scenario, that would include the MySQL Workbench project from Unit 4, link:data-model.html[+Designing the Data Model+], the DDL script that creates the `affablebean` database schema, and possibly a separate script that populates the `category` and `product` tables with business data.
+As part of your source distribution, you would need to also provide any scripts or artifacts that are necessary for setup, configuration, and population of the database. In this scenario, that would include the MySQL Workbench project from Unit 4, xref:data-model.adoc[+Designing the Data Model+], the DDL script that creates the `affablebean` database schema, and possibly a separate script that populates the `category` and `product` tables with business data.
 
-As was indicated in the tutorial link:design.html#scenario[+Scenario+], a "technically-oriented staff member is able to deploy the application to the production server once it is ready." Aside from necessary performance tuning (GlassFish tuning is discussed in Unit 12 link:test-profile.html#glassFishTune[+Testing and Profiling+]) the person responsible for this would need to ensure that the database driver is accessible to the server (i.e., place the driver JAR file in the server's libra [...]
+As was indicated in the tutorial xref:design.adoc#scenario[+Scenario+], a "technically-oriented staff member is able to deploy the application to the production server once it is ready." Aside from necessary performance tuning (GlassFish tuning is discussed in Unit 12 xref:test-profile.adoc#glassFishTune[+Testing and Profiling+]) the person responsible for this would need to ensure that the database driver is accessible to the server (i.e., place the driver JAR file in the server's libra [...]
 
-*Note:* Recall that the `sun-resources.xml` file, which you created in Unit 6, link:connect-db.html#createConnPoolDataSource[+Connecting the Application to the Database+] contains entries that instruct the GlassFish server to create the JDBC resource and connection pool when the application is deployed. The `sun-resources.xml` file is a deployment descriptor specific to the GlassFish server only. Therefore, if the customer isn't using GlassFish as the production server, the file should b [...]
+*Note:* Recall that the `sun-resources.xml` file, which you created in Unit 6, xref:connect-db.adoc#createConnPoolDataSource[+Connecting the Application to the Database+] contains entries that instruct the GlassFish server to create the JDBC resource and connection pool when the application is deployed. The `sun-resources.xml` file is a deployment descriptor specific to the GlassFish server only. Therefore, if the customer isn't using GlassFish as the production server, the file should b [...]
 
 In terms of security, it would be necessary to set up a _user_ and _group_ on the production server, so that the server can authenticate persons wanting to log into the administration console. Also, SSL support for the production server would need to be enabled, and you would need to acquire a certificate signed by a trusted third-party Certificate Authority (CA), such as link:http://www.verisign.com[+VeriSign+] or link:http://www.thawte.com/[+Thawte+].
 
@@ -82,7 +82,7 @@ Once the database is created and tables are populated with necessary data, the c
 
 The GlassFish plugin support in NetBeans also enables you to connect to a remote instance of GlassFish. You can therefore work with a GlassFish production server from the IDE for monitoring, profiling, and debugging tasks. If you are interested in using GlassFish as a production server, refer to the <<seeAlso,See Also>> section below for a list of web hosting solutions.
 
-_Portability_ is among the key benefits of Java EE. As your application adheres to the technology specifications, it can theoretically be deployed to any server that supports the same specifications. Recall that the link:intro.html#jcp[+Introduction+] lists the specifications that you have used in this tutorial. All of these specifications are part of the Java EE 6 platform specification (link:http://jcp.org/en/jsr/summary?id=316[+JSR 316+]). Therefore, any server that is Java EE 6-compl [...]
+_Portability_ is among the key benefits of Java EE. As your application adheres to the technology specifications, it can theoretically be deployed to any server that supports the same specifications. Recall that the xref:intro.adoc#jcp[+Introduction+] lists the specifications that you have used in this tutorial. All of these specifications are part of the Java EE 6 platform specification (link:http://jcp.org/en/jsr/summary?id=316[+JSR 316+]). Therefore, any server that is Java EE 6-compl [...]
 
 
 
@@ -254,17 +254,17 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 *JavaServer Faces*
 
-* link:../../web/jsf20-support.html[+JSF 2.0 Support in NetBeans IDE+]
-* link:../../web/jsf20-intro.html[+Introduction to JavaServer Faces 2.0+]
-* link:../../web/jsf20-crud.html[+Generating a JavaServer Faces 2.0 CRUD Application from a Database+]
+* xref:../../web/jsf20-support.adoc[+JSF 2.0 Support in NetBeans IDE+]
+* xref:../../web/jsf20-intro.adoc[+Introduction to JavaServer Faces 2.0+]
+* xref:../../web/jsf20-crud.adoc[+Generating a JavaServer Faces 2.0 CRUD Application from a Database+]
 * link:../../../samples/scrum-toys.html[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
 
 *Contexts and Dependency Injection*
 
-* link:../cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
-* link:../cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
-* link:../cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
-* link:../cdi-events.html[+Working with Events in CDI+]
+* xref:../cdi-intro.adoc[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
+* xref:../cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+]
+* xref:../cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+]
+* xref:../cdi-events.adoc[+Working with Events in CDI+]
 
 
 === JavaServer Faces
@@ -309,8 +309,8 @@ Many people have helped with this project. I am especially grateful to following
 * Ed Burns, who was my SEED mentor, for his patience and guidance, and his willingness to share his technical expertise in our numerous discussions concerning Java web technologies.
 * My managers, Patrick Keegan, for originally approving this project, and David Lindt, who showed continuous support.
 * David Konecny and Andrei Badea for their invaluable help and advice, especially in regard Java Persistence, working with EclipseLink, and integrating EE 6 technologies.
-* Don McKinney for providing the three beautiful diagrams used in link:design.html[+Designing the Application+].
-* Eric Jendrock and the Java EE Tutorial team, for granting permission to adapt and reproduce diagrams from the Java EE 5 Tutorial. Diagrams were used in link:security.html[+Securing the Application+], and are based on link:http://download.oracle.com/javaee/5/tutorial/doc/bnbxj.html#bnbxl[+Figure 28-6: Mapping Roles to Users and Groups+] and link:http://download.oracle.com/javaee/5/tutorial/doc/bncbe.html#gexfa[+Figure 30-3: Form-Based Authentication+].
+* Don McKinney for providing the three beautiful diagrams used in xref:design.adoc[+Designing the Application+].
+* Eric Jendrock and the Java EE Tutorial team, for granting permission to adapt and reproduce diagrams from the Java EE 5 Tutorial. Diagrams were used in xref:security.adoc[+Securing the Application+], and are based on link:http://download.oracle.com/javaee/5/tutorial/doc/bnbxj.html#bnbxl[+Figure 28-6: Mapping Roles to Users and Groups+] and link:http://download.oracle.com/javaee/5/tutorial/doc/bncbe.html#gexfa[+Figure 30-3: Form-Based Authentication+].
 * Jan Pirek, for coordinating and setting up necessary resources to make the link:http://services.netbeans.org/AffableBean/[+live demo+] a reality.
 * Ondrej Panek for providing a Czech translation of text used in the sample application.
 * Also, special thanks to link:http://www.flickr.com/photos/cobalt/[+cobalt123+] for graciously permitting usage of several photos, including link:http://www.flickr.com/photos/cobalt/46523149/[+Fresh Picks+] and link:http://www.flickr.com/photos/cobalt/1441879742/[+Give Us Our Daily Bread #1+].
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/connect-db.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/connect-db.adoc
index 24f5b35d5..bdc1ab764 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/connect-db.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/connect-db.adoc
@@ -32,7 +32,7 @@
 
 This tutorial unit focuses on communication between the database and the application. You begin by adding sample data to the database and explore some of the features provided by the IDE's SQL editor. You set up a data source and connection pool on the GlassFish server, and proceed by creating a JSP page that tests the data source by performing a simple query on the database.
 
-This unit also addresses how the application retrieves and displays images necessary for web presentation, and how to set context parameters and retrieve their values from web pages. Once you are certain the data source is working correctly, you apply JSTL's `core` and `sql` tag libraries to retrieve and display category and product images for the link:design.html#index[+index+] and link:design.html#category[+category+] pages.
+This unit also addresses how the application retrieves and displays images necessary for web presentation, and how to set context parameters and retrieve their values from web pages. Once you are certain the data source is working correctly, you apply JSTL's `core` and `sql` tag libraries to retrieve and display category and product images for the xref:design.adoc#index[+index+] and xref:design.adoc#category[+category+] pages.
 
 You can view a live demo of the application that you build in this tutorial: link:http://services.netbeans.org/AffableBean/[+NetBeans E-commerce Tutorial Demo Application+].
 
@@ -60,7 +60,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 * The NetBeans IDE Java Bundle includes Java Web and EE technologies, which are required for the application you build in this tutorial.
 * The NetBeans IDE Java Bundle also includes the GlassFish server, which you require for this tutorial. You could link:http://glassfish.dev.java.net/public/downloadsindex.html[+download the GlassFish server independently+], but the version provided with the NetBeans download has the added benefit of being automatically registered with the IDE.
 * You can follow this tutorial unit without having completed previous units. To do so, perform the following three steps:
-1. *Set up your MySQL database server.* Follow the steps outlined in: link:setup-dev-environ.html#communicate[+Communicating with the Database Server+].
+1. *Set up your MySQL database server.* Follow the steps outlined in: xref:setup-dev-environ.adoc#communicate[+Communicating with the Database Server+].
 2. *Create the `affablebean` schema on the database server.*
 .. Click on link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252Faffablebean_schema_creation.sql[+affablebean_schema_creation.sql+] and copy (Ctrl-C; ⌘-C on Mac) the entire contents of the file.
 .. Open the IDE's SQL editor. In the Services window (Ctrl-5; ⌘-5 on Mac), right-click the `affablebean` database connection ( image:images/db-connection-node.png[] ) node and choose Execute Command. The IDE's SQL editor opens.
@@ -190,7 +190,7 @@ If the displayed data needs to be resynchronized with the actual database, you c
 [[createConnPoolDataSource]]
 == Creating a Connection Pool and Data Source
 
-From this point onward, you establish connectivity between the MySQL database and the `affablebean` application through the GlassFish server which it is deployed to. This communication is made possible with the Java Database Connectivity (link:http://java.sun.com/products/jdbc/overview.html[+JDBC+]) API. The JDBC API is an integration library contained in the JDK (refer back to the component diagram displayed in the tutorial link:intro.html#platform[+Introduction+]). Although this tutori [...]
+From this point onward, you establish connectivity between the MySQL database and the `affablebean` application through the GlassFish server which it is deployed to. This communication is made possible with the Java Database Connectivity (link:http://java.sun.com/products/jdbc/overview.html[+JDBC+]) API. The JDBC API is an integration library contained in the JDK (refer back to the component diagram displayed in the tutorial xref:intro.adoc#platform[+Introduction+]). Although this tutori [...]
 
 A connection pool contains a group of reusable connections for a particular database. Because creating each new physical connection is time-consuming, the server maintains a pool of available connections to increase performance. When an application requests a connection, it obtains one from the pool. When an application closes a connection, the connection is returned to the pool. Connection pools use a JDBC driver to create physical database connections.
 
@@ -200,7 +200,7 @@ In order to enable the application access to the `affablebean` database, you nee
 
 *Note:* You can also create connection pools and data sources directly on the GlassFish server using the GlassFish Administration Console. However, creating these resources in this manner requires that you manually enter database connection details (i.e., username, password and URL). The benefit of using the NetBeans wizard is that it extracts any connection details directly from an existing database connection, thus eliminating potential connectivity problems.
 
-To access the console from the IDE, in the Services window right-click the Servers > GlassFish node and choose View Admin Console. The default username / password is: `admin` / `adminadmin`. If you'd like to set up the connection pool and data source using the GlassFish Administration console, follow steps 3-15 of the link:setup.html[+NetBeans E-commerce Tutorial Setup Instructions+]. The setup instructions are provided for later tutorial units.
+To access the console from the IDE, in the Services window right-click the Servers > GlassFish node and choose View Admin Console. The default username / password is: `admin` / `adminadmin`. If you'd like to set up the connection pool and data source using the GlassFish Administration console, follow steps 3-15 of the xref:setup.adoc[+NetBeans E-commerce Tutorial Setup Instructions+]. The setup instructions are provided for later tutorial units.
 
 1. Click the New File ( image:images/new-file-btn.png[] ) button in the IDE's toolbar. (Alternatively, press Ctrl-N; ⌘-N on Mac.)
 2. Select the *GlassFish* category, then select *JDBC Resource* and click Next.
@@ -477,7 +477,7 @@ By way of demonstration, you create context parameters for the image paths to ca
 
 image::images/projects-win-img-folder.png[title="Import the 'img' folder into the AffableBean project"] 
 
-The `categories` and `products` folders contain the images that will be displayed in the link:design.html#index[+index+] and link:design.html#category[+category+] pages, respectively.
+The `categories` and `products` folders contain the images that will be displayed in the xref:design.adoc#index[+index+] and xref:design.adoc#category[+category+] pages, respectively.
 
 [start=3]
 . Open the project's web deployment descriptor. In the Projects window, expand the Configuration Files node and double-click `web.xml`.
@@ -736,7 +736,7 @@ This URL can can be explained in the following manner:
 * `/AffableBean`: The context root of your deployed application
 * `/category`: The path to the request
 
-Recall that in link:page-views-controller.html#controller[+Preparing the Page Views and Controller Servlet+], you mapped a request for '`/category`' to the `ControllerServlet`. Currently, the `ControllerServlet` internally forwards the request to `/WEB-INF/view/category.jsp`, which is why the category page displays upon clicking an image link.
+Recall that in xref:page-views-controller.adoc#controller[+Preparing the Page Views and Controller Servlet+], you mapped a request for '`/category`' to the `ControllerServlet`. Currently, the `ControllerServlet` internally forwards the request to `/WEB-INF/view/category.jsp`, which is why the category page displays upon clicking an image link.
 
 You can verify the application's context root by expanding the Configuration Files node in the Projects window, and opening the `sun-web.xml` file. The `sun-web.xml` file is a deployment descriptor specific to GlassFish.
 
@@ -984,7 +984,7 @@ You have now completed this tutorial unit. In it, you explored how to connect yo
 
 You can download and examine link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot3.zip[+snapshot 3+] if you'd like to compare your work with the solution project. The solution project contains enhancements to the HTML markup and stylesheet in order to properly display all provided images. It also provides welcome page text, and a basic implementation for the page footer.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20NetBeans%20E-commerce%20Tutorial%20-%20Connecting%20the%20Application%20to%20the%20Database[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[+Send Us Your Feedback+]
 
 
 
@@ -1034,10 +1034,10 @@ This can occur when you are using an incorrect username/password combination. Ma
 
 === NetBeans Resources
 
-* link:../../ide/mysql.html[+Connecting to a MySQL Database+]
-* link:../../web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:../../web/mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+]
-* link:../../ide/database-improvements-screencast.html[+Screencast: Database Support in NetBeans IDE+]
+* xref:../../ide/mysql.adoc[+Connecting to a MySQL Database+]
+* xref:../../web/quickstart-webapps.adoc[+Introduction to Developing Web Applications+]
+* xref:../../web/mysql-webapp.adoc[+Creating a Simple Web Application Using a MySQL Database+]
+* xref:../../ide/database-improvements-screencast.adoc[+Screencast: Database Support in NetBeans IDE+]
 
 
 === MySQL Resources
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/data-model.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/data-model.adoc
index 079ba53ef..ff957cff4 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/data-model.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/data-model.adoc
@@ -65,7 +65,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 
 In the real world, you may not have the luxury of designing the data model for your application. For example, your task may be to develop an application on top of an existing database system. Provided you do not have a data model to base your application on, creating one should be one of the first design steps you take before embarking on development. Creating a data model involves identifying the objects, or _entities_, required by your system and defining the relationships between them.
 
-To begin identifying the entities we need for the data model, re-examine the use-case presented in link:design.html#mockups[+Designing the Application+]. Search for commonly-occurring nouns. For example:
+To begin identifying the entities we need for the data model, re-examine the use-case presented in xref:design.adoc#mockups[+Designing the Application+]. Search for commonly-occurring nouns. For example:
 
 
 === Use-Case
@@ -74,7 +74,7 @@ To begin identifying the entities we need for the data model, re-examine the use
 
 
 
-The text highlighted above in *bold* indicates the candidates that we can consider for the data model. Upon closer inspection, you may deduce that the shopping cart does not need to be included, since the data it provides (i.e., products and their quantities) is equally offered by a customer order once it is processed. In fact, as will be demonstrated in Unit 8, link:manage-sessions.html[+Managing Sessions+], the shopping cart merely serves as a mechanism that retains a user session temp [...]
+The text highlighted above in *bold* indicates the candidates that we can consider for the data model. Upon closer inspection, you may deduce that the shopping cart does not need to be included, since the data it provides (i.e., products and their quantities) is equally offered by a customer order once it is processed. In fact, as will be demonstrated in Unit 8, xref:manage-sessions.adoc[+Managing Sessions+], the shopping cart merely serves as a mechanism that retains a user session temp [...]
 
 * *customer*
 * *category*
@@ -83,7 +83,7 @@ The text highlighted above in *bold* indicates the candidates that we can consid
 
 With these four entities, we can begin constructing an entity-relationship diagram (ERD).
 
-*Note:* In this tutorial, we create a database schema from the ERD, then use the IDE's EclipseLink support to generate JPA entity classes from the existing database. (EclipseLink and the Java Persistence API (JPA) are covered in Unit 7, link:entity-session.html[+Adding Entity Classes and Session Beans+].) This approach is described as _bottom up_ development. An equally viable alternative is the _top down_ approach.
+*Note:* In this tutorial, we create a database schema from the ERD, then use the IDE's EclipseLink support to generate JPA entity classes from the existing database. (EclipseLink and the Java Persistence API (JPA) are covered in Unit 7, xref:entity-session.adoc[+Adding Entity Classes and Session Beans+].) This approach is described as _bottom up_ development. An equally viable alternative is the _top down_ approach.
 
 * *Top down:* In _top down_ development, you start with an existing Java implementation of the domain model, and have complete freedom with respect to the design of the database schema. You must create mapping metadata (i.e., annotations used in JPA entity classes), and can optionally use a persistence tool to automatically generate the schema.
 * *Bottom up:* _Bottom up_ development begins with an existing database schema. In this case, the easiest way to proceed is to use forward-engineering tools to extract metadata from the schema and generate annotated Java source code (JPA entity classes).
@@ -200,7 +200,7 @@ image::images/wb-entity-tables.png[title="Create all tables for affablebean sche
 [[addProperties]]
 === Adding Entity Properties
 
-Now that you've added entities to the canvas, you need to specify their properties. Entity properties correspond to the columns defined in a database table. For example, consider the `customer` entity. In regard to the `AffableBean` application, what aspects of a customer would need to be persisted to the database? These would likely be all of the information gathered in the link:design.html#checkout[+checkout page+]'s customer details form, as well as some association to the processed order.
+Now that you've added entities to the canvas, you need to specify their properties. Entity properties correspond to the columns defined in a database table. For example, consider the `customer` entity. In regard to the `AffableBean` application, what aspects of a customer would need to be persisted to the database? These would likely be all of the information gathered in the xref:design.adoc#checkout[+checkout page+]'s customer details form, as well as some association to the processed order.
 
 When adding properties, you need to determine the most appropriate data type for each property. MySQL supports a number of data types in several categories: numeric types, date and time types, and string (character) types. Refer to the official manual for a summary of data types within each category: link:http://dev.mysql.com/doc/refman/5.1/en/data-type-overview.html[+10.1. Data Type Overview+]. In this tutorial, the data types have been chosen for you. Choosing the appropriate data type [...]
 
@@ -427,7 +427,7 @@ Choose View > Toggle Grid to disable the canvas grid. You can also create notes
 
 To incorporate the data model you created into the MySQL database, you can employ WorkBench to forward-engineer the diagram into an SQL script (more precisely, a DDL script) to generate the schema. The wizard that you use also enables you to immediately run the script on your database server.
 
-*Important:* Make sure your MySQL database server is running. Steps describing how to setup and run the database are provided in link:setup-dev-environ.html#communicate[+Setting up the Development Environment: Communicating with the Database Server+].
+*Important:* Make sure your MySQL database server is running. Steps describing how to setup and run the database are provided in xref:setup-dev-environ.adoc#communicate[+Setting up the Development Environment: Communicating with the Database Server+].
 
 1. Set the default storage engine used in Workbench to InnoDB. Choose Tools > Options (MySQLWorkbench > Preferences on Mac) to open the Workbench Preferences window. Click the MySQL tab, then select InnoDB as the default storage engine. 
 
@@ -474,7 +474,7 @@ For an explanation of what these variables are, and their purpose in the script,
 * *Port:* `3306`
 * *Username:* `root`
 * *Password:* `nbuser`
-(The parameters you set should correspond to those from link:setup-dev-environ.html#communicate[+Setting up the Development Environment: Communicating with the Database Server+].)
+(The parameters you set should correspond to those from xref:setup-dev-environ.adoc#communicate[+Setting up the Development Environment: Communicating with the Database Server+].)
 
 [start=8]
 . Click Execute. In the final panel of the wizard, you receive confirmation that the wizard was able to connect to and execute the script successfully.
@@ -491,18 +491,18 @@ The `affablebean` schema is now created and exists on your MySQL server. In the
 
 Now that the `affablebean` schema exists on your MySQL server, ensure that you can view the tables you created in the ERD from the IDE's Services window.
 
-*Important:* Make sure that you have followed the steps outlined in link:setup-dev-environ.html#communicate[+Setting up the Development Environment: Communicating with the Database Server+]. This heading describes how to run the MySQL database server, register it with the IDE, create a database instance, and form a connection to the instance from the IDE.
+*Important:* Make sure that you have followed the steps outlined in xref:setup-dev-environ.adoc#communicate[+Setting up the Development Environment: Communicating with the Database Server+]. This heading describes how to run the MySQL database server, register it with the IDE, create a database instance, and form a connection to the instance from the IDE.
 
-1. In the IDE, open the Services window (Ctrl-5; ⌘-5 on Mac) and locate the database connection node ( image:images/db-connection-node.png[] ) for the `affablebean` database instance you created in the link:setup-dev-environ.html#communicate[+previous tutorial unit+].
+1. In the IDE, open the Services window (Ctrl-5; ⌘-5 on Mac) and locate the database connection node ( image:images/db-connection-node.png[] ) for the `affablebean` database instance you created in the xref:setup-dev-environ.adoc#communicate[+previous tutorial unit+].
 2. Refresh the connection to the `affablebean` database. To do so, right-click the connection node and choose Refresh.
 3. Expand the Tables node. You can now see the five tables defined by the schema.
 4. Expand any of the table nodes. Each table contains the columns and indexes that you created when working in MySQL Workbench. 
 
 image::images/services-window-schema.png[title="Update the database connection to view schema tables"]
 
-The IDE is now connected to a database that uses the schema you created for the `AffableBean` application. From the IDE, you can now view any table data you create in the database, as well as directly modify, add and delete data. You will explore some of these options later, in link:connect-db.html[+Connecting the Application to the Database+], after you've added sample data to the database.
+The IDE is now connected to a database that uses the schema you created for the `AffableBean` application. From the IDE, you can now view any table data you create in the database, as well as directly modify, add and delete data. You will explore some of these options later, in xref:connect-db.adoc[+Connecting the Application to the Database+], after you've added sample data to the database.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20NetBeans%20E-commerce%20Tutorial%20-%20Designing%20the%20Data%20Model[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[+Send Us Your Feedback+]
 
 
 
@@ -513,9 +513,9 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20NetBeans%20E-commerce%20T
 === NetBeans Resources
 
 * link:../../../articles/mysql.html[+MySQL and NetBeans IDE+]
-* link:../../ide/mysql.html[+Connecting to a MySQL Database+]
-* link:../../web/mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+]
-* link:../../ide/database-improvements-screencast.html[+Screencast: Database Support in NetBeans IDE+]
+* xref:../../ide/mysql.adoc[+Connecting to a MySQL Database+]
+* xref:../../web/mysql-webapp.adoc[+Creating a Simple Web Application Using a MySQL Database+]
+* xref:../../ide/database-improvements-screencast.adoc[+Screencast: Database Support in NetBeans IDE+]
 
 
 === MySQL &amp; Data Modeling Resources
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/design.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/design.adoc
index 735cfab0d..7166bc068 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/design.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/design.adoc
@@ -205,7 +205,7 @@ Also, you agree with staff on the following rules, which apply to multiple pages
 * Return to the welcome page by clicking the logo image
 * The user is able to select the language (English or Czech) to view the page in for all pages except the confirmation page.
 
-*Note:* Although not presented here, you would equally need to work with the client to produce use-cases and mockups, and establish rules for the administration console. The NetBeans E-commerce Tutorial focuses on developing the store front (i.e., the website). However, Unit 11, link:security.html[+Securing the Application+] demonstrates how to create a login mechanism to access the administration console. Also, you can examine the provided implementation of the administration console by [...]
+*Note:* Although not presented here, you would equally need to work with the client to produce use-cases and mockups, and establish rules for the administration console. The NetBeans E-commerce Tutorial focuses on developing the store front (i.e., the website). However, Unit 11, xref:security.adoc[+Securing the Application+] demonstrates how to create a login mechanism to access the administration console. Also, you can examine the provided implementation of the administration console by [...]
 
 
 [[business]]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/entity-session.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/entity-session.adoc
index 855b8b799..3e49bc94d 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/entity-session.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/entity-session.adoc
@@ -32,12 +32,12 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
-3. link:setup-dev-environ.html[+Setting up the Development Environment+]
-4. link:data-model.html[+Designing the Data Model+]
-5. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
-6. link:connect-db.html[+Connecting the Application to the Database+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
+3. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
+4. xref:data-model.adoc[+Designing the Data Model+]
+5. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
+6. xref:connect-db.adoc[+Connecting the Application to the Database+]
 7. *Adding Entity Classes and Session Beans*
 * <<whatEJB,What are EJB and JPA Technologies?>>
 * <<whatSession,What are Session Beans?>>
@@ -48,22 +48,22 @@
 * <<seeAlso,See Also>>
 
 [start=8]
-. link:manage-sessions.html[+Managing Sessions+]
+. xref:manage-sessions.adoc[+Managing Sessions+]
 
 [start=9]
-. link:transaction.html[+Integrating Transactional Business Logic+]
+. xref:transaction.adoc[+Integrating Transactional Business Logic+]
 
 [start=10]
-. link:language.html[+Adding Language Support+]
+. xref:language.adoc[+Adding Language Support+]
 
 [start=11]
-. link:security.html[+Securing the Application+]
+. xref:security.adoc[+Securing the Application+]
 
 [start=12]
-. link:test-profile.html[+Testing and Profiling+]
+. xref:test-profile.adoc[+Testing and Profiling+]
 
 [start=13]
-. link:conclusion.html[+Conclusion+]
+. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
@@ -72,11 +72,11 @@ This tutorial unit introduces the link:http://java.sun.com/products/ejb/[+Enterp
 * *Entity Classes from Database wizard:* Creates a Java Persistence API entity class for each selected database table, complete with named query annotations, fields representing columns, and relationships representing foreign keys.
 * *Session Beans for Entity Classes wizard:* Creates an EJB session facade for each entity class with basic access methods.
 
-These two wizards provide an efficient way for you to quickly set up the model for your application. If you reexamine the link:design.html#mvcDiagram[+MVC diagram+] for the application you are building, you can see where EJB session beans and JPA entity classes fit into its structure.
+These two wizards provide an efficient way for you to quickly set up the model for your application. If you reexamine the xref:design.adoc#mvcDiagram[+MVC diagram+] for the application you are building, you can see where EJB session beans and JPA entity classes fit into its structure.
 
 image::images/mvc-diagram.png[title="MVC diagram of the AffableBean application"]
 
-In this unit, the entity classes you create form a Java-based representation of the `affablebean` database. While each entity class represents a database table, instances of entity classes correspond to records that can be saved (i.e., _persisted_) to the database. The business logic of the application is encapsulated by session beans, which can either be used as _facade_ classes that enable CRUD (Create-Read-Update-Delete) access to entities (as demonstrated here), or they can contain c [...]
+In this unit, the entity classes you create form a Java-based representation of the `affablebean` database. While each entity class represents a database table, instances of entity classes correspond to records that can be saved (i.e., _persisted_) to the database. The business logic of the application is encapsulated by session beans, which can either be used as _facade_ classes that enable CRUD (Create-Read-Update-Delete) access to entities (as demonstrated here), or they can contain c [...]
 
 You can view a live demo of the application that you build in this tutorial: link:http://services.netbeans.org/AffableBean/[+NetBeans E-commerce Tutorial Demo Application+].
 
@@ -101,7 +101,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 * The NetBeans IDE requires the Java Development Kit (JDK) to run properly. If you do not have any of the resources listed above, the JDK should be the first item that you download and install.
 * The NetBeans IDE Java Bundle includes Java Web and EE technologies, which are required for the application you build in this tutorial.
 * The NetBeans IDE Java Bundle also includes the GlassFish server, which you require for this tutorial. You could link:http://glassfish.dev.java.net/public/downloadsindex.html[+download the GlassFish server independently+], but the version provided with the NetBeans download has the added benefit of being automatically registered with the IDE.
-* You can follow this tutorial unit without having completed previous units. To do so, see the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+* You can follow this tutorial unit without having completed previous units. To do so, see the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 * link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot4.zip[+Snapshot 4+] of the `AffableBean` project is available for download and corresponds to state the project after completing this unit using NetBeans IDE 6.9.
 
 
@@ -131,8 +131,8 @@ You can think of EJB both as components, or Java classes that are incorporated i
 
 * *Pooling:* For each EJB component, the EJB platform creates a pool of component instances that are shared by clients. At any point in time, each pooled instance is only allowed to be used by a single client. As soon as an instance is finished servicing a client, it is returned to the pool for reuse instead of being frivolously discarded for the garbage collector to reclaim.
 * *Thread Safety:* EJB makes all components thread-safe and highly performant in ways athat are completely invisible. This means that you can write your server components as if you were developing a single-threaded desktop application. It doesn't matter how complex the component itself is; EJB will make sure it is thread-safe.
-* *Transactions:* EJB supports declarative transaction management that helps you add transactional behavior to components using simple configuration instead of code. In effect, you can designate any component method to be transactional. If the method completes normally, EJB commits the transaction and makes the data changes made by the method permanent. Otherwise the transaction is rolled back. Container-managed EJB transactions are demonstrated in Unit 9, link:transaction.html[+Integrat [...]
-* *Security:* EJB supports integration with the Java Authentication and Authorization Service (JAAS) API, so it is easy to completely externalize security and secure an application using simple configuration instead of cluttering up your application with security code.^<<footnote2,[2]>>^ In Unit 11, link:security.html#secureEJB[+Securing the Application+], a demonstration of EJB's link:http://download.oracle.com/javaee/6/api/javax/annotation/security/RolesAllowed.html[+@RolesAllowed+] an [...]
+* *Transactions:* EJB supports declarative transaction management that helps you add transactional behavior to components using simple configuration instead of code. In effect, you can designate any component method to be transactional. If the method completes normally, EJB commits the transaction and makes the data changes made by the method permanent. Otherwise the transaction is rolled back. Container-managed EJB transactions are demonstrated in Unit 9, xref:transaction.adoc[+Integrat [...]
+* *Security:* EJB supports integration with the Java Authentication and Authorization Service (JAAS) API, so it is easy to completely externalize security and secure an application using simple configuration instead of cluttering up your application with security code.^<<footnote2,[2]>>^ In Unit 11, xref:security.adoc#secureEJB[+Securing the Application+], a demonstration of EJB's link:http://download.oracle.com/javaee/6/api/javax/annotation/security/RolesAllowed.html[+@RolesAllowed+] an [...]
 
 
 [[jpa]]
@@ -182,7 +182,7 @@ EJB and JPA technologies are defined by the following specifications:
 
 These specifications define the technologies. To apply a technology to your project however, you must use an _implementation_ of the specification. When a specification becomes finalized, it includes a reference implementation, which is a free implementation of the technology. If you find this concept confusing, consider the following analogy: A musical composition (i.e., the notes on a page) defines a piece of music. When a musician learns the composition and records her performance, sh [...]
 
-See link:intro.html#jcp[+What is the Java Community Process?+] for an explanation of Java technical specifications, and how they are formally standardized.
+See xref:intro.adoc#jcp[+What is the Java Community Process?+] for an explanation of Java technical specifications, and how they are formally standardized.
 
 If you examine the download pages for the final releases of the EJB and JPA specifications, you'll find links to the following reference implementations:
 
@@ -260,7 +260,7 @@ image::images/entity-classes-69.png[title="NetBeans 6.9 - Entity Classes from Da
 
 image::images/entity-classes.png[title="View new entity classes in the Projects window"] 
 
-Note that the wizard generated an additional entity class, `OrderedProductPK`. Recall that the data model's `ordered_product` table uses a composite primary key that comprises the primary keys of both the `customer_order` and `product` tables. (See link:data-model.html#manyToMany[+Designing the Data Model - Creating Many-To-Many Relationships+].) Because of this, the persistence provider creates a separate entity class for the composite key, and _embeds_ it into the `OrderedProduct` enti [...]
+Note that the wizard generated an additional entity class, `OrderedProductPK`. Recall that the data model's `ordered_product` table uses a composite primary key that comprises the primary keys of both the `customer_order` and `product` tables. (See xref:data-model.adoc#manyToMany[+Designing the Data Model - Creating Many-To-Many Relationships+].) Because of this, the persistence provider creates a separate entity class for the composite key, and _embeds_ it into the `OrderedProduct` enti [...]
 
 [source,java]
 ----
@@ -371,7 +371,7 @@ Your application now contains a persistence model of the `affablebean` database
 [[access]]
 == Accessing Data with EJBs
 
-In the link:connect-db.html[+previous tutorial unit+], you learned how to access the database from the application by configuring a data source on GlassFish, adding a resource reference to the application's deployment descriptor, and using JSTL `<sql>` tags in the application's JSP pages. This is a valuable technique, as it allows you to quickly set up prototypes that include data from the database. However, this is not a realistic scenario for medium to large-sized applications, or appl [...]
+In the xref:connect-db.adoc[+previous tutorial unit+], you learned how to access the database from the application by configuring a data source on GlassFish, adding a resource reference to the application's deployment descriptor, and using JSTL `<sql>` tags in the application's JSP pages. This is a valuable technique, as it allows you to quickly set up prototypes that include data from the database. However, this is not a realistic scenario for medium to large-sized applications, or appl [...]
 
 The following instructions demonstrate how to begin using the session and entity beans in the `AffableBean` project. You are going to remove the JSTL data access logic that you previously set up for the index and category pages. In its place, you'll utilize the data access methods provided by the session beans, and store the data in scoped variables so that it can be retrieved from front-end page views. We'll tackle the index page first, then move on to the more complicated category page.
 
@@ -498,7 +498,7 @@ image::images/index-page.png[title="Verify that the index page is able to retrie
 [[category]]
 === category page
 
-The link:design.html#category[+category page+] requires three pieces of data in order to render properly:
+The xref:design.adoc#category[+category page+] requires three pieces of data in order to render properly:
 
 1. *category data:* for left column category buttons
 2. *selected category:* the selected category is highlighted in the left column, and the name of the selected category displays above the product table
@@ -726,11 +726,11 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 === NetBeans Resources
 
 * link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
-* link:../javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../secure-ejb.html[+Building Secure Enterprise Beans in Java EE+]
-* link:../javaee-entapp-ejb.html[+Creating an Enterprise Application with EJB 3.1+]
-* link:../jpa-eclipselink-screencast.html[+Using JPA Support with EclipseLink+] [screencast]
+* xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../secure-ejb.adoc[+Building Secure Enterprise Beans in Java EE+]
+* xref:../javaee-entapp-ejb.adoc[+Creating an Enterprise Application with EJB 3.1+]
+* xref:../jpa-eclipselink-screencast.adoc[+Using JPA Support with EclipseLink+] [screencast]
 * link:../../../../community/media.html[+Video Tutorials and Demos for NetBeans IDE+]
 * link:http://refcardz.dzone.com/refcardz/netbeans-java-editor-68[+NetBeans Java Editor 6.8 Reference Card+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/index.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/index.adoc
index 5d8cc8c67..bde34229d 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/index.adoc
@@ -26,23 +26,23 @@
 :toc-title:
 :description: e-Commerce Tutorials
 
-- link:index.html[e-Commerce Tutorials]
-- link:section.html[]
-- link:entity-session.html[The NetBeans E-commerce Tutorial - Adding Entity Classes and Session Beans]
-- link:language.html[The NetBeans E-commerce Tutorial - Adding Language Support]
-- link:conclusion.html[The NetBeans E-commerce Tutorial - Conclusion]
-- link:connect-db.html[The NetBeans E-commerce Tutorial - Connecting the Application to the Database]
-- link:design.html[The NetBeans E-commerce Tutorial - Designing the Application]
-- link:data-model.html[The NetBeans E-commerce Tutorial - Designing the Data Model]
-- link:transaction.html[The NetBeans E-commerce Tutorial - Integrating Transactional Business Logic]
-- link:intro.html[The NetBeans E-commerce Tutorial - Introduction]
+- xref:index.adoc[e-Commerce Tutorials]
+- xref:section.adoc[]
+- xref:entity-session.adoc[The NetBeans E-commerce Tutorial - Adding Entity Classes and Session Beans]
+- xref:language.adoc[The NetBeans E-commerce Tutorial - Adding Language Support]
+- xref:conclusion.adoc[The NetBeans E-commerce Tutorial - Conclusion]
+- xref:connect-db.adoc[The NetBeans E-commerce Tutorial - Connecting the Application to the Database]
+- xref:design.adoc[The NetBeans E-commerce Tutorial - Designing the Application]
+- xref:data-model.adoc[The NetBeans E-commerce Tutorial - Designing the Data Model]
+- xref:transaction.adoc[The NetBeans E-commerce Tutorial - Integrating Transactional Business Logic]
+- xref:intro.adoc[The NetBeans E-commerce Tutorial - Introduction]
 - link:netbeans-ecommerce-tutorial.html[The NetBeans E-commerce Tutorial - Introduction]
-- link:manage-sessions.html[The NetBeans E-commerce Tutorial - Managing Sessions]
-- link:page-views-controller.html[The NetBeans E-commerce Tutorial - Preparing the Page Views and Controller Servlet]
-- link:security.html[The NetBeans E-commerce Tutorial - Securing the Application]
-- link:setup-dev-environ.html[The NetBeans E-commerce Tutorial - Setting up the Development Environment]
-- link:setup.html[The NetBeans E-commerce Tutorial - Setup Instructions]
-- link:test-profile.html[The NetBeans E-commerce Tutorial - Testing and Profiling]
+- xref:manage-sessions.adoc[The NetBeans E-commerce Tutorial - Managing Sessions]
+- xref:page-views-controller.adoc[The NetBeans E-commerce Tutorial - Preparing the Page Views and Controller Servlet]
+- xref:security.adoc[The NetBeans E-commerce Tutorial - Securing the Application]
+- xref:setup-dev-environ.adoc[The NetBeans E-commerce Tutorial - Setting up the Development Environment]
+- xref:setup.adoc[The NetBeans E-commerce Tutorial - Setup Instructions]
+- xref:test-profile.adoc[The NetBeans E-commerce Tutorial - Testing and Profiling]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/intro.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/intro.adoc
index 837809888..7ad6f8f69 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/intro.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/intro.adoc
@@ -42,40 +42,40 @@
 * <<seeAlso,See Also>>
 
 [start=2]
-. link:design.html[+Designing the Application+]
+. xref:design.adoc[+Designing the Application+]
 
 [start=3]
-. link:setup-dev-environ.html[+Setting up the Development Environment+]
+. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
 
 [start=4]
-. link:data-model.html[+Designing the Data Model+]
+. xref:data-model.adoc[+Designing the Data Model+]
 
 [start=5]
-. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
+. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
 
 [start=6]
-. link:connect-db.html[+Connecting the Application to the Database+]
+. xref:connect-db.adoc[+Connecting the Application to the Database+]
 
 [start=7]
-. link:entity-session.html[+Adding Entity Classes and Session Beans+]
+. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
 
 [start=8]
-. link:manage-sessions.html[+Managing Sessions+]
+. xref:manage-sessions.adoc[+Managing Sessions+]
 
 [start=9]
-. link:transaction.html[+Integrating Transactional Business Logic+]
+. xref:transaction.adoc[+Integrating Transactional Business Logic+]
 
 [start=10]
-. link:language.html[+Adding Language Support+]
+. xref:language.adoc[+Adding Language Support+]
 
 [start=11]
-. link:security.html[+Securing the Application+]
+. xref:security.adoc[+Securing the Application+]
 
 [start=12]
-. link:test-profile.html[+Testing and Profiling+]
+. xref:test-profile.adoc[+Testing and Profiling+]
 
 [start=13]
-. link:conclusion.html[+Conclusion+]
+. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
@@ -90,7 +90,7 @@ Taking the time to master the IDE will ultimately lead you to become more effici
 
 The tutorial is modular in fashion, with each unit focusing on specific concepts, technologies, and features of the IDE. You can successfully follow a tutorial unit on its own using the provided setup instructions and application snapshots (from Unit 5 onward). However, you'll get the most benefit by working through all units consecutively, from beginning to end. This will also help to illustrate the development process.
 
-Unit 3, link:setup-dev-environ.html[+Setting up the Development Environment+] introduces you to the NetBeans IDE. In it, you create a Java web project which is the basis for the work you undertake in later tutorial units. In Unit 4, link:data-model.html[+Designing the Data Model+], you primarily work with link:http://wb.mysql.com/[+MySQL WorkBench+], a visual database design tool, to create a data model for the application. Each successive tutorial unit provides you with a _project snaps [...]
+Unit 3, xref:setup-dev-environ.adoc[+Setting up the Development Environment+] introduces you to the NetBeans IDE. In it, you create a Java web project which is the basis for the work you undertake in later tutorial units. In Unit 4, xref:data-model.adoc[+Designing the Data Model+], you primarily work with link:http://wb.mysql.com/[+MySQL WorkBench+], a visual database design tool, to create a data model for the application. Each successive tutorial unit provides you with a _project snaps [...]
 
 You can view a live demo of the application that you build in this tutorial: link:http://services.netbeans.org/AffableBean/[+NetBeans E-commerce Tutorial Demo Application+].
 
@@ -280,7 +280,7 @@ Consider what would be necessary if you wanted to create a Java-based web applic
 5. Establish a deployment method, i.e., a way to copy resources from your development directory to the server's deployment area.
 6. Bookmark or install relevant API documentation.
 
-For educative purposes, it is worthwhile to create and run a Java web project manually so that you are aware the necessary steps involved. But eventually, you'll want to consider using tools that reduce or eliminate the need to perform tedious or repetitious tasks, thereby enabling you to focus on developing code that solves specific business needs. An IDE streamlines the process outlined above. As demonstrated in Unit 3, link:setup-dev-environ.html[+Setting up the Development Environmen [...]
+For educative purposes, it is worthwhile to create and run a Java web project manually so that you are aware the necessary steps involved. But eventually, you'll want to consider using tools that reduce or eliminate the need to perform tedious or repetitious tasks, thereby enabling you to focus on developing code that solves specific business needs. An IDE streamlines the process outlined above. As demonstrated in Unit 3, xref:setup-dev-environ.adoc[+Setting up the Development Environmen [...]
 
 An IDE also typically handles project compilation and deployment in a way that is transparent to you as a developer. For example, the web project that you create in NetBeans includes an Ant build script that is used to compile, clean, package and deploy the project. This means that you can run your project from the IDE, and it will automatically be compiled and deployed, then open in your default browser. Taking this a step further, many IDEs support a Deploy on on Save feature. In other [...]
 
@@ -302,9 +302,9 @@ People are saying great things about NetBeans. For a list of testimonials, see l
 The IDE provides many link:../../../../features/web/index.html[+features for web development+], and several advantages over other IDEs. Here are several noteworthy points:
 
 * *Works Out of the Box:* Simply download, install, and run the IDE. With its small download size, installation is a breeze. The IDE runs on many platforms including Windows, Linux, Mac OS X and Solaris. All IDE tools and features are fully integrated - no need to hunt for plug-ins - and they work together when you launch the IDE.
-* *Free and Open Source:* When you use the NetBeans IDE, you join a vibrant, link:../../../../community/index.html[+open source community+] with thousands of users ready to help and contribute. There are discussions on the link:../../../../community/lists/index.html[+NetBeans project mailing lists+], blogs on link:http://www.planetnetbeans.org/[+Planet NetBeans+], and helpful FAQs and tutorials on the link:http://wiki.netbeans.org/[+community wiki+].
+* *Free and Open Source:* When you use the NetBeans IDE, you join a vibrant, xref:../../../../community/index.adoc[+open source community+] with thousands of users ready to help and contribute. There are discussions on the xref:../../../../community/mailing-lists.adoc[+NetBeans project mailing lists+], blogs on link:http://www.planetnetbeans.org/[+Planet NetBeans+], and helpful FAQs and tutorials on the xref:../../../../wiki/index.adoc[+community wiki+].
 * *Profiling and Debugging Tools:* With NetBeans IDE link:../../../../features/java/profiler.html[+profiler+], you get real time insight into memory usage and potential performance bottlenecks. Furthermore, you can instrument specific parts of code to avoid performance degradation during profiling. The link:http://profiler.netbeans.org/docs/help/6.0/heapwalker.html[+HeapWalker+] tool helps you evaluate Java heap contents and find memory leaks.
-* *Customizable Projects:* Through the NetBeans IDE build process, which relies on industry standards such as link:http://ant.apache.org/[+Apache Ant+], link:http://www.gnu.org/software/make/[+make+], link:http://maven.apache.org/[+Maven+], and link:http://rake.rubyforge.org/[+rake+] - rather than a proprietary build process - you can easily customize projects and add functionality. You can build, run, and deploy projects to servers outside of the IDE.
+* *Customizable Projects:* Through the NetBeans IDE build process, which relies on industry standards such as link:https://ant.apache.org/[+Apache Ant+], link:http://www.gnu.org/software/make/[+make+], link:http://maven.apache.org/[+Maven+], and link:http://rake.rubyforge.org/[+rake+] - rather than a proprietary build process - you can easily customize projects and add functionality. You can build, run, and deploy projects to servers outside of the IDE.
 * *Collaboration Tools:* The IDE provides built-in support for version control systems such as CVS, Subversion, and Mercurial.
 * *Extensive Documentation:* There's a wealth of tips and instructions contained in the IDE's built-in help set. Simply press F1 (fn-F1 on Mac) on a component in the IDE to invoke the help set. Also, the IDE's link:../../../index.html[+official knowledge base+] provides hundreds of online tutorials, articles and link:../../../../community/media.html[+screencasts+] that are continuously being updated.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/language.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/language.adoc
index 6cda2c38e..ce3510008 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/language.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/language.adoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Adding Language Support
 
 
-The goal of this tutorial unit is to demonstrate how to enable language support for a web application. "Language support" here refers to the ability to display page views according to the customer-specified languages. Within the context of the `AffableBean` application, we have agreed to provide support for both English and Czech, as per the previously outlined link:design.html#requirements[+customer requirements+].
+The goal of this tutorial unit is to demonstrate how to enable language support for a web application. "Language support" here refers to the ability to display page views according to the customer-specified languages. Within the context of the `AffableBean` application, we have agreed to provide support for both English and Czech, as per the previously outlined xref:design.adoc#requirements[+customer requirements+].
 
 In order to accomplish this, you rely on Java's support for internationalization. You create a _resource bundle_ for each language and let the Java runtime environment determine the appropriate language for incoming client requests. You also implement a 'language toggle' to enable users to switch the languages manually.
 
@@ -61,7 +61,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 * The NetBeans IDE requires the Java Development Kit (JDK) to run properly. If you do not have any of the resources listed above, the JDK should be the first item that you download and install.
 * The NetBeans IDE Java Bundle includes Java Web and EE technologies, which are required for the application you build in this tutorial.
 * The NetBeans IDE Java Bundle also includes the GlassFish server, which you require for this tutorial. You could link:http://glassfish.dev.java.net/public/downloadsindex.html[+download the GlassFish server independently+], but the version provided with the NetBeans download has the added benefit of being automatically registered with the IDE.
-* You can follow this tutorial unit without having completed previous units. To do so, see the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+* You can follow this tutorial unit without having completed previous units. To do so, see the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 
 
 
@@ -140,7 +140,7 @@ The following exercise demonstrates how to integrate English and Czech language
 1. Open the `AffableBean` project link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot8.zip[+snapshot 8+] in the IDE. Click the Open Project ( image:images/open-project-btn.png[] ) button and use the wizard to navigate to the location on your computer where you downloaded the project.
 2. Click the Run Project ( image:images/run-project-btn.png[] ) button to run the project and ensure that it is properly configured with your database and application server. 
 
-If you receive an error when running the project, revisit the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+If you receive an error when running the project, revisit the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 
 
 [start=3]
@@ -273,7 +273,7 @@ You might assume that if the default bundle is in English, then there is no need
 
 The purpose of this step is to inform JSTL's format (i.e., link:http://download.oracle.com/docs/cd/E17802_01/products/products/jsp/jstl/1.1/docs/tlddocs/fmt/tld-summary.html[+`fmt`+]) tag library where it can locate any resource bundles existing in the application. You accomplish this by instructing the application to create a link:http://download.oracle.com/docs/cd/E17477_01/javaee/5/jstl/1.1/docs/api/javax/servlet/jsp/jstl/fmt/LocalizationContext.html[+`LocalizationContext`+] using the [...]
 
-The topic of setting context parameters is also covered in link:connect-db.html#param[+Connecting the Application to the Database+].
+The topic of setting context parameters is also covered in xref:connect-db.adoc#param[+Connecting the Application to the Database+].
 
 1. In the Projects window, expand the Configuration Files node, then double-click `web.xml` to open it in the editor.
 2. Under the deployment descriptor's General tab, expand the Context Parameters category.
@@ -456,9 +456,9 @@ image::images/go-to-file-dialog.png[title="Use the Go to File dialog to quickly
 ----
 This markup implements the language toggle's appearance when English is the displayed language. In other words, the toggle provides a link allowing the user to select the Czech (i.e., '`česky`') option. The link is used to send a request for `chooseLanguage`, and creates a query string (`?language=cs`) that specifies the requested language code. 
 
-*Note:* Recall that in Unit 5, link:page-views-controller.html#controller[+Preparing the Page Views and Controller Servlet+], you set the `ControllerServlet` to handle the `/chooseLanguage` URL pattern.
+*Note:* Recall that in Unit 5, xref:page-views-controller.adoc#controller[+Preparing the Page Views and Controller Servlet+], you set the `ControllerServlet` to handle the `/chooseLanguage` URL pattern.
 
-Snapshot 8 includes the link:http://jquery.com/[+jQuery+] JavaScript library and takes advantage of various UI effects to enhance the appearance and behavior of the website. Aside from a link:http://plugins.jquery.com/project/validate[+jQuery plugin for client-side validation+] (discussed in the link:transaction.html#client[+previous tutorial unit+]), the snapshot implements an easing effect for category headings in the welcome page, as well as for category buttons in the category page.  [...]
+Snapshot 8 includes the link:http://jquery.com/[+jQuery+] JavaScript library and takes advantage of various UI effects to enhance the appearance and behavior of the website. Aside from a link:http://plugins.jquery.com/project/validate[+jQuery plugin for client-side validation+] (discussed in the xref:transaction.adoc#client[+previous tutorial unit+]), the snapshot implements an easing effect for category headings in the welcome page, as well as for category buttons in the category page.  [...]
 
 
 [start=3]
@@ -510,7 +510,7 @@ In the above implementation, you rely on conditional tags from JSTL's `core` tag
 request.getLocale();
 ----
 
-You can use the IDE's HTTP Monitor (Window > Debugging > HTTP Server Monitor) to examine HTTP headers for client requests. In order to use the HTTP Monitor, you need to first activate it for the server you are using. Unit 8, link:manage-sessions.html[+Managing Sessions+] provides a demonstration under the sub-section, link:manage-sessions.html#http-monitor[+Examining Client-Server Communication with the HTTP Monitor+].
+You can use the IDE's HTTP Monitor (Window > Debugging > HTTP Server Monitor) to examine HTTP headers for client requests. In order to use the HTTP Monitor, you need to first activate it for the server you are using. Unit 8, xref:manage-sessions.adoc[+Managing Sessions+] provides a demonstration under the sub-section, xref:manage-sessions.adoc#http-monitor[+Examining Client-Server Communication with the HTTP Monitor+].
 
 To determine the language of the preferred locale, you use the `Locale` class' `getLanguage` method. Again, from a servlet you could access the language of the client request's preferred locale with the following.
 
@@ -530,7 +530,7 @@ Returning to the code you just added to the `header.jspf` fragment, you utilize
 ${pageContext.request.locale.language}
 ----
 
-*Note:* The above implementation uses `<c:url>` tags to set up the toggle link. This is done in order to properly encode the request URL in the event that URL rewriting is used as a means for session tracking. Unit 8, link:manage-sessions.html#encodeUrl[+Managing Sessions+] provides a brief explanation of how the `<c:url>` tags can be used.
+*Note:* The above implementation uses `<c:url>` tags to set up the toggle link. This is done in order to properly encode the request URL in the event that URL rewriting is used as a means for session tracking. Unit 8, xref:manage-sessions.adoc#encodeUrl[+Managing Sessions+] provides a brief explanation of how the `<c:url>` tags can be used.
 
 
 [start=5]
@@ -818,7 +818,7 @@ Begin this exercise with link:https://netbeans.org/projects/samples/downloads/do
 1. Open link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot9.zip[+snapshot 9+] in the IDE. Click the Open Project ( image:images/open-project-btn.png[] ) button and use the wizard to navigate to the location on your computer where you downloaded the project.
 2. Click the Run Project ( image:images/run-project-btn.png[] ) button to run the project. When navigating through the site, note that when you click the language toggle from any of the page views, you are returned to the application's welcome page. 
 
-If you receive an error when running the project, revisit the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+If you receive an error when running the project, revisit the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 
 
 [start=3]
@@ -875,7 +875,7 @@ If you receive an error when running the project, revisit the link:setup.html[+s
      users view the same page when switching between English and Czech. --%>
 <c:set var='view' value='/checkout' scope='session' />
 ----
-Based on customer-agreed <<impDeets,implementation details>>, we do not need to provide a means of switching languages on the confirmation page view. From a usability perspective, a user will have already selected his or her preferred language prior to checkout. From an implementation perspective, recall that we destroy the user session upon a successfully completed order. (Refer back to the final paragraph in link:manage-sessions.html[+Managing Sessions+], which describes how to apply t [...]
+Based on customer-agreed <<impDeets,implementation details>>, we do not need to provide a means of switching languages on the confirmation page view. From a usability perspective, a user will have already selected his or her preferred language prior to checkout. From an implementation perspective, recall that we destroy the user session upon a successfully completed order. (Refer back to the final paragraph in xref:manage-sessions.adoc[+Managing Sessions+], which describes how to apply t [...]
 1. *Session destroyed:* Would be necessary to take extra measures to ensure that a `chooseLanguage` request from the confirmation page refers to the appropriate order, and can display customer-sensitive details in a secure fashion.
 2. *Session maintained:* Would risk enabling users to mistakenly place double orders on their shopping cart. Also, by not terminating user sessions when they are no longer needed, an unnecessary load may be placed on the server.
 
@@ -1068,8 +1068,8 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 === NetBeans Resources
 
-* link:../javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
+* xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
 * link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/manage-sessions.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/manage-sessions.adoc
index f30847421..d949e56a2 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/manage-sessions.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/manage-sessions.adoc
@@ -32,13 +32,13 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
-3. link:setup-dev-environ.html[+Setting up the Development Environment+]
-4. link:data-model.html[+Designing the Data Model+]
-5. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
-6. link:connect-db.html[+Connecting the Application to the Database+]
-7. link:entity-session.html[+Adding Entity Classes and Session Beans+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
+3. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
+4. xref:data-model.adoc[+Designing the Data Model+]
+5. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
+6. xref:connect-db.adoc[+Connecting the Application to the Database+]
+7. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
 8. *Managing Sessions*
 * <<session-data,Handling Session Data>>
 * <<debug,Examining Session Data with the Java Debugger>>
@@ -47,19 +47,19 @@
 * <<seeAlso,See Also>>
 
 [start=9]
-. link:transaction.html[+Integrating Transactional Business Logic+]
+. xref:transaction.adoc[+Integrating Transactional Business Logic+]
 
 [start=10]
-. link:language.html[+Adding Language Support+]
+. xref:language.adoc[+Adding Language Support+]
 
 [start=11]
-. link:security.html[+Securing the Application+]
+. xref:security.adoc[+Securing the Application+]
 
 [start=12]
-. link:test-profile.html[+Testing and Profiling+]
+. xref:test-profile.adoc[+Testing and Profiling+]
 
 [start=13]
-. link:conclusion.html[+Conclusion+]
+. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
@@ -92,7 +92,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 * The NetBeans IDE requires the Java Development Kit (JDK) to run properly. If you do not have any of the resources listed above, the JDK should be the first item that you download and install.
 * The NetBeans IDE Java Bundle includes Java Web and EE technologies, which are required for the application you build in this tutorial.
 * The NetBeans IDE Java Bundle also includes the GlassFish server, which you require for this tutorial. You could link:http://glassfish.dev.java.net/public/downloadsindex.html[+download the GlassFish server independently+], but the version provided with the NetBeans download has the added benefit of being automatically registered with the IDE.
-* You can follow this tutorial unit without having completed previous units. To do so, see the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+* You can follow this tutorial unit without having completed previous units. To do so, see the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 
 
 
@@ -263,7 +263,7 @@ ${sessionScope.categoryProducts}
 
 Begin exploring how the application behaves during runtime. Use the IDE's debugger to step through code and examine how the `HttpSession` is created, and how other objects can be placed in the session scope to be retrieved at a later point.
 
-1. Open the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot5.zip[+project snapshot+] for this tutorial unit in the IDE. Click the Open Project ( image:images/open-project-btn.png[] ) button and use the wizard to navigate to the location on your computer where you downloaded the project. If you are proceeding from the link:entity-session.html[+previous tutorial unit+], note that this project snapshot includes a new `c [...]
+1. Open the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot5.zip[+project snapshot+] for this tutorial unit in the IDE. Click the Open Project ( image:images/open-project-btn.png[] ) button and use the wizard to navigate to the location on your computer where you downloaded the project. If you are proceeding from the xref:entity-session.adoc[+previous tutorial unit+], note that this project snapshot includes a new `c [...]
 * `WEB-INF/web.xml`
 * `css/affablebean.css`
 * `WEB-INF/jspf/header.jspf`
@@ -276,11 +276,11 @@ Begin exploring how the application behaves during runtime. Use the IDE's debugg
 [start=2]
 . Run the project ( image:images/run-project-btn.png[] ) to ensure that it is properly configured with your database and application server. 
 
-If you receive an error when running the project, revisit the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+If you receive an error when running the project, revisit the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 
 
 [start=3]
-. Test the application's functionality in your browser. If you are continuing directly from the link:entity-session.html[+previous tutorial unit+], you'll note the following enhancements.
+. Test the application's functionality in your browser. If you are continuing directly from the xref:entity-session.adoc[+previous tutorial unit+], you'll note the following enhancements.
 
 
 === category page
@@ -339,7 +339,7 @@ You can view and modify the debug port number from the Servers window (Tools > S
 
 <form action="addToCart" method="post">
 ----
-As you may recall from link:page-views-controller.html#controller[+Preparing the Page Views and Controller Servlet+], the `ControllerServlet`'s `doPost` method handles requests for the `/addToCart` URL pattern. You can therefore expect that when a user clicks an 'add to cart' button, the `doPost` method is called.
+As you may recall from xref:page-views-controller.adoc#controller[+Preparing the Page Views and Controller Servlet+], the `ControllerServlet`'s `doPost` method handles requests for the `/addToCart` URL pattern. You can therefore expect that when a user clicks an 'add to cart' button, the `doPost` method is called.
 
 [start=8]
 . Click 'add to cart' for any product in the category page. Switch back to the IDE and note that the debugger suspends on the breakpoint. 
@@ -1029,7 +1029,7 @@ image::images/session-null.png[title="Highlight expressions and hover your mouse
 [start=27]
 . Save (Ctrl-S; ⌘-S on Mac) the file.
 
-link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot6.zip[+Snapshot 6+] provides you with the completed project version for this tutorial unit. One final topic concerning session management should be mentioned. You can explicitly terminate a session by calling the `invalidate` method on the session object. If the session is no longer needed, it should be removed in order to conserve the memory available to your server. Af [...]
+link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot6.zip[+Snapshot 6+] provides you with the completed project version for this tutorial unit. One final topic concerning session management should be mentioned. You can explicitly terminate a session by calling the `invalidate` method on the session object. If the session is no longer needed, it should be removed in order to conserve the memory available to your server. Af [...]
 
 
 [source,java]
@@ -1061,13 +1061,13 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 === NetBeans Resources
 
 * link:../../../../features/java/debugger.html[+NetBeans IDE Features: Debugger+]
-* link:../../java/debug-multithreaded.html[+Debugging Multithreaded Applications+]
-* link:../../java/debug-multithreaded-screencast.html[+Video of the Multithreaded Debugging with the NetBeans IDE+]
-* link:../../java/debug-evaluator-screencast.html[+Video of Using the Code Snippet Evaluator in the NetBeans Debugger+]
+* xref:../../java/debug-multithreaded.adoc[+Debugging Multithreaded Applications+]
+* xref:../../java/debug-multithreaded-screencast.adoc[+Video of the Multithreaded Debugging with the NetBeans IDE+]
+* xref:../../java/debug-evaluator-screencast.adoc[+Video of Using the Code Snippet Evaluator in the NetBeans Debugger+]
 * link:../../../../community/media.html[+Video Tutorials and Demos for NetBeans IDE+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
-* link:../javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../javaee-intro.html[+Introduction to Java EE Technology+]
+* xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
 * link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/page-views-controller.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/page-views-controller.adoc
index 6bd932838..ef8a1179f 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/page-views-controller.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/page-views-controller.adoc
@@ -32,10 +32,10 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
-3. link:setup-dev-environ.html[+Setting up the Development Environment+]
-4. link:data-model.html[+Designing the Data Model+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
+3. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
+4. xref:data-model.adoc[+Designing the Data Model+]
 5. *Preparing the Page Views and Controller Servlet*
 * <<createProjectFiles,Creating Project Files>>
 * <<implementHTML,Implementing HTML and CSS content>>
@@ -47,28 +47,28 @@
 * <<seeAlso,See Also>>
 
 [start=6]
-. link:connect-db.html[+Connecting the Application to the Database+]
+. xref:connect-db.adoc[+Connecting the Application to the Database+]
 
 [start=7]
-. link:entity-session.html[+Adding Entity Classes and Session Beans+]
+. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
 
 [start=8]
-. link:manage-sessions.html[+Managing Sessions+]
+. xref:manage-sessions.adoc[+Managing Sessions+]
 
 [start=9]
-. link:transaction.html[+Integrating Transactional Business Logic+]
+. xref:transaction.adoc[+Integrating Transactional Business Logic+]
 
 [start=10]
-. link:language.html[+Adding Language Support+]
+. xref:language.adoc[+Adding Language Support+]
 
 [start=11]
-. link:security.html[+Securing the Application+]
+. xref:security.adoc[+Securing the Application+]
 
 [start=12]
-. link:test-profile.html[+Testing and Profiling+]
+. xref:test-profile.adoc[+Testing and Profiling+]
 
 [start=13]
-. link:conclusion.html[+Conclusion+]
+. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
@@ -76,7 +76,7 @@ This tutorial unit demonstrates how to create project files in the IDE, and intr
 
 In this unit, you also create a web deployment descriptor (`web.xml` file) for the application. You can use the deployment descriptor to specify configuration information which is read by the server during deployment. Although the link:http://jcp.org/en/jsr/detail?id=315[+Servlet 3.0 Specification+], included in Java EE 6, enables you to use class annotations in place of XML, you may still require the deployment descriptor to configure certain elements of your application. Specifically,  [...]
 
-One of the goals of this tutorial unit is to create JSP pages that correspond to the views specified in the application design. Referring back to the link:design.html#mockups[+page mockups+] and link:design.html#business[+process flow diagram+], you begin implementing page layouts according to the mockups by creating _placeholders_ for all visual and functional components. This unit provides a guide for implementing the layout of the welcome page. You can apply the outlined steps to crea [...]
+One of the goals of this tutorial unit is to create JSP pages that correspond to the views specified in the application design. Referring back to the xref:design.adoc#mockups[+page mockups+] and xref:design.adoc#business[+process flow diagram+], you begin implementing page layouts according to the mockups by creating _placeholders_ for all visual and functional components. This unit provides a guide for implementing the layout of the welcome page. You can apply the outlined steps to crea [...]
 
 You can view a live demo of the application that you build in this tutorial: link:http://services.netbeans.org/AffableBean/[+NetBeans E-commerce Tutorial Demo Application+].
 
@@ -112,7 +112,7 @@ To create new files for your project, access the IDE's File wizard. You can clic
 [[jsp]]
 === Creating JSP Pages
 
-Begin working in the project by creating JSP pages that correspond to the views displayed in the link:design.html#business[+process flow diagram+].
+Begin working in the project by creating JSP pages that correspond to the views displayed in the xref:design.adoc#business[+process flow diagram+].
 
 The `index.jsp` page that was generated by the IDE will become the project's welcome page. Create JSP pages for the four remaining views and, for now, place them in the project's webroot with `index.jsp`.
 
@@ -146,11 +146,11 @@ image::images/projects-win-css.png[title="Projects window displays new 'css' fol
 [[implementHTML]]
 == Implementing HTML and CSS content
 
-The purpose of this section is to design the page views so that they begin to mirror the provided link:design.html#mockups[+page mockups+]. As such, they'll serve as a scaffolding which you can use to insert dynamic content during later stages of project development. To do so, you'll utilize the IDE's HTML and CSS editors, along with several CSS support windows.
+The purpose of this section is to design the page views so that they begin to mirror the provided xref:design.adoc#mockups[+page mockups+]. As such, they'll serve as a scaffolding which you can use to insert dynamic content during later stages of project development. To do so, you'll utilize the IDE's HTML and CSS editors, along with several CSS support windows.
 
 *Browser compatibility note:* This tutorial uses Firefox 3 and _does not_ guarantee that page view markup is compatible with other modern browsers. Naturally, when working with front-end web technologies (HTML, CSS, JavaScript) you would need take measures to ensure that your web pages render properly in the browsers and browser versions that you expect visitors to your site will be using (typically Internet Explorer, Firefox, Safari, Chrome, and Opera). When working in the IDE, you can  [...]
 
-Preparing the display of your web pages is usually an iterative process which you would fine-tune with regular feedback from the customer. The following steps are designed to introduce you to the facilities provided by the IDE, and demonstrate how to get started using the link:design.html#index[+welcome page mockup+] as an example.
+Preparing the display of your web pages is usually an iterative process which you would fine-tune with regular feedback from the customer. The following steps are designed to introduce you to the facilities provided by the IDE, and demonstrate how to get started using the xref:design.adoc#index[+welcome page mockup+] as an example.
 
 1. In the Projects window, double-click `index.jsp` to open it in the editor.
 2. Begin by creating `<div>` tags for the main areas of the page. You can create five tags altogether: four for main areas (header, footer, left column, and right column), and the fifth to contain the others. Remove any content within the `<body>` tags and replace with the following. (New code is shown in *bold*.)
@@ -243,7 +243,7 @@ body {
 image::images/index-page.png[title="Run the project to view the current state of pages"]
 
 [start=6]
-. Now, begin creating placeholders for page components within each of the four visible areas. Start with the header. Reviewing the link:design.html#index[+welcome page mockup+], the header should contain the following components:
+. Now, begin creating placeholders for page components within each of the four visible areas. Start with the header. Reviewing the xref:design.adoc#index[+welcome page mockup+], the header should contain the following components:
 * logo
 * logo text
 * shopping cart widget
@@ -359,7 +359,7 @@ By following the previous steps, you are probably able to see a pattern emerging
 Following these three steps, let's implement the components in the remaining areas.
 
 [start=9]
-. Create placeholders for components in the right column. According to the link:design.html#index[+welcome page mockup+], the right column contains four evenly-spaced boxes. 
+. Create placeholders for components in the right column. According to the xref:design.adoc#index[+welcome page mockup+], the right column contains four evenly-spaced boxes. 
 
 Create the structure for the four boxes. Insert the following code between the `<div id="indexRightColumn">` tags. (New code shown in *bold*.)
 
@@ -492,7 +492,7 @@ The welcome page is complete. You've created all necessary placeholders for comp
 
 You've now completed the initial design of the application's welcome page. All placeholders for page components exist. Later in the tutorial, when you begin to apply dynamic logic to the page views, you can simply plug JSTL and EL expressions into these placeholders.
 
-The task remains for you to implement the initial design for the other pages based on the link:design.html#mockups[+mockups+]. To accomplish this, follow the pattern outlined above, namely:
+The task remains for you to implement the initial design for the other pages based on the xref:design.adoc#mockups[+mockups+]. To accomplish this, follow the pattern outlined above, namely:
 
 1. Create `<div>` tags for the main page areas.
 2. Iterate through each area and perform three steps:
@@ -553,7 +553,7 @@ The IDE's editor provides many facilities that help you to work more efficiently
 [[view]]
 == Placing JSP Pages in WEB-INF
 
-Looking back at the link:design.html#mockups[+page mockups+] that were created, you can see that the link:design.html#index[+welcome page+] should look the same whenever it is requested, for whomever requests it. That is, the content that displays on the welcome page is not determined by a user's _session_. (Sessions are discussed in Unit 8, link:manage-sessions.html[+Managing Sessions+].) Notice however that all other pages do need some form of user-specific information to display prope [...]
+Looking back at the xref:design.adoc#mockups[+page mockups+] that were created, you can see that the xref:design.adoc#index[+welcome page+] should look the same whenever it is requested, for whomever requests it. That is, the content that displays on the welcome page is not determined by a user's _session_. (Sessions are discussed in Unit 8, xref:manage-sessions.adoc[+Managing Sessions+].) Notice however that all other pages do need some form of user-specific information to display prope [...]
 
 Create a new folder named `view`, and place it in the `WEB-INF` folder. Then move all JSP pages other than the welcome page into this new folder.
 
@@ -581,7 +581,7 @@ You receive an HTTP Status 404 message, indicating that the resource is not avai
 [[jspf]]
 == Creating a Header and Footer
 
-Looking at the link:design.html#mockups[+page mockups+], it is easy to see that all of the five views share identical content; at the top, they contain the company logo, a language toggle, and other widgets associated with shopping cart functionality. At the bottom, they contain some text with Privacy Policy and Contact links. Rather than including this code in each page source file, we can factor it out into two JSP fragments: a header and a footer. We'll then include the fragment files [...]
+Looking at the xref:design.adoc#mockups[+page mockups+], it is easy to see that all of the five views share identical content; at the top, they contain the company logo, a language toggle, and other widgets associated with shopping cart functionality. At the bottom, they contain some text with Privacy Policy and Contact links. Rather than including this code in each page source file, we can factor it out into two JSP fragments: a header and a footer. We'll then include the fragment files [...]
 
 For these fragments, let's create a new folder named `jspf`, and place it within `WEB-INF`.
 
@@ -746,7 +746,7 @@ You will see that the <<welcome-page,welcome page displays as it did previously>
 [[controller]]
 == Creating the Controller Servlet
 
-The controller servlet handles incoming requests by initiating any actions needed to generate the model for the request, then forwarding the request to the appropriate view. For a visual representation, refer back to the link:design.html#mvcDiagram[+MVC diagram for the AffableBean project+].
+The controller servlet handles incoming requests by initiating any actions needed to generate the model for the request, then forwarding the request to the appropriate view. For a visual representation, refer back to the xref:design.adoc#mvcDiagram[+MVC diagram for the AffableBean project+].
 
 The IDE provides a Servlet wizard that enables you to define the servlet component in a web application either by including the `@WebServlet` annotation in the generated class, or by adding the necessary directives to the deployment descriptor. In the following steps, you create the `ControllerServlet` and define it in the application context using the link:http://java.sun.com/javaee/6/docs/api/javax/servlet/annotation/WebServlet.html[+`@WebServlet`+] annotation.
 
@@ -764,7 +764,7 @@ image::images/servlet-wizard.png[title="Use the Servlet wizard to create servlet
 
 http://localhost/AffableBean*/category*
 ----
-The URL patterns should correspond to the views and actions that a user can initiate. Looking at the link:design.html#index[+welcome page mockup+], a user should be able to select a category. We can therefore associate the `/category` URL with the action of clicking on a category image. Likewise, in the link:design.html#category[+category page+], users should be able to add an item to the shopping cart. We can therefore specify `/addToCart`.
+The URL patterns should correspond to the views and actions that a user can initiate. Looking at the xref:design.adoc#index[+welcome page mockup+], a user should be able to select a category. We can therefore associate the `/category` URL with the action of clicking on a category image. Likewise, in the xref:design.adoc#category[+category page+], users should be able to add an item to the shopping cart. We can therefore specify `/addToCart`.
 
 [start=5]
 . In the URL Pattern(s) field, type in '`/category, /addToCart, /viewCart`'. Patterns are separated by commas. You can add more patterns directly in the servlet class once it's created. 
@@ -846,7 +846,7 @@ Be sure to separate each pattern with a comma. You can also reformat the annotat
 [[implement]]
 == Implementing the Controller Servlet
 
-As previously stated, the controller servlet handles incoming requests by initiating any actions needed to generate the model for the request, then forwarding the request to the appropriate view. For a visual representation, refer back to the link:design.html#mvcDiagram[+MVC diagram for the AffableBean project+].
+As previously stated, the controller servlet handles incoming requests by initiating any actions needed to generate the model for the request, then forwarding the request to the appropriate view. For a visual representation, refer back to the xref:design.adoc#mvcDiagram[+MVC diagram for the AffableBean project+].
 
 Looking at the generated code for the new `ControllerServlet`, you can see that the IDE's servlet template employs a `processRequest` method which is called by both `doGet` and `doPost` methods. (You may need to expand the code fold by clicking the plus icon ( image:images/code-fold-icon.png[] ) in the editor's left margin to view these methods.) Because this application differentiates between `doGet` and `doPost`, you'll add code directly to these methods and remove the `processRequest` [...]
 
@@ -1028,10 +1028,10 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 === NetBeans Tutorials
 
-* link:../javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../../web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:../../web/mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+]
+* xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../../web/quickstart-webapps.adoc[+Introduction to Developing Web Applications+]
+* xref:../../web/mysql-webapp.adoc[+Creating a Simple Web Application Using a MySQL Database+]
 * link:../../../../community/media.html[+Video Tutorials and Demos for NetBeans IDE+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
 * link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/section.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/section.adoc
index 96e34efd7..6f2ecbb79 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/section.adoc
@@ -19,23 +19,23 @@
 
 .e-Commerce Tutorials
 ************************************************
-- link:index.html[e-Commerce Tutorials]
-- link:section.html[]
-- link:entity-session.html[The NetBeans E-commerce Tutorial - Adding Entity Classes and Session Beans]
-- link:language.html[The NetBeans E-commerce Tutorial - Adding Language Support]
-- link:conclusion.html[The NetBeans E-commerce Tutorial - Conclusion]
-- link:connect-db.html[The NetBeans E-commerce Tutorial - Connecting the Application to the Database]
-- link:design.html[The NetBeans E-commerce Tutorial - Designing the Application]
-- link:data-model.html[The NetBeans E-commerce Tutorial - Designing the Data Model]
-- link:transaction.html[The NetBeans E-commerce Tutorial - Integrating Transactional Business Logic]
-- link:intro.html[The NetBeans E-commerce Tutorial - Introduction]
+- xref:index.adoc[e-Commerce Tutorials]
+- xref:section.adoc[]
+- xref:entity-session.adoc[The NetBeans E-commerce Tutorial - Adding Entity Classes and Session Beans]
+- xref:language.adoc[The NetBeans E-commerce Tutorial - Adding Language Support]
+- xref:conclusion.adoc[The NetBeans E-commerce Tutorial - Conclusion]
+- xref:connect-db.adoc[The NetBeans E-commerce Tutorial - Connecting the Application to the Database]
+- xref:design.adoc[The NetBeans E-commerce Tutorial - Designing the Application]
+- xref:data-model.adoc[The NetBeans E-commerce Tutorial - Designing the Data Model]
+- xref:transaction.adoc[The NetBeans E-commerce Tutorial - Integrating Transactional Business Logic]
+- xref:intro.adoc[The NetBeans E-commerce Tutorial - Introduction]
 - link:netbeans-ecommerce-tutorial.html[The NetBeans E-commerce Tutorial - Introduction]
-- link:manage-sessions.html[The NetBeans E-commerce Tutorial - Managing Sessions]
-- link:page-views-controller.html[The NetBeans E-commerce Tutorial - Preparing the Page Views and Controller Servlet]
-- link:security.html[The NetBeans E-commerce Tutorial - Securing the Application]
-- link:setup-dev-environ.html[The NetBeans E-commerce Tutorial - Setting up the Development Environment]
-- link:setup.html[The NetBeans E-commerce Tutorial - Setup Instructions]
-- link:test-profile.html[The NetBeans E-commerce Tutorial - Testing and Profiling]
+- xref:manage-sessions.adoc[The NetBeans E-commerce Tutorial - Managing Sessions]
+- xref:page-views-controller.adoc[The NetBeans E-commerce Tutorial - Preparing the Page Views and Controller Servlet]
+- xref:security.adoc[The NetBeans E-commerce Tutorial - Securing the Application]
+- xref:setup-dev-environ.adoc[The NetBeans E-commerce Tutorial - Setting up the Development Environment]
+- xref:setup.adoc[The NetBeans E-commerce Tutorial - Setup Instructions]
+- xref:test-profile.adoc[The NetBeans E-commerce Tutorial - Testing and Profiling]
 ************************************************
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/security.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/security.adoc
index 067ae3089..b3e2ee84f 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/security.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/security.adoc
@@ -32,16 +32,16 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
-3. link:setup-dev-environ.html[+Setting up the Development Environment+]
-4. link:data-model.html[+Designing the Data Model+]
-5. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
-6. link:connect-db.html[+Connecting the Application to the Database+]
-7. link:entity-session.html[+Adding Entity Classes and Session Beans+]
-8. link:manage-sessions.html[+Managing Sessions+]
-9. link:transaction.html[+Integrating Transactional Business Logic+]
-10. link:language.html[+Adding Language Support+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
+3. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
+4. xref:data-model.adoc[+Designing the Data Model+]
+5. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
+6. xref:connect-db.adoc[+Connecting the Application to the Database+]
+7. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
+8. xref:manage-sessions.adoc[+Managing Sessions+]
+9. xref:transaction.adoc[+Integrating Transactional Business Logic+]
+10. xref:language.adoc[+Adding Language Support+]
 11. *Securing the Application*
 * <<examineSnapshot,Examining the Project Snapshot>>
 * <<formBased,Setting up Form-Based Authentication>>
@@ -50,10 +50,10 @@
 * <<seeAlso,See Also>>
 
 [start=12]
-. link:test-profile.html[+Testing and Profiling+]
+. xref:test-profile.adoc[+Testing and Profiling+]
 
 [start=13]
-. link:conclusion.html[+Conclusion+]
+. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
@@ -66,7 +66,7 @@ The first concern, _access control_, is typically a two-step process that involv
 
 The second concern, protecting data while it is in transit, typically involves using Transport Layer Security (TLS), or its predecessor, Secure Sockets Layer (SSL), in order to encrypt any data communicated between the client and server.
 
-Upon reviewing the Affable Bean staff's link:design.html#requirements[+list of requirements+], we'll need to secure the application in the following ways:
+Upon reviewing the Affable Bean staff's xref:design.adoc#requirements[+list of requirements+], we'll need to secure the application in the following ways:
 
 * Set up a login form for the administration console that enables staff members access to the console's services, and blocks unauthorized users.
 * Configure secure data transport for both the customer checkout process, and for any data transmitted to and from the administration console.
@@ -96,7 +96,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 * The NetBeans IDE requires the Java Development Kit (JDK) to run properly. If you do not have any of the resources listed above, the JDK should be the first item that you download and install.
 * The NetBeans IDE Java Bundle includes Java Web and EE technologies, which are required for the application you build in this tutorial.
 * The NetBeans IDE Java Bundle also includes the GlassFish server, which you require for this tutorial. You could link:http://glassfish.dev.java.net/public/downloadsindex.html[+download the GlassFish server independently+], but the version provided with the NetBeans download has the added benefit of being automatically registered with the IDE.
-* You can follow this tutorial unit without having completed previous units. To do so, see the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+* You can follow this tutorial unit without having completed previous units. To do so, see the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 * Java EE security is an expansive topic that spans well beyond the scope of this tutorial unit. In order to fully appreciate the range of implementation options that are available to you, refer to the link:http://download.oracle.com/javaee/6/tutorial/doc/gijrp.html[+Java EE 6 Tutorial, Part VII: Security+]. This unit provides ample references to relevant sub-sections within the Java EE Tutorial.
 
 
@@ -109,11 +109,11 @@ The beginning state of the snapshot helps to illustrate the need for security in
 1. Open the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot10.zip[+project snapshot+] for this tutorial unit in the IDE. Click the Open Project ( image:images/open-project-btn.png[] ) button and use the wizard to navigate to the location on your computer where you downloaded the project.
 2. Run the project ( image:images/run-project-btn.png[] ) to ensure that it is properly configured with your database and application server. 
 
-If you receive an error when running the project, revisit the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+If you receive an error when running the project, revisit the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 
 
 [start=3]
-. Test the application's functionality in your browser. This snapshot provides an implementation of the administration console, as specified in the link:design.html#requirements[+customer requirements+]. To examine the administration console, enter the following URL in your browser:
+. Test the application's functionality in your browser. This snapshot provides an implementation of the administration console, as specified in the xref:design.adoc#requirements[+customer requirements+]. To examine the administration console, enter the following URL in your browser:
 
 [source,java]
 ----
@@ -125,7 +125,7 @@ image::images/admin-console.png[title="Append the application's default URL with
 
 The administration console enables you to view all customers and orders contained in the database. When you click either of the links in the left panel, the page will update to display a table listing customers or orders, depending on your choice. (The 'log out' link currently does not "log out" an authenticated user.) 
 
-*Note:* The customers and orders that you see displayed in the administration console are dependent on the data stored in your database. You can create new records by stepping through the checkout process in the website. Alternatively, you can run the link:https://netbeans.org/project_downloads/samples/Samples/JavaEE/ecommerce/affablebean_sample_data.sql[+affablebean_sample_data.sql+] script on your `affablebean` database to have your data correspond to the records displayed in the follo [...]
+*Note:* The customers and orders that you see displayed in the administration console are dependent on the data stored in your database. You can create new records by stepping through the checkout process in the website. Alternatively, you can run the link:https://netbeans.org/project_downloads/samples/Samples/JavaEE/ecommerce/affablebean_sample_data.sql[+affablebean_sample_data.sql+] script on your `affablebean` database to have your data correspond to the records displayed in the follo [...]
 
 
 image::images/admin-console-customers.png[title="Click the 'view all customers' link to view all customer records in a table"] 
@@ -162,7 +162,7 @@ If you have been following the NetBeans E-commerce Tutorial sequentially, you'll
 |===
 
 [start=5]
-. In the browser, return to the customer website by clicking the Affable Bean logo in the upper left corner of the web page. Step through the entire link:design.html#business[+business process flow+] of the application and note that the checkout process is handled over a non-secure channel. 
+. In the browser, return to the customer website by clicking the Affable Bean logo in the upper left corner of the web page. Step through the entire xref:design.adoc#business[+business process flow+] of the application and note that the checkout process is handled over a non-secure channel. 
 
 When customers reach the checkout page, they are expected to submit sensitive personal information in order to complete their orders. Part of your task in this tutorial unit is to ensure that this data is sent over a secure channel. Because the administration console also enables authenticated users to view customers' personal information, it too needs to be configured so that data is sent over the Internet securely.
 
@@ -888,9 +888,9 @@ image::images/http-404.png[title="The browser address bar indicates that a secur
 
 === NetBeans Resources
 
-* link:../../web/security-webapps.html[+Securing a Web Application+]
-* link:../javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
+* xref:../../web/security-webapps.adoc[+Securing a Web Application+]
+* xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
 * link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup-dev-environ.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup-dev-environ.adoc
index 291d5c050..5ed49b935 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup-dev-environ.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup-dev-environ.adoc
@@ -32,8 +32,8 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
 3. *Setting up the Development Environment*
 * <<create,Creating a Web Project>>
 * <<run,Running the Web Project>>
@@ -41,38 +41,38 @@
 * <<seeAlso,See Also>>
 
 [start=4]
-. link:data-model.html[+Designing the Data Model+]
+. xref:data-model.adoc[+Designing the Data Model+]
 
 [start=5]
-. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
+. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
 
 [start=6]
-. link:connect-db.html[+Connecting the Application to the Database+]
+. xref:connect-db.adoc[+Connecting the Application to the Database+]
 
 [start=7]
-. link:entity-session.html[+Adding Entity Classes and Session Beans+]
+. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
 
 [start=8]
-. link:manage-sessions.html[+Managing Sessions+]
+. xref:manage-sessions.adoc[+Managing Sessions+]
 
 [start=9]
-. link:transaction.html[+Integrating Transactional Business Logic+]
+. xref:transaction.adoc[+Integrating Transactional Business Logic+]
 
 [start=10]
-. link:language.html[+Adding Language Support+]
+. xref:language.adoc[+Adding Language Support+]
 
 [start=11]
-. link:security.html[+Securing the Application+]
+. xref:security.adoc[+Securing the Application+]
 
 [start=12]
-. link:test-profile.html[+Testing and Profiling+]
+. xref:test-profile.adoc[+Testing and Profiling+]
 
 [start=13]
-. link:conclusion.html[+Conclusion+]
+. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
-The following steps describe how to set up your development environment. In the process, you'll learn about some of the primary windows of the IDE and understand how the IDE uses an link:http://ant.apache.org/[+Ant+] build script to perform common actions on your project. By the end of this tutorial unit, you'll have created a web application project, and confirmed that you can successfully build the project, deploy it to your development server, and run it from the IDE.
+The following steps describe how to set up your development environment. In the process, you'll learn about some of the primary windows of the IDE and understand how the IDE uses an link:https://ant.apache.org/[+Ant+] build script to perform common actions on your project. By the end of this tutorial unit, you'll have created a web application project, and confirmed that you can successfully build the project, deploy it to your development server, and run it from the IDE.
 
 You also learn how to connect the IDE to a MySQL database server, create database instances, and connect to database instances from the IDE's Services window. In this unit, you create a new database named `affablebean`, which you will use throughout the tutorial.
 
@@ -130,10 +130,10 @@ If you wanted to deploy to a server that isn't yet registered with the IDE, you
 [start=7]
 . For Java EE Version, select Java EE 6 Web. 
 
-The application that you create makes use of various Java EE 6 features, namely servlet annotations (new in the link:http://jcp.org/en/jsr/summary?id=315[+Servlet 3.0 Specification+]), and EJBs used directly in servlet containers (new in the link:http://jcp.org/en/jsr/summary?id=318[+EJB 3.1 Specification+]). Both Servlet 3.0 and EJB 3.1 are part of the Java EE 6 platform, therefore you require an EE-6 compliant server such as GlassFish v3 to work through this tutorial. For more informat [...]
+The application that you create makes use of various Java EE 6 features, namely servlet annotations (new in the link:http://jcp.org/en/jsr/summary?id=315[+Servlet 3.0 Specification+]), and EJBs used directly in servlet containers (new in the link:http://jcp.org/en/jsr/summary?id=318[+EJB 3.1 Specification+]). Both Servlet 3.0 and EJB 3.1 are part of the Java EE 6 platform, therefore you require an EE-6 compliant server such as GlassFish v3 to work through this tutorial. For more informat [...]
 
 [start=8]
-. Make sure that the 'Enable Contexts and Dependency Injection' option is deselected. This option is specific to the Contexts and Dependency Injection (CDI) technology, specified by link:http://jcp.org/en/jsr/detail?id=299[+JSR-299+], and is not used in this tutorial. For more information, see link:../cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]. 
+. Make sure that the 'Enable Contexts and Dependency Injection' option is deselected. This option is specific to the Contexts and Dependency Injection (CDI) technology, specified by link:http://jcp.org/en/jsr/detail?id=299[+JSR-299+], and is not used in this tutorial. For more information, see xref:../cdi-intro.adoc[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]. 
 
 image::images/new-project-wzd2.png[title="Specify development server, EE version, and whether to include CDI support"] 
 
@@ -217,7 +217,7 @@ Both of these targets in turn depend on other targets, which you can examine els
 4. The WAR file gets deployed to the designated server.
 5. The browser opens to display the server's URL and application's context path.
 
-Consult the official link:http://ant.apache.org/manual/index.html[+Ant Manual+] for more information on using Ant.
+Consult the official link:https://ant.apache.org/manual/index.html[+Ant Manual+] for more information on using Ant.
 
 
 [start=4]
@@ -450,16 +450,16 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 === NetBeans Resources
 
-* link:../../java/project-setup.html[+Creating, Importing, and Configuring Java Projects+]
+* xref:../../java/project-setup.adoc[+Creating, Importing, and Configuring Java Projects+]
 * link:../../../articles/mysql.html[+MySQL and NetBeans IDE+]
-* link:../../ide/mysql.html[+Connecting to a MySQL Database+]
-* link:../../web/mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+]
+* xref:../../ide/mysql.adoc[+Connecting to a MySQL Database+]
+* xref:../../web/mysql-webapp.adoc[+Creating a Simple Web Application Using a MySQL Database+]
 
 
 === External Resources
 
-* link:http://ant.apache.org/manual/index.html[+Apache Ant User Manual+]
-* link:http://ant.apache.org/manual/tutorial-HelloWorldWithAnt.html[+Hello World with Ant+]
+* link:https://ant.apache.org/manual/index.html[+Apache Ant User Manual+]
+* link:https://ant.apache.org/manual/tutorial-HelloWorldWithAnt.html[+Hello World with Ant+]
 * link:http://dev.mysql.com/doc/refman/5.1/en/[+MySQL 5.1 Reference Manual+]
 * link:http://dev.mysql.com/doc/administrator/en/index.html[+MySQL Administrator Reference Manual+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup.adoc
index 925ed0bc4..3ff421b30 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup.adoc
@@ -32,25 +32,25 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
-3. link:setup-dev-environ.html[+Setting up the Development Environment+]
-4. link:data-model.html[+Designing the Data Model+]
-5. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
-6. link:connect-db.html[+Connecting the Application to the Database+]
-7. link:entity-session.html[+Adding Entity Classes and Session Beans+]
-8. link:manage-sessions.html[+Managing Sessions+]
-9. link:transaction.html[+Integrating Transactional Business Logic+]
-10. link:language.html[+Adding Language Support+]
-11. link:security.html[+Securing the Application+]
-12. link:test-profile.html[+Testing and Profiling+]
-13. link:conclusion.html[+Conclusion+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
+3. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
+4. xref:data-model.adoc[+Designing the Data Model+]
+5. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
+6. xref:connect-db.adoc[+Connecting the Application to the Database+]
+7. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
+8. xref:manage-sessions.adoc[+Managing Sessions+]
+9. xref:transaction.adoc[+Integrating Transactional Business Logic+]
+10. xref:language.adoc[+Adding Language Support+]
+11. xref:security.adoc[+Securing the Application+]
+12. xref:test-profile.adoc[+Testing and Profiling+]
+13. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
 If you want to follow a tutorial unit without having completed previous units, you need to perform some preliminary steps in order to set up your development environment.
 
-1. *Set up your MySQL database server.* Follow the steps outlined in: link:setup-dev-environ.html#communicate[+Communicating with the Database Server+].
+1. *Set up your MySQL database server.* Follow the steps outlined in: xref:setup-dev-environ.adoc#communicate[+Communicating with the Database Server+].
 2. *Create the `affablebean` schema on the database server, and populate the database with sample data:*
 .. Click on link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252Faffablebean.sql[+affablebean.sql+] and copy (Ctrl-C; ⌘-C on Mac) the entire contents of the file.
 .. Open the IDE's SQL editor. In the Services window (Ctrl-5; ⌘-5 on Mac), right-click the `affablebean` database connection ( image:images/db-connection-node.png[] ) node and choose Execute Command. 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/test-profile.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/test-profile.adoc
index 732d3b59b..2df1dba8f 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/test-profile.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/test-profile.adoc
@@ -32,17 +32,17 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
-3. link:setup-dev-environ.html[+Setting up the Development Environment+]
-4. link:data-model.html[+Designing the Data Model+]
-5. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
-6. link:connect-db.html[+Connecting the Application to the Database+]
-7. link:entity-session.html[+Adding Entity Classes and Session Beans+]
-8. link:manage-sessions.html[+Managing Sessions+]
-9. link:transaction.html[+Integrating Transactional Business Logic+]
-10. link:language.html[+Adding Language Support+]
-11. link:security.html[+Securing the Application+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
+3. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
+4. xref:data-model.adoc[+Designing the Data Model+]
+5. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
+6. xref:connect-db.adoc[+Connecting the Application to the Database+]
+7. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
+8. xref:manage-sessions.adoc[+Managing Sessions+]
+9. xref:transaction.adoc[+Integrating Transactional Business Logic+]
+10. xref:language.adoc[+Adding Language Support+]
+11. xref:security.adoc[+Securing the Application+]
 12. *Testing and Profiling*
 * <<test,Testing with JMeter>>
 * <<profile,Using the NetBeans Profiler>>
@@ -50,7 +50,7 @@
 * <<seeAlso,See Also>>
 
 [start=13]
-. link:conclusion.html[+Conclusion+]
+. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
@@ -83,7 +83,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 * The NetBeans IDE requires the Java Development Kit (JDK) to run properly. If you do not have any of the resources listed above, the JDK should be the first item that you download and install.
 * The NetBeans IDE Java Bundle includes Java Web and EE technologies, which are required for the application you build in this tutorial.
 * The NetBeans IDE Java Bundle also includes the GlassFish server, which you require for this tutorial. You could link:http://glassfish.dev.java.net/public/downloadsindex.html[+download the GlassFish server independently+], but the version provided with the NetBeans download has the added benefit of being automatically registered with the IDE.
-* You can follow this tutorial unit without having completed previous units. To do so, see the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+* You can follow this tutorial unit without having completed previous units. To do so, see the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 * *You do not need to download JMeter for its use in this tutorial.* Instead, you install the NetBeans JMeter Kit plugin, which includes the JMeter distribution. You will therefore require an Internet connection at the point when you install the plugin in the tutorial. JMeter can be downloaded independently from link:http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi[+http://jakarta.apache.org/site/downloads/downloads_jmeter.cgi+].
 * The JMeter Kit plugin for NetBeans 6.8 installs JMeter version 2.2 (released June 2006). The plugin for NetBeans 6.9 installs JMeter version 2.4 (released July 2010). There is a significant difference between these two versions.
 
@@ -91,7 +91,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 [[test]]
 == Testing with JMeter
 
-Begin by examining the `AffableBean` tutorial application. Then install the JMeter Kit plugin using the IDE's Plugins Manager. Launch JMeter from the IDE, and proceed by creating a test plan based on the tutorial link:design.html#mockups[+use-case+]. Finally, explore some of JMeter's facilities for functional and load testing.
+Begin by examining the `AffableBean` tutorial application. Then install the JMeter Kit plugin using the IDE's Plugins Manager. Launch JMeter from the IDE, and proceed by creating a test plan based on the tutorial xref:design.adoc#mockups[+use-case+]. Finally, explore some of JMeter's facilities for functional and load testing.
 
 * <<install,Install the JMeter Kit Plugin>>
 * <<createTestPlan,Create a Test Plan>>
@@ -105,7 +105,7 @@ Begin by examining the `AffableBean` tutorial application. Then install the JMet
 1. Open the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_complete.zip[+`AffableBean` project+] in the IDE. Click the Open Project ( image:images/open-project-btn.png[] ) button and use the wizard to navigate to the location on your computer where you downloaded the project.
 2. Run the project ( image:images/run-project-btn.png[] ) to ensure that it is properly configured with your database and application server. 
 
-If you receive an error when running the project, revisit the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL. If you want to log into the project's administration console (not required in this tutorial unit), you'll need to create a user named `nbuser` on the GlassFish server. This task is described in Unit 11, link:security.html#createUsers[+Securing the Application: Create Users and/or G [...]
+If you receive an error when running the project, revisit the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL. If you want to log into the project's administration console (not required in this tutorial unit), you'll need to create a user named `nbuser` on the GlassFish server. This task is described in Unit 11, xref:security.adoc#createUsers[+Securing the Application: Create Users and/or G [...]
 
 
 [start=3]
@@ -136,7 +136,7 @@ If you open the Files window (Ctrl-2; ⌘-2 on Mac), you'll see a new `jmeter` f
 [[createTestPlan]]
 === Create a Test Plan
 
-To demonstrate how to create a test plan in JMeter, we'll base our plan on the tutorial use-case, which was presented in link:design.html#mockups[+Designing the Application+]. A list of user-initiated requests to the server, based on the given use-case, might look something like the following:
+To demonstrate how to create a test plan in JMeter, we'll base our plan on the tutorial use-case, which was presented in xref:design.adoc#mockups[+Designing the Application+]. A list of user-initiated requests to the server, based on the given use-case, might look something like the following:
 
 |===
 |Use-Case |Server Request 
@@ -534,9 +534,9 @@ When building web applications, you need to be mindful of memory allocation. Asi
 
 The following example aims to familiarize you with the Profiler's interface, and demonstrates how you can utilize its functionality to ensure that the `AffableBean` application will continue to perform efficiently after it has been serving client requests for some time. In this example, you download and add a new JMeter test plan, link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FuseCaseTestRandom.jmx[+`useCaseTestRandom.jmx`+], to the pro [...]
 
-Consider that only a small fraction of visits to an e-commerce site will result in a completed order. If you recall from units 8 and 9, link:manage-sessions.html[+Managing Sessions+] and link:transaction.html[+Integrating Transactional Business Logic+], the application terminates the user session upon a successfully completed order. In other words, with each completed order, the server is able to free up any resources that were previously tied to the session. Now, consider the far more c [...]
+Consider that only a small fraction of visits to an e-commerce site will result in a completed order. If you recall from units 8 and 9, xref:manage-sessions.adoc[+Managing Sessions+] and xref:transaction.adoc[+Integrating Transactional Business Logic+], the application terminates the user session upon a successfully completed order. In other words, with each completed order, the server is able to free up any resources that were previously tied to the session. Now, consider the far more c [...]
 
-*Note:* Recall that in link:manage-sessions.html#time-out[+Managing Sessions: Handling Session Time-Outs+], you set the `AffableBean` session time-out to 10 minutes.
+*Note:* Recall that in xref:manage-sessions.adoc#time-out[+Managing Sessions: Handling Session Time-Outs+], you set the `AffableBean` session time-out to 10 minutes.
 
 1. Download link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FuseCaseTestRandom.jmx[+`useCaseTestRandom.jmx`+] and add it to the `AffableBean` project. To add it to the project, copy it from your computer's file system (Ctrl-C; ⌘-C on Mac), then in the IDE, open the Files window (Ctrl-2; ⌘-2 on Mac), right-click the `jmeter` folder and choose Paste. 
 
@@ -764,12 +764,12 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 * link:http://profiler.netbeans.org/[+NetBeans Profiler+] [product page]
 * link:../../../../features/java/profiler.html[+NetBeans Profiler Features+]
-* link:../../java/profiler-profilingpoints.html[+Using Profiling Points+]
+* xref:../../java/profiler-profilingpoints.adoc[+Using Profiling Points+]
 * link:http://profiler.netbeans.org/docs/help/6.0/heapwalker.html[+Using HeapWalker+]
 * link:http://wiki.netbeans.org/HeapWalkerDemo[+HeapWalker Demo+]
-* link:../../java/profile-loadgenerator.html[+Using a Load Generator+]
-* link:../profiler-javaee.html[+Profiling an Enterprise Application+]
-* link:../../java/profiler-intro.html[+Introduction to Profiling Java Applications+]
+* xref:../../java/profile-loadgenerator.adoc[+Using a Load Generator+]
+* xref:../profiler-javaee.adoc[+Profiling an Enterprise Application+]
+* xref:../../java/profiler-intro.adoc[+Introduction to Profiling Java Applications+]
 * link:../../../articles/nb-profiler-uncoveringleaks_pt1.html[+Uncovering Memory Leaks Using NetBeans Profiler+]
 * link:../../../../community/magazine/html/04/profiler.html[+Advanced Profiling: Theory in Practice with NetBeans+]
 * link:https://netbeans.org/download/magazine/01/nb01_profiler.pdf[+Exploring the NetBeans Profiler+] [pdf]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/transaction.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/transaction.adoc
index e695db0a2..4b639ece2 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/transaction.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/transaction.adoc
@@ -32,14 +32,14 @@
 
 == Tutorial Contents
 
-1. link:intro.html[+Introduction+]
-2. link:design.html[+Designing the Application+]
-3. link:setup-dev-environ.html[+Setting up the Development Environment+]
-4. link:data-model.html[+Designing the Data Model+]
-5. link:page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
-6. link:connect-db.html[+Connecting the Application to the Database+]
-7. link:entity-session.html[+Adding Entity Classes and Session Beans+]
-8. link:manage-sessions.html[+Managing Sessions+]
+1. xref:intro.adoc[+Introduction+]
+2. xref:design.adoc[+Designing the Application+]
+3. xref:setup-dev-environ.adoc[+Setting up the Development Environment+]
+4. xref:data-model.adoc[+Designing the Data Model+]
+5. xref:page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
+6. xref:connect-db.adoc[+Connecting the Application to the Database+]
+7. xref:entity-session.adoc[+Adding Entity Classes and Session Beans+]
+8. xref:manage-sessions.adoc[+Managing Sessions+]
 9. *Integrating Transactional Business Logic*
 * <<overview,Overview of the Transaction>>
 * <<projSnapshot,Examining the Project Snapshot>>
@@ -53,20 +53,20 @@
 * <<seeAlso,See Also>>
 
 [start=10]
-. link:language.html[+Adding Language Support+]
+. xref:language.adoc[+Adding Language Support+]
 
 [start=11]
-. link:security.html[+Securing the Application+]
+. xref:security.adoc[+Securing the Application+]
 
 [start=12]
-. link:test-profile.html[+Testing and Profiling+]
+. xref:test-profile.adoc[+Testing and Profiling+]
 
 [start=13]
-. link:conclusion.html[+Conclusion+]
+. xref:conclusion.adoc[+Conclusion+]
 
 image::../../../../images_www/articles/68/netbeans-stamp-68-69.png[title="Content on this page applies to NetBeans IDE, versions 6.8 and 6.9"]
 
-The purpose of this tutorial unit is to demonstrate how you can use the object-relational mapping (ORM) capabilities provided by EJB and JPA technologies to gather data from a web request and write to a back-end database. Of particular interest is EJB's support for _container-managed_ transactions (refer to the link:entity-session.html#gf-java-ee-container[+GlassFish v3 Java EE Container diagram+]). By applying several non-intrusive annotations, you can transform your EJB class into a tr [...]
+The purpose of this tutorial unit is to demonstrate how you can use the object-relational mapping (ORM) capabilities provided by EJB and JPA technologies to gather data from a web request and write to a back-end database. Of particular interest is EJB's support for _container-managed_ transactions (refer to the xref:entity-session.adoc#gf-java-ee-container[+GlassFish v3 Java EE Container diagram+]). By applying several non-intrusive annotations, you can transform your EJB class into a tr [...]
 
 Within the context of the `AffableBean` application, this tutorial unit focuses on processing a customer order when data from the checkout form is received. You create an `OrderManager` EJB to process the checkout form data along with the session `cart` object. The `OrderManager` performs a transaction that involves multiple write actions to the `affablebean` database. If any of the actions fails, the transaction is rolled back.
 
@@ -93,7 +93,7 @@ You can view a live demo of the application that you build in this tutorial: lin
 * The NetBeans IDE requires the Java Development Kit (JDK) to run properly. If you do not have any of the resources listed above, the JDK should be the first item that you download and install.
 * The NetBeans IDE Java Bundle includes Java Web and EE technologies, which are required for the application you build in this tutorial.
 * The NetBeans IDE Java Bundle also includes the GlassFish server, which you require for this tutorial. You could link:http://glassfish.dev.java.net/public/downloadsindex.html[+download the GlassFish server independently+], but the version provided with the NetBeans download has the added benefit of being automatically registered with the IDE.
-* You can follow this tutorial unit without having completed previous units. To do so, see the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+* You can follow this tutorial unit without having completed previous units. To do so, see the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 
 
 
@@ -130,18 +130,18 @@ Because we are implementing the transaction within a larger context, we'll appro
 
 Begin by examining the project snapshot associated with this tutorial unit.
 
-1. Open the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot7.zip[+project snapshot+] for this tutorial unit in the IDE. Click the Open Project ( image:images/open-project-btn.png[] ) button and use the wizard to navigate to the location on your computer where you downloaded the project. If you are proceeding from the link:manage-sessions.html[+previous tutorial unit+], note that this project snapshot is identical to  [...]
+1. Open the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot7.zip[+project snapshot+] for this tutorial unit in the IDE. Click the Open Project ( image:images/open-project-btn.png[] ) button and use the wizard to navigate to the location on your computer where you downloaded the project. If you are proceeding from the xref:manage-sessions.adoc[+previous tutorial unit+], note that this project snapshot is identical to  [...]
 * The `confirmation.jsp` page is fully implemented.
 * The `affablebean.css` stylesheet includes rules specific to the `confirmation.jsp` page implementation.
 
 [start=2]
 . Run the project ( image:images/run-project-btn.png[] ) to ensure that it is properly configured with your database and application server. 
 
-If you receive an error when running the project, revisit the link:setup.html[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
+If you receive an error when running the project, revisit the xref:setup.adoc[+setup instructions+], which describe how to prepare the database and establish connectivity between the IDE, GlassFish, and MySQL.
 
 
 [start=3]
-. Test the application's functionality in your browser. In particular, step through the entire link:design.html#business[+business process flow+]. When you click the submit an order from the checkout page, the confirmation page currently displays as follows: 
+. Test the application's functionality in your browser. In particular, step through the entire xref:design.adoc#business[+business process flow+]. When you click the submit an order from the checkout page, the confirmation page currently displays as follows: 
 
 image::images/confirmation-page-start.png[title="Confirmation page displays without any data relating to the processed order"] 
 
@@ -436,7 +436,7 @@ image::images/fix-all-imports.png[title="Press Ctrl-Shift-I to fix imports in a
 [[entityManager]]
 == Utilizing JPA's EntityManager
 
-As was mentioned in link:entity-session.html[+Adding Entity Classes and Session Beans+], the `EntityManager` API is included in JPA, and is responsible for performing persistence operations on the database. In the `AffableBean` project, all of the EJBs employ the `EntityManager`. To demonstrate, open any of the session facade beans in the editor and note that the class uses the `@PersistenceContext` annotation to express a dependency on a container-managed `EntityManager` and its associa [...]
+As was mentioned in xref:entity-session.adoc[+Adding Entity Classes and Session Beans+], the `EntityManager` API is included in JPA, and is responsible for performing persistence operations on the database. In the `AffableBean` project, all of the EJBs employ the `EntityManager`. To demonstrate, open any of the session facade beans in the editor and note that the class uses the `@PersistenceContext` annotation to express a dependency on a container-managed `EntityManager` and its associa [...]
 
 
 [source,java]
@@ -574,7 +574,7 @@ What is the scope of the persistence context? If you open the IDE's Javadoc Inde
 At this stage you might assume that, transaction or no transaction, the `OrderManager` is now able to successfully write entity objects to the database. Run the project and see how customer orders are currently being processed.
 
 1. Press F6 (fn-F6 on Mac) to run the project.
-2. Step through the link:design.html#business[+business process flow+]. When you arrive at the checkout page, be sure to enter data that you know will not cause SQL errors to occur when the write actions are performed. (Validation is discussed in a later tutorial unit.) For example, enter the following into the checkout form:
+2. Step through the xref:design.adoc#business[+business process flow+]. When you arrive at the checkout page, be sure to enter data that you know will not cause SQL errors to occur when the write actions are performed. (Validation is discussed in a later tutorial unit.) For example, enter the following into the checkout form:
 * *name:* `Hugo Reyes`
 * *email:* `hurley@mrcluck.com`
 * *phone:* `606252924`
@@ -804,7 +804,7 @@ image::images/transaction-output.png[role="left", link="images/transaction-outpu
 
 Press Shift-Esc on the Output window to maximize it.
 
-As shown in the above image, the green text indicates output from EclipseLink. Recall how in link:entity-session.html[+Adding Entity Classes and Session Beans+] you set EclipseLink's logging level to `FINEST` in the persistence unit. Being able to examine this output is key to understanding how the persistence provider interacts with the database and is a great help when you need to debug your project.
+As shown in the above image, the green text indicates output from EclipseLink. Recall how in xref:entity-session.adoc[+Adding Entity Classes and Session Beans+] you set EclipseLink's logging level to `FINEST` in the persistence unit. Being able to examine this output is key to understanding how the persistence provider interacts with the database and is a great help when you need to debug your project.
 
 You've now successfully integrated the transaction into the `AffableBean` project. You can link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot8.zip[+download snapshot 8+] to examine code that completes the request-response cycle when a checkout form is submitted. The snapshot implements a `getOrderDetails` method in the `OrderManager`, which gathers all details pertaining to the placed order. If the transaction succeeds, [...]
 
@@ -883,7 +883,7 @@ image::images/ie-55.png[title="Documentation popup warns of method calls to non-
 
 The purpose of server-side validation is to ensure that each piece of data is in a format that is ready for further processing or is acceptable for storage. By "format", we mean both the data type as well as the size of the piece of data. The generated JPA entity classes are guaranteed to map their properties to the appropriate data types of the corresponding database table columns. When relying on these entity classes, we need to not only make sure that user data can be applied to creat [...]
 
-To illustrate an example, consider the checkout form's credit card number field. Client-side validation checks that the entered data does not include letters.^<<footnote2,[2]>>^ Because the `maxlength` attribute in the HTML markup is set to `19`, users cannot enter more than 19 characters into this field. Server-side validation also places a limit at 19 characters. Keep in mind that the data type of the `cc_number` column in the database's `customer` table is: `VARCHAR(19)` (Refer to ste [...]
+To illustrate an example, consider the checkout form's credit card number field. Client-side validation checks that the entered data does not include letters.^<<footnote2,[2]>>^ Because the `maxlength` attribute in the HTML markup is set to `19`, users cannot enter more than 19 characters into this field. Server-side validation also places a limit at 19 characters. Keep in mind that the data type of the `cc_number` column in the database's `customer` table is: `VARCHAR(19)` (Refer to ste [...]
 
 Server-side validation in the `AffableBean` project is implemented by means of a `Validator` class. The `ControllerServlet` creates a `Validator` object and calls its `validateForm` method on the user data:
 
@@ -991,8 +991,8 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 === NetBeans Resources
 
-* link:../javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
+* xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
 * link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/platform.adoc b/netbeans.apache.org/src/content/kb/docs/platform.adoc
index e8625b7b4..814d72ea3 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform.adoc
@@ -64,10 +64,10 @@ somewhat old, but NetBeans main concepts have not evolved that much, and most
 of them are still up to date.
 
 * link:https://leanpub.com/nbp4beginners[+"Apache NetBeans Platform for Beginners"+]
-* link:http://www.apress.com/9781430241010[+"The Definitive Guide to NetBeans Platform 7"+]
+* link:https://link.springer.com/book/10.1007/978-1-4302-4102-7[+"The Definitive Guide to NetBeans Platform 7"+]
 * link:https://www.packtpub.com/netbeans-platform-6-9-developers-guide/book[+"NetBeans Platform 6.9 Developer's Guide"+]
-* link:http://www.apress.com/9781430224174[+"The Definitive Guide to NetBeans Platform 6.5"+]
-* link:http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802[+"Rich Client Programming: Plugging into the NetBeans Platform"+]
+* link:https://link.springer.com/book/10.1007/978-1-4302-2418-1[+"The Definitive Guide to NetBeans Platform 6.5"+]
+* link:https://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802[+"Rich Client Programming: Plugging into the NetBeans Platform"+]
 
 === Reference cards
 
@@ -75,8 +75,8 @@ The dzone link:https://dzone.com/refcardz/netbeans-platform-70[Essential NetBean
 
 === Wiki
 
-Our wiki's link:https://netbeans.apache.org/wiki/DevFaqIndex.asciidoc[+NetBeans Developer FAQ+] has interesting "tricks" you may want to take a look at.  
-link:https://netbeans.apache.org/wiki/NbmIdioms.asciidoc[NetBeans APIs idioms] is also useful to know the answers to many frequent questions.
+Our wiki's xref:../../wiki/DevFaqIndex.adoc[+NetBeans Developer FAQ+] has interesting "tricks" you may want to take a look at.  
+xref:../../wiki/NbmIdioms.adoc[NetBeans APIs idioms] is also useful to know the answers to many frequent questions.
 
 === Blogs
 Some blogs you may find of interest:
@@ -94,7 +94,7 @@ you may want to check.
 === Screencasts
 
 * link:http://prezi.com/b5ntwnpvu9j8/free-netbeans-platform-crash-course/[+Slides: Free NetBeans Platform Crash Course+]
-* link:https://netbeans.apache.org/tutorials/nbm-10-top-apis.html[+Video: Top 10 NetBeans APIs+]
+* xref:../../tutorials/nbm-10-top-apis.adoc[+Video: Top 10 NetBeans APIs+]
 
 === Community-Contributed Docs
 
@@ -117,25 +117,25 @@ The community has also contributed documentation along the years. Let us know if
 
 We have ported the NetBeans Tutorials to this site, but some of the tutorials need a review.
 
-You can help us improve the tutorials following link:https://netbeans.apache.org/kb/docs/contributing.html[these contribution guidelines].
+You can help us improve the tutorials following xref:contributing.adoc[these contribution guidelines].
 
-* For historical reasons, the link:https://netbeans.apache.org/kb/docs/platform/[NetBeans Platform Learning Trail] has also a list of tutorials you may want to check.
+* For historical reasons, the xref:platform/index.adoc[NetBeans Platform Learning Trail] has also a list of tutorials you may want to check.
 
 === Introductory tutorials
 
-* The link:https://netbeans.apache.org/tutorials/nbm-runtime-container.html[+Runtime Container Tutorial+] explains how NetBeans works internally.
-* link:https://netbeans.apache.org/tutorials/nbm-10-top-apis.html[+Top 10 NetBeans APIs (Videos)+] explains the "top 10" NetBeans APIs.
+* The xref:../../tutorials/nbm-runtime-container.adoc[+Runtime Container Tutorial+] explains how NetBeans works internally.
+* xref:../../tutorials/nbm-10-top-apis.adoc[+Top 10 NetBeans APIs (Videos)+] explains the "top 10" NetBeans APIs.
 
 
-* link:https://netbeans.apache.org/tutorials/nbm-google.html[+NetBeans Plugin Quick Start+]
-* link:https://netbeans.apache.org/tutorials/nbm-quick-start.html[+NetBeans Platform Quick Start+]
-* link:https://netbeans.apache.org/tutorials/nbm-dukescript.html[+NetBeans Platform Plugins with DukeScript+]
-* link:https://netbeans.apache.org/tutorials/nbm-porting-basic.html[+Porting Swing Components+]
-* link:https://netbeans.apache.org/tutorials/nbm-javafx.html[+Porting JavaFX Components+]
-* link:https://netbeans.apache.org/tutorials/nbm-selection-1.html[+Part 1: Selection Management Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-selection-2.html[+Part 2: Selection Management Tutorial II—Using Nodes+]
-* link:https://netbeans.apache.org/tutorials/nbm-nodesapi2.html[+Part 3: Nodes API Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-property-editors.html[+Part 4: Property Editor API Tutorial+]
+* xref:../../tutorials/nbm-google.adoc[+NetBeans Plugin Quick Start+]
+* xref:../../tutorials/nbm-quick-start.adoc[+NetBeans Platform Quick Start+]
+* xref:../../tutorials/nbm-dukescript.adoc[+NetBeans Platform Plugins with DukeScript+]
+* xref:../../tutorials/nbm-porting-basic.adoc[+Porting Swing Components+]
+* xref:../../tutorials/nbm-javafx.adoc[+Porting JavaFX Components+]
+* xref:../../tutorials/nbm-selection-1.adoc[+Part 1: Selection Management Tutorial+]
+* xref:../../tutorials/nbm-selection-2.adoc[+Part 2: Selection Management Tutorial II—Using Nodes+]
+* xref:../../tutorials/nbm-nodesapi2.adoc[+Part 3: Nodes API Tutorial+]
+* xref:../../tutorials/nbm-property-editors.adoc[+Part 4: Property Editor API Tutorial+]
 
 
 === Extending the NetBeans Platform
@@ -149,7 +149,7 @@ concept of "layers" (that works in a similar way to the Windows registry).
 * For an introduction to the NetBeans Lookup API see link:http://netbeans.dzone.com/articles/netbeans-lookups-explained[+NetBeans Lookups Explained!+].
 * You may also find link:http://netbeans.dzone.com/news/netbeans-extension-points[+How Do NetBeans Extension Points Work?+] of interest.
 * The link:https://dzone.com/articles/how-create-pluggable-photo-alb[+How to Create a Pluggable Photo Album in Java+] 
-* The link:http://bits.netbeans.org/dev/javadoc/layers.html[+Description of Layer Registrations in NetBeans APIs+] explains how each module
+* The link:https://bits.netbeans.org/dev/javadoc/layers.html[+Description of Layer Registrations in NetBeans APIs+] explains how each module
 in NetBeans registers files, documents, classes and more in a global registry that you can query.
 
 === Using Maven to build applications
@@ -158,12 +158,12 @@ You can use Maven and the NetBeans Platform to build great applications. Here're
 tutorials to get you started:
 
 * link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices in NetBeans IDE+]
-* link:http://bits.netbeans.org/mavenutilities/nbm-maven-plugin/[+About the NetBeans Module Maven Plugin+]
-* link:https://netbeans.apache.org/tutorials/nbm-maven-commandline.html[+NetBeans Platform Maven Command Line Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-maven-quickstart.html[+NetBeans Platform Quick Start Using Maven+]
-* link:https://netbeans.apache.org/tutorials/nbm-maven-modulesingle.html[+NetBeans Platform File Type Tutorial Using Maven+]
-* link:https://netbeans.apache.org/tutorials/nbm-maven-modulesuite.html[+NetBeans Platform Selection Tutorial Using Maven+]
-* link:https://netbeans.apache.org/tutorials/nbm-maven-crud.html[+NetBeans Platform CRUD Tutorial Using Maven+]
+* link:https://bits.netbeans.org/mavenutilities/nbm-maven-plugin/[+About the NetBeans Module Maven Plugin+]
+* xref:../../tutorials/nbm-maven-commandline.adoc[+NetBeans Platform Maven Command Line Tutorial+]
+* xref:../../tutorials/nbm-maven-quickstart.adoc[+NetBeans Platform Quick Start Using Maven+]
+* xref:../../tutorials/nbm-maven-modulesingle.adoc[+NetBeans Platform File Type Tutorial Using Maven+]
+* xref:../../tutorials/nbm-maven-modulesuite.adoc[+NetBeans Platform Selection Tutorial Using Maven+]
+* xref:../../tutorials/nbm-maven-crud.adoc[+NetBeans Platform CRUD Tutorial Using Maven+]
 * link:http://blogs.oracle.com/geertjan/entry/mavenized_netbeans_platform_runtime_container[+Mavenized NetBeans Platform Runtime Container+]
 * link:https://dzone.com/articles/how-create-maven-nb-project-type[+How to Create a Custom Project Type in a Mavenized NetBeans Platform Application+]
 * link:https://dzone.com/articles/nb-how-create-javahelp-mavenized[+How to Create JavaHelp in a Mavenized NetBeans Platform Application+]
@@ -173,27 +173,27 @@ tutorials to get you started:
 You can use OSGi modules within a NetBeans Platform. 
 
 * http://wiki.apidesign.org/wiki/Netigso[OSGi and NetBeans]
-* link:https://netbeans.apache.org/tutorials/nbm-osgi-quickstart.html[+NetBeans Platform Quick Start Using OSGi+]
-* link:https://netbeans.apache.org/tutorials/nbm-emf.html[+NetBeans Platform EMF Integration Tutorial+]
+* xref:../../tutorials/nbm-osgi-quickstart.adoc[+NetBeans Platform Quick Start Using OSGi+]
+* xref:../../tutorials/nbm-emf.adoc[+NetBeans Platform EMF Integration Tutorial+]
 
 === Testing and diagnostics
 
 When building applications on top of the NetBeans Platform you want, of course, to test things. Also to diagnose what's going on. These are of help:
 
-* link:https://netbeans.apache.org/tutorials/nbm-test.html[+NetBeans Platform Test Infrastructure Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-gesture.html[+NetBeans Platform Gesture Collection Infrastructure Tutorial+]
+* xref:../../tutorials/nbm-test.adoc[+NetBeans Platform Test Infrastructure Tutorial+]
+* xref:../../tutorials/nbm-gesture.adoc[+NetBeans Platform Gesture Collection Infrastructure Tutorial+]
 
 === Sample applications.
 
-* link:https://netbeans.apache.org/tutorials/nbm-paintapp.html[+Paint Application Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-feedreader.html[+Feed Reader Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-htmleditor.html[+HTML Editor Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-povray-1.html[+POV-Ray Renderer Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-crud.html[+Create/Read/Update/Delete (CRUD)+]
-* link:https://netbeans.apache.org/tutorials/nbm-geospatial.html[+Geospatial+]
-* link:https://netbeans.apache.org/tutorials/nbm-workflow.html[+Workflow+]
+* xref:../../tutorials/nbm-paintapp.adoc[+Paint Application Tutorial+]
+* xref:../../tutorials/nbm-feedreader.adoc[+Feed Reader Tutorial+]
+* xref:../../tutorials/nbm-htmleditor.adoc[+HTML Editor Tutorial+]
+* xref:../../tutorials/nbm-povray-1.adoc[+POV-Ray Renderer Tutorial+]
+* xref:../../tutorials/nbm-crud.adoc[+Create/Read/Update/Delete (CRUD)+]
+* xref:../../tutorials/nbm-geospatial.adoc[+Geospatial+]
+* xref:../../tutorials/nbm-workflow.adoc[+Workflow+]
 
-* link:https://netbeans.apache.org/tutorials/nbm-ide.html[+Development Environment+]
+* xref:../../tutorials/nbm-ide.adoc[+Development Environment+]
 
 === How to develop editors
 
@@ -201,27 +201,27 @@ Of course, the NetBeans Platform has many features to build top-noch editors (th
 we build the NetBeans IDE on top of the platform :-)). Here's a list of tutorials
 that you can use to build your own editors.
 
-* link:https://netbeans.apache.org/tutorials/nbm-filetype.html[+File Type Integration Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-javacc-lexer.html[+JavaCC Lexer Generator Integration Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-javacc-parser.html[+JavaCC Parser Generator Integration Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-copyfqn.html[+Java Language Infrastructure Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-code-generator.html[+Code Generator Integration Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-code-completion.html[+Code Completion Integration Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-mark-occurrences.html[+Mark Occurrences Module Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-palette-api1.html[+Code Snippet Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-palette-api2.html[+Editor Component Palette Module Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-xmleditor.html[+XML Editor Extension Module Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-hyperlink.html[+Hyperlink Navigation Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-java-hint.html[+Java Hints Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-code-template.html[+Code Templates Tutorial+]
+* xref:../../tutorials/nbm-filetype.adoc[+File Type Integration Tutorial+]
+* xref:../../tutorials/nbm-javacc-lexer.adoc[+JavaCC Lexer Generator Integration Tutorial+]
+* xref:../../tutorials/nbm-javacc-parser.adoc[+JavaCC Parser Generator Integration Tutorial+]
+* xref:../../tutorials/nbm-copyfqn.adoc[+Java Language Infrastructure Tutorial+]
+* xref:../../tutorials/nbm-code-generator.adoc[+Code Generator Integration Tutorial+]
+* xref:../../tutorials/nbm-code-completion.adoc[+Code Completion Integration Tutorial+]
+* xref:../../tutorials/nbm-mark-occurrences.adoc[+Mark Occurrences Module Tutorial+]
+* xref:../../tutorials/nbm-palette-api1.adoc[+Code Snippet Tutorial+]
+* xref:../../tutorials/nbm-palette-api2.adoc[+Editor Component Palette Module Tutorial+]
+* xref:../../tutorials/nbm-xmleditor.adoc[+XML Editor Extension Module Tutorial+]
+* xref:../../tutorials/nbm-hyperlink.adoc[+Hyperlink Navigation Tutorial+]
+* xref:../../tutorials/nbm-java-hint.adoc[+Java Hints Tutorial+]
+* xref:../../tutorials/nbm-code-template.adoc[+Code Templates Tutorial+]
 
 === NetBeans APIs for Visualizing Data
 
 The NetBeans Platform has a powerful library (called the "NetBeans Visual Library") that you can use
 to build complex user-interactive visualizations.
 
-* link:https://netbeans.apache.org/tutorials/nbm-visual_library.html[+Visual Library Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-quick-start-visual.html[+Visual Library Tutorial for Java Applications+]
+* xref:../../tutorials/nbm-visual_library.adoc[+Visual Library Tutorial+]
+* xref:../../tutorials/nbm-quick-start-visual.adoc[+Visual Library Tutorial for Java Applications+]
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+Visualize SQL Scripts with the NetBeans Platform+]
 * link:http://wiki.netbeans.org/VisualDatabaseExplorer[+A Visual Database Explorer for NetBeans+]
 * link:http://java.dzone.com/news/how-create-visual-applications[+How to Create Visual Applications in Java?+]
@@ -238,63 +238,63 @@ rails in a train station, or a hierarchy of parts of a component you're designin
 
 These tutorials explain how to extend existing project types or to create your own.
 
-* link:https://netbeans.apache.org/tutorials/nbm-projectsamples.html[+Project Sample Module Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-projectextension.html[+Project Type Extension Module Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-projecttype.html[+Project Type Module Tutorial+]
+* xref:../../tutorials/nbm-projectsamples.adoc[+Project Sample Module Tutorial+]
+* xref:../../tutorials/nbm-projectextension.adoc[+Project Type Extension Module Tutorial+]
+* xref:../../tutorials/nbm-projecttype.adoc[+Project Type Module Tutorial+]
 
 === Templates
 
 We use "templates" to create files with some predefined content.
 
-* link:https://netbeans.apache.org/tutorials/nbm-filetemplates.html[+File Template Module Tutorial+]
+* xref:../../tutorials/nbm-filetemplates.adoc[+File Template Module Tutorial+]
 
 === Installers
 
-* link:https://netbeans.apache.org/tutorials/nbm-nbi.html[+Installer Integration Tutorial+]
+* xref:../../tutorials/nbm-nbi.adoc[+Installer Integration Tutorial+]
 
 === Options window
 
-* link:https://netbeans.apache.org/tutorials/nbm-options.html[+Options Window Module Tutorial+]
+* xref:../../tutorials/nbm-options.adoc[+Options Window Module Tutorial+]
 
 === Property editors
 
 When you select an object in your application, the "Property Editor" window automatically shows
 the properties of the object. Be it a plane, a train or a satellite.
 
-* link:https://netbeans.apache.org/tutorials/nbm-propertyeditors-integration.html[+Property Editor Integration Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-nodesapi.html[+System Properties Module Tutorial+]
+* xref:../../tutorials/nbm-propertyeditors-integration.adoc[+Property Editor Integration Tutorial+]
+* xref:../../tutorials/nbm-nodesapi.adoc[+System Properties Module Tutorial+]
 
 === Quick search, Ribbon bars, Wizards
 
 The IDE has specific components that help you create quick search fields, ribbon bars and wizards.
 
-* link:https://netbeans.apache.org/tutorials/nbm-quick-search.html[+Quick Search Integration Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-ribbonbar.html[+Ribbon Bar Tutorial+]
-* link:https://netbeans.apache.org/tutorials/nbm-wizard.html[+Wizard Module Tutorial+]
+* xref:../../tutorials/nbm-quick-search.adoc[+Quick Search Integration Tutorial+]
+* xref:../../tutorials/nbm-ribbonbar.adoc[+Ribbon Bar Tutorial+]
+* xref:../../tutorials/nbm-wizard.adoc[+Wizard Module Tutorial+]
 
 === Ant and Maven
 
 These are tutorials on how to use Ant and Maven with the NetBeans Platform.
 
-* link:https://netbeans.apache.org/tutorials/nbm-ant.html[+Ant+]
-* link:https://netbeans.apache.org/tutorials/nbm-maven-commandline.html[+Maven+]
+* xref:../../tutorials/nbm-ant.adoc[+Ant+]
+* xref:../../tutorials/nbm-maven-commandline.adoc[+Maven+]
 
 [[API]]
 == API Reference
 
 This is a list of most frequently used APIs in the NetBeans Platform.
 
-* link:http://bits.netbeans.org/dev/javadoc/index.html[+NetBeans API Javadoc+]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[+Module System API+]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[+Window System API+]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[+Filesystems API+]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[+Datasystems API+]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[+Nodes API+]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[+Explorer API+]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[+Property Sheet Customization+]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[+Visual Library API+]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/api.html[+Utilities API+]
-* link:http://bits.netbeans.org/dev/javadoc/branding.html[+Branding+]
-* link:http://bits.netbeans.org/dev/javadoc/layers.html[+Description of Layer Registrations in NetBeans APIs+]
-* link:http://bits.netbeans.org/dev/javadoc/apichanges.html[+Latest NetBeans API Changes+]
+* link:https://bits.netbeans.org/dev/javadoc/index.html[+NetBeans API Javadoc+]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[+Module System API+]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[+Window System API+]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[+Filesystems API+]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[+Datasystems API+]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[+Nodes API+]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[+Explorer API+]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[+Property Sheet Customization+]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[+Visual Library API+]
+* 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/branding.html[+Branding+]
+* link:https://bits.netbeans.org/dev/javadoc/layers.html[+Description of Layer Registrations in NetBeans APIs+]
+* link:https://bits.netbeans.org/dev/javadoc/apichanges.html[+Latest NetBeans API Changes+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/platform/index.adoc b/netbeans.apache.org/src/content/kb/docs/platform/index.adoc
index 3c2ad11da..eca6b6774 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform/index.adoc
@@ -52,7 +52,7 @@ additional editor feature.
 
 == Getting Started
 
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc] ( xref:../../../download/index.adoc[download javadoc.zip for offline viewing])
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc] ( xref:../../../download/index.adoc[download javadoc.zip for offline viewing])
 *  link:https://mail-archives.apache.org/mod_mbox/netbeans-dev/[NetBeans Developer Mailing List]
 *  xref:../../../wiki/index.adoc[NetBeans Developer FAQ]
 *  xref:../../../tutorials/nbm-google.adoc[NetBeans Plugin Quick Start]
@@ -86,12 +86,12 @@ image::images/nbp4beginners.jpg[role="left", link="https://leanpub.com/nbp4begin
 
 [.feature]
 --
-image::images/refcard70.png[role="left", link="http://refcardz.dzone.com/refcardz/netbeans-platform-70"]
+image::images/refcard70.png[role="left", link="https://dzone.com/refcardz/netbeans-platform-70"]
 --
 
 ==== Quick Overviews
-*  link:http://netbeans.dzone.com/articles/netbeans-lookups-explained[NetBeans Lookups Explained!]
-*  link:http://netbeans.dzone.com/news/netbeans-extension-points[How Do NetBeans Extension Points Work?]
+*  link:https://dzone.com/articles/netbeans-lookups-explained[NetBeans Lookups Explained!]
+*  link:https://dzone.com/articles/netbeans-extension-points[How Do NetBeans Extension Points Work?]
 
 ==== Selection Management Series
 *  xref:../../../tutorials/nbm-selection-1.adoc[Part 1: Selection Management Tutorial]
@@ -135,8 +135,8 @@ image::images/refcard70.png[role="left", link="http://refcardz.dzone.com/refcard
 *  xref:../../../tutorials/nbm-quick-start-visual.adoc[Visual Library Tutorial for Java Applications]
 *  link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[Visualize SQL Scripts with the NetBeans Platform]
 *  xref:../../../wiki/VisualDatabaseExplorer.adoc[A Visual Database Explorer for NetBeans]
-*  link:http://java.dzone.com/news/how-create-visual-applications[How to Create Visual Applications in Java?]
-*  link:http://java.dzone.com/news/how-add-resize-functionality-v[How to Add Resize Functionality to Visual Applications in Java?]
+*  link:https://dzone.com/articles/how-create-visual-applications[How to Create Visual Applications in Java?]
+*  link:https://dzone.com/articles/how-add-resize-functionality-v[How to Add Resize Functionality to Visual Applications in Java?]
 *  link:https://netbeans.org/community/magazine/html/04/visuallibrary.html[Creative Uses of the Visual Library]
 
 == Miscellaneous NetBeans Platform Tutorials
@@ -157,8 +157,8 @@ NOTE: These tutorials are alphabetically ordered.
 
 == Command Line
 
-*  link:../../../tutorials/nbm-ant.adoc[Ant]
-*  link:../../../tutorials/nbm-maven-commandline.adoc[Maven]
+*  xref:../../../tutorials/nbm-ant.adoc[Ant]
+*  xref:../../../tutorials/nbm-maven-commandline.adoc[Maven]
 
 == YouTube: Five Simple Ways to Extend NetBeans IDE
 
@@ -171,7 +171,7 @@ image::images/five-easy-extend.png[role="left", link="http://www.youtube.com/wat
 
 === General Introductions
 *  xref:../../../wiki/MavenBestPractices.adoc[Maven Best Practices in NetBeans IDE]
-*  link:http://bits.netbeans.org/mavenutilities/nbm-maven-plugin/[About the NetBeans Module Maven Plugin]
+*  link:https://bits.netbeans.org/mavenutilities/nbm-maven-plugin/[About the NetBeans Module Maven Plugin]
 
 === NetBeans Platform Tutorials
 *  xref:../../../tutorials/nbm-maven-commandline.adoc[NetBeans Platform Maven Command Line Tutorial]
@@ -215,26 +215,26 @@ image::images/five-easy-extend.png[role="left", link="http://www.youtube.com/wat
 
 === Official NetBeans Platform Reference Material
 
-*  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Module System API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[Window System API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[Filesystems API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[Datasystems API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[Nodes API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[Explorer API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[Property Sheet Customization]
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[Visual Library API]
-*  link:http://bits.netbeans.org/netbeans/trunk/javadoc/org-openide-util/org/openide/util/doc-files/api.html[Utilities API]
-*  link:http://bits.netbeans.org/dev/javadoc/branding.html[Branding]
-*  link:http://bits.netbeans.org/dev/javadoc/layers.html[Description of Layer Registrations in NetBeans APIs]
-*  link:http://bits.netbeans.org/dev/javadoc/apichanges.html[Latest NetBeans API Changes]
+*  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Module System API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[Window System API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[Filesystems API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[Datasystems API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[Nodes API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[Explorer API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[Property Sheet Customization]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[Visual Library API]
+*  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/branding.html[Branding]
+*  link:https://bits.netbeans.org/dev/javadoc/layers.html[Description of Layer Registrations in NetBeans APIs]
+*  link:https://bits.netbeans.org/dev/javadoc/apichanges.html[Latest NetBeans API Changes]
 
 == Other Resources
 
 === Online Magazine Articles
 
 *  link:http://java.sun.com/developer/technicalArticles/javase/extensible/index.html[Creating Extensible Applications With the Java Platform]
-*  link:http://java.dzone.com/news/how-create-pluggable-photo-alb[How to Create a Pluggable Photo Album in Java]
+*  link:https://dzone.com/articles/how-create-pluggable-photo-alb[How to Create a Pluggable Photo Album in Java]
 *  link:https://netbeans.org/community/magazine/html/04/maven.html[NetBeans Platform Development with Maven and Mevenide]
 
 === NetBeans Platform Blogs
@@ -250,9 +250,9 @@ image::images/five-easy-extend.png[role="left", link="http://www.youtube.com/wat
 image::images/nbp4beginners.jpg[role="left", link="https://leanpub.com/nbp4beginners"]
 --
 
-*  link:http://www.apress.com/9781430241010["The Definitive Guide to NetBeans Platform 7"]
+*  link:https://link.springer.com/book/10.1007/978-1-4302-4102-7["The Definitive Guide to NetBeans Platform 7"]
 *  link:https://www.packtpub.com/netbeans-platform-6-9-developers-guide/book["NetBeans Platform 6.9 Developer's Guide"]
-*  link:http://www.apress.com/9781430224174["The Definitive Guide to NetBeans Platform 6.5"]
-*  link:http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802["Rich Client Programming: Plugging into the NetBeans Platform"]
+*  link:https://link.springer.com/book/10.1007/978-1-4302-2418-1["The Definitive Guide to NetBeans Platform 6.5"]
+*  link:https://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802["Rich Client Programming: Plugging into the NetBeans Platform"]
 
 
diff --git a/netbeans.apache.org/src/content/templates/README.adoc b/netbeans.apache.org/src/content/templates/README.asciidoc
similarity index 100%
rename from netbeans.apache.org/src/content/templates/README.adoc
rename to netbeans.apache.org/src/content/templates/README.asciidoc
diff --git a/netbeans.apache.org/src/content/tutorials/index.adoc b/netbeans.apache.org/src/content/tutorials/index.adoc
index 6ee98cbe7..a452fd4d5 100644
--- a/netbeans.apache.org/src/content/tutorials/index.adoc
+++ b/netbeans.apache.org/src/content/tutorials/index.adoc
@@ -25,80 +25,80 @@
 :toc-title:
 :description: NetBeans Platform Tutorials
 
-- link:nbm-glossary.html[Basic Terms for NetBeans Rich Client Application Development]
-- link:nbm-code-generator.html[Code Generator Integration Tutorial]
-- link:nbm-visual_library4.html[DRAFT: NetBeans Visual Library Widget Creation Tutorial]
-- link:nbm-filetype.html[File Type Integration Tutorial]
-- link:nbm-propertyeditors-integration.html[Integrated Property Editors in NetBeans]
-- link:nbm-javacc-lexer.html[JavaCC Lexer Generator Integration Tutorial for the NetBeans Platform]
-- link:nbm-javacc-parser.html[JavaCC Parser Generator Integration Tutorial for the NetBeans Platform]
-- link:nbm-idioms.html[]
-- link:nbm-projecttypeant.html[NetBeans Ant-Based Project Type Module Tutorial]
-- link:nbm-code-completion.html[NetBeans Code Completion Tutorial]
-- link:nbm-palette-api1.html[NetBeans Code Snippet Module Tutorial]
-- link:nbm-code-template.html[NetBeans Code Template Module Tutorial]
-- link:nbm-palette-api2.html[NetBeans Editor Component Palette Module Tutorial]
-- link:nbm-filetemplates.html[NetBeans File Template Module Tutorial]
-- link:nbm-hyperlink.html[NetBeans Hyperlink Navigation Tutorial]
-- link:nbm-java-hint.html[NetBeans Java Hint Module Tutorial]
-- link:nbm-copyfqn.html[NetBeans Java Language Infrastructure Tutorial]
-- link:nbm-mark-occurrences.html[NetBeans Mark Occurrences Module Tutorial]
-- link:nbm-nodesapi3.html[NetBeans Nodes, Explorer Manager, and Component Palette Tutorial]
-- link:nbm-nodesapi2.html[NetBeans Nodes API Tutorial]
-- link:nbm-options.html[NetBeans Options Window Module Tutorial]
-- link:nbm-ant.html[NetBeans Platform Ant Command Line Tutorial]
-- link:nbm-crud.html[NetBeans Platform CRUD Application Tutorial]
-- link:nbm-maven-crud.html[NetBeans Platform CRUD Tutorial Using Maven]
-- link:nbm-emf.html[NetBeans Platform EMF Integration Tutorial]
-- link:nbm-feedreader.html[NetBeans Platform Feed Reader Tutorial]
-- link:nbm-maven-modulesingle.html[NetBeans Platform File Type Tutorial Using Maven]
-- link:nbm-gesture.html[NetBeans Platform Gesture Collection Infrastructure Tutorial]
-- link:nbm-htmleditor.html[NetBeans Platform HTML Editor]
-- link:nbm-nbi.html[NetBeans Platform Installer Integration Tutorial]
-- link:nbm-javafx.html[NetBeans Platform JavaFX Porting Tutorial]
-- link:nbm-maven-commandline.html[NetBeans Platform Maven Command Line Tutorial]
-- link:nbm-paintapp.html[NetBeans Platform Paint Application Tutorial]
-- link:nbm-google.html[NetBeans Platform Plugin Quick Start]
-- link:nbm-dukescript.html[NetBeans Platform Plugins with DukeScript]
-- link:nbm-quick-start.html[NetBeans Platform Quick Start]
-- link:nbm-maven-quickstart.html[NetBeans Platform Quick Start Using Maven]
-- link:nbm-osgi-quickstart.html[NetBeans Platform Quick Start Using OSGi]
-- link:nbm-ribbonbar.html[NetBeans Platform Ribbon Bar Integration Tutorial]
-- link:nbm-runtime-container.html[NetBeans Platform Runtime Container Tutorial]
-- link:nbm-maven-modulesuite.html[NetBeans Platform Selection Tutorial Using Maven]
-- link:nbm-porting-basic.html[NetBeans Platform Swing Porting Tutorial]
-- link:nbm-test.html[NetBeans Platform Test Infrastructure Tutorial]
-- link:nbm-geospatial.html[NetBeans Platform Tutorial for Geospatial Systems]
-- link:nbm-ide.html[NetBeans Platform Tutorial for Integrated Development Environments]
-- link:nbm-workflow.html[NetBeans Platform Workflow Tutorial]
-- link:nbm-projectsamples.html[NetBeans Project Sample Module Tutorial]
-- link:nbm-projectextension.html[NetBeans Project Type Extension Module Tutorial]
-- link:nbm-projecttype.html[NetBeans Project Type Module Tutorial]
-- link:nbm-property-editors.html[NetBeans Property Editor Tutorial]
-- link:nbm-selection-2.html[NetBeans Selection Management Tutorial II—Using Nodes]
-- link:nbm-selection-1.html[NetBeans Selection Management Tutorial I—Using a TopComponent&#39;s Lookup]
-- link:nbm-server-plugin.html[NetBeans Server-Skeleton Module Tutorial]
-- link:nbm-nodesapi.html[NetBeans System Properties Module Tutorial]
-- link:nbm-visual_library2.html[NetBeans Visual Database Explorer Tutorial]
-- link:nbm-visual_library.html[NetBeans Visual Library Tutorial]
-- link:nbm-visual_library3.html[NetBeans Visual Library Tutorial for Java Applications]
-- link:nbm-quick-start-visual.html[NetBeans Visual Library Tutorial for Standard Java SE Applications]
-- link:nbm-wizard.html[NetBeans Wizard Module Tutorial]
-- link:nbm-xmleditor.html[NetBeans XML Editor Extension Module Tutorial]
-- link:nbm-feedreader_background.html[Preparing to Create the Feed Reader Application]
-- link:nbm-quick-search.html[Quick Search Integration Tutorial]
-- link:section.html[]
-- link:nbm-10-top-apis.html[Top 10 NetBeans APIs]
-- link:nbm-povray-1.html[Writing POV-Ray Support for NetBeans I—Application Structure &amp;amp; File Support]
-- link:nbm-povray-3.html[Writing POV-Ray Support for NetBeans III—Implementing a Project Type]
-- link:nbm-povray-2.html[Writing POV-Ray Support for NetBeans II—Project Type Design]
-- link:nbm-povray-4.html[Writing POV-Ray Support for NetBeans IV—Providing Project Templates]
-- link:nbm-povray-9.html[Writing POV-Ray Support for NetBeans IX—Build Support]
-- link:nbm-povray-5.html[Writing POV-Ray Support for NetBeans V—Creating an API]
-- link:nbm-povray-8.html[Writing POV-Ray Support for NetBeans VIII—Implementing ViewService and its Actions]
-- link:nbm-povray-6.html[Writing POV-Ray Support for NetBeans VI—Implementing the API]
-- link:nbm-povray-7.html[Writing POV-Ray Support for NetBeans VII—Support For Running POV-Ray]
-- link:nbm-povray-10.html[Writing POV-Ray Support for NetBeans X—Conclusion]
+- xref:nbm-glossary.adoc[Basic Terms for NetBeans Rich Client Application Development]
+- xref:nbm-code-generator.adoc[Code Generator Integration Tutorial]
+- xref:nbm-visual_library4.adoc[DRAFT: NetBeans Visual Library Widget Creation Tutorial]
+- xref:nbm-filetype.adoc[File Type Integration Tutorial]
+- xref:nbm-propertyeditors-integration.adoc[Integrated Property Editors in NetBeans]
+- xref:nbm-javacc-lexer.adoc[JavaCC Lexer Generator Integration Tutorial for the NetBeans Platform]
+- xref:nbm-javacc-parser.adoc[JavaCC Parser Generator Integration Tutorial for the NetBeans Platform]
+- xref:nbm-idioms.adoc[]
+- xref:nbm-projecttypeant.adoc[NetBeans Ant-Based Project Type Module Tutorial]
+- xref:nbm-code-completion.adoc[NetBeans Code Completion Tutorial]
+- xref:nbm-palette-api1.adoc[NetBeans Code Snippet Module Tutorial]
+- xref:nbm-code-template.adoc[NetBeans Code Template Module Tutorial]
+- xref:nbm-palette-api2.adoc[NetBeans Editor Component Palette Module Tutorial]
+- xref:nbm-filetemplates.adoc[NetBeans File Template Module Tutorial]
+- xref:nbm-hyperlink.adoc[NetBeans Hyperlink Navigation Tutorial]
+- xref:nbm-java-hint.adoc[NetBeans Java Hint Module Tutorial]
+- xref:nbm-copyfqn.adoc[NetBeans Java Language Infrastructure Tutorial]
+- xref:nbm-mark-occurrences.adoc[NetBeans Mark Occurrences Module Tutorial]
+- xref:nbm-nodesapi3.adoc[NetBeans Nodes, Explorer Manager, and Component Palette Tutorial]
+- xref:nbm-nodesapi2.adoc[NetBeans Nodes API Tutorial]
+- xref:nbm-options.adoc[NetBeans Options Window Module Tutorial]
+- xref:nbm-ant.adoc[NetBeans Platform Ant Command Line Tutorial]
+- xref:nbm-crud.adoc[NetBeans Platform CRUD Application Tutorial]
+- xref:nbm-maven-crud.adoc[NetBeans Platform CRUD Tutorial Using Maven]
+- xref:nbm-emf.adoc[NetBeans Platform EMF Integration Tutorial]
+- xref:nbm-feedreader.adoc[NetBeans Platform Feed Reader Tutorial]
+- xref:nbm-maven-modulesingle.adoc[NetBeans Platform File Type Tutorial Using Maven]
+- xref:nbm-gesture.adoc[NetBeans Platform Gesture Collection Infrastructure Tutorial]
+- xref:nbm-htmleditor.adoc[NetBeans Platform HTML Editor]
+- xref:nbm-nbi.adoc[NetBeans Platform Installer Integration Tutorial]
+- xref:nbm-javafx.adoc[NetBeans Platform JavaFX Porting Tutorial]
+- xref:nbm-maven-commandline.adoc[NetBeans Platform Maven Command Line Tutorial]
+- xref:nbm-paintapp.adoc[NetBeans Platform Paint Application Tutorial]
+- xref:nbm-google.adoc[NetBeans Platform Plugin Quick Start]
+- xref:nbm-dukescript.adoc[NetBeans Platform Plugins with DukeScript]
+- xref:nbm-quick-start.adoc[NetBeans Platform Quick Start]
+- xref:nbm-maven-quickstart.adoc[NetBeans Platform Quick Start Using Maven]
+- xref:nbm-osgi-quickstart.adoc[NetBeans Platform Quick Start Using OSGi]
+- xref:nbm-ribbonbar.adoc[NetBeans Platform Ribbon Bar Integration Tutorial]
+- xref:nbm-runtime-container.adoc[NetBeans Platform Runtime Container Tutorial]
+- xref:nbm-maven-modulesuite.adoc[NetBeans Platform Selection Tutorial Using Maven]
+- xref:nbm-porting-basic.adoc[NetBeans Platform Swing Porting Tutorial]
+- xref:nbm-test.adoc[NetBeans Platform Test Infrastructure Tutorial]
+- xref:nbm-geospatial.adoc[NetBeans Platform Tutorial for Geospatial Systems]
+- xref:nbm-ide.adoc[NetBeans Platform Tutorial for Integrated Development Environments]
+- xref:nbm-workflow.adoc[NetBeans Platform Workflow Tutorial]
+- xref:nbm-projectsamples.adoc[NetBeans Project Sample Module Tutorial]
+- xref:nbm-projectextension.adoc[NetBeans Project Type Extension Module Tutorial]
+- xref:nbm-projecttype.adoc[NetBeans Project Type Module Tutorial]
+- xref:nbm-property-editors.adoc[NetBeans Property Editor Tutorial]
+- xref:nbm-selection-2.adoc[NetBeans Selection Management Tutorial II—Using Nodes]
+- xref:nbm-selection-1.adoc[NetBeans Selection Management Tutorial I—Using a TopComponent&#39;s Lookup]
+- xref:nbm-server-plugin.adoc[NetBeans Server-Skeleton Module Tutorial]
+- xref:nbm-nodesapi.adoc[NetBeans System Properties Module Tutorial]
+- xref:nbm-visual_library2.adoc[NetBeans Visual Database Explorer Tutorial]
+- xref:nbm-visual_library.adoc[NetBeans Visual Library Tutorial]
+- xref:nbm-visual_library3.adoc[NetBeans Visual Library Tutorial for Java Applications]
+- xref:nbm-quick-start-visual.adoc[NetBeans Visual Library Tutorial for Standard Java SE Applications]
+- xref:nbm-wizard.adoc[NetBeans Wizard Module Tutorial]
+- xref:nbm-xmleditor.adoc[NetBeans XML Editor Extension Module Tutorial]
+- xref:nbm-feedreader_background.adoc[Preparing to Create the Feed Reader Application]
+- xref:nbm-quick-search.adoc[Quick Search Integration Tutorial]
+- link:section.adoc[]
+- xref:nbm-10-top-apis.adoc[Top 10 NetBeans APIs]
+- xref:nbm-povray-1.adoc[Writing POV-Ray Support for NetBeans I—Application Structure &amp;amp; File Support]
+- xref:nbm-povray-3.adoc[Writing POV-Ray Support for NetBeans III—Implementing a Project Type]
+- xref:nbm-povray-2.adoc[Writing POV-Ray Support for NetBeans II—Project Type Design]
+- xref:nbm-povray-4.adoc[Writing POV-Ray Support for NetBeans IV—Providing Project Templates]
+- xref:nbm-povray-9.adoc[Writing POV-Ray Support for NetBeans IX—Build Support]
+- xref:nbm-povray-5.adoc[Writing POV-Ray Support for NetBeans V—Creating an API]
+- xref:nbm-povray-8.adoc[Writing POV-Ray Support for NetBeans VIII—Implementing ViewService and its Actions]
+- xref:nbm-povray-6.adoc[Writing POV-Ray Support for NetBeans VI—Implementing the API]
+- xref:nbm-povray-7.adoc[Writing POV-Ray Support for NetBeans VII—Support For Running POV-Ray]
+- xref:nbm-povray-10.adoc[Writing POV-Ray Support for NetBeans X—Conclusion]
 
 
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-ant.adoc b/netbeans.apache.org/src/content/tutorials/nbm-ant.adoc
index 4f013d4db..d3cc7e0f3 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-ant.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-ant.adoc
@@ -650,4 +650,4 @@ image::images/ant_80_ant-window-run.png[]
 
 Congratulations, you've successfully set up a pure Ant-based application structure for working with the NetBeans Platform.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-code-completion.adoc b/netbeans.apache.org/src/content/tutorials/nbm-code-completion.adoc
index 38cc3c981..f7ba710f2 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-code-completion.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-code-completion.adoc
@@ -49,10 +49,10 @@ For troubleshooting purposes, you are welcome to download the  link:http://web.a
 
 Two classes apply to code completion and these will be developed in this tutorial:
 
-*  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/CompletionItem.html[CompletionItem]`` 
-*  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/CompletionProvider.html[CompletionProvider]`` 
+*  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/CompletionItem.html[CompletionItem]`` 
+*  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/CompletionProvider.html[CompletionProvider]`` 
 
-Both of these come from the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/overview-summary.html[Editor Code Completion API] and are implemented in this tutorial's module as CountriesCompletionItem and CountriesCompletionProvider.
+Both of these come from the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/overview-summary.html[Editor Code Completion API] and are implemented in this tutorial's module as CountriesCompletionItem and CountriesCompletionProvider.
 
 
 == Creating the Module Project
@@ -112,7 +112,7 @@ public class CountriesCompletionProvider implements  link:https://bits.netbeans.
     }
 
     @Override
-    public  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/CompletionTask.html[CompletionTask]  link:https://bits.netbeans.org/dev/javadocorg-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/CompletionProvider.html#createTask(int,%20javax.swing.text.JTextComponent)[createTask(int queryType, JTextComponent jtc)] {
+    public  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/CompletionTask.html[CompletionTask]  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/CompletionProvider.html#createTask(int,%20javax.swing.text.JTextComponent)[createTask(int queryType, JTextComponent jtc)] {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
@@ -243,7 +243,7 @@ In this section we will create a class that implements  `` link:https://bits.net
 [source,java,subs="macros"]
 ----
 
-return new  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/support/AsyncCompletionTask.html[AsyncCompletionTask](new AsyncCompletionQuery() {
+return new  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-completion/org/netbeans/spi/editor/completion/support/AsyncCompletionTask.html[AsyncCompletionTask](new AsyncCompletionQuery() {
 
     @Override
     protected void query(CompletionResultSet completionResultSet, Document document, int caretOffset) {
@@ -632,11 +632,11 @@ When the user clicks the URL button, the browser set in the IDE will open, displ
 Congratulations, you have now completed a simple implementation of a code completion integration module.
 
 
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 == See Also
 
 For more information about creating and developing plugins, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail]
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
+*  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-code-generator.adoc b/netbeans.apache.org/src/content/tutorials/nbm-code-generator.adoc
index c4f78f5b3..c4514a469 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-code-generator.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-code-generator.adoc
@@ -32,7 +32,7 @@
 
 This tutorial shows you how to write a module that integrates new items into the NetBeans Code Generator feature, which appears when you click Alt-Insert in an editor.
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-code-generator.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-code-generator.html[the previous version of this document].
 
 
 
@@ -155,7 +155,7 @@ public class DemoCodeGenerator implements CodeGenerator {
 
 == Coding the Code Generator Integration
 
-Next, we will implement the NetBeans Java Editor APIs introduced in the  link:https://netbeans.apache.org/tutorials/nbm-copyfqn.html[NetBeans Java Language Infrastructure Tutorial].
+Next, we will implement the NetBeans Java Editor APIs introduced in the  xref:nbm-copyfqn.adoc[NetBeans Java Language Infrastructure Tutorial].
 
 Below, we set dependencies on the required modules and then implement them in our own module.
 
@@ -280,7 +280,7 @@ image::images/code-generator_72_new-filewizard-4.png[]
 image::images/code-generator_72_new-filewizard-5.png[]
 
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -290,4 +290,4 @@ For more information about creating and developing NetBeans modules, see the fol
 
 *  link:https://netbeans.apache.org/platform/index.html[NetBeans Platform Homepage]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API List (Current Development Version)]
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-code-template.adoc b/netbeans.apache.org/src/content/tutorials/nbm-code-template.adoc
index 4203c1064..895183f86 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-code-template.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-code-template.adoc
@@ -37,7 +37,7 @@ image::images/code-templates_72_pic2.png[]
 
 To provide this functionality, you will not need to use any Java code at all. As shown in this tutorial, you will only need to provide an XML file that defines your code templates, by registering it in your module's  ``layer.xml``  file.
 
-NOTE:  This document uses NetBeans IDE 8.0 or above and NetBeans Platform 8.0 or above. If you are using an earlier version, see  link:74/nbm-code-template.html[the previous version of this document].
+// NOTE:  This document uses NetBeans IDE 8.0 or above and NetBeans Platform 8.0 or above. If you are using an earlier version, see  link:74/nbm-code-template.html[the previous version of this document].
 
 
 
@@ -175,12 +175,12 @@ An NBM file is the binary version of the module that provides the code templates
 
 [start=3]
 1. The recipient can install the module by using their IDE's Plugin Manager. They would choose Tools > Plugins from the main menu.
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
-*  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
+*  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-copyfqn.adoc b/netbeans.apache.org/src/content/tutorials/nbm-copyfqn.adoc
index d468b426e..dfefd5288 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-copyfqn.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-copyfqn.adoc
@@ -32,7 +32,7 @@
 
 In this tutorial, you will be introduced to aspects of the NetBeans "Retouche" APIs, which give you access to the NetBeans Java editor.
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-copyfqn.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-copyfqn.html[the previous version of this document].
 
 
 
@@ -201,7 +201,7 @@ In the next section, we will go further than distinguishing between project node
 
 == Identifying Java Source Files
 
-In this section, we begin using one of the new "Retouche" APIs, called  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/overview-summary.html[Java Source]. Here we use the  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/org/netbeans/api/java/source/JavaSource.html[JavaSource]``  class, which represents a Java source file. We return an instance of this class for the file object associated with our data object. If null is returned,  [...]
+In this section, we begin using one of the new "Retouche" APIs, called  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/overview-summary.html[Java Source]. Here we use the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/org/netbeans/api/java/source/JavaSource.html[JavaSource]``  class, which represents a Java source file. We return an instance of this class for the file object associated with our data object. If null is returned [...]
 
 
 [start=1]
@@ -255,12 +255,12 @@ In this section, we are introduced to our first explicitly invoked "Retouche" ta
 
 
 [start=1]
-1. Replace the "Hurray!" message in the  ``actionPerformed``  method with this line: link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/org/netbeans/api/java/source/JavaSource.html#runUserActionTask(org.netbeans.api.java.source.Task,%20boolean)[javaSource.runUserActionTask]
+1. Replace the "Hurray!" message in the  ``actionPerformed``  method with this line: link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/org/netbeans/api/java/source/JavaSource.html#runUserActionTask(org.netbeans.api.java.source.Task,%20boolean)[javaSource.runUserActionTask]
 
 [source,java,subs="verbatim,macros,quotes"]
 ----
 
-(new link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/org/netbeans/api/java/source/Task.html[Task]< link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/org/netbeans/api/java/source/CompilationController.html[CompilationController]>());
+(new link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/org/netbeans/api/java/source/Task.html[Task]< link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-java-source/org/netbeans/api/java/source/CompilationController.html[CompilationController]>());
 ----
 
 You should now see a lightbulb in the editor's left sidebar, as shown here:
@@ -615,7 +615,7 @@ private void setClipboardContents(String content) {
 }
 ----
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == See Also
@@ -624,5 +624,5 @@ For more information about creating and developing NetBeans Module, see the foll
 
 *  link:http://wiki.netbeans.org/Java_DevelopersGuide[Java Developer's Guide]
 *  link:http://wiki.netbeans.org/RetoucheDeveloperFAQ[Retouche Developer FAQ]
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-crud.adoc b/netbeans.apache.org/src/content/tutorials/nbm-crud.adoc
index 60aaf7acc..0c70ab8a8 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-crud.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-crud.adoc
@@ -38,9 +38,9 @@ Once we have code for accessing the database, we wrap the entity classes into a
 
 Once we have an editor, we begin adding CRUD functionality. First, the "R", standing for "Read", is handled by the viewer described above. Next, the "U" for "Update" is handled, followed by the "C" for "Create", and the "D" for "Delete".
 
-At the end of the tutorial, you will have learned about a range of NetBeans Platform features that help you in creating applications of this kind. For example, you will have learned about the  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/UndoRedo.Manager.html[UndoRedo.Manager]``  and the  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.html[ExplorerManager]`` , as well as NetBeans Platform Swing compon [...]
+At the end of the tutorial, you will have learned about a range of NetBeans Platform features that help you in creating applications of this kind. For example, you will have learned about the  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/UndoRedo.Manager.html[UndoRedo.Manager]``  and the  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.html[ExplorerManager]`` , as well as NetBeans Platform Swing comp [...]
 
-NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-crud.html[the previous version of this document]. A prerequisite for following this tutorial is that you have already completed and understood the  link:nbm-quick-start.html[NetBeans Platform Quick Start], while  link:https://leanpub.com/nbp4beginners[NetBeans Platform for Beginners] (published in 2014) is very highly recommended.
+// NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-crud.html[the previous version of this document]. A prerequisite for following this tutorial is that you have already completed and understood the  xref:nbm-quick-start.adoc[NetBeans Platform Quick Start], while  link:https://leanpub.com/nbp4beginners[NetBeans Platform for Beginners] (published in 2014) is very highly recommended.
 
 
 
@@ -101,7 +101,7 @@ In this section, you generate entity classes from a selected database.
 
 image::images/crud_72_db-1.png[]
 
-Alternatively, use any database you like and adapt the steps that follow to your particular use case. For Oracle Database, see  link:https://netbeans.apache.org/kb/docs/ide/oracle-db.html[Connecting to an Oracle Database]; for MySQL, see  link:https://netbeans.apache.org/kb/docs/ide/mysql.html[Connecting to a MySQL Database] for help.
+Alternatively, use any database you like and adapt the steps that follow to your particular use case. For Oracle Database, see  xref:../kb/docs/ide/oracle-db.adoc[Connecting to an Oracle Database]; for MySQL, see  xref:../kb/docs/ide/mysql.adoc[Connecting to a MySQL Database] for help.
 
 
 [start=2]
@@ -363,7 +363,7 @@ At the top of the class, declare and initialize the  ``ExplorerManager`` :
 private static ExplorerManager em = new ExplorerManager();
 ----
 
-Watch  link:https://netbeans.apache.org/tutorials/nbm-10-top-apis.html[Top 10 NetBeans APIs] for details on the above code, especially the screencast dealing with the Nodes API and the Explorer &amp; Property Sheet API.
+Watch  xref:nbm-10-top-apis.adoc[Top 10 NetBeans APIs] for details on the above code, especially the screencast dealing with the Nodes API and the Explorer &amp; Property Sheet API.
 
 
 [start=4]
@@ -371,7 +371,7 @@ Watch  link:https://netbeans.apache.org/tutorials/nbm-10-top-apis.html[Top 10 Ne
 
 
 [start=5]
-1. Create a factory class that will create a new  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/org/netbeans/api/db/explorer/node/BaseNode.html[BeanNode] for each customer in your database:
+1. Create a factory class that will create a new  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/org/netbeans/api/db/explorer/node/BaseNode.html[BeanNode] for each customer in your database:
 
 [source,java]
 ----
@@ -458,7 +458,7 @@ Now you are able to view your data in a tree hierarchy, as you would be able to
 
 In this section, you first create an editor. The editor will be provided by a new NetBeans module. So, you will first create a new module. Then, within that new module, you will create a new  ``TopComponent`` , containing two  ``JTextFields`` , for each of the columns you want to let the user edit. You will need to let the viewer module communicate with the editor module. Whenever a new  ``Node``  is selected in the viewer module, you will add the current  ``Customer``  object to the  `` [...]
 
-Next, you will synchronize your  ``JTextFields``  with the NetBeans Platform's Undo, Redo, and Save functionality. In other words, when the user makes changes to a  ``JTextField`` , you want the NetBeans Platform's existing functionality to become available so that, instead of needing to create new functionality, you'll simply be able to hook into the NetBeans Platform's support. To this end, you will need to use  ``UndoRedoManager`` , together with  `` link:http://bits.netbeans.org/dev/ [...]
+Next, you will synchronize your  ``JTextFields``  with the NetBeans Platform's Undo, Redo, and Save functionality. In other words, when the user makes changes to a  ``JTextField`` , you want the NetBeans Platform's existing functionality to become available so that, instead of needing to create new functionality, you'll simply be able to hook into the NetBeans Platform's support. To this end, you will need to use  ``UndoRedoManager`` , together with  `` link:https://bits.netbeans.org/dev [...]
 
 
 [start=1]
@@ -634,7 +634,7 @@ One drawback of the approach above is that now our  ``CustomerEditorTopComponent
 
 === Enable the Undo/Redo Actions for the Editor
 
-What we'd like to have happen is that whenever the user makes a change to one of the  ``JTextFields`` , the "Undo" button and the "Redo" button, as well as the related menu items in the Edit menu, should become enabled. To that end, the NetBeans Platform makes the  link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/UndoRedo.Manager.html[UndoRedo.Manager] available, which is based on the Swing  link:http://docs.oracle.com/javase/6/docs/api/javax/swing/undo/UndoManag [...]
+What we'd like to have happen is that whenever the user makes a change to one of the  ``JTextFields`` , the "Undo" button and the "Redo" button, as well as the related menu items in the Edit menu, should become enabled. To that end, the NetBeans Platform makes the  link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/UndoRedo.Manager.html[UndoRedo.Manager] available, which is based on the Swing  link:http://docs.oracle.com/javase/6/docs/api/javax/swing/undo/UndoMana [...]
 
 
 [start=1]
@@ -716,7 +716,7 @@ You might also want to check whether the text in the text field has actually cha
 
 
 [start=3]
-1. Here is the method and inner class referred to above. First, the method that is fired whenever a change is detected. Then, a  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable]``  is dynamically added to the  ``InstanceContent``  whenever a change is detected:
+1. Here is the method and inner class referred to above. First, the method that is fired whenever a change is detected. Then, a  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable]``  is dynamically added to the  ``InstanceContent``  whenever a change is detected:
 
 
 [source,java]
@@ -729,11 +729,11 @@ private void modify() {
 }
 ----
 
-NOTE:  To use the above code snippet, you need to set up a dynamic Lookup, as described in the  link:nbm-quick-start.html[NetBeans Platform Quick Start]. Since the NetBeans Platform Quick Start is a prerequisite for following this tutorial, no time will be spent explaining dynamic Lookups here. If you do not know how to use  ``InstanceContent``  or if the term "dynamic Lookup" means nothing to you, please stop working on this tutorial and work through the NetBeans Platform Quick Start instead.
+NOTE:  To use the above code snippet, you need to set up a dynamic Lookup, as described in the  xref:nbm-quick-start.adoc[NetBeans Platform Quick Start]. Since the NetBeans Platform Quick Start is a prerequisite for following this tutorial, no time will be spent explaining dynamic Lookups here. If you do not know how to use  ``InstanceContent``  or if the term "dynamic Lookup" means nothing to you, please stop working on this tutorial and work through the NetBeans Platform Quick Start instead.
 
 
 [start=4]
-1. Finally, we need to create an  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable]`` , which is the default implementation of the  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/api/actions/Savable.html[Savable]``  interface.
+1. Finally, we need to create an  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable]`` , which is the default implementation of the  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/api/actions/Savable.html[Savable]``  interface.
 
 By publishing an  ``AbstractSavable``  into the  ``Lookup``  of a  ``TopComponent`` , the Save actions will become enabled when the  ``TopComponent``  is selected.
 
@@ -749,7 +749,7 @@ NOTE:  All the code below is an inner class within  ``CustomerEditorTopComponent
 
 private static final Icon ICON = ImageUtilities.loadImageIcon("org/shop/editor/Icon.png", true);
 
-private class MySavable extends  link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable] implements Icon {
+private class MySavable extends  link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable] implements Icon {
 
     MySavable() {
         register();
@@ -1019,7 +1019,7 @@ public void resetFields() {
 
 
 [start=2]
-1. In the  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable]`` , ensure that a return of  ``null``  indicates that a new entry is saved, instead of an existing entry being updated:
+1. In the  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable]`` , ensure that a return of  ``null``  indicates that a new entry is saved, instead of an existing entry being updated:
 
 [source,java,subs="verbatim,quotes"]
 ----
@@ -1097,8 +1097,8 @@ For information on embedding a database in a NetBeans Platform application, see
 
 For more information about creating and developing applications, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail]
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+*  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-dukescript.adoc b/netbeans.apache.org/src/content/tutorials/nbm-dukescript.adoc
index a92fe7a26..e0c787941 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-dukescript.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-dukescript.adoc
@@ -32,7 +32,7 @@
 
 Welcome to a new era for NetBeans plugin development!
 
-This tutorial shows you how you can use the  link:http://bits.netbeans.org/html+java/1.2.3/index.html[html4java API] (aka DukeScript) to create NetBeans Plugins. This API allows you to define your view using HTML 5, and code the view logic in Java. After completing this tutorial, you'll be able to create Plugins for the NetBeans IDE, or for your NetBeans Platform Application with this new Technology.
+This tutorial shows you how you can use the  link:https://bits.netbeans.org/html+java/1.2.3/index.html[html4java API] (aka DukeScript) to create NetBeans Plugins. This API allows you to define your view using HTML 5, and code the view logic in Java. After completing this tutorial, you'll be able to create Plugins for the NetBeans IDE, or for your NetBeans Platform Application with this new Technology.
 
 After you finish this tutorial, you can move on to the  link:https://dukescript.com/documentation.html[DukeScript Library]. This page provides comprehensive documentation of the DukeScript APIs and many helpful tutorials.
 
@@ -251,7 +251,7 @@ In order to create our Github Tool, you need to complete the following steps:
 
 DukeScript allows developers a clean separation of view and view logic. The view is defined in HTML, the logic is written in Java. With this approach you can write and test the logic independent of the view. We'll start by coding the logic of our application. The view will be added later.
 
-In this section, you'll use the  link:http://bits.netbeans.org/html4j/1.0/net/java/html/json/Model.html[@Model] annotation to create the view logic of our application. You'll learn how to connect a model to the Github REST API.
+In this section, you'll use the  link:https://bits.netbeans.org/html4j/1.0/net/java/html/json/Model.html[@Model] annotation to create the view logic of our application. You'll learn how to connect a model to the Github REST API.
 
 NOTE:  In this section we will create a Java class with annotations. At compile-time, another Java class is generated from these annotations. This saves us a from writing a lot of setters, getters and other boilerplate code. If you're interested in having a look at the generated code, you can find it in your project in Folder "Generated Sources (annotations)."
 
@@ -417,7 +417,7 @@ Please note that the new property has the attribute  ``array``  set to true. Thi
                         
 ----
 
-The method  ``connect``  is annotated with the annotation  link:http://bits.netbeans.org/html4j/1.0/net/java/html/json/OnReceive.html[@OnReceive] It will generate a new method of the same name in our ViewModel. The generated method has a parameter for the parts of the url enclosed in curly braces ({name}). When you call the method with a parameter, this will replace the  ``{name}``  to build the URL dynamically.
+The method  ``connect``  is annotated with the annotation  link:https://bits.netbeans.org/html4j/1.0/net/java/html/json/OnReceive.html[@OnReceive] It will generate a new method of the same name in our ViewModel. The generated method has a parameter for the parts of the url enclosed in curly braces ({name}). When you call the method with a parameter, this will replace the  ``{name}``  to build the URL dynamically.
 
 The generated method does a lot of magic for us. It will call the URL to retrieve the answer. The answer is in the JSON format you've seen above. In our connect method, we've declared that we want to receive a  ``List<RepositoryInfo> repos`` . Therefore the generated method will automatically parse the JSON message and map it to a list of RepositoryInfo Objects.
 
@@ -549,4 +549,4 @@ This concludes the NetBeans Platform Plugins with DukeScript. This document has
 
 *  link:https://dukescript.com[The DukeScript Website]
 *  link:https://dukescript.com/blog.html[The DukeScript Blog]
-*  link:http://bits.netbeans.org/html+java/1.2.3/index.html[NetBeans html4JavaAPI Javadoc]
+*  link:https://bits.netbeans.org/html+java/1.2.3/index.html[NetBeans html4JavaAPI Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-emf.adoc b/netbeans.apache.org/src/content/tutorials/nbm-emf.adoc
index ebe8989b4..49b13a4f1 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-emf.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-emf.adoc
@@ -299,7 +299,7 @@ After checking the above checkbox, only the Java classes in the specified packag
 
 == Creating an OSGi Bundle to Provide the Window
 
-Now we add a new OSGi bundle that provides a window for the application. The window will display a ` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html[Node]` class for the Library object, together with ` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Children.html[Children]` for each Book object and Borrower object in the Library. For demonstration purposes, we will hardcode some values to define a dummy Library, togeth [...]
+Now we add a new OSGi bundle that provides a window for the application. The window will display a ` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html[Node]` class for the Library object, together with ` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Children.html[Children]` for each Book object and Borrower object in the Library. For demonstration purposes, we will hardcode some values to define a dummy Library, toge [...]
 
 
 [start=1]
@@ -341,14 +341,14 @@ The other OSGi-related dependencies you see in the screenshot above were added b
 [source,java,subs="verbatim,macros"]
 ----
 
-public class LibraryNode extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html[AbstractNode] {
+public class LibraryNode extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html[AbstractNode] {
 
     public LibraryNode(Library library) {
         super(Children.create(new BookOrBorrowerChildFactory(library), true));
         setDisplayName(library.getName());
     }
 
-    private static class BookOrBorrowerChildFactory extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html[ChildFactory]<Object> {
+    private static class BookOrBorrowerChildFactory extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html[ChildFactory]<Object> {
 
         private final Library library;
 
@@ -371,7 +371,7 @@ public class LibraryNode extends link:http://bits.netbeans.org/dev/javadoc/org-o
 
         @Override
         protected Node createNodeForKey(Object key) {
-            link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/BeanNode.html[BeanNode] childNode = null;
+            link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/BeanNode.html[BeanNode] childNode = null;
             try {
                 childNode = new BeanNode(key);
                 if (key instanceof Book) {
@@ -402,7 +402,7 @@ public class LibraryNode extends link:http://bits.netbeans.org/dev/javadoc/org-o
 [source,java,subs="verbatim,macros"]
 ----
 
-public class LibraryChildFactory extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html[ChildFactory]<Library> {
+public class LibraryChildFactory extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html[ChildFactory]<Library> {
 
     @Override
     protected boolean createKeys(List<Library> list) {
@@ -470,7 +470,7 @@ public class LibraryChildFactory extends link:http://bits.netbeans.org/dev/javad
 [source,java,subs="macros"]
 ----
 
-public class LibraryViewer extends link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent] implements  link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.Provider.html[ExplorerManager.Provider] {
+public class LibraryViewer extends link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent] implements  link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.Provider.html[ExplorerManager.Provider] {
 
     private ExplorerManager em = new ExplorerManager();
 
@@ -480,7 +480,7 @@ public class LibraryViewer extends link:http://bits.netbeans.org/dev/javadoc/org
         //Set the layout of the window:
         setLayout(new BorderLayout());
         //Create a new BeanTreeView:
-        link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/view/BeanTreeView.html[BeanTreeView] btv = new BeanTreeView();
+        link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/view/BeanTreeView.html[BeanTreeView] btv = new BeanTreeView();
         //Hide the root node:
         btv.setRootVisible(false);
         //Add the BeanTreeView:
@@ -575,7 +575,7 @@ image::images/emf_emf-library-model-015.png[]
 
 Congratulations, you have integrated your EMF model into your NetBeans Platform application.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-feedreader.adoc b/netbeans.apache.org/src/content/tutorials/nbm-feedreader.adoc
index 5f00c3e25..5f782cecd 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-feedreader.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-feedreader.adoc
@@ -39,7 +39,7 @@ image::images/feedreader_73_result-6.png[]
 
 This is [.underline]#not# a beginner's tutorial. The assumption is that you are familiar with, and have used, NetBeans Platform idioms such as " link:https://netbeans.apache.org/wiki/index.asciidoc#_nodes_and_explorer[Node]" and " link:https://netbeans.apache.org/wiki/index.asciidoc#_lookup[Lookup]". The  link:https://netbeans.org/features/platform/all-docs.html[NetBeans Platform Learning Trail] provides several quick starts and other beginner materials that cover these topics in detail.
 
-NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-feedreader.html[the previous version of this document].
+// NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-feedreader.html[the previous version of this document].
 
 
 
@@ -178,19 +178,19 @@ You need to subclass several classes that belong to the NetBeans APIs. The class
 [start=2]
 1. Click Add Dependency. You will need the following APIs. Click the links below for further information on each of the APIs you will be using.
 
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/doc-files/api.html[Actions APIs]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[Datasystems API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/package-summary.html[Dialogs API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[Explorer &amp; Property Sheet API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[File System API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/doc-files/lookup-api.html[Lookup API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[Nodes API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/doc-files/api.html[Actions APIs]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[Datasystems API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/package-summary.html[Dialogs API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[Explorer &amp; Property Sheet API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[File System API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/doc-files/lookup-api.html[Lookup API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[Nodes API]
 * rome
 * rome-fetcher
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-settings/overview-summary.html[Settings API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[UI Utilities API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-util/overview-summary.html[Utilities API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/package-summary.html[Window System API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-settings/overview-summary.html[Settings API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[UI Utilities API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-util/overview-summary.html[Utilities API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/package-summary.html[Window System API]
 
 Click OK to exit the Project Properties dialog box.
 
@@ -252,29 +252,29 @@ Press Ctrl-Shift-I to let the IDE generate the required import statement.
 [source,java,subs="macros"]
 ----
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Description.html[@TopComponent.Description]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Description.html[@TopComponent.Description]
 (
         preferredID = "FeedTopComponent",
         persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Registration.html[@TopComponent.Registration](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Registration.html[@TopComponent.Registration](
         mode = "explorer", 
         openAtStartup = true)
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](
         category = "Window", 
         id = "org.myorg.feedreader.FeedTopComponent")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]({
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]({
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](
         path = "Menu/Window", 
         position = 0)
 })
-link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.OpenActionRegistration.html[@TopComponent.OpenActionRegistration](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.OpenActionRegistration.html[@TopComponent.OpenActionRegistration](
         displayName = "#CTL_FeedAction")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]({
+link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]({
         "CTL_FeedAction=Open Feed Window"})
 public class FeedTopComponent extends TopComponent {
 ----
 
-NOTE:  While the module is being compiled, the annotations above will be processed. XML entries will be created in the module's  ``generated-layer.xml``  file, for each of the @TopComponent* and @Action* annotations. The  ``generated-layer.xml``  file will be contributed by the module to the System Filesystem of the application. Read more  link:https://netbeans.apache.org/wiki/devfaqsystemfilesystem[about the System Filesystem here]. For example, the  ``FeedTopComponent``  will be displa [...]
+NOTE:  While the module is being compiled, the annotations above will be processed. XML entries will be created in the module's  ``generated-layer.xml``  file, for each of the @TopComponent* and @Action* annotations. The  ``generated-layer.xml``  file will be contributed by the module to the System Filesystem of the application. Read more  xref:../wiki/DevFaqSystemFilesystem.adoc[about the System Filesystem here]. For example, the  ``FeedTopComponent``  will be displayed in the main area [...]
 
 
 [start=4]
@@ -467,7 +467,7 @@ import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
 import org.openide.util.Utilities;
 
-public class RootNode extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
+public class RootNode extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
 
     public RootNode(Node filterNode) throws DataObjectNotFoundException {
         super(filterNode, new RssFolderChildren(filterNode));
@@ -514,7 +514,7 @@ import org.openide.nodes.Node;
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 
-public class RssFolderChildren extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.Children.html[FilterNode.Children] {
+public class RssFolderChildren extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.Children.html[FilterNode.Children] {
 
     RssFolderChildren(Node rssFolderNode) {
         super(rssFolderNode);
@@ -597,7 +597,7 @@ import org.openide.util.lookup.Lookups;
 /**
  * Getting the feed node and wrapping it in a FilterNode
  */
-public class OneFeedNode extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
+public class OneFeedNode extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
 
     OneFeedNode(Node feedFileNode, SyndFeed feed) {
         super(feedFileNode, Children.create(new FeedChildFactory(feed), false), Lookups.fixed(feed));
@@ -658,7 +658,7 @@ import org.openide.nodes.Node;
 import org.openide.util.Exceptions;
 import org.openide.util.NbCollections;
 
-public class FeedChildFactory extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html[ChildFactory<SyndEntry>] {
+public class FeedChildFactory extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html[ChildFactory<SyndEntry>] {
 
     private final SyndFeed feed;
 
@@ -668,7 +668,7 @@ public class FeedChildFactory extends link:http://bits.netbeans.org/dev/javadoc/
 
     @Override
     protected boolean createKeys(List<SyndEntry> list) {
-        list.addAll(link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbCollections.html[NbCollections].checkedListByCopy(feed.getEntries(), SyndEntry.class, true));
+        list.addAll(link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbCollections.html[NbCollections].checkedListByCopy(feed.getEntries(), SyndEntry.class, true));
         return true;
     }
 
@@ -723,7 +723,7 @@ import org.openide.util.actions.SystemAction;
 import org.openide.util.lookup.Lookups;
 import org.openide.windows.TopComponent;
 
-class OneEntryNode extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
+class OneEntryNode extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
 
     private final SyndEntry entry;
 
@@ -813,14 +813,14 @@ Instead of a  ``JEditorPane`` , you can use the JavaFX WebView component. A NetB
 
 ==  Displaying the Node Hierarchy in the Feed Window
 
-In this section, we use a NetBeans Platform component called  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/view/BeanTreeView.html[BeanTreeView]``  to display a hierarchy of feeds in our  ``TopComponent`` .
+In this section, we use a NetBeans Platform component called  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/view/BeanTreeView.html[BeanTreeView]``  to display a hierarchy of feeds in our  ``TopComponent`` .
 
 
 [start=1]
-1. Open  ``FeedTopComponent.java``  and type  ``implements  link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.Provider.html[ExplorerManager.Provider]``  at the end of the class declaration.
+1. Open  ``FeedTopComponent.java``  and type  ``implements  link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.Provider.html[ExplorerManager.Provider]``  at the end of the class declaration.
 
 [start=2]
-1. Press Alt-Enter in the line and click on the suggestion. The IDE adds an import statement for the required package  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.html[org.openide.explorer.ExplorerManager]`` . Press Alt-Enter again and click on the suggestion. The IDE implements the abstract method  ``getExplorerManager()`` .
+1. Press Alt-Enter in the line and click on the suggestion. The IDE adds an import statement for the required package  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.html[org.openide.explorer.ExplorerManager]`` . Press Alt-Enter again and click on the suggestion. The IDE implements the abstract method  ``getExplorerManager()`` .
 
 [start=3]
 1. Type  ``return manager;``  in the body of the new  ``getExplorerManager()``  method. Press Alt-Enter in the line and let the IDE create a field called  ``manager``  for you. Replace the default definition with this one:
@@ -942,12 +942,12 @@ public class AddRssAction extends AbstractAction {
     })
     @Override
     public void actionPerformed(ActionEvent ae) {
-link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.html[NotifyDescriptor].InputLine nd = new NotifyDescriptor.InputLine(
+link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.html[NotifyDescriptor].InputLine nd = new NotifyDescriptor.InputLine(
                 Bundle.FN_askurl_msg(),
                 Bundle.FN_askurl_title(),
                 NotifyDescriptor.OK_CANCEL_OPTION,
                 NotifyDescriptor.PLAIN_MESSAGE);
-        Object result =  link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html[DialogDisplayer].getDefault().notify(nd);
+        Object result =  link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html[DialogDisplayer].getDefault().notify(nd);
         if (result.equals(NotifyDescriptor.OK_OPTION)) {
             String urlString = nd.getInputText();
             URL url;
@@ -1048,12 +1048,12 @@ public class AddFolderAction extends AbstractAction {
     })
     @Override
     public void actionPerformed(ActionEvent ae) {
-link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.html[NotifyDescriptor].InputLine nd = new NotifyDescriptor.InputLine(
+link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.html[NotifyDescriptor].InputLine nd = new NotifyDescriptor.InputLine(
                 Bundle.FN_askfolder_msg(),
                 Bundle.FN_askfolder_title(),
                 NotifyDescriptor.OK_CANCEL_OPTION,
                 NotifyDescriptor.PLAIN_MESSAGE);
-        Object result =  link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html[DialogDisplayer].getDefault().notify(nd);
+        Object result =  link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html[DialogDisplayer].getDefault().notify(nd);
         if (result.equals(NotifyDescriptor.OK_OPTION)) {
             final String folderString = nd.getInputText();
             try {
@@ -1086,4 +1086,4 @@ You should see a new feed is added and the result should be something like this:
 
 image::images/feedreader_73_new-feed.png[]
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-filetemplates.adoc b/netbeans.apache.org/src/content/tutorials/nbm-filetemplates.adoc
index 81e391daa..8153cfb0b 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-filetemplates.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-filetemplates.adoc
@@ -34,7 +34,7 @@ This tutorial demonstrates how to create a NetBeans module providing file templa
 
 A file template consists of a template file, an HTML description file, and an icon. The HTML description file displays information about the template in the New File wizard. The icon identifies the template and distinguishes it from other templates in the New File wizard. In this tutorial, you create a new file template by copying the content of an existing file template into an empty file. Then, once you have set up a description file for the New File wizard and a distinguishing icon, y [...]
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-filetemplates.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-filetemplates.html[the previous version of this document].
 
 
 
@@ -389,12 +389,12 @@ Now look in the Template Manager again, in the Licenses folder. You see some tem
 
 In summary, since NetBeans IDE 6.0, you are able to let the user define, per project, the license that each of its files should display. Plus, imagine if the user needs to create a new project with a different license. Assuming the user has a set of licenses defined in the Template Manager, using a new license is as simple as adding that one key/value pair to the  ``nbproject/project.properties``  file. That was not possible before but, thanks to FreeMarker support, is possible now. For  [...]
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about creating and developing NetBeans Module, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-filetype.adoc b/netbeans.apache.org/src/content/tutorials/nbm-filetype.adoc
index 231d1a7d9..9d56a4266 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-filetype.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-filetype.adoc
@@ -32,7 +32,7 @@
 
 This tutorial shows you how to write a module that lets the IDE, or any other application built on the NetBeans Platform, recognize a new file type.
 
-NOTE:  This document uses NetBeans IDE 8.0 or above and NetBeans Platform 8.0 or above. If you are using an earlier version, see  link:74/nbm-filetype.html[the previous version of this document].
+// NOTE:  This document uses NetBeans IDE 8.0 or above and NetBeans Platform 8.0 or above. If you are using an earlier version, see  link:74/nbm-filetype.html[the previous version of this document].
 
 
 
@@ -110,7 +110,7 @@ Note the following about the fields in the File Recognition panel:
 
 Let's imagine that Abc files can be case-sensitive. For this reason, you specify _two_ MIME types in this tutorial— ``abc``  and  ``ABC`` .
 
-* *XML Root Element.* Specifies a unique namespace that distinguishes the XML file type from all other XML file types. Since many XML files have the same extension ( ``xml`` ), the IDE distinguishes between XML files via their XML root elements. More specifically, the IDE can distinguish between namespaces and the first XML element in XML files. You can use this to, for example, distinguish between a JBoss deployment descriptor and a WebLogic deployment descriptor. Once you have made thi [...]
+* *XML Root Element.* Specifies a unique namespace that distinguishes the XML file type from all other XML file types. Since many XML files have the same extension ( ``xml`` ), the IDE distinguishes between XML files via their XML root elements. More specifically, the IDE can distinguish between namespaces and the first XML element in XML files. You can use this to, for example, distinguish between a JBoss deployment descriptor and a WebLogic deployment descriptor. Once you have made thi [...]
 
 Click Next.
 
@@ -135,7 +135,7 @@ image::images/filetype_72_new-filetype-4.png[]
 
 Each of the newly generated files is briefly introduced:
 
-* *AbcDataObject.java.* Wraps a  ``FileObject`` . DataObjects are produced by DataLoaders. For more information, see  link:https://netbeans.apache.org/wiki/devfaqdataobject[What is a DataObject?].
+* *AbcDataObject.java.* Wraps a  ``FileObject`` . DataObjects are produced by DataLoaders. For more information, see  xref:../wiki/DevFaqDataObject.adoc[What is a DataObject?].
 * *AbcTemplate.abc.* Provides the basis of a file template that is registered in the  ``layer.xml``  via an annotation defined in the  ``package-info.java``  file, such that it will be installed in the New File dialog as a new template.
 * *AbcVisualElement.java.* Sample visual tab in multiview editor.
 
@@ -413,7 +413,7 @@ You now have two visual tabs in a multiview window. For each additional tab, cre
 
 A  ``DataObject``  is like a  ``FileObject`` , except that it knows what kind of file is being shown. The "New File Type" wizard created a  ``DataObject``  for our file type, so let's now use it to parse the underlying file and expose its content as new nodes in the explorer views, e.g., the Projects window, Files window, and the Favorites window.
 
-For background to this section and complete details on support for nodes on the NetBeans Platform, see  link:https://netbeans.apache.org/tutorials/nbm-nodesapi2.html[NetBeans Nodes API Tutorial].
+For background to this section and complete details on support for nodes on the NetBeans Platform, see  xref:nbm-nodesapi2.adoc[NetBeans Nodes API Tutorial].
 
 
 [start=1]
@@ -507,7 +507,7 @@ image::images/filetype_72_new-action-6.png[]
 
 Our Node now has child Nodes. In this section, we also assign properties to our Node. The properties are displayed in the Properties window.
 
-For background to this section and complete details on support for properties on the NetBeans Platform, see  link:https://netbeans.apache.org/tutorials/nbm-property-editors.html[NetBeans Property Editor Tutorial].
+For background to this section and complete details on support for properties on the NetBeans Platform, see  xref:nbm-property-editors.adoc[NetBeans Property Editor Tutorial].
 
 By default, the following properties are shown in the Properties window for our new file:
 
@@ -595,7 +595,7 @@ image::images/filetype_72_new-action-7.png[]
 
 Let's now illustrate via a small example how the various views can be synchronized.
 
-For background to this section and complete details on the Visual Library in the NetBeans Platform, see "NetBeans APIs for Visualizing Data" in the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail], especially the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[official Visual Library documentation].
+For background to this section and complete details on the Visual Library in the NetBeans Platform, see "NetBeans APIs for Visualizing Data" in the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail], especially the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[official Visual Library documentation].
 
 
 [start=1]
@@ -683,7 +683,7 @@ image::images/filetype_72_new-action-8.png[]
 
 Make a change in the source view, save the change, switch to this visual view, and notice that the visual view reflects the changed source view.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
@@ -692,4 +692,4 @@ For more information about creating and developing NetBeans modules, see the fol
 
 *  link:https://netbeans.apache.org/platform/index.html[NetBeans Platform Homepage]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API List (Current Development Version)]
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-geospatial.adoc b/netbeans.apache.org/src/content/tutorials/nbm-geospatial.adoc
index cba8cc8db..919c61aec 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-geospatial.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-geospatial.adoc
@@ -39,7 +39,7 @@ By the end of this tutorial, you will have learned how to set up a powerful geos
 
 image::images/air_72_openmap-nb-small.png[]
 
-NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-geospatial.html[the previous version of this document].
+// NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-geospatial.html[the previous version of this document].
 
 
 
@@ -510,7 +510,7 @@ In the supporting windows, you need to implement a LookupListener. When the wind
 
 Conversely, you might need the map to be updated when one or more of the supporting windows change. In that case, the map window must be subscribed to the Lookup of the currently selected window or to the specific supporting window that it is interested in. The supporting window needs to published objects of interest to the map window.
 
-The  link:https://netbeans.apache.org/tutorials/nbm-quick-start.html[NetBeans Platform Quick Start] describes this mechanism in detail.
+The  xref:nbm-quick-start.adoc[NetBeans Platform Quick Start] describes this mechanism in detail.
 
 
 == Configuring the Geospatial System
@@ -697,8 +697,8 @@ Run the application and notice that the tabs are removed.
 
 Congratulations! At this stage, with very little coding, you have created the starting point of an air-traffic control system.
 
-To continue learning about the NetBeans Platform, head on to the four-part "NetBeans Platform Selection Management" series,  link:https://netbeans.apache.org/tutorials/nbm-selection-1.html[which starts here]. After that, get started with the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail], choosing the tutorials that are most relevant to your particular business scenario. Also, whenever you have questions about the NetBeans Platform, of any kind, [...]
+To continue learning about the NetBeans Platform, head on to the four-part "NetBeans Platform Selection Management" series,  xref:nbm-selection-1.adoc[which starts here]. After that, get started with the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail], choosing the tutorials that are most relevant to your particular business scenario. Also, whenever you have questions about the NetBeans Platform, of any kind, feel free to write to the mailing list, dev@platform.netbeans. [...]
 
 Have fun with the NetBeans Platform and see you on the mailing list!
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-gesture.adoc b/netbeans.apache.org/src/content/tutorials/nbm-gesture.adoc
index 5ab67506b..55110b00a 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-gesture.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-gesture.adoc
@@ -628,9 +628,9 @@ image::images/gesture_70_sample-2.png[]
 This concludes the NetBeans Platform Gesture Collector Tutorial. This document has described how to collect user interface gestures from the users of a NetBeans Platform application. For more information about gesture collecting on the NetBeans Platform, see the following resources:
 
 *  link:http://statistics.netbeans.org/analytics/[NetBeans Analytics Community]
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-uihandler/overview-summary.html[UI Gestures Collector Infrastructure]
-*  link:http://wiki.netbeans.org/UIGesturesCollector[UIGesturesCollector]
-*  link:http://wiki.netbeans.org/HowToUseUIGesturesCollectorInYourApp[HowToUseUIGesturesCollectorInYourApp]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-uihandler/overview-summary.html[UI Gestures Collector Infrastructure]
+*  xref:../wiki/UIGesturesCollector.adoc[UIGesturesCollector]
+*  xref:../wiki/HowToUseUIGesturesCollectorInYourApp.adoc[HowToUseUIGesturesCollectorInYourApp]
 *  link:http://blogs.oracle.com/geertjan/entry/collecting_data_on_users_of[Collecting Data on Users of a NetBeans Platform Application]
 *  link:http://weblogs.java.net/blog/fvo/archive/2010/11/22/slowness-detection-netbeans-rcp-applications[Slowness Detection in NetBeans RCP Applications]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html[Logging in NetBeans]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html[Logging in NetBeans]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-glossary.adoc b/netbeans.apache.org/src/content/tutorials/nbm-glossary.adoc
index dfe1f14b1..3d45dc0cc 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-glossary.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-glossary.adoc
@@ -32,7 +32,7 @@
 
 link:mailto:dev@netbeans.apache.org?subject=Feedback:%20NetBeans%20IDE%20Glossary%20for%20NetBeans%20Modules[Feedback]
 
-The NetBeans Platform tutorials assume that you are familiar with some of the basic terms that relate to NetBeans module development. The terms are few and not very difficult. Once you have grasped the concepts below, you should consider reading  link:nbm-idioms.html[Introduction to the NetBeans Idioms and Infrastructure].
+The NetBeans Platform tutorials assume that you are familiar with some of the basic terms that relate to NetBeans module development. The terms are few and not very difficult. Once you have grasped the concepts below, you should consider reading  xref:../wiki/NbmIdioms.adoc[Introduction to the NetBeans Idioms and Infrastructure].
 
 The basic terms used in module development are as follows:
 
@@ -40,7 +40,7 @@ The basic terms used in module development are as follows:
 
 * *System Filesystem.* The general registry that contains NetBeans configuration information, built from the layer.xml configuration files of the registered modules. NetBeans stores a wide variety of configuration information in the System Filesystem. For example, the System Filesystem contains a folder called Menu, which contains subfolders with names such as File and Edit. These subfolders contain files that represent Java classes which implement the actions that appear in the "File" a [...]
 
-* *Module.* A group of Java classes that provides an application with a specific feature. For example, the feature provided by the Java classes in the  link:nbm-feedreader.html[Feed Reader Tutorial] is an RSS/Atom feed reader. The Java classes use the manifest.mf file to declare the module and the layer.xml configuration file to register their functionality in the System Filesystem. In NetBeans terminology, "plugin" is an adjective, while "module" is a noun. There is no discernible diffe [...]
+* *Module.* A group of Java classes that provides an application with a specific feature. For example, the feature provided by the Java classes in the  xref:nbm-feedreader.adoc[Feed Reader Tutorial] is an RSS/Atom feed reader. The Java classes use the manifest.mf file to declare the module and the layer.xml configuration file to register their functionality in the System Filesystem. In NetBeans terminology, "plugin" is an adjective, while "module" is a noun. There is no discernible diffe [...]
 
 * *NetBeans APIs.* The public interfaces and classes which are available to module writers. They are divided into specific APIs for dealing with different types of functionality. The contents and behavior of the Java source packages and its subpackages, as specified in the API reference documentation, are the APIs. For the full NetBeans API List, click  link:https://bits.netbeans.org/dev/javadoc/[here].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-google.adoc b/netbeans.apache.org/src/content/tutorials/nbm-google.adoc
index 9d684524c..7bd882037 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-google.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-google.adoc
@@ -35,7 +35,7 @@ Welcome to Apache NetBeans plugin development!
 
 This tutorial provides a simple and quick introduction to the Apache NetBeans plugin development workflow by walking you through the creation of a new toolbar for any Apache NetBeans Platform application. Once you are done with this tutorial, you will know how to create, build, and install plugins for the Apache NetBeans Platform.
 
-After you finish this tutorial, you can move on to the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform learning trail]. The learning trail provides comprehensive tutorials that highlight a wide range of Apache NetBeans APIs for a variety of application types. If you do not need to do a "Hello World" tutorial, you can skip the instructions that follow and jump straight to the learning trail.
+After you finish this tutorial, you can move on to the  xref:../kb/docs/platform.adoc[NetBeans Platform learning trail]. The learning trail provides comprehensive tutorials that highlight a wide range of Apache NetBeans APIs for a variety of application types. If you do not need to do a "Hello World" tutorial, you can skip the instructions that follow and jump straight to the learning trail.
 
 The toolbar you create in this tutorial will look as follows:
 
@@ -45,7 +45,7 @@ The concept is that the user enters some text, presses kbd:Enter, and the IDE's
 
 To create this toolbar, you will use the  link:https://bits.netbeans.org/dev/javadoc/[NetBeans APIs] to enhance the Apache NetBeans Platform's feature set. Specifically, you will create and register an action invoked by a button created by the NetBeans Platform in the toolbar. You will then create a  ``JPanel``  containing a  ``JLabel``  and  ``JTextField``  as GUI components. Finally, you will implement  link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/action [...]
 
-If it would help you, do some background reading before diving into this tutorial. In particular, you might like to read the  link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Modules API Reference] document, which explains what modules are and provides some context for this tutorial. Also note that there is an extensive Reference Material section on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning  [...]
+If it would help you, do some background reading before diving into this tutorial. In particular, you might like to read the  link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Modules API Reference] document, which explains what modules are and provides some context for this tutorial. Also note that there is an extensive Reference Material section on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]. Of course you can [...]
 
 The completed tutorial source code is also available as link:https://github.com/bradh/GoogleBar[a GitHub repository].
 
@@ -109,7 +109,7 @@ OpenIDE-Module-Localizing-Bundle: org/myorg/googletoolbar/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
 ----
 
-For details on these NetBeans-specific manifest keys, check the  link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[NetBeans Modules API] Javadoc description.
+For details on these NetBeans-specific manifest keys, check the  link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[NetBeans Modules API] Javadoc description.
 
 
 
@@ -221,7 +221,7 @@ public final class GoogleActionListener implements ActionListener {
 }
 ----
 
-NOTE:  When you build the module, which is done automatically in the next step when you run the module, the class annotations that you see above will be converted to XML tags in a file that will be contributed to the virtual filesystem of the application. The XML file will be named "generated-layer.xml" and will be found in the "build\classes\META-INF" folder of your module, which you can see if the Files window (Ctrl-2) is open in the IDE. This file is created at compile-time and contai [...]
+NOTE:  When you build the module, which is done automatically in the next step when you run the module, the class annotations that you see above will be converted to XML tags in a file that will be contributed to the virtual filesystem of the application. The XML file will be named "generated-layer.xml" and will be found in the "build\classes\META-INF" folder of your module, which you can see if the Files window (Ctrl-2) is open in the IDE. This file is created at compile-time and contai [...]
 
 
 [start=6]
@@ -382,7 +382,7 @@ Press Enter. The IDE's default browser starts up, if you have set one in the Opt
 
 In this section, you have created a  ``JPanel``  that displays a  ``JTextField``  and a  ``JLabel`` . You have presented it in the NetBeans toolbar, thanks to the  ``Presenter.Toolbar``  class. When the user presses Enter in the  ``JTextField`` , its content is sent to a Google search. The HTML browser opens and you see the result of the Google search. The  ``ActionListener``  is used to integrate the  ``JPanel``  within the application's toolbar, as registered via the annotations in the [...]
 
-link:https://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[ Send Us Your Feedback]
 
 
 
@@ -390,7 +390,7 @@ link:https://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feed
 
 This concludes the NetBeans Plugin Quick Start. This document has described how to create a plugin that adds a Google Search toolbar to the IDE. For more information about creating and developing plugins, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail]
+*  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
 * NetBeans API classes used in this tutorial:
 *  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/HtmlBrowser.URLDisplayer.html[HtmlBrowser.URLDisplayer]`` 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-htmleditor.adoc b/netbeans.apache.org/src/content/tutorials/nbm-htmleditor.adoc
index 32249d2b1..d509b453a 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-htmleditor.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-htmleditor.adoc
@@ -32,9 +32,9 @@
 
 This tutorial provides a very simple and quick introduction to the NetBeans Platform workflow by walking you through the creation of a simple HTML Editor. Though simple to create, the HTML Editor you create will be a mature application because it will reuse the infrastructure provided by the NetBeans Platform, as well as several modules from NetBeans IDE. For example, without any coding, your HTML Editor will have a mature window system, which it reuses from the NetBeans Platform. Once y [...]
 
-After you finish this tutorial, you can move on to the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform learning trail]. The learning trail provides comprehensive tutorials that highlight a wide range of NetBeans APIs for a variety of application types. If you do not want to do a "Hello World" application, you can skip this tutorial and jump straight to the learning trail.
+After you finish this tutorial, you can move on to the  xref:../kb/docs/platform.adoc[NetBeans Platform learning trail]. The learning trail provides comprehensive tutorials that highlight a wide range of NetBeans APIs for a variety of application types. If you do not want to do a "Hello World" application, you can skip this tutorial and jump straight to the learning trail.
 
-NOTE:  This document uses NetBeans IDE 8.1 and NetBeans Platform 8.1. If you are using an earlier version of these products, see  link:80/nbm-htmleditor.html[the previous version of this document]. If this is your first encounter with the NetBeans Platform, you are recommended to work through the  link:nbm-quick-start.html[NetBeans Platform Quick Start] before continuing with this one. If, instead of learning how to create a NetBeans Platform application, you would like to learn how to c [...]
+// NOTE:  This document uses NetBeans IDE 8.1 and NetBeans Platform 8.1. If you are using an earlier version of these products, see  link:80/nbm-htmleditor.html[the previous version of this document]. If this is your first encounter with the NetBeans Platform, you are recommended to work through the  xref:nbm-quick-start.adoc[NetBeans Platform Quick Start] before continuing with this one. If, instead of learning how to create a NetBeans Platform application, you would like to learn how t [...]
 
 
 
@@ -290,12 +290,12 @@ jnlp.platform.codebase=http://bits.netbeans.org/6.9/jnlp/
 
 As soon as the application is started as a JNLP application, all its shared plug-in modules are going to be loaded from netbeans.org and shared with other applications doing the same.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == See Also
 
 This concludes the NetBeans HTML Editor Tutorial. For more information about creating and developing applications on the NetBeans Platform, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-hyperlink.adoc b/netbeans.apache.org/src/content/tutorials/nbm-hyperlink.adoc
index d3029e648..869bf73c3 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-hyperlink.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-hyperlink.adoc
@@ -39,7 +39,7 @@ When the hyperlink is clicked, something happens relevant to the identifier, for
 
 Though the focus of this tutorial is on hyperlinking in an HTML file, the principles shown here could equally be applied to other types of files, such as to Java source files, XML files, JSP files, Properties files, or Manifest files.
 
-NOTE:  This document is applicable to NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-hyperlink.html[the previous version of this document].
+// NOTE:  This document is applicable to NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-hyperlink.html[the previous version of this document].
 
 
 == Getting Started
@@ -77,7 +77,7 @@ image::images/hyperlink_72_add-libs.png[]
 
 The  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProvider.html[HyperlinkProvider] class implements three methods, each of which is discussed in detail below, accompanied by a practical example in the context of our module.
 
-An alternative approach, which lets you define a tooltip on your hyperlink, is provided by the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProviderExt.html[HyperlinkProviderExt] class, which is discussed  link:https://blogs.oracle.com/geertjan/entry/hyperlink_for_freemarker[here] and  link:https://blogs.oracle.com/geertjan/entry/jump_to_declaration_for_freemarker[here].
+An alternative approach, which lets you define a tooltip on your hyperlink, is provided by the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProviderExt.html[HyperlinkProviderExt] class, which is discussed  link:https://blogs.oracle.com/geertjan/entry/hyperlink_for_freemarker[here] and  link:https://blogs.oracle.com/geertjan/entry/jump_to_declaration_for_freemarker[here].
 
 Below, we first we set up the class and then we implement each of the three methods in turn.
 
@@ -91,7 +91,7 @@ Setting up our class means implementing  link:https://bits.netbeans.org/dev/java
 1. Create a Java class in  ``org.netbeans.modules.myspecialhyperlink`` , and name it  ``MySpecialHyperlinkProvider`` .
 
 [start=2]
-1. Change the class signature so that  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProvider.html[org.netbeans.lib.editor.hyperlink.spi.HyperlinkProvider]``  is implemented.
+1. Change the class signature so that  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProvider.html[org.netbeans.lib.editor.hyperlink.spi.HyperlinkProvider]``  is implemented.
 
 [start=3]
 1. Note that the following import statements will be needed in this tutorial:
@@ -285,4 +285,4 @@ Now that the HyperlinkProvider is registered, you can run the module and try out
 
 image::images/hyperlink_hyperlink-69-1.png[]
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-ide.adoc b/netbeans.apache.org/src/content/tutorials/nbm-ide.adoc
index cbdb3be4b..d79636aa1 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-ide.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-ide.adoc
@@ -34,7 +34,7 @@ The NetBeans Platform is a solid infrastructure for creating your own software d
 
 In this quick start, you are shown how to set up an integrated development environment on top of the NetBeans Platform.
 
-NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-ide.html[the previous version of this document].
+// NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-ide.html[the previous version of this document].
 
 
 
@@ -47,7 +47,7 @@ NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are
 
 For troubleshooting purposes, you are welcome to download the  link:http://web.archive.org/web/20170409072842/http://java.net/projects/nb-api-samples/show/versions/8.0/tutorials/MyIDE[completed tutorial source code].
 
-NOTE:  If you are new to the NetBeans Platform, do some background reading before diving into this tutorial. In particular, read the  link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Modules API Reference] document, which explains what modules are and provides some context for this tutorial, while noting that there is an extensive Reference Material section on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform [...]
+NOTE:  If you are new to the NetBeans Platform, do some background reading before diving into this tutorial. In particular, read the  link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Modules API Reference] document, which explains what modules are and provides some context for this tutorial, while noting that there is an extensive Reference Material section on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
 
 == Creating a Generic Application Basis
@@ -121,4 +121,4 @@ Depending on your needs, you can create custom features in your application that
 
 Congratulations. You have learned how to create the starting point for your own IDE.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-java-hint.adoc b/netbeans.apache.org/src/content/tutorials/nbm-java-hint.adoc
index d83b9a4c3..ad3b1c2ea 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-java-hint.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-java-hint.adoc
@@ -343,7 +343,7 @@ image::images/hint_72_result-3.png[]
 
 In this tutorial, you have been introduced to the NetBeans Java hint infrastructure. To obtain a deeper understanding, see the sources referred to at the start of this tutorial, as well as the resources referred to below.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == See Also
@@ -351,6 +351,6 @@ link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedba
 For more information about creating and developing NetBeans Module, see the following resources:
 
 *  link:http://wiki.netbeans.org/Java_DevelopersGuide[Java Developer's Guide]
-*  link:https://netbeans.apache.org/tutorials/nbm-copyfqn.html[NetBeans Java Language Infrastructure Tutorial]
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:nbm-copyfqn.adoc[NetBeans Java Language Infrastructure Tutorial]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-javacc-lexer.adoc b/netbeans.apache.org/src/content/tutorials/nbm-javacc-lexer.adoc
index d120e26b2..87317a2b2 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-javacc-lexer.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-javacc-lexer.adoc
@@ -32,7 +32,7 @@
 
 This tutorial shows you how to generate a lexer with  link:https://javacc.github.io/javacc//[JavaCC] and use it to create editor features for applications created on top of the NetBeans Platform.
 
-NOTE:  This document uses NetBeans IDE 7.2 or above and NetBeans Platform 7.2 or above. If you are using an earlier version, see  link:71/nbm-javacc-lexer.html[the previous version of this document].
+// NOTE:  This document uses NetBeans IDE 7.2 or above and NetBeans Platform 7.2 or above. If you are using an earlier version, see  link:71/nbm-javacc-lexer.html[the previous version of this document].
 
 
 
@@ -51,7 +51,7 @@ JavaCC is a generator for Java lexers and Java parsers. A Java lexer and parser
 
 This tutorial focuses specifically on lexers. Lexical analysis, or "lexing", is the process of converting a sequence of characters into a sequence of tokens. Functionality that performs lexical analysis is called a lexical analyzer, a lexer, or a scanner. In this tutorial, the term "lexer" will be used. A lexer typically exists as a single function called by a parser. For example, while a typical lexer recognizes parentheses as tokens, it does nothing to ensure that an opening parenthese [...]
 
-Part 2 of this tutorial, the  link:nbm-javacc-parser.html[JavaCC Parser Generator Integration Tutorial], shows you how to create a parser that parses the same text that the lexer in this tutorial lexes.
+Part 2 of this tutorial, the  xref:nbm-javacc-parser.adoc[JavaCC Parser Generator Integration Tutorial], shows you how to create a parser that parses the same text that the lexer in this tutorial lexes.
 
 The NetBeans Platform provides hooks for integrating a lexer into your own Java desktop application on the NetBeans Platform. For example, in this tutorial, you use a sample grammar specification provided by JavaCC to generate a lexer and use it to create syntax coloring in an editor for a simplified Java language defined by the sample grammar specification:
 
@@ -89,7 +89,7 @@ The project contains all of your sources and project metadata, such as the proje
 
 In this section, we use a wizard to create the classes necessary for recognizing "SimpleJava" files, for which we will create the new "text/x-sj" MIME type, which will recognize files with ".sj" as their file extension.
 
-NOTE:  For details on the steps below, follow the  link:https://netbeans.apache.org/tutorials/nbm-filetype.html[File Type Integration Tutorial].
+NOTE:  For details on the steps below, follow the  xref:nbm-filetype.adoc[File Type Integration Tutorial].
 
 
 [start=1]
@@ -124,7 +124,7 @@ image::images/javacc_71_JavaIcon.gif[]
 
 image::images/javacc_72_code-4.png[]
 
-The newly generated files above are described in the  link:https://netbeans.apache.org/tutorials/nbm-filetype.html[File Type Integration Tutorial].
+The newly generated files above are described in the  xref:nbm-filetype.adoc[File Type Integration Tutorial].
 
 
 [start=5]
@@ -389,7 +389,7 @@ You've now completed the JavaCC part of the tutorial. The time has come to use t
 
 == Integrating the JavaCC Lexer with NetBeans APIs
 
-In this section, we take the files generated in the previous section and integrate them with the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/overview-summary.html[NetBeans Lexer API].
+In this section, we take the files generated in the previous section and integrate them with the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/overview-summary.html[NetBeans Lexer API].
 
 
 [start=1]
@@ -414,7 +414,7 @@ image::images/javacc_72_add-lexer-3.png[]
 
 
 [start=3]
-1. The first class you need to implement is  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/org/netbeans/api/lexer/TokenId.html[org.netbeans.api.lexer.TokenId]`` .  ``TokenId``  represents one type of token. It has three properties:
+1. The first class you need to implement is  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/org/netbeans/api/lexer/TokenId.html[org.netbeans.api.lexer.TokenId]`` .  ``TokenId``  represents one type of token. It has three properties:
 
 *  ``name.``  Unique name of the token type, such as  ``"KEYWORD_IF".`` 
 *  ``id.``  Unique number.
@@ -465,7 +465,7 @@ public class SJTokenId implements TokenId {
 
 
 [start=4]
-1. The next class you need to implement is  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/org/netbeans/spi/lexer/LanguageHierarchy.html[org.netbeans.spi.lexer.LanguageHierarchy]`` .  ``LanguageHierarchy``  provides a list of token types for our language and creates a new instance of our lexer.
+1. The next class you need to implement is  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/org/netbeans/spi/lexer/LanguageHierarchy.html[org.netbeans.spi.lexer.LanguageHierarchy]`` .  ``LanguageHierarchy``  provides a list of token types for our language and creates a new instance of our lexer.
 
 Create a class named  ``SJLanguageHierarchy``  and define it as follows:
 
@@ -527,7 +527,7 @@ NOTE:  Because the  ``SJLexer``  class does not yet exist, a red error mark is s
 
 
 [start=5]
-1. The last class you need to implement is  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/org/netbeans/spi/lexer/Lexer.html[org.netbeans.spi.lexer.Lexer]`` .  ``Lexer``  reads input text and returns tokens for it. In our case, the Lexer implementation needs to delegate to the lexer generated by JavaCC.
+1. The last class you need to implement is  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/org/netbeans/spi/lexer/Lexer.html[org.netbeans.spi.lexer.Lexer]`` .  ``Lexer``  reads input text and returns tokens for it. In our case, the Lexer implementation needs to delegate to the lexer generated by JavaCC.
 
 Create a class named  ``SJLexer``  and define it as follows:
 
@@ -575,7 +575,7 @@ class SJLexer implements Lexer<SJTokenId> {
 }
 ----
 
-NOTE:  The class above does not compile at the moment because  ``JavaCharStream``  has not been defined to receive a  ``LexerInput`` . In the next step, we rewrite the  ``JavaCharStream``  class generated by JavaCC. Our new version of  ``JavaCharStream`` , listed in the next step, reads input characters from  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/org/netbeans/spi/lexer/LexerInput.html[org.netbeans.spi.lexer.LexerInput]`` , instead of the standard  ``Inpu [...]
+NOTE:  The class above does not compile at the moment because  ``JavaCharStream``  has not been defined to receive a  ``LexerInput`` . In the next step, we rewrite the  ``JavaCharStream``  class generated by JavaCC. Our new version of  ``JavaCharStream`` , listed in the next step, reads input characters from  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-lexer/org/netbeans/spi/lexer/LexerInput.html[org.netbeans.spi.lexer.LexerInput]`` , instead of the standard  ``Inp [...]
 
 
 [start=6]
@@ -736,7 +736,7 @@ image::images/javacc_72_add-lexer-6.png[]
 
 == Enabling Lexer Support in NetBeans Platform Applications
 
-In NetBeans IDE, lexer support is enabled via the "Lexer to NetBeans Bridge" module. This module uses the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeLookup.html[MIME Lookup API] to search for language descriptions registered by modules such as the one you are creating in this tutorial. If you are creating lexer support for your own application created on the NetBeans Platform, you explictly need to add the enab [...]
+In NetBeans IDE, lexer support is enabled via the "Lexer to NetBeans Bridge" module. This module uses the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeLookup.html[MIME Lookup API] to search for language descriptions registered by modules such as the one you are creating in this tutorial. If you are creating lexer support for your own application created on the NetBeans Platform, you explictly need to add the ena [...]
 
 
 [start=1]
@@ -967,20 +967,20 @@ Look in the Options window, under the Tools menu, and you should be able to chan
 
 image::images/javacc_72_result-2.png[]
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
-This tutorial is the official version of the first part of  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], which, aside from being a rough draft, is partly obsolete and out of date for the NetBeans Platform.
+This tutorial is the official version of the first part of  xref:../wiki/How_to_create_support_for_a_new_language.adoc[http://wiki.netbeans.org/How_to_create_support_for_a_new_language], which, aside from being a rough draft, is partly obsolete and out of date for the NetBeans Platform.
 
-Part 2 of this tutorial, the  link:nbm-javacc-parser.html[JavaCC Parser Generator Integration Tutorial], shows you how to create a parser that parses the same text that the lexer in this tutorial lexes.
+Part 2 of this tutorial, the  xref:nbm-javacc-parser.adoc[JavaCC Parser Generator Integration Tutorial], shows you how to create a parser that parses the same text that the lexer in this tutorial lexes.
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
 *  link:https://netbeans.apache.org/platform/index.html[NetBeans Platform Homepage]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API List (Current Development Version)]
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 
 
 == Appendix
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-javacc-parser.adoc b/netbeans.apache.org/src/content/tutorials/nbm-javacc-parser.adoc
index e02e1c3ea..4ec5f0d7b 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-javacc-parser.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-javacc-parser.adoc
@@ -32,7 +32,7 @@
 
 This tutorial shows you how to generate a parser with  link:https://javacc.github.io/javacc//[JavaCC] and use it to create features in a NetBeans editor.
 
-NOTE:  Prior to starting to work on this tutorial, you must have completed the  link:nbm-javacc-lexer.html[JavaCC Lexer Generator Integration Tutorial], since that tutorial shows how to create the module structure, file type support, and lexer used in the instructions that follow.
+NOTE:  Prior to starting to work on this tutorial, you must have completed the  xref:nbm-javacc-lexer.adoc[JavaCC Lexer Generator Integration Tutorial], since that tutorial shows how to create the module structure, file type support, and lexer used in the instructions that follow.
 
 You will learn how to create several features in a NetBeans editor, based on your JavaCC parser, such as a syntax error parser, as shown below:
 
@@ -51,7 +51,7 @@ For troubleshooting purposes, you are welcome to download the  link:http://web.a
 
 == Generating a Parser from JavaCC
 
-Let's now use JavaCC to generate a parser, in the same way as we generated a lexer in the  link:nbm-javacc-lexer.html[JavaCC Lexer Generator Integration Tutorial]. We'll need to edit the JavaCC grammar file less than we did in the previous tutorial, since we're not going to remove the parser generator as we did last time.
+Let's now use JavaCC to generate a parser, in the same way as we generated a lexer in the  xref:nbm-javacc-lexer.adoc[JavaCC Lexer Generator Integration Tutorial]. We'll need to edit the JavaCC grammar file less than we did in the previous tutorial, since we're not going to remove the parser generator as we did last time.
 
 
 [start=1]
@@ -105,7 +105,7 @@ You've now completed the JavaCC part of the tutorial. The time has come to use t
 
 == Integrating the JavaCC Parser with NetBeans APIs
 
-In this section, we take the files generated in the previous section and integrate them with the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/overview-summary.html[NetBeans Parsing API].
+In this section, we take the files generated in the previous section and integrate them with the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/overview-summary.html[NetBeans Parsing API].
 
 
 [start=1]
@@ -120,7 +120,7 @@ image::images/javacc_72_parser-4.png[]
 
 
 [start=3]
-1. The first NetBeans APIclass you need to implement is  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Parser.html[org.netbeans.modules.parsing.spi.Parser]`` . Create a class named  ``SJParser``  and define it as follows:
+1. The first NetBeans APIclass you need to implement is  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Parser.html[org.netbeans.modules.parsing.spi.Parser]`` . Create a class named  ``SJParser``  and define it as follows:
 
 
 [source,java,subs="macros"]
@@ -133,14 +133,14 @@ import java.io.StringReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.event.ChangeListener;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/api/Snapshot.html[org.netbeans.modules.parsing.api.Snapshot];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/api/Task.html[org.netbeans.modules.parsing.api.Task];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Parser.html[org.netbeans.modules.parsing.spi.Parser];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/ParserResultTask.html[org.netbeans.modules.parsing.spi.Parser.Result];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/SourceModificationEvent.html[org.netbeans.modules.parsing.spi.SourceModificationEvent];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/api/Snapshot.html[org.netbeans.modules.parsing.api.Snapshot];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/api/Task.html[org.netbeans.modules.parsing.api.Task];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Parser.html[org.netbeans.modules.parsing.spi.Parser];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/ParserResultTask.html[org.netbeans.modules.parsing.spi.Parser.Result];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/SourceModificationEvent.html[org.netbeans.modules.parsing.spi.SourceModificationEvent];
 import org.simplejava.jccparser.JavaParser;
 
-public class SJParser extends link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Parser.html[Parser] {
+public class SJParser extends link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Parser.html[Parser] {
 
     private Snapshot snapshot;
     private JavaParser javaParser;
@@ -544,10 +544,10 @@ At this point, we're ready to implement our first  ``ParserResultTask`` . This t
 
 
 [start=1]
-1. Create a factory, i.e.,  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/TaskFactory.html[TaskFactory]`` .
+1. Create a factory, i.e.,  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/TaskFactory.html[TaskFactory]`` .
 
 [start=2]
-1. Create a task, i.e.,  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/ParserResultTask.html[ParserResultTask]`` .
+1. Create a task, i.e.,  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/ParserResultTask.html[ParserResultTask]`` .
 
 [start=3]
 1. Register the factory in the layer file.
@@ -573,21 +573,21 @@ import java.util.List;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.StyledDocument;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Parser.Result.html[org.netbeans.modules.parsing.spi.Parser.Result];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/ParserResultTask.html[org.netbeans.modules.parsing.spi.ParserResultTask];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Scheduler.html[org.netbeans.modules.parsing.spi.Scheduler];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/SchedulerEvent.html[org.netbeans.modules.parsing.spi.SchedulerEvent];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-editor-hints/org/netbeans/spi/editor/hints/ErrorDescription.html[org.netbeans.spi.editor.hints.ErrorDescription];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-editor-hints/org/netbeans/spi/editor/hints/ErrorDescriptionFactory.html[org.netbeans.spi.editor.hints.ErrorDescriptionFactory];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-editor-hints/org/netbeans/spi/editor/hints/HintsController.html[org.netbeans.spi.editor.hints.HintsController];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-editor-hints/org/netbeans/spi/editor/hints/Severity.html[org.netbeans.spi.editor.hints.Severity];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Parser.Result.html[org.netbeans.modules.parsing.spi.Parser.Result];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/ParserResultTask.html[org.netbeans.modules.parsing.spi.ParserResultTask];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/Scheduler.html[org.netbeans.modules.parsing.spi.Scheduler];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/SchedulerEvent.html[org.netbeans.modules.parsing.spi.SchedulerEvent];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-editor-hints/org/netbeans/spi/editor/hints/ErrorDescription.html[org.netbeans.spi.editor.hints.ErrorDescription];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-editor-hints/org/netbeans/spi/editor/hints/ErrorDescriptionFactory.html[org.netbeans.spi.editor.hints.ErrorDescriptionFactory];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-editor-hints/org/netbeans/spi/editor/hints/HintsController.html[org.netbeans.spi.editor.hints.HintsController];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-editor-hints/org/netbeans/spi/editor/hints/Severity.html[org.netbeans.spi.editor.hints.Severity];
 import org.openide.text.NbDocument;
 import org.openide.util.Exceptions;
 import org.simplejava.jccparser.ParseException;
 import org.simplejava.jccparser.Token;
 import org.simplejava.parser.SJParser.SJParserResult;
 
-public class SJSyntaxErrorHighlightingTask extends link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/ParserResultTask.html[ParserResultTask] {
+public class SJSyntaxErrorHighlightingTask extends link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/ParserResultTask.html[ParserResultTask] {
 
     @Override
     public void run (Result result, SchedulerEvent event) {
@@ -647,11 +647,11 @@ package org.simplejava.parser;
 import java.util.Collection;
 import java.util.Collections;
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/api/Snapshot.html[org.netbeans.modules.parsing.api.Snapshot];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/TaskFactory.html[org.netbeans.modules.parsing.spi.TaskFactory];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/api/Snapshot.html[org.netbeans.modules.parsing.api.Snapshot];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/TaskFactory.html[org.netbeans.modules.parsing.spi.TaskFactory];
 
 @MimeRegistration(mimeType="text/x-sj",service=TaskFactory.class)
-public class SJSyntaxErrorHighlightingTaskFactory extends link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/TaskFactory.html[TaskFactory] {
+public class SJSyntaxErrorHighlightingTaskFactory extends link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/org/netbeans/modules/parsing/spi/TaskFactory.html[TaskFactory] {
 
     @Override
     public Collection create (Snapshot snapshot) {
@@ -675,11 +675,11 @@ Next, we'll create the skeleton of an indentation task for our language.
 
 
 [start=1]
-1. Add a dependency on the " link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/overview-summary.html[Editor Indentation]" module.
+1. Add a dependency on the " link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/overview-summary.html[Editor Indentation]" module.
 
 [start=2]
 1. 
-Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.html[IndentTask]`` :
+Create a new  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.html[IndentTask]`` :
 
 
 [source,java,subs="macros"]
@@ -688,12 +688,12 @@ Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-
 package org.simplejava.parser;
 
 import javax.swing.text.BadLocationException;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/Context.html[org.netbeans.modules.editor.indent.spi.Context];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ExtraLock.html[org.netbeans.modules.editor.indent.spi.ExtraLock];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.html[org.netbeans.modules.editor.indent.spi.IndentTask];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/Context.html[org.netbeans.modules.editor.indent.spi.Context];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ExtraLock.html[org.netbeans.modules.editor.indent.spi.ExtraLock];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.html[org.netbeans.modules.editor.indent.spi.IndentTask];
 import org.openide.awt.StatusDisplayer;
 
-public class SJIndentTask implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.html[IndentTask] {
+public class SJIndentTask implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.html[IndentTask] {
 
     private Context context;
 
@@ -718,7 +718,7 @@ NOTE:  The indent task will make a callback to the  ``reindent()``  method when
 
 
 [start=3]
-1. Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.Factory.html[IndentTask.Factory]`` :
+1. Create a new  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.Factory.html[IndentTask.Factory]`` :
 
 
 [source,java,subs="macros"]
@@ -727,11 +727,11 @@ NOTE:  The indent task will make a callback to the  ``reindent()``  method when
 package org.simplejava.parser;
 
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/Context.html[org.netbeans.modules.editor.indent.spi.Context];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.html[org.netbeans.modules.editor.indent.spi.IndentTask];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/Context.html[org.netbeans.modules.editor.indent.spi.Context];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.html[org.netbeans.modules.editor.indent.spi.IndentTask];
 
 @MimeRegistration(mimeType="text/x-sj",service=IndentTask.Factory.class)
-public class SJIndentTaskFactory implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.Factory.html[IndentTask.Factory] {
+public class SJIndentTaskFactory implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/IndentTask.Factory.html[IndentTask.Factory] {
 
     @Override
     public IndentTask createTask(Context context) {
@@ -750,11 +750,11 @@ Next, we'll create the skeleton of a reformat task for our language.
 
 
 [start=1]
-1. If you have not already done so in the previous section, add a dependency on the " link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/overview-summary.html[Editor Indentation]" module.
+1. If you have not already done so in the previous section, add a dependency on the " link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/overview-summary.html[Editor Indentation]" module.
 
 [start=2]
 1. 
-Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.html[ReformatTask]`` :
+Create a new  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.html[ReformatTask]`` :
 
 
 [source,java,subs="macros"]
@@ -763,12 +763,12 @@ Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-
 package org.simplejava.parser;
 
 import javax.swing.text.BadLocationException;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/Context.html[org.netbeans.modules.editor.indent.spi.Context];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ExtraLock.html[org.netbeans.modules.editor.indent.spi.ExtraLock];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.html[org.netbeans.modules.editor.indent.spi.ReformatTask];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/Context.html[org.netbeans.modules.editor.indent.spi.Context];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ExtraLock.html[org.netbeans.modules.editor.indent.spi.ExtraLock];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.html[org.netbeans.modules.editor.indent.spi.ReformatTask];
 import org.openide.awt.StatusDisplayer;
 
-public class SJReformatTask implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.html[ReformatTask] {
+public class SJReformatTask implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.html[ReformatTask] {
 
     private Context context;
 
@@ -793,7 +793,7 @@ NOTE:  The reformat task will make a callback to the  ``reformat()``  method whe
 
 
 [start=3]
-1. Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.Factory.html[ReformatTask.Factory]`` :
+1. Create a new  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.Factory.html[ReformatTask.Factory]`` :
 
 
 [source,java,subs="macros"]
@@ -802,11 +802,11 @@ NOTE:  The reformat task will make a callback to the  ``reformat()``  method whe
 package org.simplejava.parser;
 
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/Context.html[org.netbeans.modules.editor.indent.spi.Context];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.Factory.html[org.netbeans.modules.editor.indent.spi.ReformatTask];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/Context.html[org.netbeans.modules.editor.indent.spi.Context];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.Factory.html[org.netbeans.modules.editor.indent.spi.ReformatTask];
 
 @MimeRegistration(mimeType="text/x-sj",service=ReformatTask.Factory.class)
-public class SJReformatTaskFactory implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.Factory.html[ReformatTask.Factory] {
+public class SJReformatTaskFactory implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-indent/org/netbeans/modules/editor/indent/spi/ReformatTask.Factory.html[ReformatTask.Factory] {
 
     @Override
     public ReformatTask createTask(Context context) {
@@ -837,11 +837,11 @@ image::images/javacc_72_add-brace-2.png[]
 
 
 [start=1]
-1. Add a dependency on the " link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/overview-summary.html[Editor Brace Matching]" module.
+1. Add a dependency on the " link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/overview-summary.html[Editor Brace Matching]" module.
 
 [start=2]
 1. 
-Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.html[BracesMatcherFactory]`` :
+Create a new  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.html[BracesMatcherFactory]`` :
 
 
 [source,java,subs="macros"]
@@ -850,13 +850,13 @@ Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-
 package org.simplejava.parser;
 
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcher.html[org.netbeans.spi.editor.bracesmatching.BracesMatcher];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.html[org.netbeans.spi.editor.bracesmatching.BracesMatcherFactory];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/MatcherContext.html[org.netbeans.spi.editor.bracesmatching.MatcherContext];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/support/BracesMatcherSupport.html[org.netbeans.spi.editor.bracesmatching.support.BracesMatcherSupport];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcher.html[org.netbeans.spi.editor.bracesmatching.BracesMatcher];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.html[org.netbeans.spi.editor.bracesmatching.BracesMatcherFactory];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/MatcherContext.html[org.netbeans.spi.editor.bracesmatching.MatcherContext];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/support/BracesMatcherSupport.html[org.netbeans.spi.editor.bracesmatching.support.BracesMatcherSupport];
 
 @MimeRegistration(mimeType="text/x-sj",service=BracesMatcherFactory.class)
-public class SJBracesMatcherFactory implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.html[BracesMatcherFactory] {
+public class SJBracesMatcherFactory implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.html[BracesMatcherFactory] {
 
     @Override
     public BracesMatcher createMatcher(MatcherContext context) {
@@ -866,14 +866,14 @@ public class SJBracesMatcherFactory implements link:http://bits.netbeans.org/dev
 }
 ----
 
-The  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/support/BracesMatcherSupport.html[BracesMatcherSupport]``  package provides a number of useful implementations of  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcher.html[BracesMatcher]`` . One of these is used in the code above.
+The  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/support/BracesMatcherSupport.html[BracesMatcherSupport]``  package provides a number of useful implementations of  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-bracesmatching/org/netbeans/spi/editor/bracesmatching/BracesMatcher.html[BracesMatcher]`` . One of these is used in the code above.
 
 When you install the module into the application, open an SJ file, and select a brace, you should see that the brace is highlighted, together with its matching brace. Press Ctrl-[ to toggle between matching braces.
 
 
 == Implementing a New Feature: Code Folding
 
-The " link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/overview-summary.html[Editor Code Folding]" module provides the functionality you need to implement for creating your own code folds.
+The " link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/overview-summary.html[Editor Code Folding]" module provides the functionality you need to implement for creating your own code folds.
 
 In this tutorial, we will create a code fold for the "FORMAL_COMMENT" token provided by our lexer:
 
@@ -887,11 +887,11 @@ image::images/javacc_72_add-fold-2.png[]
 
 
 [start=1]
-1. Add a dependency on the " link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/overview-summary.html[Editor Code Folding]" module.
+1. Add a dependency on the " link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/overview-summary.html[Editor Code Folding]" module.
 
 [start=2]
 1. 
-Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManager.html[FoldManager]`` :
+Create a new  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManager.html[FoldManager]`` :
 
 
 [source,java,subs="verbatim,macros"]
@@ -908,13 +908,13 @@ import org.netbeans.api.editor.fold.FoldType;
 import org.netbeans.api.lexer.Token;
 import org.netbeans.api.lexer.TokenHierarchy;
 import org.netbeans.api.lexer.TokenSequence;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldHierarchyTransaction.html[org.netbeans.spi.editor.fold.FoldHierarchyTransaction];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldHierarchyTransaction.html[org.netbeans.spi.editor.fold.FoldHierarchyTransaction];
 import org.netbeans.spi.editor.fold.FoldManager;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldOperation.html[org.netbeans.spi.editor.fold.FoldOperation];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldOperation.html[org.netbeans.spi.editor.fold.FoldOperation];
 import org.openide.util.Exceptions;
 import org.simplejava.lexer.SJTokenId;
 
-public class SJFoldManager implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManager.html[FoldManager] {
+public class SJFoldManager implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManager.html[FoldManager] {
 
     private FoldOperation operation;
     public static final FoldType COMMENT_FOLD_TYPE = new FoldType("/*...*/");
@@ -991,7 +991,7 @@ public class SJFoldManager implements link:http://bits.netbeans.org/dev/javadoc/
 
 
 [start=3]
-1. Create a new  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManagerFactory.html[FoldManagerFactory]`` :
+1. Create a new  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManagerFactory.html[FoldManagerFactory]`` :
 
 
 [source,java,subs="macros"]
@@ -1000,11 +1000,11 @@ public class SJFoldManager implements link:http://bits.netbeans.org/dev/javadoc/
 package org.simplejava.parser;
 
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManager.html[import org.netbeans.spi.editor.fold.FoldManager];
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManagerFactory.html[import org.netbeans.spi.editor.fold.FoldManagerFactory];
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManager.html[import org.netbeans.spi.editor.fold.FoldManager];
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManagerFactory.html[import org.netbeans.spi.editor.fold.FoldManagerFactory];
 
 @MimeRegistration(mimeType="text/x-sj",service=FoldManagerFactory.class)
-public class SJFoldManagerFactory implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManagerFactory.html[FoldManagerFactory] {
+public class SJFoldManagerFactory implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-fold/org/netbeans/spi/editor/fold/FoldManagerFactory.html[FoldManagerFactory] {
 
     @Override
     public FoldManager createFoldManager() {
@@ -1016,7 +1016,7 @@ public class SJFoldManagerFactory implements link:http://bits.netbeans.org/dev/j
 
 When you install the module into the application, open an SJ file, and type a multiline comment at the top of the file, as shown at the start of this section, a code fold will automatically appear around the comment.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
@@ -1027,4 +1027,4 @@ For more information about creating and developing NetBeans modules, see the fol
 
 *  link:https://netbeans.apache.org/platform/index.html[NetBeans Platform Homepage]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API List (Current Development Version)]
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-javafx.adoc b/netbeans.apache.org/src/content/tutorials/nbm-javafx.adoc
index e6f0737c0..effe30684 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-javafx.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-javafx.adoc
@@ -508,6 +508,6 @@ image::images/javafx_72_result-5.png[]
 The tutorial is complete. You have created a modular application on the NetBeans Platform, while making use of JavaFX chart technology.
 
 
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-mark-occurrences.adoc b/netbeans.apache.org/src/content/tutorials/nbm-mark-occurrences.adoc
index cc4e2251a..1ea738da5 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-mark-occurrences.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-mark-occurrences.adoc
@@ -46,10 +46,10 @@ For troubleshooting purposes, you are welcome to download the  link:http://web.a
 
 == Introduction to Highlight Layers
 
-In this tutorial, you implement several classes provided by the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/package-summary.html[NetBeans Highlighting SPI]. The two principle classes in this context are as follows:
+In this tutorial, you implement several classes provided by the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/package-summary.html[NetBeans Highlighting SPI]. The two principle classes in this context are as follows:
 
-* * link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayer.html[Highlight Layer]*. Defines a set of highlights used for rendering a document.
-* * link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html[Highlight Layer Factory]*. Defines a MIME-specific factory for creating highlight layers.
+* * link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayer.html[Highlight Layer]*. Defines a set of highlights used for rendering a document.
+* * link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html[Highlight Layer Factory]*. Defines a MIME-specific factory for creating highlight layers.
 
 The above two classes need to be registered in the module's  ``layer.xml``  file, within the editor folder of the relevant MIME-type.
 
@@ -78,23 +78,23 @@ Next, we will implement the Highlighting SPI. The SPI's classes are as follows:
 |===
 |Class |Description 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html[HighlightsLayerFactory] |Defines the factory for creating highlight layers. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html[HighlightsLayerFactory] |Defines the factory for creating highlight layers. 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.Context.html[HighlightsLayerFactory.Context] |Defines the context passed to the factory when the factory is asked to create highlight layers. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.Context.html[HighlightsLayerFactory.Context] |Defines the context passed to the factory when the factory is asked to create highlight layers. 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsContainer.html[HighlightsContainer] |Defines the container of highlighted areas and related attributes. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsContainer.html[HighlightsContainer] |Defines the container of highlighted areas and related attributes. 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayer.html[HighlightsLayer] |Defines the highlight layer, consisting of attributes. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayer.html[HighlightsLayer] |Defines the highlight layer, consisting of attributes. 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/ZOrder.html[ZOrder] |Defines position of highlight layer in relation to other highlight layers. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/ZOrder.html[ZOrder] |Defines position of highlight layer in relation to other highlight layers. 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/support/OffsetsBag.html[OffsetsBag] |Defines a set of highlighted areas specified by their offsets in the document. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/support/OffsetsBag.html[OffsetsBag] |Defines a set of highlighted areas specified by their offsets in the document. 
 |===
 
 
 === Specifying the Module's Dependencies
 
-You will need to subclass several classes that belong to  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. Each has to be declared as a Module dependency. Use the Project Properties dialog box for this purpose.
+You will need to subclass several classes that belong to  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. Each has to be declared as a Module dependency. Use the Project Properties dialog box for this purpose.
 
 
 [start=1]
@@ -125,7 +125,7 @@ image::images/mark-occs_72_project-1.png[]
 
 === Creating the Highlight Layer Factory
 
-Highlight layer factories are defined by the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/package-summary.html[Highlighting SPI].
+Highlight layer factories are defined by the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/package-summary.html[Highlighting SPI].
 
 To use the Highlighting SPI to create the palette in this tutorial, take the following steps:
 
@@ -142,15 +142,15 @@ To use the Highlighting SPI to create the palette in this tutorial, take the fol
 import javax.swing.text.Document;
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
 import org.netbeans.api.editor.mimelookup.MimeRegistrations;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayer.html[org.netbeans.spi.editor.highlighting.HighlightsLayer];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html[org.netbeans.spi.editor.highlighting.HighlightsLayerFactory];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/ZOrder.html[org.netbeans.spi.editor.highlighting.ZOrder];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayer.html[org.netbeans.spi.editor.highlighting.HighlightsLayer];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html[org.netbeans.spi.editor.highlighting.HighlightsLayerFactory];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/ZOrder.html[org.netbeans.spi.editor.highlighting.ZOrder];
 
 @MimeRegistrations({
     @MimeRegistration(mimeType = "text/html", service = HighlightsLayerFactory.class),
     @MimeRegistration(mimeType = "text/xml", service = HighlightsLayerFactory.class)
 })
-public class MarkHTMLOccurrencesHighlightsLayerFactory implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html[HighlightsLayerFactory] {
+public class MarkHTMLOccurrencesHighlightsLayerFactory implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html[HighlightsLayerFactory] {
 
     public static MarkHTMLOccurrencesHighlighter getMarkOccurrencesHighlighter(Document doc) {
         MarkHTMLOccurrencesHighlighter highlighter =
@@ -163,13 +163,13 @@ public class MarkHTMLOccurrencesHighlightsLayerFactory implements link:http://bi
     }
 
     @Override
-    public HighlightsLayer[] link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html#createLayers(org.netbeans.spi.editor.highlighting.HighlightsLayerFactory.Context)[createLayers]( link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.Context.html[Context] context) {
+    public HighlightsLayer[] link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.html#createLayers(org.netbeans.spi.editor.highlighting.HighlightsLayerFactory.Context)[createLayers]( link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayerFactory.Context.html[Context] context) {
         return new HighlightsLayer[]{
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayer.html#create(java.lang.String,%20org.netbeans.spi.editor.highlighting.ZOrder,%20boolean,%20org.netbeans.spi.editor.highlighting.HighlightsContainer)[HighlightsLayer.create](
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsLayer.html#create(java.lang.String,%20org.netbeans.spi.editor.highlighting.ZOrder,%20boolean,%20org.netbeans.spi.editor.highlighting.HighlightsContainer)[HighlightsLayer.create](
                     MarkHTMLOccurrencesHighlighter.class.getName(),
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/ZOrder.html[ZOrder.CARET_RACK.forPosition(2000)],
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/ZOrder.html[ZOrder.CARET_RACK.forPosition(2000)],
                     true,
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsContainer.html[getMarkOccurrencesHighlighter(context.getDocument()).getHighlightsBag()])
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/HighlightsContainer.html[getMarkOccurrencesHighlighter(context.getDocument()).getHighlightsBag()])
                 };
     }
 
@@ -198,12 +198,12 @@ import javax.swing.text.AttributeSet;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.StyleConstants;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-settings/org/netbeans/api/editor/settings/AttributesUtilities.html[org.netbeans.api.editor.settings.AttributesUtilities];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor/org/netbeans/modules/editor/NbEditorUtilities.html[org.netbeans.modules.editor.NbEditorUtilities];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/support/OffsetsBag.html[org.netbeans.spi.editor.highlighting.support.OffsetsBag];
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/cookies/EditorCookie.html[org.openide.cookies.EditorCookie];
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[org.openide.loaders.DataObject];
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/RequestProcessor.html[org.openide.util.RequestProcessor];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-settings/org/netbeans/api/editor/settings/AttributesUtilities.html[org.netbeans.api.editor.settings.AttributesUtilities];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor/org/netbeans/modules/editor/NbEditorUtilities.html[org.netbeans.modules.editor.NbEditorUtilities];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/spi/editor/highlighting/support/OffsetsBag.html[org.netbeans.spi.editor.highlighting.support.OffsetsBag];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/cookies/EditorCookie.html[org.openide.cookies.EditorCookie];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[org.openide.loaders.DataObject];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/RequestProcessor.html[org.openide.util.RequestProcessor];
 
 public class MarkHTMLOccurrencesHighlighter implements CaretListener {
 
@@ -285,12 +285,12 @@ image::images/mark-occs_72_result-3.png[]
 
 [start=3]
 1. Navigate from one matching word to the next via Ctrl-F3.
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
-*  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
+*  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-maven-commandline.adoc b/netbeans.apache.org/src/content/tutorials/nbm-maven-commandline.adoc
index 08e85c50f..60bef2ce3 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-maven-commandline.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-maven-commandline.adoc
@@ -567,9 +567,9 @@ You have now successfully added a new module to the application and launched the
 image::images/maven-commandline_72_p5.png[title="Screenshot of Message Dialog"] 
 image::images/maven-commandline_72_p6.png[title="Screenshot of Message Dialog"]
 
-This tutorial demonstrated how you can use the Maven command line to create NetBeans Platform applications. For more examples on how to build NetBeans Platform applications and modules, see the tutorials listed in the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail].
+This tutorial demonstrated how you can use the Maven command line to create NetBeans Platform applications. For more examples on how to build NetBeans Platform applications and modules, see the tutorials listed in the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
  
 
@@ -578,9 +578,9 @@ link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedb
 
 This document described how to use the Maven build framework to create a new NetBeans Platform application without using NetBeans IDE. For more information about creating and developing applications, see the following resources.
 
-*  link:https://netbeans.apache.org/tutorials/nbm-maven-quickstart.html[NetBeans Platform Quick Start Using Maven]
-*  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail]
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
+*  xref:nbm-maven-quickstart.adoc[NetBeans Platform Quick Start Using Maven]
+*  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
 
 If you have any questions about the NetBeans Platform, feel free to write to the mailing list, dev@platform.netbeans.org, or view the  link:https://mail-archives.apache.org/mod_mbox/netbeans-dev/[NetBeans Platform mailing list archive].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-maven-crud.adoc b/netbeans.apache.org/src/content/tutorials/nbm-maven-crud.adoc
index 91222c908..7aa7f0765 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-maven-crud.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-maven-crud.adoc
@@ -32,7 +32,7 @@
 
 This tutorial demonstrates how to use the Maven build framework to create a simple NetBeans Platform application that can read from and write to a database. In this document you will use Maven archetypes to create the NetBeans Platform application and module, and the Swing UI toolkit and "Matisse" GUI Builder to create window components.
 
-This document is based on the Ant-based  link:nbm-crud.html[NetBeans Platform CRUD Application Tutorial] and can be used to understand some of the differences between using Ant and Maven to develop NetBeans Platform applications. After you understand how Maven is different from Ant, you can easily proceed through other tutorials on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail].
+This document is based on the Ant-based  xref:nbm-crud.adoc[NetBeans Platform CRUD Application Tutorial] and can be used to understand some of the differences between using Ant and Maven to develop NetBeans Platform applications. After you understand how Maven is different from Ant, you can easily proceed through other tutorials on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
 
 
@@ -44,10 +44,10 @@ NOTE:  You do not need to download Maven because it is bundled with the IDE. Opt
 
 NOTE:  This is [.underline]#not# a beginners tutorial. Before starting this tutorial, it is important that you familiarize yourself with the following introductory Maven documentation:
 
-*  link:http://wiki.netbeans.org/MavenBestPractices[Best Practices for Maven in NetBeans IDE]
+*  xref:../wiki/MavenBestPractices.adoc[Best Practices for Maven in NetBeans IDE]
 *  link:http://www.sonatype.com/books/maven-book/reference/introduction.html[Chapter 1. Introducing Apache Maven] (from  link:http://www.sonatype.com/books/maven-book/reference/public-book.html[Maven: The Definitive Guide])
-*  link:https://netbeans.apache.org/tutorials/nbm-maven-commandline.html[NetBeans Platform Command Line Tutorial]
-*  link:https://netbeans.apache.org/tutorials/nbm-maven-quickstart.html[NetBeans Platform Quick Start Using Maven]
+*  xref:nbm-maven-commandline.adoc[NetBeans Platform Command Line Tutorial]
+*  xref:nbm-maven-quickstart.adoc[NetBeans Platform Quick Start Using Maven]
 
 Watch this YouTube movie before beginning to work on the tutorial because it shows the steps you will take below:
 
@@ -426,11 +426,11 @@ image::images/maven-crud_72_new-editor-4.png[title="screenshot"]
 
 
 [start=7]
-1. Now that you have completed the steps above, you can refer to the Ant-based  link:nbm-crud.html[NetBeans Platform CRUD Application Tutorial], since all the Java code in that tutorial is applicable to the application you are creating here.
+1. Now that you have completed the steps above, you can refer to the Ant-based  xref:nbm-crud.adoc[NetBeans Platform CRUD Application Tutorial], since all the Java code in that tutorial is applicable to the application you are creating here.
 
-You have a basic understanding of how developing with Maven is different from Ant. You can easily proceed through other tutorials on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail] and apply them to your Maven scenarios.
+You have a basic understanding of how developing with Maven is different from Ant. You can easily proceed through other tutorials on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail] and apply them to your Maven scenarios.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[ Send Us Your Feedback]
 
  
 
@@ -439,8 +439,8 @@ link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedb
 
 This concludes the CRUD Tutorial. This document has described how to use the Maven build framework to create a new NetBeans Platform application with CRUD functionality. For more information about creating and developing applications, see the following resources.
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail]
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
+*  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
 
 If you have any questions about the NetBeans Platform, feel free to write to the mailing list, dev@platform.netbeans.org, or view the  link:https://mail-archives.apache.org/mod_mbox/netbeans-dev/[NetBeans Platform mailing list archive].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesingle.adoc b/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesingle.adoc
index 8458e08db..6dc737fe2 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesingle.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesingle.adoc
@@ -32,7 +32,7 @@
 
 This document demonstrates how to create a NetBeans module from a Maven archetype and build and install the module in NetBeans IDE or any other application on the NetBeans Platform. In this tutorial, you will create a module project that when installed enables you to recognize a new type of file in your projects. The module also creates a menu action that is available when the user right-click a file conforming to the new file type.
 
-This document is based on the Ant-based  link:https://netbeans.apache.org/tutorials/nbm-filetype.html[NetBeans File Type Tutorial] and can be used to learn some of the differences between using Ant and Maven to develop NetBeans modules. After you understand the differences, you can easily proceed through other tutorials on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail].
+This document is based on the Ant-based  xref:nbm-filetype.adoc[NetBeans File Type Tutorial] and can be used to learn some of the differences between using Ant and Maven to develop NetBeans modules. After you understand the differences, you can easily proceed through other tutorials on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
 
 
@@ -44,7 +44,7 @@ NOTE:  You do not need to download Maven because it is bundled with the IDE. Opt
 
 Before starting this tutorial you may want to familiarize yourself with the following introductory Maven documentation:
 
-*  link:http://wiki.netbeans.org/MavenBestPractices[Best Practices for Maven in NetBeans IDE]
+*  xref:../wiki/MavenBestPractices.adoc[Best Practices for Maven in NetBeans IDE]
 *  link:http://www.sonatype.com/books/maven-book/reference/introduction.html[Chapter 1. Introducing Apache Maven] (from  link:http://www.sonatype.com/books/maven-book/reference/public-book.html[Maven: The Definitive Guide])
 
 
@@ -186,7 +186,7 @@ When you click Finish, the IDE creates the files shown below:
 
 image::images/maven-single_71_pic7.png[title="Module wizard 1"]
 
-For more details on the files that the IDE created, see  link:https://netbeans.apache.org/wiki/devfaqdataobject[What is a DataObject] and the section on  link:nbm-filetype.html#recognizing[Recognizing Abc Files] in the Ant-Based  link:nbm-filetype.html[File Type Integration Tutorial].
+For more details on the files that the IDE created, see  xref:../wiki/DevFaqDataObject.adoc[What is a DataObject] and the section on  xref:nbm-filetype.adoc#recognizing[Recognizing Abc Files] in the Ant-Based  xref:nbm-filetype.adoc[File Type Integration Tutorial].
 
 
 == Building and Running the Project
@@ -372,9 +372,9 @@ When you right-click on a node of the  ``abc``  file type you will see that My A
 
 image::images/maven-single_71_pic95.png[title="Module wizard 1"]
 
-This tutorial demonstrated how to create and run a NetBeans module that you created from a Maven Archetype. You also learned a little about how to work with file types, but for more details you should look at the Ant-Based  link:https://netbeans.apache.org/tutorials/nbm-filetype.html[NetBeans File Type Tutorial]. For more examples on how to build NetBeans Platform applications and modules, see the tutorials listed in the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Pl [...]
+This tutorial demonstrated how to create and run a NetBeans module that you created from a Maven Archetype. You also learned a little about how to work with file types, but for more details you should look at the Ant-Based  xref:nbm-filetype.adoc[NetBeans File Type Tutorial]. For more examples on how to build NetBeans Platform applications and modules, see the tutorials listed in the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
  
 
@@ -383,8 +383,8 @@ link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedb
 
 For more information about creating and developing applications, see the following resources.
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail]
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
+*  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
 
 If you have any questions about the NetBeans Platform, feel free to write to the mailing list, dev@platform.netbeans.org, or view the  link:https://mail-archives.apache.org/mod_mbox/netbeans-dev/[NetBeans Platform mailing list archive].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesuite.adoc b/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesuite.adoc
index 78f7aa58f..0013b664d 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesuite.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesuite.adoc
@@ -32,7 +32,7 @@
 
 This document demonstrates how to create a NetBeans Platform Module Suite from Maven archetypes and build and install the suite in your installation of the IDE. In this tutorial you will create a Maven module suite project that contains three NetBeans modules as sub-projects. The Maven project that contains the sub-projects is a simple POM project that declares how the suite is compiled and the installation target.
 
-This document is based on the Ant-based  link:https://netbeans.apache.org/tutorials/nbm-selection-1.html[NetBeans Selection Management Tutorial] and illustrates some of the differences between using Ant and Maven to develop NetBeans Platform module suites. After you understand some of the differences, you can easily proceed through other tutorials on the the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail].
+This document is based on the Ant-based  xref:nbm-selection-1.adoc[NetBeans Selection Management Tutorial] and illustrates some of the differences between using Ant and Maven to develop NetBeans Platform module suites. After you understand some of the differences, you can easily proceed through other tutorials on the the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
 
 
@@ -44,10 +44,10 @@ NOTE:  You do not need to download Maven because it is bundled with the IDE. Opt
 
 NOTE:  This is [.underline]#not# a beginners tutorial. Before starting this tutorial, it is important that you familiarize yourself with the following introductory Maven documentation:
 
-*  link:http://wiki.netbeans.org/MavenBestPractices[Best Practices for Maven in NetBeans IDE]
+*  xref:../wiki/MavenBestPractices.adoc[Best Practices for Maven in NetBeans IDE]
 *  link:http://www.sonatype.com/books/maven-book/reference/introduction.html[Chapter 1. Introducing Apache Maven] (from  link:http://www.sonatype.com/books/maven-book/reference/public-book.html[Maven: The Definitive Guide])
-*  link:https://netbeans.apache.org/tutorials/nbm-maven-commandline.html[NetBeans Platform Command Line Tutorial]
-*  link:https://netbeans.apache.org/tutorials/tutorials/nbm-maven-quickstart.html[NetBeans Platform Quick Start Using Maven]
+*  xref:nbm-maven-commandline.adoc[NetBeans Platform Command Line Tutorial]
+*  xref:nbm-maven-quickstart.adoc[NetBeans Platform Quick Start Using Maven]
 
 
 == Creating the NetBeans Platform Application
@@ -207,7 +207,7 @@ For more information, see the  link:http://bits.netbeans.org/mavenutilities/nbm-
 
 == Listening to the Selection
 
-In this section you will create a new module named MyViewer and add a window component and two text fields. The component will implement  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/LookupListener.html[LookupListener]``  to listen for changes to the selection.
+In this section you will create a new module named MyViewer and add a window component and two text fields. The component will implement  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/LookupListener.html[LookupListener]``  to listen for changes to the selection.
 
 
 === Creating the Module
@@ -376,14 +376,14 @@ public void componentClosed() {
 }
 ----
 
-*Note.* By using  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/Utilities.html#actionsGlobalContext%28%29[Utilities.actionsGlobalContext()]`` , each time the window is opened, the window listens to the global context for Event objects. Whenever a new Event is published into the global context, the  ``resultChanged``  method is automatically triggered to handle the event.
+*Note.* By using  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/Utilities.html#actionsGlobalContext%28%29[Utilities.actionsGlobalContext()]`` , each time the window is opened, the window listens to the global context for Event objects. Whenever a new Event is published into the global context, the  ``resultChanged``  method is automatically triggered to handle the event.
 
 Make sure to import the correct  ``Event``  class, that is,  ``com.mycompany.mavenselectionsuite.Event`` .
 
 
 == Publishing a Selected Object
 
-In this section you will create a new module called MyEditor. The module will contain a  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent]``  that will publish instances of the  ``Event``  object into the Lookup of the TopComponent. When the user selects the TopComponent, the objects in its Lookup will be available globally. Once published globally, the viewer window created in the previous section, which is listening for [...]
+In this section you will create a new module called MyEditor. The module will contain a  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent]``  that will publish instances of the  ``Event``  object into the Lookup of the TopComponent. When the user selects the TopComponent, the objects in its Lookup will be available globally. Once published globally, the viewer window created in the previous section, which is listening fo [...]
 
 
 === Creating the Module
@@ -469,9 +469,9 @@ Now that the target installation of the IDE is specified, you can use the Run co
 
 image::images/maven-suite_72_pic13.png[title="screenshot"]
 
-This tutorial demonstrated how to create and run a NetBeans Platform application that you create from a Maven archetype. You saw how applications are structured and how you configure a modules POM to specify public packages. Most important of all, you learned how to publish objects into the selection and how to listen for them and update other parts of the application accordingly. For more examples on how to build NetBeans Platform applications, see the tutorials listed in the  link:http [...]
+This tutorial demonstrated how to create and run a NetBeans Platform application that you create from a Maven archetype. You saw how applications are structured and how you configure a modules POM to specify public packages. Most important of all, you learned how to publish objects into the selection and how to listen for them and update other parts of the application accordingly. For more examples on how to build NetBeans Platform applications, see the tutorials listed in the  xref:../k [...]
 
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[ Send Us Your Feedback]
 
  
 
@@ -480,9 +480,9 @@ link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedb
 
 For more information about creating and developing on the NetBeans Platform, see the following resources.
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail]
+*  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
 *  link:https://netbeans.apache.org/wiki/[NetBeans Developer FAQ]
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
 
 If you have any questions about the NetBeans Platform, feel free to write to the mailing list, dev@platform.netbeans.org, or view the  link:https://mail-archives.apache.org/mod_mbox/netbeans-dev/[NetBeans Platform mailing list archive].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-maven-quickstart.adoc b/netbeans.apache.org/src/content/tutorials/nbm-maven-quickstart.adoc
index c4250d94a..08f4a2821 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-maven-quickstart.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-maven-quickstart.adoc
@@ -34,11 +34,11 @@ Welcome to the  link:https://netbeans.apache.org/platform/[*NetBeans Platform*]!
 
 This document is a quick demonstration of how to create a simple NetBeans Platform application on top of the Maven build framework. After using Maven archetypes to create the NetBeans Platform application build structure, you use the Swing UI toolkit and "Matisse" GUI Builder to create a window component. The modular aspect of the NetBeans Platform enables you to expand the functionality of your application by adding new features during development or at runtime.
 
-This document is based on the Ant-based  link:nbm-quick-start.html[NetBeans Platform Quick Start for NetBeans Platform]. and illustrates some of the differences between using Ant and Maven to develop NetBeans Platform applications. After you understand how Maven is different from Ant, you can easily proceed through other tutorials on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail].
+This document is based on the Ant-based  xref:nbm-quick-start.adoc[NetBeans Platform Quick Start for NetBeans Platform]. and illustrates some of the differences between using Ant and Maven to develop NetBeans Platform applications. After you understand how Maven is different from Ant, you can easily proceed through other tutorials on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
-NOTE: This document uses NetBeans Platform 7.2 and NetBeans IDE 7.2. If you are using an earlier version, see  link:71/nbm-maven-quickstart.html[the previous version of this document].
+// NOTE: This document uses NetBeans Platform 7.2 and NetBeans IDE 7.2. If you are using an earlier version, see  link:71/nbm-maven-quickstart.html[the previous version of this document].
 
-If you are new to the NetBeans Platform, you might want to watch the screencast series  link:https://netbeans.apache.org/tutorials/nbm-10-top-apis.html[Top 10 NetBeans APIs].
+If you are new to the NetBeans Platform, you might want to watch the screencast series  xref:nbm-10-top-apis.adoc[Top 10 NetBeans APIs].
 
 
 
@@ -50,9 +50,9 @@ NOTE:  You do not need to download Maven because it is bundled with the IDE. Opt
 
 Before starting this tutorial you may want to familiarize yourself with the following documentation:
 
-*  link:http://wiki.netbeans.org/MavenBestPractices[Best Practices for Maven in NetBeans IDE]
+*  xref:../wiki/MavenBestPractices.adoc[Best Practices for Maven in NetBeans IDE]
 *  link:http://www.sonatype.com/books/maven-book/reference/introduction.html[Chapter 1. Introducing Apache Maven] (from  link:http://www.sonatype.com/books/maven-book/reference/public-book.html[Maven: The Definitive Guide])
-*  link:https://netbeans.apache.org/tutorials/nbm-maven-commandline.html[NetBeans Platform Command Line Tutorial]
+*  xref:nbm-maven-commandline.adoc[NetBeans Platform Command Line Tutorial]
 
 
 == Creating a Maven Based NetBeans Platform Application Project
@@ -558,7 +558,7 @@ public class UpperCaseFilter *implements TextFilter {
 }
 ----
 
-To use the  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ServiceProvider.html[@ServiceProvider]``  annotation, you need to set a dependency in your module on the NetBeans Lookup API. When the module is compiled, a NetBeans annotation processor will create a META-INF/services folder with a file named after the interface, containing the name of the implementing class. Via  ``Lookup.getDefault`` , in the next section in this tutorial, the file [...]
+To use the  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ServiceProvider.html[@ServiceProvider]``  annotation, you need to set a dependency in your module on the NetBeans Lookup API. When the module is compiled, a NetBeans annotation processor will create a META-INF/services folder with a file named after the interface, containing the name of the implementing class. Via  ``Lookup.getDefault`` , in the next section in this tutorial, the fil [...]
 
 
 === Loading Implementations of the TextFilter Interface
@@ -598,9 +598,9 @@ In this exercise, you publish the contents of the text area when the "Filter!" b
 
 
 [start=1]
-1. In the *MavenWordEngine* module, add an  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent]``  object to the  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[Lookup]``  of the TopComponent.
+1. In the *MavenWordEngine* module, add an  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent]``  object to the  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[Lookup]``  of the TopComponent.
 
-For details on  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[Lookup]`` ,  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent]`` , and related concepts, see  link:https://netbeans.apache.org/wiki/index.asciidoc#_lookup[NetBeans Lookup] in the  link:https://netbeans.apache.org/wiki/[NetBeans Developer Wiki].
+For details on  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[Lookup]`` ,  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent]`` , and related concepts, see  link:https://netbeans.apache.org/wiki/index.asciidoc#_lookup[NetBeans Lookup] in the  link:https://netbeans.apache.org/wiki/[NetBeans Developer Wiki].
 
 
 [source,java]
@@ -747,9 +747,9 @@ image::images/maven-quickstart_72_result-1.png[title="Screenshot of final NetBea
 
 When you type text in the Text window and click the Filter! button, the text is converted to upper case letters and the text is added to the content of the History window.
 
-This tutorial demonstrated the fundamental pieces of NetBeans Platform applications. Creating a NetBeans Platform application using Maven is not very different from creating an application using Ant. The major difference is understanding how the Maven POM controls how the application is assembled. For more examples on how to build NetBeans Platform applications and modules, see the tutorials listed in the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail].
+This tutorial demonstrated the fundamental pieces of NetBeans Platform applications. Creating a NetBeans Platform application using Maven is not very different from creating an application using Ant. The major difference is understanding how the Maven POM controls how the application is assembled. For more examples on how to build NetBeans Platform applications and modules, see the tutorials listed in the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[ Send Us Your Feedback]
 
  
 
@@ -758,8 +758,8 @@ link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedb
 
 For more information about creating and developing applications, see the following resources.
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail]
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
+*  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
 
 If you have any questions about the NetBeans Platform, feel free to write to the mailing list, dev@platform.netbeans.org, or view the  link:https://mail-archives.apache.org/mod_mbox/netbeans-dev/[NetBeans Platform mailing list archive].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-nbi.adoc b/netbeans.apache.org/src/content/tutorials/nbm-nbi.adoc
index 2ed69bf13..c0dcef1de 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-nbi.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-nbi.adoc
@@ -40,7 +40,7 @@ In this tutorial, you learn how to use the infrastructure of the NetBeans IDE in
 
 This tutorial is derived from the following sources:
 
-*  link:http://wiki.netbeans.org/NBI[http://wiki.netbeans.org/NBI]
+*  xref:../wiki/NBI.adoc[http://wiki.netbeans.org/NBI]
 *  link:http://installer.netbeans.org/docs/nbi-devguide.html[http://installer.netbeans.org/docs/nbi-devguide.html]
 
 
@@ -307,7 +307,7 @@ Now go into C:\\AJava\jre\lib and delete the "rt.jar".
 1. Go to C:\\AJava\jre and select the "bin" folder and the "lib" folder. Right-click and ZIP the selected folders. You'll end up with "jre.zip".
 
 [start=4]
-1. Put "unzipsfx.exe",  link:http://www.info-zip.org/pub/infozip/[which can you get here] or  link:https://netbeans.apache.org/wiki/devfaqaccesssourcesusingmercurial[by downloading the NetBeans sources] and then looking in the "nbi/infra/build/jvm/tools/unzipsfx" folder, into the same folder as where the "jre.zip" is found. Then, in the folder where "unzipsfx.exe" and "jre.zip" are found, run this:
+1. Put "unzipsfx.exe",  link:http://www.info-zip.org/pub/infozip/[which can you get here] or  xref:../wiki/DevFaqAccessSourcesUsingMercurial.adoc[by downloading the NetBeans sources] and then looking in the "nbi/infra/build/jvm/tools/unzipsfx" folder, into the same folder as where the "jre.zip" is found. Then, in the folder where "unzipsfx.exe" and "jre.zip" are found, run this:
 
 [source,java]
 ----
@@ -411,7 +411,7 @@ default_options="-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=32m -J-ea"
 jdkhome="jre"
 ----
 
-Read about  link:http://wiki.netbeans.org/FaqWhatIsUserdir[userdir &amp; cachedir] in the NetBeans Wiki.
+Read about  xref:../wiki/FaqWhatIsUserdir.adoc[userdir &amp; cachedir] in the NetBeans Wiki.
 
 
 [start=3]
@@ -437,6 +437,6 @@ Run the application via the executable in the "bin" folder and the JRE within th
 
 Now that you have learned how to create, customize, and bundle additional resources with the NetBeans installer, read the resources below for many additional details and other information that may be relevant to your business needs:
 
-*  link:http://wiki.netbeans.org/NBI[http://wiki.netbeans.org/NBI]
+*  xref:../wiki/NBI.adoc[http://wiki.netbeans.org/NBI]
 *  link:http://installer.netbeans.org/docs/nbi-devguide.html[http://installer.netbeans.org/docs/nbi-devguide.html]
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-nodesapi.adoc b/netbeans.apache.org/src/content/tutorials/nbm-nodesapi.adoc
index da2a4f0de..8f1786ebe 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-nodesapi.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-nodesapi.adoc
@@ -32,7 +32,7 @@
 
 This tutorial is intended to demonstrate aspects of the  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/package-summary.html[NetBeans Nodes API].
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-nodesapi.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-nodesapi.html[the previous version of this document].
 
 
 
@@ -78,9 +78,9 @@ Later, you will need to subclass several classes that belong to NetBeans APIs. E
 1. For each of the following APIs, click "Add..." in the Libraries panel, select the name from the Module list, and then click OK to confirm it:
 
 *  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/overview-summary.html[Actions API]`` 
-*  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-core-ide/overview-summary.html[Core IDE]``  (click "Show Non-API Modules" to see it)
+*  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-core-ide/overview-summary.html[Core IDE]``  (click "Show Non-API Modules" to see it)
 *  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/overview-summary.html[Dialogs API]`` 
-*  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/overview-summary.html[Lookup API]`` 
+*  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/overview-summary.html[Lookup API]`` 
 *  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API]`` 
 *  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util/overview-summary.html[Utilities API]`` 
 *  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/overview-summary.html[Window System API]`` 
@@ -107,7 +107,7 @@ The functionality of a NetBeans module is provided by its Java classes. In this
 
 This Java class specifies the definition of the main node. The definition includes a display name, as well as a definition of the children that will be under the main node. The definition of the children is provided by the  ``AllPropsChildFactory``  class, which keeps track of the list of child nodes. The class also takes care of things such as the main node's context menu.
 
-Via the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-core-ide/org/netbeans/api/core/ide/ServicesTabNodeRegistration.html[@ServicesTabNodeRegistration] annotation, the node is registered as a new node within the Services window.
+Via the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-core-ide/org/netbeans/api/core/ide/ServicesTabNodeRegistration.html[@ServicesTabNodeRegistration] annotation, the node is registered as a new node within the Services window.
 
 Do the following:
 
@@ -214,10 +214,10 @@ public class AllPropsNode extends AbstractNode {
 
 [start=2]
 1. *Understand the file.* Here is an explanation of the class:
-* * ``public class AllPropsNode extends  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html[AbstractNode]`` .*  ``AbstractNode``  is a generic Node subclass.  `` link:https://bits.netbeans.org/dev/javadocorg-openide-nodes/org/openide/nodes/Node.html[Node]``  is the abstract class,  ``AbstractNode``  is the common implementation that can be customized.
+* * ``public class AllPropsNode extends  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html[AbstractNode]`` .*  ``AbstractNode``  is a generic Node subclass.  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html[Node]``  is the abstract class,  ``AbstractNode``  is the common implementation that can be customized.
 * *Constructor:*
 * * ``public AllPropsNode`` .* In creating this node, it first calls super -- the  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#AbstractNode(org.openide.nodes.Children)[constructor for the super class (AbstractNode)]. This creates the infrastructure for AbstractNode, and shows that it is mandatory to supply a child object for its use. This object represents the list of children of the node, creating a separate class for clarity: AllProp [...]
-* * `` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#setIconBaseWithExtension%28java.lang.String%29[setIconBaseWithExtension]`` .* Designates the location for the associated icon.
+* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#setIconBaseWithExtension%28java.lang.String%29[setIconBaseWithExtension]`` .* Designates the location for the associated icon.
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html#setDisplayName(java.lang.String)[setDisplayName]`` .* Sets the name the user sees. This defaults to the internal name, but it is better to set it to something localized.
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html#setShortDescription(java.lang.String)[setShortDescription]`` .* Sets the associated tool tip. This is the override to specify what goes into the node context menu.
 * *Methods:*
@@ -226,11 +226,11 @@ public class AllPropsNode extends AbstractNode {
 *  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/NewAction.html[NewAction]``  enables the creation of a new subnode or key-value pair
 *  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/OpenLocalExplorerAction.html[OpenLocalExplorerAction]``  permits the user to make a new Explorer window showing only system properties
 
-Both  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/ToolsAction.html[ToolsAction]``  and  `` link:https://bits.netbeans.org/dev/javadocorg-openide-actions/org/openide/actions/PropertiesAction.html[PropertiesAction]``  are standard actions that most nodes should have.
+Both  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/ToolsAction.html[ToolsAction]``  and  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/PropertiesAction.html[PropertiesAction]``  are standard actions that most nodes should have.
 
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#getHelpCtx()[getHelpCtx]`` .* Supplies an IDE key for the context help. When building context help for this Module, this is how you would associate a specific node with a specific help string.
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#cloneNode()[cloneNode]`` .* Creates a new copy of the node that enables other parts of the IDE to display a separate copy of the System Properties list, other than the Services window. This is more efficient than the fallback implementation, which is to delegate to the original.
-* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#getNewTypes()[getNewTypes]`` .* Returns a list of  `` link:https://bits.netbeans.org/dev/javadocorg-openide-util/org/openide/util/datatransfer/NewType.html[NewType]``  objects. When there is a  ``NewAction``  in the context menu, the action displays menu items corresponding to each of the  ``NewTypes``  in the node. The action provides the actual GUI, such as showing a submenu. You spe [...]
+* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#getNewTypes()[getNewTypes]`` .* Returns a list of  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/datatransfer/NewType.html[NewType]``  objects. When there is a  ``NewAction``  in the context menu, the action displays menu items corresponding to each of the  ``NewTypes``  in the node. The action provides the actual GUI, such as showing a submenu. You sp [...]
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/datatransfer/NewType.html#create()[create]`` .* Creates the new object. In this example, there will be dialog boxes for the key-in values.
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.InputLine.html[NotifyDescriptor.InputLine]`` .* The description of a small dialog with a single text entry field pop up, a title for the dialog, and a message.
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html#notify(org.openide.NotifyDescriptor)[DialogDisplayer.getDefault().notify(desc)]`` .* Displays all this in a pop-up dialog.
@@ -245,7 +245,7 @@ Finally, another class,  ``PropertiesNotifier.changed``  (created next), is call
 
 === PropertiesNotifier.java
 
-This Java class manages routing events whenever there are changes, including adding, deleting, or renaming a property, or when a property value has changed. You could also see it as a helper routine, very similar to a JavaBeans component that has an event set attached to it. However, it is not strictly a JavaBeans component -- there are no instances of this class -- but its static methods are used like JavaBeans instance methods. Use is made of the  link:http://bits.netbeans.org/dev/java [...]
+This Java class manages routing events whenever there are changes, including adding, deleting, or renaming a property, or when a property value has changed. You could also see it as a helper routine, very similar to a JavaBeans component that has an event set attached to it. However, it is not strictly a JavaBeans component -- there are no instances of this class -- but its static methods are used like JavaBeans instance methods. Use is made of the  link:https://bits.netbeans.org/dev/jav [...]
 
 
 [start=1]
@@ -287,7 +287,7 @@ public class PropertiesNotifier {
 
 This Java class is responsible for keeping track of the list of nodes underneath the main node. When first asked for the list, the class retrieves all system properties and asks the node implementation to keep track of all the system property names. The abstract class doing this is called  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Children.html[Children]`` .
 
-In this example, a popular children implementation called  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.Detachable.html[ChildFactory]``  is used. By subclassing  ``ChildFactory`` , you need not explicitly keep track of the nodes -- this implementation does that. Instead, you keep track of a set of keys, which are lighter weight objects. Each key typically represents one node. You must tell the implementation how to create a node for each k [...]
+In this example, a popular children implementation called  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.Detachable.html[ChildFactory]``  is used. By subclassing  ``ChildFactory`` , you need not explicitly keep track of the nodes -- this implementation does that. Instead, you keep track of a set of keys, which are lighter weight objects. Each key typically represents one node. You must tell the implementation how to create a node for each  [...]
 
 In this example, the keys are names of system properties.
 
@@ -350,10 +350,10 @@ public class AllPropsChildFactory extends ChildFactory.Detachable<String> {
 
 [start=2]
 1. *Understand the file.* The important methods that should be defined when implementing  ``ChildFactory``  include:
-* * `` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.Detachable.html#addNotify%28%29[addNotify]`` .* Called the first time that a list of nodes is needed by the platform. An example of this is when the System Properties node is expanded. When  ``addNotify``  is called, it calls the helper method  ``refreshList``  to determine the keys, then it registers itself with the  ``PropertiesNotifier`` , requesting notification of any system property ch [...]
-* * `` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.Detachable.html#removeNotify%28%29[removeNotify]`` .* Called when the user collapses a System Properties node and starts working on something else. The platform will notice that the list of nodes is no longer needed, and it will free up the memory that is no longer being used. Note that momentarily collapsing the node will not trigger this call. When  ``removeNotify``  is called, it removes  [...]
-* * `` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html#createKeys%28java.util.List%29[createKeys]`` .* The  ``System.getProperties``  call retrieves all of the properties currently defined in the system. This call goes through all of the property names, keeping and sorting this list. When  ``true``  is returned, every item found in the  ``toPopulate``  list is automatically passed to  ``createNodeForKey`` , where the subnodes are created, o [...]
-* * `` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html#createNodeForKey%28T%29[createNodeForKey]`` .* Called by the implementation whenever it needs to construct a child node. It is passed the key for which it is making a node. It returns either none, one, or more nodes corresponding to what should be displayed for the key. In this example, a new instance of one property node is being created, and the system property name is passed into its [...]
+* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.Detachable.html#addNotify%28%29[addNotify]`` .* Called the first time that a list of nodes is needed by the platform. An example of this is when the System Properties node is expanded. When  ``addNotify``  is called, it calls the helper method  ``refreshList``  to determine the keys, then it registers itself with the  ``PropertiesNotifier`` , requesting notification of any system property c [...]
+* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.Detachable.html#removeNotify%28%29[removeNotify]`` .* Called when the user collapses a System Properties node and starts working on something else. The platform will notice that the list of nodes is no longer needed, and it will free up the memory that is no longer being used. Note that momentarily collapsing the node will not trigger this call. When  ``removeNotify``  is called, it removes [...]
+* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html#createKeys%28java.util.List%29[createKeys]`` .* The  ``System.getProperties``  call retrieves all of the properties currently defined in the system. This call goes through all of the property names, keeping and sorting this list. When  ``true``  is returned, every item found in the  ``toPopulate``  list is automatically passed to  ``createNodeForKey`` , where the subnodes are created,  [...]
+* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/ChildFactory.html#createNodeForKey%28T%29[createNodeForKey]`` .* Called by the implementation whenever it needs to construct a child node. It is passed the key for which it is making a node. It returns either none, one, or more nodes corresponding to what should be displayed for the key. In this example, a new instance of one property node is being created, and the system property name is passed into it [...]
 
 
 === OnePropNode.java
@@ -509,10 +509,10 @@ public class OnePropNode extends AbstractNode {
 
 [start=3]
 1. *Methods:*
-* * `` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#getPreferredAction%28%29[getPreferredAction]`` .* Sets what is run by default if the node is double clicked or similar user actions are performed. In this example, the default action is to pop up the property sheet.
+* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#getPreferredAction%28%29[getPreferredAction]`` .* Sets what is run by default if the node is double clicked or similar user actions are performed. In this example, the default action is to pop up the property sheet.
 * * ``createSheet`` .* Configures the look of the property sheet. This creates the list of tabs in the property sheet, along with the list of properties.  ``createSheet``  is not called until there is a need to display the list of properties.
 * * ``super. link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html#createSheet()[createSheet]`` .* Ensures there is a sheet to start with.
-* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Sheet.html#get(java.lang.String)[sheet.get (Sheet.PROPERTIES)]`` .* Checks to see if there is a tab named  ``Properties`` . If not,  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Sheet.html#createPropertiesSet()[Sheet.createPropertiesSet]``  makes one. Note that  `` link:https://bits.netbeans.org/dev/javadocorg-openide-nodes/org/openide/nodes/Sheet.html[Sheet]``  refe [...]
+* * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Sheet.html#get(java.lang.String)[sheet.get (Sheet.PROPERTIES)]`` .* Checks to see if there is a tab named  ``Properties`` . If not,  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Sheet.html#createPropertiesSet()[Sheet.createPropertiesSet]``  makes one. Note that  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Sheet.html[Sheet]``  ref [...]
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/PropertySupport.Name.html[PropertySupport.Name]`` .* Creates a  ``Name``  property that reflects the name of the node. The code is already synchronizing the node name with the system property name.
 * * ``ValueProp`` .* Is an inner class, a custom property that is created for this example.  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/PropertySupport.ReadWrite.html[PropertySupport.ReadWrite]``  is the base class for entering and viewing values. The super call provides a code name for the property as well as a display name and a tool tip for the user.
 * * `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.Property.html#getValue()[getValue]`` .* Looks up the system property.
@@ -600,6 +600,6 @@ image::images/sysprops_nbm-sysprops-70-2.png[]
 
 For more information about creating and developing NetBeans Module, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-nodesapi2.adoc b/netbeans.apache.org/src/content/tutorials/nbm-nodesapi2.adoc
index a3607ce2c..9f2b006cd 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-nodesapi2.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-nodesapi2.adoc
@@ -38,17 +38,17 @@ This tutorial shows how to make use of some of the features of the Nodes API in
 * Create properties for display in the property sheet
 * Provide Actions from Nodes
 
-This tutorial is intended as a follow-on to the  link:nbm-selection-1.html[NetBeans Selection Management Tutorial], which covers how `Lookup` is used in managing selection in the NetBeans windowing system, and its link:nbm-selection-2.html[follow-on tutorial] which demonstrates how to use the Nodes API in managing selection.
+This tutorial is intended as a follow-on to the  xref:nbm-selection-1.adoc[NetBeans Selection Management Tutorial], which covers how `Lookup` is used in managing selection in the NetBeans windowing system, and its xref:nbm-selection-2.adoc[follow-on tutorial] which demonstrates how to use the Nodes API in managing selection.
 
 This tutorial builds on the source code created in the first tutorial and enhanced in the second tutorial. If you have not yet done these tutorials, you should do them first; or at least ensure you are familiar with the content and approach used, and download the completed result of the second tutorial. 
 
 
-For troubleshooting purposes, you are welcome to download the  link:https://netbeans.apache.org/tutorials/nbm-nodesapi2.html[completed tutorial source code].
+For troubleshooting purposes, you are welcome to download the  xref:nbm-nodesapi2.adoc[completed tutorial source code].
 
 
 == Creating a Node subclass
 
-As mentioned in the  link:nbm-selection-2.html[previous tutorial], Nodes are _presentation objects_. That means that they are not a data model themselves - rather, they are a presentation layer for an _underlying data model_. In the Projects or Files windows in the NetBeans IDE, you can see ``Node``s used where the underlying data model is files on disk. In the Services window in the IDE, you can see them used where the underlying objects are configurable aspects of NetBeans runtime envi [...]
+As mentioned in the  xref:nbm-selection-2.adoc[previous tutorial], Nodes are _presentation objects_. That means that they are not a data model themselves - rather, they are a presentation layer for an _underlying data model_. In the Projects or Files windows in the NetBeans IDE, you can see ``Node``s used where the underlying data model is files on disk. In the Services window in the IDE, you can see them used where the underlying objects are configurable aspects of NetBeans runtime envi [...]
 
 As a presentation layer, ``Node``s add human-friendly attributes to the objects they model. The essential ones are:
 
@@ -221,7 +221,7 @@ public String getHtmlDisplayName() {
 
 image::images/nbm-nodesapi2/html-display-3.png[]
 
-NOTE:  You got rid of the blue color and switched to plain old black. Using the value of `UIManager.getColor("textText")` guarantees us text that will always be readable under any look and feel, which is valuable; also, color should be used sparingly in user interfaces, to avoid the  link:http://www.catb.org/jargon/html/A/angry-fruit-salad.html[angry fruit salad] effect. If you really want to use wilder colors in your UI, the best bet is to either find a UIManager key/value pair that con [...]
+NOTE:  You got rid of the blue color and switched to plain old black. Using the value of `UIManager.getColor("textText")` guarantees us text that will always be readable under any look and feel, which is valuable; also, color should be used sparingly in user interfaces, to avoid the  link:http://www.catb.org/jargon/html/A/angry-fruit-salad.html[angry fruit salad] effect. If you really want to use wilder colors in your UI, the best bet is to either find a UIManager key/value pair that con [...]
 
 
 == Providing Icons
@@ -665,10 +665,10 @@ This tutorial has introduced the following ideas:
 * Nodes have Actions; an Action which implements  ``Presenter.Popup``  can provide its own component to display in a popup menu; the same is true for main menu items using  ``Presenter.Menu`` , and toolbar items using  ``Presenter.Toolbar`` .
 * Nodes have properties, which can be displayed on the property sheet.
 
-link:https://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
-You've now begun to delve into how to get more out of the property sheet in NetBeans. In the  link:nbm-property-editors.html[next tutorial], you will cover how to write custom editors and provide a custom inline editor for use in the property sheet.
+You've now begun to delve into how to get more out of the property sheet in NetBeans. In the  xref:nbm-property-editors.adoc[next tutorial], you will cover how to write custom editors and provide a custom inline editor for use in the property sheet.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-nodesapi3.adoc b/netbeans.apache.org/src/content/tutorials/nbm-nodesapi3.adoc
index 6c3b28b4f..bbc681244 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-nodesapi3.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-nodesapi3.adoc
@@ -172,7 +172,7 @@ public ExplorerManager getExplorerManager() {
 [source,java,subs="macros"]
 ----
 link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#associateLookup(org.openide.util.Lookup)[associateLookup]
-( link:https://bits.netbeans.org/dev/javadocorg-openide-explorer/org/openide/explorer/ExplorerUtils.html[ExplorerUtils]. link:https://bits.netbeans.org/dev/javadocorg-openide-explorer/org/openide/explorer/ExplorerUtils.html#createLookup(org.openide.explorer.ExplorerManager,%20javax.swing.ActionMap)[createLookup(explorerManager, getActionMap())]);
+( link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerUtils.html[ExplorerUtils]. link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerUtils.html#createLookup(org.openide.explorer.ExplorerManager,%20javax.swing.ActionMap)[createLookup(explorerManager, getActionMap())]);
 explorerManager.setRootContext(new  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html[AbstractNode(new CategoryChildren())]);
 explorerManager.getRootContext().setDisplayName("Marilyn Monroe's Movies");
 ----
@@ -817,7 +817,7 @@ private static class MyDragAndDropHandler extends link:https://bits.netbeans.org
     public void  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/DragAndDropHandler.html#customize(org.openide.util.datatransfer.ExTransferable,%20org.openide.util.Lookup)[customize(ExTransferable exTransferable, Lookup lookup)] {
         final MovieNode item = (MovieNode)lookup.lookup( MovieNode.class );
         if( null != item ) {
-            exTransferable. link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/datatransfer/ExTransferable.html#put(org.openide.util.datatransfer.ExTransferable.Single)[put]( new  link:https://bits.netbeans.org/dev/javadocorg-openide-util/org/openide/util/datatransfer/ExTransferable.Single.html[ExTransferable.Single( MyCustomDataFlavor )] {
+            exTransferable. link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/datatransfer/ExTransferable.html#put(org.openide.util.datatransfer.ExTransferable.Single)[put]( new  link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/datatransfer/ExTransferable.Single.html[ExTransferable.Single( MyCustomDataFlavor )] {
                 protected Object  link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/datatransfer/ExTransferable.Single.html#getData()[getData()] throws IOException, UnsupportedFlavorException {
                     //return item.getSomeData();
                     return null;
@@ -830,6 +830,6 @@ private static class MyDragAndDropHandler extends link:https://bits.netbeans.org
 
 
 [start=8]
-1. Install the module again. When the TopComponent opens, the new Component Palette is shown. The categories you created in this tutorial are now categories in the Component Palette, while the movies are items within the categories. Next, you need to add drag and drop functionality to the items in the palette, as described in the  link:https://netbeans.apache.org/tutorials/nbm-palette-api4.html[NetBeans Drag and Drop Tutorial].
+1. Install the module again. When the TopComponent opens, the new Component Palette is shown. The categories you created in this tutorial are now categories in the Component Palette, while the movies are items within the categories. Next, you need to add drag and drop functionality to the items in the palette, as described in the  xref:nbm-palette-api4.adoc[NetBeans Drag and Drop Tutorial].
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-options.adoc b/netbeans.apache.org/src/content/tutorials/nbm-options.adoc
index a3c0d1c42..5cfc7d286 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-options.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-options.adoc
@@ -32,7 +32,7 @@
 
 This tutorial demonstrates how to extend the Options window.
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-options.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-options.html[the previous version of this document].
 
 
 
@@ -59,7 +59,7 @@ image::images/options_72_pic2.png[]
 
 In this case, your new subpanel will have its own tab, just like "Action Items" or "Diff" above, together with the settings within a panel in the body of the Options window extension. Whether you add your user settings within a new primary panel or within a tab in the Miscellaneous panel is completely up to you. Factors that might influence your decision are purely personal and a question of your own taste.
 
-At the end of this tutorial, the Options window will be extended with a new panel. In addition, you will be shown how to use the NetBeans  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences]``  class to store and use the settings that the user specifies in your Options window extension.
+At the end of this tutorial, the Options window will be extended with a new panel. In addition, you will be shown how to use the NetBeans  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences]``  class to store and use the settings that the user specifies in your Options window extension.
 
 
 == Creating the Module Project
@@ -144,11 +144,11 @@ import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.SubRegistration.html[@OptionsPanelController.SubRegistration](location = "Advanced",
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.SubRegistration.html[@OptionsPanelController.SubRegistration](location = "Advanced",
 displayName = "#AdvancedOption_DisplayName_CoolOptions",
 keywords = "#AdvancedOption_Keywords_CoolOptions",
 keywordsCategory = "Advanced/CoolOptions")
-public final class CoolOptionsOptionsPanelController extends link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.html[OptionsPanelController] {
+public final class CoolOptionsOptionsPanelController extends link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.html[OptionsPanelController] {
 
     private CoolOptionsPanel panel;
     private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
@@ -313,7 +313,7 @@ Look at the generated code.
 
 [source,java,subs="macros"]
 ----
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.TopLevelRegistration.html[@OptionsPanelController.TopLevelRegistration]
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.TopLevelRegistration.html[@OptionsPanelController.TopLevelRegistration]
 (
     categoryName = "#OptionsCategory_Name_Cool",
     iconBase = "org/netbeans/modules/cooloptions/icon32.png",
@@ -326,7 +326,7 @@ link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/n
 
 [source,java,subs="macros"]
 ----
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.ContainerRegistration.html[@ContainerRegistration]
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.ContainerRegistration.html[@ContainerRegistration]
 (
         id = "Cool", 
         categoryName = "#OptionsCategory_Name_Cool", 
@@ -364,7 +364,7 @@ In the next section, we add a text field and button to the panel and we learn ho
 
 == Storing and Loading Preferences
 
-In this section, we begin by designing the Options window extension. Using the GUI Builder, we add a  ``JPanel`` , a  ``JTextField`` , and a  ``JLabel`` . Then we install the module again and we see the result. Next, we begin coding. Using the NetBeans  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences]``  class, we store the value entered by the user. Storage of preferences is done in the user directory. Then we load the pref [...]
+In this section, we begin by designing the Options window extension. Using the GUI Builder, we add a  ``JPanel`` , a  ``JTextField`` , and a  ``JLabel`` . Then we install the module again and we see the result. Next, we begin coding. Using the NetBeans  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences]``  class, we store the value entered by the user. Storage of preferences is done in the user directory. Then we load the pre [...]
 
 
 === Designing the Panel
@@ -414,7 +414,7 @@ void store() {
  }
 ----
 
-The comments in the code present the three ways in which preferences can be stored. The first uses the JDK's Preferences API. The second uses the NetBeans IDE 6.x+ NetBeans  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences]``  class. The third uses the pre-6.0 System Option class. The third approach is deprecated, while the first does not store preferences in the application's user directory. The second approach, the NetBeans [...]
+The comments in the code present the three ways in which preferences can be stored. The first uses the JDK's Preferences API. The second uses the NetBeans IDE 6.x+ NetBeans  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences]``  class. The third uses the pre-6.0 System Option class. The third approach is deprecated, while the first does not store preferences in the application's user directory. The second approach, the NetBean [...]
 
 
 [start=2]
@@ -497,7 +497,7 @@ Whenever the application restarts, the current preference in the Options window
 Congratulations! You have successfully completed the Options Window Module Tutorial. You now know how to provide the functionality needed for users to set your module's options.
 
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -505,5 +505,5 @@ link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedba
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-paintapp.adoc b/netbeans.apache.org/src/content/tutorials/nbm-paintapp.adoc
index efe229659..bda6e27e8 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-paintapp.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-paintapp.adoc
@@ -32,7 +32,7 @@
 
 This tutorial takes you through the basics of using NetBeans IDE to develop rich-client applications on top of the NetBeans Platform. When you develop applications on top of the NetBeans Platform, you are developing on top of the NetBeans IDE's core. All the modules belonging to the IDE that are not relevant to your application are excluded, but those that are useful are kept. By reusing features readily available in IDE's core, you save yourself a lot of time and energy.
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-paintapp.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-paintapp.html[the previous version of this document].
 
 
 
@@ -52,7 +52,7 @@ image::images/paintapp_73_result-2.png[]
 
 This initial version is far from a full fledged paint application, but it demonstrates a very simple case of creating an application on top of the NetBeans Platform.
 
-NOTE:  The  link:nbm-google.html[NetBeans Plugin Quick Start] is a better tutorial for you if, instead of rich-client applications, you want to learn about NetBeans modules.
+NOTE:  The  xref:nbm-google.adoc[NetBeans Plugin Quick Start] is a better tutorial for you if, instead of rich-client applications, you want to learn about NetBeans modules.
 
 
 == Setting Up the Paint Application
@@ -140,7 +140,7 @@ image::images/paintapp_73_new-mod-4.png[]
 
 
 [start=5]
-1. You will need to subclass several classes that belong to the  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. All NetBeans APIs are implemented by modules, so this task really just means adding some modules to the list of modules that our module needs in order to run. In the Projects window, right-click the  ``Paint``  project node and choose Properties. The Project Properties dialog box opens. Under Categories, click Libraries. For each of the API's listed in the [...]
+1. You will need to subclass several classes that belong to the  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. All NetBeans APIs are implemented by modules, so this task really just means adding some modules to the list of modules that our module needs in order to run. In the Projects window, right-click the  ``Paint``  project node and choose Properties. The Project Properties dialog box opens. Under Categories, click Libraries. For each of the API's listed in th [...]
 
 |===
 |*Class* |*API* |*Purpose* 
@@ -184,7 +184,7 @@ The next step is to create the actual component on which the user can paint. Her
 
 === Embedding the Canvas in a Window
 
-Now you'll write the only class in this application that needs to touch the  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. It is a  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent]``  class. A  ``TopComponent``  class is just a  ``JPanel``  class which the NetBeans windowing system knows how to talk to—so that it can be put inside a tabbed container inside the main window.
+Now you'll write the only class in this application that needs to touch the  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. It is a  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent]``  class. A  ``TopComponent``  class is just a  ``JPanel``  class which the NetBeans windowing system knows how to talk to—so that it can be put inside a tabbed container inside the main window.
 
 
 [start=1]
@@ -224,28 +224,28 @@ Select Implement all abstract methods. The IDE generates two method skeletons—
 
 [source,java,subs="macros"]
 ----
-link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Description.html[@TopComponent.Description]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Description.html[@TopComponent.Description]
 (
         preferredID = "PaintTopComponent",
         iconBase = "/org/netbeans/paint/new_icon.png", 
         persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Registration.html[@TopComponent.Registration](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Registration.html[@TopComponent.Registration](
         mode = "editor", 
         openAtStartup = true)
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](
         category = "Window", 
         id = "org.netbeans.paint.PaintTopComponent")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]({
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]({
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](
         path = "Menu/Window", 
         position = 0),
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](
         path = "Toolbars/File", 
         position = 0)
 })
-link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.OpenActionRegistration.html[@TopComponent.OpenActionRegistration](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.OpenActionRegistration.html[@TopComponent.OpenActionRegistration](
         displayName = "#CTL_NewCanvasAction")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]({
+link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]({
         "CTL_NewCanvasAction=New Canvas",
         "LBL_Clear=Clear",
         "LBL_Foreground=Foreground",
@@ -255,7 +255,7 @@ link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBu
 public class PaintTopComponent extends TopComponent implements ActionListener, ChangeListener {
 ----
 
-NOTE:  While the module is being compiled, the annotations above will be processed. XML entries will be created in the module's  ``generated-layer.xml``  file, for each of the @TopComponent* and @Action* annotations. The  ``generated-layer.xml``  file will be contributed by the module to the System Filesystem of the application. Read more  link:https://netbeans.apache.org/wiki/devfaqsystemfilesystem[about the System Filesystem here]. For example, the  ``PaintTopComponent``  will be displ [...]
+NOTE:  While the module is being compiled, the annotations above will be processed. XML entries will be created in the module's  ``generated-layer.xml``  file, for each of the @TopComponent* and @Action* annotations. The  ``generated-layer.xml``  file will be contributed by the module to the System Filesystem of the application. Read more  xref:../wiki/DevFaqSystemFilesystem.adoc[about the System Filesystem here]. For example, the  ``PaintTopComponent``  will be displayed in the main are [...]
 
 
 [start=5]
@@ -448,6 +448,6 @@ image::images/paintapp_73_dist-1.png[]
 
 That's it! You have completed the Paint Application. You have learned how to set up a NetBeans Platform application and how to create a new window that displays something to the user.
 
-Next, you are recommended to work through the  link:https://netbeans.apache.org/tutorials/nbm-crud.html[NetBeans Platform CRUD Application Tutorial], which will teach you how to create a business-oriented NetBeans Platform application that interacts with a database.
+Next, you are recommended to work through the  xref:nbm-crud.adoc[NetBeans Platform CRUD Application Tutorial], which will teach you how to create a business-oriented NetBeans Platform application that interacts with a database.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-palette-api1.adoc b/netbeans.apache.org/src/content/tutorials/nbm-palette-api1.adoc
index 83ff9f558..2ca28dbcc 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-palette-api1.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-palette-api1.adoc
@@ -32,7 +32,7 @@
 
 This tutorial demonstrates how to create and add code snippets to the HTML/JSP Component Palette. Code snippets are small pieces of code that can be dragged from a component palette and dropped in the Source Editor. They serve to speed up coding. The HTML/JSP Component Palette has several code snippets already, but you might want to add some additional ones and share them with others.
 
-NOTE: If you are using an earlier version of Apache NetBeans, see link:74/nbm-palette-api1.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see link:74/nbm-palette-api1.html[the previous version of this document].
 
 
 
@@ -47,7 +47,7 @@ For troubleshooting purposes, you are welcome to download the link:http://web.ar
 
 == Introduction to Code Snippets
 
-To create a code snippet, you use the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/overview-summary.html[NetBeans Palette API]. A code snippet requires the following files:
+To create a code snippet, you use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/overview-summary.html[NetBeans Palette API]. A code snippet requires the following files:
 
 * A Java class that defines the piece of code to be dragged into the Source Editor.
 * A display name for the palette item.
@@ -97,7 +97,7 @@ You need to create an XML file that defines the code snippet, together with a re
 [source,java,subs="verbatim,macros"]
 ----
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteItemRegistration.html[@PaletteItemRegistration]
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteItemRegistration.html[@PaletteItemRegistration]
 (
          paletteid = "HTMLPalette", 
          category = "HTML", 
@@ -180,7 +180,7 @@ The IDE creates the  ``NewSnippets2``  project. The project contains all of your
 
 === Specifying the Module's Dependencies
 
-You will need to use several classes that belong to the link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. Each has to be declared as a module dependency. Use the Project Properties dialog box for this purpose, as described below.
+You will need to use several classes that belong to the link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. Each has to be declared as a module dependency. Use the Project Properties dialog box for this purpose, as described below.
 
 
 [start=1]
@@ -203,7 +203,7 @@ Click OK to exit the Project Properties dialog box.
 
 === Coding the Code Snippet
 
-In this section, you create  ``BR.java`` , which defines a code snippet for an HTML line break. By implementing the  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/ActiveEditorDrop.html[ActiveEditorDrop]``  class, you let the NetBeans APIs provide the infrastructure for a palette item for NetBeans editors. You also create  ``HTMLPaletteUtilities.java`` , which defines the insertion of the tag in the editor.
+In this section, you create  ``BR.java`` , which defines a code snippet for an HTML line break. By implementing the  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/ActiveEditorDrop.html[ActiveEditorDrop]``  class, you let the NetBeans APIs provide the infrastructure for a palette item for NetBeans editors. You also create  ``HTMLPaletteUtilities.java`` , which defines the insertion of the tag in the editor.
 
 
 [start=1]
@@ -220,9 +220,9 @@ package org.netbeans.modules.newsnippets2;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.JTextComponent;
 import org.netbeans.modules.newsnippets2.HTMLPaletteUtilities;
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/ActiveEditorDrop.html[org.openide.text.ActiveEditorDrop];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/ActiveEditorDrop.html[org.openide.text.ActiveEditorDrop];
 
-public class BR implements link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/ActiveEditorDrop.html[ActiveEditorDrop] {
+public class BR implements link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/ActiveEditorDrop.html[ActiveEditorDrop] {
     
     public BR() {
     }
@@ -233,7 +233,7 @@ public class BR implements link:http://bits.netbeans.org/dev/javadoc/org-openide
     }
     
     @Override
-    public boolean link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/ActiveEditorDrop.html#handleTransfer(javax.swing.text.JTextComponent)[handleTransfer(JTextComponent targetComponent]) {
+    public boolean link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/ActiveEditorDrop.html#handleTransfer(javax.swing.text.JTextComponent)[handleTransfer(JTextComponent targetComponent]) {
         String body = createBody();
         try {
             HTMLPaletteUtilities.insert(body, targetComponent);
@@ -452,7 +452,7 @@ NOTE: If you check out the  `` link:https://github.com/apache/netbeans/bdb88f1fa
 
 
 [start=1]
-1. Add a dependency on the NetBeans  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/overview-summary.html[Dialogs API]``  and the link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[ ``UI Utilities API`` ].
+1. Add a dependency on the NetBeans  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/overview-summary.html[Dialogs API]``  and the link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[ ``UI Utilities API`` ].
 
 [start=2]
 1. 
@@ -596,12 +596,12 @@ public class BR implements link:https://bits.netbeans.org/dev/javadoc/org-openid
 
 Run the module. Open an HTML file. In the Palette (Ctrl-Shift-8), notice the item named "New Line". Drag it into the HTML file and drop it. You should see your customizer. Enter something, finish the dialog, and the BR tag is added, together with a comment, at the point where you dropped the item.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-* link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
-* link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
+* xref:../kb/docs/platform.adoc[Other Related Tutorials]
+* link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-palette-api2.adoc b/netbeans.apache.org/src/content/tutorials/nbm-palette-api2.adoc
index 0476037e0..7ba651c74 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-palette-api2.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-palette-api2.adoc
@@ -32,15 +32,15 @@
 
 This tutorial demonstrates how to create a component palette that provides drag-and-drop code snippets for a new file type. Code snippets serve to speed up coding. The IDE provides a component palette for JSP files, HTML files, and Form files. In this tutorial, you learn how to create a component palette for Java source files.
 
-NOTE: If you are using an earlier version of Apache NetBeans, see link:74/nbm-palette-api2.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see link:74/nbm-palette-api2.html[the previous version of this document].
 
 For troubleshooting purposes, you are welcome to download the link:http://web.archive.org/web/20170409072842/http://java.net/projects/nb-api-samples/show/versions/8.0/tutorials/palette[completed tutorial source code].
 
 == Introduction to Component Palettes
 
-In this tutorial, you implement several classes provided by the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/overview-summary.html[NetBeans Palette API]. Then you register the new component palette in the  ``layer.xml``  file, for the  ``text/x-java``  MIME type. The palette that you create in this way will only be visible if a Java source file is open.
+In this tutorial, you implement several classes provided by the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/overview-summary.html[NetBeans Palette API]. Then you register the new component palette in the  ``layer.xml``  file, for the  ``text/x-java``  MIME type. The palette that you create in this way will only be visible if a Java source file is open.
 
-If you do not want to create a new component palette, but only want to add a code snippet to an existing component palette, see the link:nbm-palette-api1.html[NetBeans Code Snippet Module Tutorial].
+If you do not want to create a new component palette, but only want to add a code snippet to an existing component palette, see the xref:nbm-palette-api1.adoc[NetBeans Code Snippet Module Tutorial].
 
 
 == Setting up the Module Project
@@ -65,7 +65,7 @@ The IDE creates the  ``JavaSourceFilePalette``  project. The project contains al
 
 === Specifying the Module's Dependencies
 
-You will need to subclass several classes that belong to link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. Each has to be declared as a module dependency. Use the Project Properties dialog box for this purpose, as described below.
+You will need to subclass several classes that belong to link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans APIs]. Each has to be declared as a module dependency. Use the Project Properties dialog box for this purpose, as described below.
 
 
 [start=1]
@@ -93,18 +93,18 @@ For each of the following APIs, click "Add...", select the name from the Module
 
 === Integrating with the Component Palette
 
-Component Palettes are defined by the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/overview-summary.html[NetBeans Component Palette API]. The NetBeans Component Palette API consists of the following APIs:
+Component Palettes are defined by the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/overview-summary.html[NetBeans Component Palette API]. The NetBeans Component Palette API consists of the following APIs:
 
 |===
 |*File* |*Description* 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteFactory.html[PaletteFactory]``  |Creates a new instance of the Component Palette. To do so, it invokes the  ``createPalette``  method which creates a new palette from a node or layer folder. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteFactory.html[PaletteFactory]``  |Creates a new instance of the Component Palette. To do so, it invokes the  ``createPalette``  method which creates a new palette from a node or layer folder. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteController.html[PaletteController]``  |Provides access to data in the Component Palette. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteController.html[PaletteController]``  |Provides access to data in the Component Palette. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteActions.html[PaletteActions]``  |Provides the actions on the palette, categories, and items in the palette. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteActions.html[PaletteActions]``  |Provides the actions on the palette, categories, and items in the palette. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteFilter.html[PaletteFilter]``  |Controls whether a category or item is displayed in the palette. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteFilter.html[PaletteFilter]``  |Controls whether a category or item is displayed in the palette. 
 |===
 
 
@@ -124,11 +124,11 @@ package org.netbeans.modules.javasourcefilepalette;
 
 import java.io.IOException;
 import javax.swing.Action;
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeRegistration.html[org.netbeans.api.editor.mimelookup.MimeRegistration];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/DragAndDropHandler.html[org.netbeans.spi.palette.DragAndDropHandler];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteActions.html[org.netbeans.spi.palette.PaletteActions];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteController.html[org.netbeans.spi.palette.PaletteController];
-import link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteFactory.html[org.netbeans.spi.palette.PaletteFactory];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeRegistration.html[org.netbeans.api.editor.mimelookup.MimeRegistration];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/DragAndDropHandler.html[org.netbeans.spi.palette.DragAndDropHandler];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteActions.html[org.netbeans.spi.palette.PaletteActions];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteController.html[org.netbeans.spi.palette.PaletteController];
+import link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteFactory.html[org.netbeans.spi.palette.PaletteFactory];
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.datatransfer.ExTransferable;
@@ -137,15 +137,15 @@ public class JavaSourceFileLayerPaletteFactory {
 
     private static PaletteController palette = null;
 
-    link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeRegistration.html[@MimeRegistration](mimeType = "text/x-java", service = PaletteController.class)
-    public static link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteController.html[PaletteController] createPalette() {
+    link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeRegistration.html[@MimeRegistration](mimeType = "text/x-java", service = PaletteController.class)
+    public static link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteController.html[PaletteController] createPalette() {
         try {
             if (null == palette) {
-                return link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteFactory.html[PaletteFactory].createPalette(
+                return link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteFactory.html[PaletteFactory].createPalette(
                 *//Folder:*
                 "JavaPalette", 
                 *//Palette Actions:*
-                new link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteActions.html[PaletteActions]() {
+                new link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteActions.html[PaletteActions]() {
                     @Override public Action[] getImportActions() {return null;}
                     @Override public Action[] getCustomPaletteActions() {return null;}
                     @Override public Action[] getCustomCategoryActions(Lookup lkp) {return null;}
@@ -155,7 +155,7 @@ public class JavaSourceFileLayerPaletteFactory {
                 *//Palette Filter:*
                 null, 
                 *//Drag and Drop Handler:*
-                new link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/DragAndDropHandler.html[DragAndDropHandler](true) {
+                new link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/DragAndDropHandler.html[DragAndDropHandler](true) {
                     @Override public void customize(ExTransferable et, Lookup lkp) {}
                 });
             }
@@ -195,7 +195,7 @@ After you have created or added the above files to the NetBeans module, you decl
 </folder>
 ----
 
-The above can be generated automatically for you if you use the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteItemRegistration.html[@PaletteItemRegistration] annotation, as shown below, in a  ``package-info.java``  class:
+The above can be generated automatically for you if you use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/org/netbeans/spi/palette/PaletteItemRegistration.html[@PaletteItemRegistration] annotation, as shown below, in a  ``package-info.java``  class:
 
 
 [source,java,subs="macros"]
@@ -215,7 +215,7 @@ package org.netbeans.modules.javasourcefilepalette;
 import org.netbeans.spi.palette.PaletteItemRegistration;
 ----
 
-For all the details on the information referred to in this subsection, work through the link:nbm-palette-api1.html[NetBeans Code Snippet Module Tutorial].
+For all the details on the information referred to in this subsection, work through the xref:nbm-palette-api1.adoc[NetBeans Code Snippet Module Tutorial].
 
 
 == Building and Installing the Module
@@ -233,12 +233,12 @@ The IDE uses an Ant build script to build and install your module. The build scr
 
 image::images/palette_api_java-snippets-javafx.png[]
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-* link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
-* link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
+* xref:../kb/docs/platform.adoc[Other Related Tutorials]
+* link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-porting-basic.adoc b/netbeans.apache.org/src/content/tutorials/nbm-porting-basic.adoc
index a4fd4a2f9..aba8876ff 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-porting-basic.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-porting-basic.adoc
@@ -32,7 +32,7 @@
 
 This tutorial demonstrates how to port the Swing components and business logic of a simple Java application to the  link:https://netbeans.apache.org/platform/screenshots.html[NetBeans Platform]. Though the scenario below is simple, the basic concepts of "porting" an application to the NetBeans Platform will become clear. In the end, some general principles will be identified, based on the steps taken in the tutorial. Hopefully, they will be useful to you when porting your own Swing appli [...]
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-porting-basic.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-porting-basic.html[the previous version of this document].
 
 
 
@@ -127,7 +127,7 @@ This level of compliance with the NetBeans Platform is concerned with one or mor
 * Simplify the workflow to fit into the NetBeans Platform paradigms.
 * Listen to the global selection to discover what other modules are doing and update your state accordingly.
 
-In this tutorial, we will listen for the existence of  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/cookies/EditorCookie.html[EditorCookie]s`` . A cookie is a _capability_. With a Java interface, your object's capabilities are fixed at compile time, while NetBeans Platform cookies allow your object to behave dynamically because your object can expose capabilities, or not, based on its state. An  ``EditorCookie``  defines an editor, with interfaces for common  [...]
+In this tutorial, we will listen for the existence of  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/cookies/EditorCookie.html[EditorCookie]s`` . A cookie is a _capability_. With a Java interface, your object's capabilities are fixed at compile time, while NetBeans Platform cookies allow your object to behave dynamically because your object can expose capabilities, or not, based on its state. An  ``EditorCookie``  defines an editor, with interfaces for common [...]
 
 We will listen for the existence of such a cookie and then we will pass the content of the editor to the  ``TopComponent`` , in the form of words. By doing this, we are doing what the first item above outlines, i.e., inspecting existing functionality and reusing it within the context of our ported application. This is a modest level of integration. However, it pays off because it shows how you can reuse functionality provided by the NetBeans Platform or by any other application created o [...]
 
@@ -141,7 +141,7 @@ In this final stage of your porting activity, you are concerned with the followi
 * Eliminate duplicated functionality, by reusing the Navigator, Favorites window, Task List, Progress API, etc., instead of creating or maintaining your own.
 * Cooperate with other modules and adapt your application to the NetBeans Platform way of doing things.
 
-Towards the end of this tutorial, we will adopt this level of compliance by letting our  ``TopComponent``  expose a  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/api/actions/Savable.html[Savable]``  when changes are made to the "Guessed Word" text field. By doing this, we will enable the NetBeans Platform Save actions, which can be invoked from the File menu, toolbar, and keyboard shortcuts. This kind of integration brings the full benefits of the NetBeans Pl [...]
+Towards the end of this tutorial, we will adopt this level of compliance by letting our  ``TopComponent``  expose a  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/api/actions/Savable.html[Savable]``  when changes are made to the "Guessed Word" text field. By doing this, we will enable the NetBeans Platform Save actions, which can be invoked from the File menu, toolbar, and keyboard shortcuts. This kind of integration brings the full benefits of the NetBeans P [...]
 
 
 == Creating the NetBeans Platform Application
@@ -174,7 +174,7 @@ Look under some of the menus, click a few toolbar buttons, and explore the basis
 
 image::images/porting_73_agp3.png[]
 
-Next, we create a first custom module. We will name it `AnagramCore` because, in the end, it will contain the essential parts of the application. Using subsequent tutorials on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail], we will be able to add more features to the application, none of which will be manadatory parts, since the user will be able to plug them into the application. The core module, however, that is, `AnagramCore`, will be a r [...]
+Next, we create a first custom module. We will name it `AnagramCore` because, in the end, it will contain the essential parts of the application. Using subsequent tutorials on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail], we will be able to add more features to the application, none of which will be manadatory parts, since the user will be able to plug them into the application. The core module, however, that is, `AnagramCore`, will be a required module in every d [...]
 
 
 [start=3]
@@ -275,12 +275,12 @@ import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.NbBundle.Messages;
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](id="com.toy.anagrams.core.OpenAnagramGameAction",category="Window")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration](displayName = "#CTL_OpenAnagramGameAction")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]({
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](path = "Menu/Window", position = 10)
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](id="com.toy.anagrams.core.OpenAnagramGameAction",category="Window")
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration](displayName = "#CTL_OpenAnagramGameAction")
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]({
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](path = "Menu/Window", position = 10)
 })
-link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]("CTL_OpenAnagramGameAction=Open Anagram Game")
+link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]("CTL_OpenAnagramGameAction=Open Anagram Game")
 public class OpenAnagramGameAction implements ActionListener {
     
     @Override
@@ -403,7 +403,7 @@ As a final step in this section, you can simply delete the `com.toy.anagrams.ui`
 
 == Porting Level 2: Use Case Support
 
-In this section, we are concerned with listening to the global selection and making use of data we find there. The global selection is the registry for global singletons and instances of objects which have been registered in the system by modules. Here we query the lookup for  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/cookies/EditorCookie.html[EditorCookie]`` s and make use of the  ``EditorCookie`` 's document to fill the string array that defines the scra [...]
+In this section, we are concerned with listening to the global selection and making use of data we find there. The global selection is the registry for global singletons and instances of objects which have been registered in the system by modules. Here we query the lookup for  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/cookies/EditorCookie.html[EditorCookie]`` s and make use of the  ``EditorCookie`` 's document to fill the string array that defines the scr [...]
 
 A cookie is a capability. With a Java interface, your object's capabilities are fixed at compile time, while NetBeans Platform cookies allow your object to behave dynamically because your object can expose capabilities, or not, based on its state. An `EditorCookie` defines an editor, with interfaces for common activities such as opening a document, closing the editor, background loading of files, document saving, and modification notifications. We will listen for the existence of such a  [...]
 
@@ -450,12 +450,12 @@ import org.openide.util.NbBundle.Messages;
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](id="com.toy.anagrams.core.SetScrambledAnagramsAction",category="Window")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration](displayName = "#CTL_SetScrambledAnagramsAction")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]({
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](path = "Editors/text/x-manifest/Popup", position = 10)
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](id="com.toy.anagrams.core.SetScrambledAnagramsAction",category="Window")
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration](displayName = "#CTL_SetScrambledAnagramsAction")
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]({
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](path = "Editors/text/x-manifest/Popup", position = 10)
 })
-link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]("CTL_SetScrambledAnagramsAction=Set Scrambled Words")
+link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]("CTL_SetScrambledAnagramsAction=Set Scrambled Words")
 public final class SetScrambledAnagramsAction implements ActionListener {
 
     private final EditorCookie context;
@@ -623,7 +623,7 @@ Optionally, before continuing, you can now remove all the groups of modules (kno
 
 In this section, we are concerned with becoming a "good citizen" of the NetBeans Platform. We are going to expose the state of the TopComponent to the other modules, so that we can cooperate with them.
 
-As an example of this, we will modify the TopComponent to offer a  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/api/actions/Savable.html[Savable]`` , which gives the user a way to store the text typed in the text field. By offering the  ``Savable``  when changes are made in the text field, the Save button and the Save menu item under the File menu and the shortcuts for invoking the Save action will become enabled. That is because the NetBeans Platform provide [...]
+As an example of this, we will modify the TopComponent to offer a  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/api/actions/Savable.html[Savable]`` , which gives the user a way to store the text typed in the text field. By offering the  ``Savable``  when changes are made in the text field, the Save button and the Save menu item under the File menu and the shortcuts for invoking the Save action will become enabled. That is because the NetBeans Platform provid [...]
 
 When the user selects the enabled button or menu item, a dialog will be displayed and the button and menu item will become disabled, until the next time that a change is made to the text field.
 
@@ -632,7 +632,7 @@ When the user selects the enabled button or menu item, a dialog will be displaye
 1. Begin by setting a library dependency on the Dialogs API, which you learned to do in the previous sections.
 
 [start=2]
-1. Next, we define an extension of the ` link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable]`, somewhere within the `AnagramTopComponent` class:
+1. Next, we define an extension of the ` link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/spi/actions/AbstractSavable.html[AbstractSavable]`, somewhere within the `AnagramTopComponent` class:
 
 [source,java]
 ----
@@ -705,7 +705,7 @@ guessedWord.getDocument().addDocumentListener(new DocumentListener() {
 
 
 [start=4]
-1. Now we declare an ` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent]` at the top of the class. The `InstanceContent` class is a very powerful class in the NetBeans Platform, enabling you to update the Lookup on the fly, at runtime. We also declare the implementation of our `Savable`:
+1. Now we declare an ` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent]` at the top of the class. The `InstanceContent` class is a very powerful class in the NetBeans Platform, enabling you to update the Lookup on the fly, at runtime. We also declare the implementation of our `Savable`:
 
 
 [source,java]
@@ -784,7 +784,7 @@ Below is a list of the principle differences between the typical Swing approach
 * Assigning of mnemonics to labels and buttons
 * Showing dialogs
 
-For details on all of the above items, read this FAQ:  link:https://netbeans.apache.org/wiki/devfaqnbideosyncracies[Common calls that should be done slightly differently in NetBeans than standard Swing apps (loading images, localized strings, showing dialogs)].
+For details on all of the above items, read this FAQ:  xref:../wiki/DevFaqNbIdiosyncracies.adoc[Common calls that should be done slightly differently in NetBeans than standard Swing apps (loading images, localized strings, showing dialogs)].
 
 In addition, note that, since the NetBeans Platform now handles the lifecycle of your module, since it is now part of the whole application, you can no longer use  ``System.exit`` . Instead, you need to use  ``LifecycleManager`` . To run code on start up, which should only be done when absolutely necessary, you need to use the NetBeans  ``ModuleInstall``  class and, specifically, its  ``restored``  method. A useful reference in this context is  link:http://www.ociweb.com/jnb/jnbOct2005.h [...]
 
@@ -798,8 +798,8 @@ As shown above, you need to put the modules in a module suite. Then set a depend
 * *Learn from others.* Aside from joining the dev@platform.netbeans.org mailing list, also read the following two crucial articles:
 *  link:http://netbeans.dzone.com/10-tips-4-porting-2-netbeans[Top 10 Tips for Porting to the NetBeans Platform]
 *  link:http://java.dzone.com/news/how-to-split-into-modules[How to Split an Application into Modules?]
-* *Watch the Top 10 NetBeans APIs Screencast.* The  link:https://netbeans.apache.org/tutorials/nbm-10-top-apis.html[screencast series] gives a good overview of the NetBeans Platform, with many useful code snippets and coding patterns.
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+* *Watch the Top 10 NetBeans APIs Screencast.* The  xref:nbm-10-top-apis.adoc[screencast series] gives a good overview of the NetBeans Platform, with many useful code snippets and coding patterns.
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -807,5 +807,5 @@ link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedba
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-1.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-1.adoc
index 6caf95d0d..7ae21d81d 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-1.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-1.adoc
@@ -32,7 +32,7 @@
 
 The POV-Ray tutorial is an advanced NetBeans Platform tutorial showing how to build an application for rendering POV-Ray files. In the process of creating the application, you will build on top of your existing NetBeans Platform knowledge, extending that knowledge into new areas, such as modular intercommunication and API design. You will touch upon many NetBeans APIs and learn how their best features can be combined in the creation of a real application.
 
-NOTE:  For a quick visual impression of the application you'll be creating, see the screenshot in the  link:nbm-povray-10.html[Conclusion] of this tutorial.
+NOTE:  For a quick visual impression of the application you'll be creating, see the screenshot in the  xref:nbm-povray-10.adoc[Conclusion] of this tutorial.
 
 link:http://povray.org[POV-Ray]—the Persistence Of Vision Raytracer—is an open-source 3D rendering engine and one that only a programmer could love. Rather than having a graphical modeling tool, it is based around a _scene_ language which is "compiled" into an image.
 
@@ -40,15 +40,15 @@ link:http://povray.org[POV-Ray]—the Persistence Of Vision Raytracer—is an op
 
 
 * Part 1: Application Structure &amp; File Support
-* Part 2:  link:nbm-povray-2.html[Project Type Design]
-* Part 3:  link:nbm-povray-3.html[Implementing a Project Type]
-* Part 4:  link:nbm-povray-4.html[Providing Project Templates]
-* Part 5:  link:nbm-povray-5.html[Creating an API]
-* Part 6:  link:nbm-povray-6.html[Implementing the API]
-* Part 7:  link:nbm-povray-7.html[Support For Running POV-Ray]
-* Part 8:  link:nbm-povray-8.html[Implementing ViewService and its Actions]
-* Part 9:  link:nbm-povray-9.html[Build Support]
-* Part 10:  link:nbm-povray-10.html[Conclusion]
+* Part 2:  xref:nbm-povray-2.adoc[Project Type Design]
+* Part 3:  xref:nbm-povray-3.adoc[Implementing a Project Type]
+* Part 4:  xref:nbm-povray-4.adoc[Providing Project Templates]
+* Part 5:  xref:nbm-povray-5.adoc[Creating an API]
+* Part 6:  xref:nbm-povray-6.adoc[Implementing the API]
+* Part 7:  xref:nbm-povray-7.adoc[Support For Running POV-Ray]
+* Part 8:  xref:nbm-povray-8.adoc[Implementing ViewService and its Actions]
+* Part 9:  xref:nbm-povray-9.adoc[Build Support]
+* Part 10:  xref:nbm-povray-10.adoc[Conclusion]
 
 For troubleshooting purposes, you can download the code sources of this tutorial here:
 
@@ -58,10 +58,10 @@ link:http://web.archive.org/web/20170409072842/http://java.net/projects/nb-api-s
 
 NOTE:  If you haven't developed a NetBeans Platform application before, you are advised to work through several other tutorials before working on this one—doing so will familiarize you with the basic concepts presented here. Particularly recommended are:
 
-* * link:http://wiki.netbeans.org/NbmIdioms[Introduction to NetBeans Idioms and Infrastructure]*—covers a lot of the concepts you will encounter here
-* * link:https://netbeans.apache.org/tutorials/nbm-quick-start.html[NetBeans Platform Quick Start]*—the essential starting point for anyone interested in working with the NetBeans Platform
-* * link:https://netbeans.apache.org/tutorials/nbm-selection-1.html[Selection in NetBeans]*—not directly relevant to writing project types, which is the focus of this tutorial, but will familiarize you with using the Lookup API which pops up in a number of places here
-* * link:https://netbeans.apache.org/tutorials/nbm-filetype.html[File Type]*—the tutorial describing how new file types are supported in the NetBeans Platform
+* * xref:../wiki/NbmIdioms.adoc[Introduction to NetBeans Idioms and Infrastructure]*—covers a lot of the concepts you will encounter here
+* * xref:nbm-quick-start.adoc[NetBeans Platform Quick Start]*—the essential starting point for anyone interested in working with the NetBeans Platform
+* * xref:nbm-selection-1.adoc[Selection in NetBeans]*—not directly relevant to writing project types, which is the focus of this tutorial, but will familiarize you with using the Lookup API which pops up in a number of places here
+* * xref:nbm-filetype.adoc[File Type]*—the tutorial describing how new file types are supported in the NetBeans Platform
 *  link:https://netbeans.apache.org/wiki/[NetBeans Developer FAQ]—contains essential definitions and descriptions of API classes and concepts, and how to perform the typical tasks you will need to do when using the NetBeans Platform
 
 
@@ -137,7 +137,7 @@ image::images/povray_71_ch1_pic-3.png[]
 
 The first thing we will want to create is basic support that enables NetBeans to recognize .pov files and open them in the editor—which will give us a place to hang Actions, provide special icons, and other special support specific to .pov files.
 
-A ` link:https://netbeans.apache.org/wiki/devfaqdataloader[DataLoader]` is a factory which is registered against a particular MIME type or file extension. It creates ` link:https://netbeans.apache.org/wiki/devfaqdataobject[DataObject]`s—typically one per file. So, when you expand a folder in the Projects or Files tab in the IDE, what happens under the hood is that all of the files in the folder you expanded are found, and for each file, the system locates the `DataLoader` for its file ty [...]
+A ` xref:../wiki/DevFaqDataLoader.adoc[DataLoader]` is a factory which is registered against a particular MIME type or file extension. It creates ` xref:../wiki/DevFaqDataObject.adoc[DataObject]`s—typically one per file. So, when you expand a folder in the Projects or Files tab in the IDE, what happens under the hood is that all of the files in the folder you expanded are found, and for each file, the system locates the `DataLoader` for its file type and asks it to create a `DataObject` for it.
 
 `DataObject`s contain logic that enables them to actually parse or understand a files contents, or know what to do with that particular type of file. So there is a 1:1 mapping between files and `DataObjects` and a 1:1 mapping between _file types_ and `DataLoader`s.
 
@@ -200,5 +200,5 @@ At this point we have basic support for POV-Ray files—if you right-click the m
 
 == Next Steps
 
-The  link:nbm-povray-2.html[next section] will cover designing and planning our project type and file support and how they will interrelate.
+The  xref:nbm-povray-2.adoc[next section] will cover designing and planning our project type and file support and how they will interrelate.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-10.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-10.adoc
index 187a80cc6..d6fc3cefc 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-10.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-10.adoc
@@ -30,7 +30,7 @@
 :description: Writing POV-Ray Support for NetBeans X—Conclusion - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, Writing POV-Ray Support for NetBeans X—Conclusion
 
-This is a continuation of the tutorial for building POV-Ray support for NetBeans. If you have not read the  link:nbm-povray-1.html[first],  link:nbm-povray-2.html[second],  link:nbm-povray-3.html[third],  link:nbm-povray-4.html[fourth],  link:nbm-povray-5.html[fifth],  link:nbm-povray-6.html[sixth],  link:nbm-povray-7.html[seventh],  link:nbm-povray-8.html[eighth], and  link:nbm-povray-9.html[ninth] parts of this tutorial, you may want to start there.
+This is a continuation of the tutorial for building POV-Ray support for NetBeans. If you have not read the  xref:nbm-povray-1.adoc[first],  xref:nbm-povray-2.adoc[second],  xref:nbm-povray-3.adoc[third],  xref:nbm-povray-4.adoc[fourth],  xref:nbm-povray-5.adoc[fifth],  xref:nbm-povray-6.adoc[sixth],  xref:nbm-povray-7.adoc[seventh],  xref:nbm-povray-8.adoc[eighth], and  xref:nbm-povray-9.adoc[ninth] parts of this tutorial, you may want to start there.
 
 At this stage, you have completed the application, which should look like this:
 
@@ -42,7 +42,7 @@ image::images/povray_71_ch7_pic2.png[role="left", link="images/pic1.png"]
 
 Additional steps to take to improve and enhance the application:
 
-* Test your application. (See the  link:https://netbeans.apache.org/tutorials/nbm-test.html[Test Infrastructure Tutorial].)
+* Test your application. (See the  xref:nbm-test.adoc[Test Infrastructure Tutorial].)
 * Hide the menus and toolbar buttons that you don't need in your application.
 * Add a Plugin Manager so that users can install new features at runtime.
 * Localize the application.
@@ -55,28 +55,28 @@ Additional steps to take to improve and enhance the application:
 
 We now have our POV-Ray rendering application working exactly as we want. During the course of this tutorial, many NetBeans Platform topics have been covered. Here they are listed, per part:
 
-* Part 1:  link:nbm-povray-1.html[Application Structure &amp; File Support]—Here you learn how to set up a NetBeans Platform application, how to create modules, and how the NetBeans Platform distinguishes between different types of files.
-* Part 2:  link:nbm-povray-2.html[Project Type Design]—Before beginning to code, you spend some time examining the requirements of the application and how you will implement those requirements.
-* Part 3:  link:nbm-povray-3.html[Implementing a Project Type]—Here you learn how the NetBeans Platform is able to recognize a set of folders and files on disk as being POV-Ray projects. By the end of this section, you're able to open POV-Ray projects into your application.
-* Part 4:  link:nbm-povray-4.html[Providing Project Templates]—You install your POV-Ray Project module into NetBeans IDE, so that the IDE is able to recognize POV-Ray projects. You then create some POV-Ray projects and create project template wizards, registering them in the module so that they're available to your users via the New Project dialog.
-* Part 5:  link:nbm-povray-5.html[Creating an API]—Here you create a provider of main files, a rendering service, and a viewing service. You are shown how to encapsulate these interfaces in a separate module, how to load that module on demand, and how to share it with the other two modules in the application. A first usage of one of the APIs is described—the  ``Node``  of a POV-Ray file will be bold-faced if the main file provider indicates that the  ``Node``  represents the main file of [...]
-* Part 6:  link:nbm-povray-6.html[Implementing the API]—In this section, you learn how implement the APIs created in the previous part, you add  ``Actions``  to the  ``Node``  for setting the main file and for rendering POV-Ray files, and you add some plumbing code for locating the POV-Ray executable.
-* Part 7:  link:nbm-povray-7.html[Support For Running POV-Ray]—For the first time, you actually begin working directly with the POV-Ray executable. By the end of this section, you're able to actually render POV-Ray files and display the rendered images.
-* Part 8:  link:nbm-povray-8.html[Implementing ViewService and its Actions]—An  ``Action``  for opening images, and rendering them if they don't already exist, is added. You're also introduced to the topic of icon badging, which you use to distinguish between  ``Nodes``  representing files that have been rendered and those that represent files that haven't been rendered.
-* Part 9:  link:nbm-povray-9.html[Build Support]—You now move away from working with the  ``Node``  representing POV-Ray files. Instead, you work on the project node and add new project actions, for rendering the main file of the POV-Ray project, for setting the main file if it has not been set, and for closing the project.
+* Part 1:  xref:nbm-povray-1.adoc[Application Structure &amp; File Support]—Here you learn how to set up a NetBeans Platform application, how to create modules, and how the NetBeans Platform distinguishes between different types of files.
+* Part 2:  xref:nbm-povray-2.adoc[Project Type Design]—Before beginning to code, you spend some time examining the requirements of the application and how you will implement those requirements.
+* Part 3:  xref:nbm-povray-3.adoc[Implementing a Project Type]—Here you learn how the NetBeans Platform is able to recognize a set of folders and files on disk as being POV-Ray projects. By the end of this section, you're able to open POV-Ray projects into your application.
+* Part 4:  xref:nbm-povray-4.adoc[Providing Project Templates]—You install your POV-Ray Project module into NetBeans IDE, so that the IDE is able to recognize POV-Ray projects. You then create some POV-Ray projects and create project template wizards, registering them in the module so that they're available to your users via the New Project dialog.
+* Part 5:  xref:nbm-povray-5.adoc[Creating an API]—Here you create a provider of main files, a rendering service, and a viewing service. You are shown how to encapsulate these interfaces in a separate module, how to load that module on demand, and how to share it with the other two modules in the application. A first usage of one of the APIs is described—the  ``Node``  of a POV-Ray file will be bold-faced if the main file provider indicates that the  ``Node``  represents the main file of [...]
+* Part 6:  xref:nbm-povray-6.adoc[Implementing the API]—In this section, you learn how implement the APIs created in the previous part, you add  ``Actions``  to the  ``Node``  for setting the main file and for rendering POV-Ray files, and you add some plumbing code for locating the POV-Ray executable.
+* Part 7:  xref:nbm-povray-7.adoc[Support For Running POV-Ray]—For the first time, you actually begin working directly with the POV-Ray executable. By the end of this section, you're able to actually render POV-Ray files and display the rendered images.
+* Part 8:  xref:nbm-povray-8.adoc[Implementing ViewService and its Actions]—An  ``Action``  for opening images, and rendering them if they don't already exist, is added. You're also introduced to the topic of icon badging, which you use to distinguish between  ``Nodes``  representing files that have been rendered and those that represent files that haven't been rendered.
+* Part 9:  xref:nbm-povray-9.adoc[Build Support]—You now move away from working with the  ``Node``  representing POV-Ray files. Instead, you work on the project node and add new project actions, for rendering the main file of the POV-Ray project, for setting the main file if it has not been set, and for closing the project.
 
 
 == Next Steps
 
 Now that you have completed the POV-Ray tutorial, what should you do next?
 
-* With the concepts you've learned and applied in this tutorial, take another look at the * link:http://wiki.netbeans.org/NbmIdioms[Introduction to NetBeans Idioms and Infrastructure]*, which reinforces a lot of the concepts you have encountered in this tutorial.
+* With the concepts you've learned and applied in this tutorial, take another look at the * xref:../wiki/NbmIdioms.adoc[Introduction to NetBeans Idioms and Infrastructure]*, which reinforces a lot of the concepts you have encountered in this tutorial.
 * Explore the  link:https://netbeans.apache.org/wiki/[NetBeans Developer FAQ], focusing on the specific topics you're interested in.
 * Gain some more practical experiences by joining one of the many NetBeans Platform open source projects:  link:http://web.archive.org/web/20170410015153/https://java.net/projects/netbeans[http://java.net/projects/netbeans]
-* Stay in tune with the latest NetBeans API changes, by looking through this page now and again:  link:http://bits.netbeans.org/dev/javadoc/apichanges.html[http://bits.netbeans.org/dev/javadoc/apichanges.html]
+* Stay in tune with the latest NetBeans API changes, by looking through this page now and again:  link:https://bits.netbeans.org/dev/javadoc/apichanges.html[http://bits.netbeans.org/dev/javadoc/apichanges.html]
 * As you learn more about the NetBeans Platform, blog about your experiences. You can publish or republish your blog entries, articles, tips, or any other thoughts here on NetBeans Zone:  link:http://netbeans.dzone.com/[http://netbeans.dzone.com/]
 * When you have an application ready, ask for it to be added to the  link:https://netbeans.apache.org/platform/screenshots.html[NetBeans Platform Showcase], which is a great page to look through when beginning your project, since more than likely a similar project that you can learn from, possibly in the open source community, already exists.
-* Read and work through the  link:https://netbeans.apache.org/tutorials/nbm-porting-basic.html[NetBeans Platform Porting Tutorial] and apply its principles to your own existing applications.
+* Read and work through the  xref:nbm-porting-basic.adoc[NetBeans Platform Porting Tutorial] and apply its principles to your own existing applications.
 
 
 == Appendix: Setting Up POV-Ray
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-2.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-2.adoc
index 408161e8e..71c82d72c 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-2.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-2.adoc
@@ -32,7 +32,7 @@
 
 In this part of the tutorial, we will walk through how to create a basic project type. It will be a project type that supports building 3D graphics scenes using  link:http://povray.org[POV-Ray]'s scene language, and eventually, rendering them as images and displaying the result in NetBeans.
 
-It is assumed you have completed the steps in the  link:nbm-povray-1.html[previous tutorial] for creating basic POV-Ray support.
+It is assumed you have completed the steps in the  xref:nbm-povray-1.adoc[previous tutorial] for creating basic POV-Ray support.
 
 This tutorial will go through the up-front design and thinking through needed to successfully implement a project type that will serve its users well. The subsequent tutorial walks through the implementation of the basic project.
 
@@ -45,7 +45,7 @@ The major requirement of identifying a folder as being a project is that the tes
 
 Most Project types in NetBeans use  link:http://ant.apache.org[Apache Ant] as their build infrastructure, and there are APIs for building Ant-based projects. This example does _not_ use Ant, but implements a simple basic project type. Even if you know you will use Ant, you will encounter all of the concepts presented here in implementing an Ant-based project.
 
-Notice that we implemented support for `.pov` and `.inc` files in a  link:nbm-povray-1.html[separate module]. Design-wise this makes sense—data recognition and project types are orthagonal—and it provides a good demonstration of how to do loose coupling between modules.
+Notice that we implemented support for `.pov` and `.inc` files in a  xref:nbm-povray-1.adoc[separate module]. Design-wise this makes sense—data recognition and project types are orthagonal—and it provides a good demonstration of how to do loose coupling between modules.
 
 So at this point we need to think about what we're designing, what functionality belongs to which module, and what will serve our users' needs best. Before we do any coding, some design has to happen. Here's what we know about POV-Ray and its usage patterns:
 
@@ -116,5 +116,5 @@ This gives a great opportunity to demonstrate how loose coupling between modules
 
 Design is an inescapable first-step in developing modules. It pays to think hard about what functionality belongs where, and what the user experience should be before starting to code.
 
-* link:nbm-povray-3.html[Next: Implementing POV-Ray Project Support]*
+* xref:nbm-povray-3.adoc[Next: Implementing POV-Ray Project Support]*
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-3.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-3.adoc
index 924a487c4..860cf8898 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-3.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-3.adoc
@@ -30,7 +30,7 @@
 :description: Writing POV-Ray Support for NetBeans III—Implementing a Project Type - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, Writing POV-Ray Support for NetBeans III—Implementing a Project Type
 
-This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  link:nbm-povray-1.html[first] and  link:nbm-povray-2.html[second] parts of this tutorial, you may want to start there.
+This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  xref:nbm-povray-1.adoc[first] and  xref:nbm-povray-2.adoc[second] parts of this tutorial, you may want to start there.
 
 
 == Setting Up Dependencies
@@ -565,7 +565,7 @@ class PovrayLogicalView implements LogicalViewProvider {
 
 NOTE:  Part of the value of having a concept of a project is the ability to present data in a way that is closer to the way a user will _think_ about their project than the structure of files on disk may be. The logical view of a project should present a simplified structure showing users what they need to get their work done.
 
-NOTE:  In our case, we  link:nbm-povray-2.html#phys[already decided] that the user did not need to see the `images/` subdirectory, they should just be able to click a scene file and choose _View_, and that we want to put scene files in a `scenes/` subdirectory. So the logical thing to do for our logical view is to have it show the contents of that `scenes/` directory. We can return whatever `Node` we want as the root of our logical view of the project, and NetBeans makes using the conten [...]
+NOTE:  In our case, we  xref:nbm-povray-2.adoc#phys[already decided] that the user did not need to see the `images/` subdirectory, they should just be able to click a scene file and choose _View_, and that we want to put scene files in a `scenes/` subdirectory. So the logical thing to do for our logical view is to have it show the contents of that `scenes/` directory. We can return whatever `Node` we want as the root of our logical view of the project, and NetBeans makes using the conten [...]
 
 In the Nodes API is a class called `FilterNode`. What it does is wrap an existing `Node`, and by default, simply expose the same child nodes, display name, icon, actions, etc. as the original. We can subclass `FilterNode` to change its icon and the set of actions available on it. The `DataLoader` infrastructure already provides a loader that recognizes Filesystem folders—an API class called `DataFolder`. So we get the original node for the folder for free—we just need to provide a subcla [...]
 
@@ -747,5 +747,5 @@ image::images/povray_71_ch3_pic10.png[]
 
 == Next Steps
 
-The  link:nbm-povray-4.html[next tutorial] will begin to add truly useful functionality to our projects.
+The  xref:nbm-povray-4.adoc[next tutorial] will begin to add truly useful functionality to our projects.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-4.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-4.adoc
index 44d8bfaaf..9208ceb12 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-4.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-4.adoc
@@ -30,7 +30,7 @@
 :description: Writing POV-Ray Support for NetBeans IV—Providing Project Templates - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, Writing POV-Ray Support for NetBeans IV—Providing Project Templates
 
-This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  link:nbm-povray-1.html[first],  link:nbm-povray-2.html[second], and  link:nbm-povray-3.html[third] parts of this tutorial, you may want to start there.
+This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  xref:nbm-povray-1.adoc[first],  xref:nbm-povray-2.adoc[second], and  xref:nbm-povray-3.adoc[third] parts of this tutorial, you may want to start there.
 
 
 == Project Templates
@@ -214,5 +214,5 @@ If we were using a version control system such as CVS to store our source code,
 
 == Next Steps
 
-In the  link:nbm-povray-5.html[next section] we will create the API needed for communication between our two current modules.
+In the  xref:nbm-povray-5.adoc[next section] we will create the API needed for communication between our two current modules.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-5.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-5.adoc
index 9f71d1011..8e64c84a4 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-5.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-5.adoc
@@ -30,12 +30,12 @@
 :description: Writing POV-Ray Support for NetBeans V—Creating an API - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, Writing POV-Ray Support for NetBeans V—Creating an API
 
-This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  link:nbm-povray-1.html[first],  link:nbm-povray-2.html[second],  link:nbm-povray-3.html[third], and  link:nbm-povray-4.html[fourth] parts of this tutorial, you may want to start there.
+This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  xref:nbm-povray-1.adoc[first],  xref:nbm-povray-2.adoc[second],  xref:nbm-povray-3.adoc[third], and  xref:nbm-povray-4.adoc[fourth] parts of this tutorial, you may want to start there.
 
 
 == Creating the API
 
-As discussed when we  link:nbm-povray-2.html[designed POV-Ray support], we will need an API—there will be some intercommunication between POV-Ray files and the project. In particular, we will need some interfaces:
+As discussed when we  xref:nbm-povray-2.adoc[designed POV-Ray support], we will need an API—there will be some intercommunication between POV-Ray files and the project. In particular, we will need some interfaces:
 
 * `MainFileProvider`—find the main file of a project—the one to render when the whole file is built, and allow a POV-Ray scene file node to find out if it _is_ the main file (so it can bold-face its display name).
 * `RendererService`—an API a POV-Ray file node can call to ask that it be rendered as an image
@@ -246,7 +246,7 @@ public class PovrayDataNode extends DataNode {
     }
 ----
 
-What the above code does is fairly straightforward. `getFile()` returns a `FileObject`, which is a virtual filesystem file, that this `Node` represents. `getFromProject` tries to find the project that owns the file, and if it finds one, queries its ` link:https://netbeans.apache.org/wiki/devfaqlookup[Lookup]`, asking it for an instance of the `Class` that was passed into this method (i.e., one of the classes in the API we just defined). `isMainFile()` uses the above two methods to decide [...]
+What the above code does is fairly straightforward. `getFile()` returns a `FileObject`, which is a virtual filesystem file, that this `Node` represents. `getFromProject` tries to find the project that owns the file, and if it finds one, queries its ` xref:../wiki/DevFaqLookup.adoc[Lookup]`, asking it for an instance of the `Class` that was passed into this method (i.e., one of the classes in the API we just defined). `isMainFile()` uses the above two methods to decide if this `Node` repr [...]
 
 
 [start=4]
@@ -322,5 +322,5 @@ protected Node createNodeDelegate() {
 
 == Next Steps
 
-In the  link:nbm-povray-6.html[next section] we will implement the API we have created. But, from the above code, you can see how the API will be used by our  ``Node``  class, to determine whether a  ``Node``  should be boldfaced. Here we don't need to know nor care how the API is implemented. We simply ask for the availability of the  ``MainFileProvider``  and, depending on its availability, we change the display name of the  ``Node`` .
+In the  xref:nbm-povray-6.adoc[next section] we will implement the API we have created. But, from the above code, you can see how the API will be used by our  ``Node``  class, to determine whether a  ``Node``  should be boldfaced. Here we don't need to know nor care how the API is implemented. We simply ask for the availability of the  ``MainFileProvider``  and, depending on its availability, we change the display name of the  ``Node`` .
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-6.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-6.adoc
index a56027aa0..370c99ee0 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-6.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-6.adoc
@@ -30,7 +30,7 @@
 :description: Writing POV-Ray Support for NetBeans VI—Implementing the API - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, Writing POV-Ray Support for NetBeans VI—Implementing the API
 
-This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  link:nbm-povray-1.html[first],  link:nbm-povray-2.html[second],  link:nbm-povray-3.html[third],  link:nbm-povray-4.html[fourth], and  link:nbm-povray-5.html[fifth] parts of this tutorial, you may want to start there.
+This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  xref:nbm-povray-1.adoc[first],  xref:nbm-povray-2.adoc[second],  xref:nbm-povray-3.adoc[third],  xref:nbm-povray-4.adoc[fourth], and  xref:nbm-povray-5.adoc[fifth] parts of this tutorial, you may want to start there.
 
 
 == Implementing MainFileProvider
@@ -147,7 +147,7 @@ public Lookup getLookup() {
 
 The next class to implement is `RendererService`—this is the service, belonging to the project, by which a project will be "compiled" into an image (by executing the POV-Ray program and passing it arguments).
 
-As we discussed  link:nbm-povray-2.html[earlier], we are not going to try to implement a complicated dialog that makes every possible POV-Ray setting adjustable via a GUI widget—this would add a lot of complexity when many users would be satisfied with a reasonable set of defaults. So we will have a set of different default combinations of settings that should satisfy most users. Later we will add the ability to create completely customized settings by editing the `project.properties` of [...]
+As we discussed  xref:nbm-povray-2.adoc[earlier], we are not going to try to implement a complicated dialog that makes every possible POV-Ray setting adjustable via a GUI widget—this would add a lot of complexity when many users would be satisfied with a reasonable set of defaults. So we will have a set of different default combinations of settings that should satisfy most users. Later we will add the ability to create completely customized settings by editing the `project.properties` of [...]
 
 Right now, we will not worry about the execution part—`RendererService` also provides for named sets of settings—combinations of line switches which should be passed to POV-Ray to determine rendering quality, image size and speed. Right now we will only implement that part of `RendererService`.
 
@@ -623,7 +623,7 @@ public Lookup getLookup() {
 
 == Providing Render Actions on POV-Ray Files
 
-Now we have an implementation of some of our API, the next step is to use it. As  link:nbm-povray-2.html[discussed earlier], we want a user to be able to right-click and choose to render any file, not just the main file of the project. So there should be some menu items available from our `PovrayDataNode`s which will allow the user to render the file with one of our sets of settings.
+Now we have an implementation of some of our API, the next step is to use it. As  xref:nbm-povray-2.adoc[discussed earlier], we want a user to be able to right-click and choose to render any file, not just the main file of the project. So there should be some menu items available from our `PovrayDataNode`s which will allow the user to render the file with one of our sets of settings.
 
 
 [start=1]
@@ -987,5 +987,5 @@ private static File getStandardIncludeDir(File povray) {
 
 == Next Steps
 
-The  link:nbm-povray-7.html[next section] will cover actually executing POV-Ray and piping its output to the Output window of our application.
+The  xref:nbm-povray-7.adoc[next section] will cover actually executing POV-Ray and piping its output to the Output window of our application.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-7.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-7.adoc
index 0e6af7e28..0cc85c604 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-7.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-7.adoc
@@ -30,7 +30,7 @@
 :description: Writing POV-Ray Support for NetBeans VII—Support For Running POV-Ray - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, Writing POV-Ray Support for NetBeans VII—Support For Running POV-Ray
 
-This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  link:nbm-povray-1.html[first],  link:nbm-povray-2.html[second],  link:nbm-povray-3.html[third],  link:nbm-povray-4.html[fourth],  link:nbm-povray-5.html[fifth], and  link:nbm-povray-6.html[sixth] parts of this tutorial, you may want to start there.
+This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  xref:nbm-povray-1.adoc[first],  xref:nbm-povray-2.adoc[second],  xref:nbm-povray-3.adoc[third],  xref:nbm-povray-4.adoc[fourth],  xref:nbm-povray-5.adoc[fifth], and  xref:nbm-povray-6.adoc[sixth] parts of this tutorial, you may want to start there.
 
 
 == Obtaining POV-Ray
@@ -41,7 +41,7 @@ At this point, we're almost ready to run code, so it would be a good idea to dow
 * Macintosh users may find  link:http://darwinports.opendarwin.org/[DarwinPorts] the easiest way—simply install DarwinPorts and then run `sudo port install povray`.
 * Linux and other Unix users should be fine with the downloads available from  link:http://povray.org[povray.org], using  link:http://povray.org/download/linux.php[these instructions]. Everything should work out of the box for these users, without any tweaks or post-install configurations. Make sure, however, that the POV-Ray launcher has the correct permissions, otherwise it will not execute. Run it from the command line to check that it executes.
 
-NOTE:  For details on setting up POV-Ray, especially for detailed instructions for Windows,  link:nbm-povray-10.html#appendix[see the Appendix].
+NOTE:  For details on setting up POV-Ray, especially for detailed instructions for Windows,  xref:nbm-povray-10.adoc#appendix[see the Appendix].
 
 
 == Executing POV-Ray and Displaying the Output
@@ -498,5 +498,5 @@ image::images/povray_71_ch7_pic2.png[role="left", link="images/pic1.png"]
 
 == Next Steps
 
-The  link:nbm-povray-8.html[next section] will cover implementing `ViewService` and adding actions for that.
+The  xref:nbm-povray-8.adoc[next section] will cover implementing `ViewService` and adding actions for that.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-8.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-8.adoc
index 9391fcb00..2c500308a 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-8.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-8.adoc
@@ -30,7 +30,7 @@
 :description: Writing POV-Ray Support for NetBeans VIII—Implementing ViewService and its Actions - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, Writing POV-Ray Support for NetBeans VIII—Implementing ViewService and its Actions
 
-This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  link:nbm-povray-1.html[first],  link:nbm-povray-2.html[second],  link:nbm-povray-3.html[third],  link:nbm-povray-4.html[fourth],  link:nbm-povray-5.html[fifth],  link:nbm-povray-6.html[sixth], and  link:nbm-povray-7.html[seventh] parts of this tutorial, you may want to start there.
+This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  xref:nbm-povray-1.adoc[first],  xref:nbm-povray-2.adoc[second],  xref:nbm-povray-3.adoc[third],  xref:nbm-povray-4.adoc[fourth],  xref:nbm-povray-5.adoc[fifth],  xref:nbm-povray-6.adoc[sixth], and  xref:nbm-povray-7.adoc[seventh] parts of this tutorial, you may want to start there.
 
 
 == ViewService—the Final API Piece
@@ -661,5 +661,5 @@ image::images/povray_71_ch8_pic2.png[]
 
 == Next Steps
 
-We're almost done. The  link:nbm-povray-9.html[next step] will be adding project build support and putting some finishing touches on our UI and code.
+We're almost done. The  xref:nbm-povray-9.adoc[next step] will be adding project build support and putting some finishing touches on our UI and code.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-povray-9.adoc b/netbeans.apache.org/src/content/tutorials/nbm-povray-9.adoc
index 2d2f97ceb..95d426ef1 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-9.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-9.adoc
@@ -30,7 +30,7 @@
 :description: Writing POV-Ray Support for NetBeans IX—Build Support - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, Writing POV-Ray Support for NetBeans IX—Build Support
 
-This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  link:nbm-povray-1.html[first],  link:nbm-povray-2.html[second],  link:nbm-povray-3.html[third],  link:nbm-povray-4.html[fourth],  link:nbm-povray-5.html[fifth]  link:nbm-povray-6.html[sixth],  link:nbm-povray-7.html[seventh], and  link:nbm-povray-8.html[eighth] parts of this tutorial, you may want to start there.
+This is a continuation of the tutorial for building a POV-Ray rendering application on the NetBeans Platform. If you have not read the  xref:nbm-povray-1.adoc[first],  xref:nbm-povray-2.adoc[second],  xref:nbm-povray-3.adoc[third],  xref:nbm-povray-4.adoc[fourth],  xref:nbm-povray-5.adoc[fifth]  xref:nbm-povray-6.adoc[sixth],  xref:nbm-povray-7.adoc[seventh], and  xref:nbm-povray-8.adoc[eighth] parts of this tutorial, you may want to start there.
 
 
 == Project Action Support
@@ -529,5 +529,5 @@ image::images/povray_71_ch9_pic5.png[]
 
 == Next Steps
 
-Congratulations! You have completed the POV-Ray tutorial. The  link:nbm-povray-10.html[next step] is to review the concepts you've learned and then continue your journey on the NetBeans Platform.
+Congratulations! You have completed the POV-Ray tutorial. The  xref:nbm-povray-10.adoc[next step] is to review the concepts you've learned and then continue your journey on the NetBeans Platform.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-projectextension.adoc b/netbeans.apache.org/src/content/tutorials/nbm-projectextension.adoc
index ba92eb3a4..6576e2d64 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-projectextension.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-projectextension.adoc
@@ -42,7 +42,7 @@ New NetBeans IDE APIs since NetBeans IDE 6.0 enable you to add new nodes to an e
 
 image::images/cc_72_result-2.png[]
 
-Prior to NetBeans IDE 6.0, no NetBeans IDE APIs existed for extending existing project types. Instead, you would need to create new project types from scratch. From 6.0 onwards, you are recommended to extend existing project types rather than create new ones, where possible. This will keep the number of project types to a minimum and avoid a large number of project types with very small differences. However, it is, of course, always possible to create project types from scratch, as befor [...]
+Prior to NetBeans IDE 6.0, no NetBeans IDE APIs existed for extending existing project types. Instead, you would need to create new project types from scratch. From 6.0 onwards, you are recommended to extend existing project types rather than create new ones, where possible. This will keep the number of project types to a minimum and avoid a large number of project types with very small differences. However, it is, of course, always possible to create project types from scratch, as befor [...]
 
 Annotations are used throughout this tutorial to register the lookup extension, logical view extension, and project customizer extension. As you will see below, the extensions will be registered for the project type "org-netbeans-modules-web-project", which is the web application project type. Here is a list of strings representing other project types supported by NetBeans IDE:
 
@@ -137,7 +137,7 @@ import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectUtils;
 import org.netbeans.spi.project.ProjectServiceProvider;
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectServiceProvider.html[@ProjectServiceProvider](
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectServiceProvider.html[@ProjectServiceProvider](
         service=Service.class,
         projectType="org-netbeans-modules-web-project")
 public class ServiceImpl extends Service {
@@ -210,7 +210,7 @@ Run the module to install it into a new instance of NetBeans IDE. Open a few Net
 
 === Scenario 2: Extending the Project Logical View
 
-In this section, we change the node hierarchy in the Projects window for an existing project type. We start by implementing the  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory]``  class, which we will register via an annotation.
+In this section, we change the node hierarchy in the Projects window for an existing project type. We start by implementing the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory]``  class, which we will register via an annotation.
 
 
 [start=1]
@@ -227,8 +227,8 @@ import org.netbeans.spi.project.ui.support.NodeList;
 import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.util.Exceptions;
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.Registration.html[@NodeFactory.Registration](projectType = "org-netbeans-modules-web-project")
-public class ImportantFilesNodeFactory implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory] {
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.Registration.html[@NodeFactory.Registration](projectType = "org-netbeans-modules-web-project")
+public class ImportantFilesNodeFactory implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory] {
 
     @Override
     public NodeList createNodes(Project project) {
@@ -273,7 +273,7 @@ import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.nodes.FilterNode;
 import org.openide.util.ImageUtilities;
 
-public class ImportantFilesNode extends  link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
+public class ImportantFilesNode extends  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
 
     @StaticResource
     private static final String IMAGE = "org/netbeans/modules/"
@@ -348,7 +348,7 @@ import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 
 public class ImportantFilesCustomizerTab 
-    implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.CompositeCategoryProvider.html[ProjectCustomizer.CompositeCategoryProvider] {
+    implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.CompositeCategoryProvider.html[ProjectCustomizer.CompositeCategoryProvider] {
 
     private final String name;
 
@@ -370,7 +370,7 @@ public class ImportantFilesCustomizerTab
     }
 
     @NbBundle.Messages({"LBL_Config=Configuration"})
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.CompositeCategoryProvider.Registration.html[@ProjectCustomizer.CompositeCategoryProvider.Registration](
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.CompositeCategoryProvider.Registration.html[@ProjectCustomizer.CompositeCategoryProvider.Registration](
         projectType = "org-netbeans-modules-web-project", 
         position = 10)
     public static ImportantFilesCustomizerTab createMyDemoConfigurationTab() {
@@ -472,12 +472,12 @@ image::images/cc_72_result-4.png[]
 
 In this tutorial, you have learned how to extend the project's lookup, logical view, and customizer.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-projectsamples.adoc b/netbeans.apache.org/src/content/tutorials/nbm-projectsamples.adoc
index 7b0ced04b..e02179350 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-projectsamples.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-projectsamples.adoc
@@ -32,7 +32,7 @@
 
 This tutorial demonstrates how to create a module that adds a sample to the New Project wizard. The sample could function either as an example to the user or as a new project template that provides the basic files needed to get started working on a technology of some kind.
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-projectsamples.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-projectsamples.html[the previous version of this document].
 
 
 
@@ -294,12 +294,12 @@ In the above Ant target, the  ``build.classes.dir``  property points to the loca
 
 NOTE:  We exclude some folders from the ZIP file, because these are not needed in the sample module project and, in fact, would cause problems if they were not excluded.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
-*  link:http://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-projecttype.adoc b/netbeans.apache.org/src/content/tutorials/nbm-projecttype.adoc
index 16d9ecb56..25defebd7 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-projecttype.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-projecttype.adoc
@@ -35,9 +35,9 @@ This tutorial demonstrates how to create a new project type in a NetBeans Platfo
 
 NOTE: Before going further, make sure this is the tutorial you actually need!
 
-* Rather than creating a new project type, you might want to extend an _existing_ project type instead, as described in the  link:https://netbeans.apache.org/tutorials/nbm-projectextension.html[NetBeans Project Type Extension Module Tutorial].
+* Rather than creating a new project type, you might want to extend an _existing_ project type instead, as described in the  xref:nbm-projectextension.adoc[NetBeans Project Type Extension Module Tutorial].
 * For Maven-based NetBeans Platform applications, see  link:http://web.archive.org/web/20130603022225/http://netbeans.dzone.com/how-create-maven-nb-project-type[How to Create a Custom Project Type in a Mavenized NetBeans Platform Application].
-* If the projects for which you're creating a project type (whether on Ant or Maven based NetBeans Platform applications) need to use Ant as their build tool, you should use the  link:https://netbeans.apache.org/tutorials/nbm-projecttypeant.html[NetBeans Ant-Based Project Type Module Tutorial] instead.
+* If the projects for which you're creating a project type (whether on Ant or Maven based NetBeans Platform applications) need to use Ant as their build tool, you should use the  xref:nbm-projecttypeant.adoc[NetBeans Ant-Based Project Type Module Tutorial] instead.
 
 
 You will also make use of these icons, which you can right-click here and download: image:images/projecttypes_72pics_icon.png[] and image:images/projecttypes_72pics_sub-icon.png[]
@@ -59,19 +59,19 @@ The following are the main NetBeans API classes we will be implementing in this
 |===
 |Class |Description 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory.html[org.netbeans.spi.project.ProjectFactory]``  |Determines when a folder or file is a valid project and then creates the implemention of  ``org.netbeans.api.project.Project`` . 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory.html[org.netbeans.spi.project.ProjectFactory]``  |Determines when a folder or file is a valid project and then creates the implemention of  ``org.netbeans.api.project.Project`` . 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[org.netbeans.api.project.Project]``  |Represents the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[org.netbeans.api.project.Project]``  |Represents the project. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[org.netbeans.spi.project.ui.LogicalViewProvider]``  |Provides the logical view for the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[org.netbeans.spi.project.ui.LogicalViewProvider]``  |Provides the logical view for the project. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[org.netbeans.api.project.ProjectInformation]``  |Provides supplemental information for the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[org.netbeans.api.project.ProjectInformation]``  |Provides supplemental information for the project. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ActionProvider.html[org.netbeans.spi.project.ActionProvider]``  |Provides one or more actions for the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ActionProvider.html[org.netbeans.spi.project.ActionProvider]``  |Provides one or more actions for the project. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/CopyOperationImplementation.html[org.netbeans.spi.project.CopyOperationImplementation]``  |Provides the Copy operation for the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/CopyOperationImplementation.html[org.netbeans.spi.project.CopyOperationImplementation]``  |Provides the Copy operation for the project. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/DeleteOperationImplementation.html[org.netbeans.spi.project.DeleteOperationImplementation]``  |Provides the Delete operation for the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/DeleteOperationImplementation.html[org.netbeans.spi.project.DeleteOperationImplementation]``  |Provides the Delete operation for the project. 
 |===
 
 
@@ -129,7 +129,7 @@ image::images/projecttypes_72pics_proj-3.png[]
 
 == Creating the Project Factory
 
-We start by implementing the  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory.html[org.netbeans.spi.project.ProjectFactory]``  class.
+We start by implementing the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory.html[org.netbeans.spi.project.ProjectFactory]``  class.
 
 
 [start=1]
@@ -151,7 +151,7 @@ import org.openide.filesystems.FileObject;
 import org.openide.util.lookup.ServiceProvider;
 
 @ServiceProvider(service=ProjectFactory.class)
-public class CustomerProjectFactory implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory.html[ProjectFactory] {
+public class CustomerProjectFactory implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory.html[ProjectFactory] {
 
     public static final String PROJECT_FILE = "customer.txt";
 
@@ -164,7 +164,7 @@ public class CustomerProjectFactory implements  link:http://bits.netbeans.org/de
 
     *//Specifies when the project will be opened, i.e., if the project exists:*
     @Override
-    public Project loadProject(FileObject dir,  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectState.html[ProjectState] state) throws IOException {
+    public Project loadProject(FileObject dir,  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectState.html[ProjectState] state) throws IOException {
         return isProject(dir) ? new CustomerProject(dir, state) : null;
     }
 
@@ -178,12 +178,12 @@ public class CustomerProjectFactory implements  link:http://bits.netbeans.org/de
 
 NOTE:  The @ServiceProvider annotation used in the class signature above will cause a META-INF/services file to be created when the module is compiled. Within that folder, a file named after the fully qualified name of the interface will be found, containing the fully qualified name of the implementing class. That is the standard JDK mechanism, since JDK 6, for registering implementations of interfaces. That is how project types are registered in the NetBeans Plaform.
 
-Instead of  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory.html[ProjectFactory]`` , consider implementing the newer  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory2.html[ProjectFactory2]`` .  ``ProjectFactory2``  is a performance correction to  ``ProjectFactory`` , done in a compatible way. If you implement  ``ProjectFactory2`` , the project will not [...]
+Instead of  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory.html[ProjectFactory]`` , consider implementing the newer  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectFactory2.html[ProjectFactory2]`` .  ``ProjectFactory2``  is a performance correction to  ``ProjectFactory`` , done in a compatible way. If you implement  ``ProjectFactory2`` , the project will n [...]
 
 
 == Creating the Project
 
-Next, we implement the  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[org.netbeans.api.project.Project]``  class.
+Next, we implement the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[org.netbeans.api.project.Project]``  class.
 
 
 [start=1]
@@ -202,7 +202,7 @@ import org.netbeans.spi.project.ProjectState;
 import org.openide.filesystems.FileObject;
 import org.openide.util.Lookup;
 
-public class CustomerProject implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[Project] {
+public class CustomerProject implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[Project] {
 
     CustomerProject(FileObject dir, ProjectState state) {
         throw new UnsupportedOperationException("Not yet implemented");
@@ -298,9 +298,9 @@ In this section, you register minimum NetBeans project support, that is, you cre
 [source,java,subs="macros"]
 ----
 
-private final class Info implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[ProjectInformation] {
+private final class Info implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[ProjectInformation] {
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-annotations-common/org/netbeans/api/annotations/common/StaticResource.html[@StaticResource()]
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-annotations-common/org/netbeans/api/annotations/common/StaticResource.html[@StaticResource()]
     public static final String CUSTOMER_ICON = "org/customer/project/icon.png";
 
     @Override
@@ -385,9 +385,9 @@ In this section, you define the logical view of your project, as shown in the Pr
 [source,java,subs="macros"]
 ----
 
-class CustomerProjectLogicalView implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[LogicalViewProvider] {
+class CustomerProjectLogicalView implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[LogicalViewProvider] {
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-annotations-common/org/netbeans/api/annotations/common/StaticResource.html[@StaticResource()]
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-annotations-common/org/netbeans/api/annotations/common/StaticResource.html[@StaticResource()]
     public static final String CUSTOMER_ICON = "org/customer/project/icon.png";
 
     private final CustomerProject project;
@@ -513,7 +513,7 @@ In this section, you learn how to define which folders and files should be displ
 
 public ProjectNode(Node node, CustomerProject project) 
     throws DataObjectNotFoundException {
-    super(node, link:pass:[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactorySupport.html#createCompositeChildren(org.netbeans.api.project.Project, java.lang.String)][NodeFactorySupport.createCompositeChildren](
+    super(node, link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactorySupport.html#createCompositeChildren(org.netbeans.api.project.Project,%20java.lang.String)[NodeFactorySupport.createCompositeChildren](
                     project, 
                     "Projects/org-customer-project/Nodes"),*
             // new FilterNode.Children(node),
@@ -568,8 +568,8 @@ import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
 import org.openide.util.Exceptions;
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.Registration.html[@NodeFactory.Registration](projectType = "org-customer-project", position = 10)
-public class TextsNodeFactory implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory] {
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.Registration.html[@NodeFactory.Registration](projectType = "org-customer-project", position = 10)
+public class TextsNodeFactory implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory] {
 
     @Override
     public NodeList<?> createNodes(Project project) {
@@ -636,7 +636,7 @@ public class TextsNodeFactory implements  link:http://bits.netbeans.org/dev/java
 
 image::images/projecttypes_72pics_text-folder-1.png[]
 
-An important point to realize in this section is that the  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.Registration.html[@NodeFactory.Registration]``  annotation can be used to register new child nodes of the customer project node, either within the current module or via external modules. In this way, the logical view of your project is extensible, that is, logical views can be pluggable, if an extension p [...]
+An important point to realize in this section is that the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.Registration.html[@NodeFactory.Registration]``  annotation can be used to register new child nodes of the customer project node, either within the current module or via external modules. In this way, the logical view of your project is extensible, that is, logical views can be pluggable, if an extension  [...]
 
 [[projectcustomizer]]
 === Creating and Registering the Project Customizer
@@ -729,7 +729,7 @@ import org.netbeans.spi.project.ui.support.ProjectCustomizer;
 import org.openide.awt.StatusDisplayer;
 import org.openide.util.lookup.Lookups;
 
-public class CustomerCustomizerProvider implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/CustomizerProvider.html[CustomizerProvider] {
+public class CustomerCustomizerProvider implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/CustomizerProvider.html[CustomizerProvider] {
 
     public final CustomerProject project;
 
@@ -742,7 +742,7 @@ public class CustomerCustomizerProvider implements  link:http://bits.netbeans.or
 
     @Override
     public void showCustomizer() {
-        Dialog dialog =  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.html[ProjectCustomizer].createCustomizerDialog(
+        Dialog dialog =  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.html[ProjectCustomizer].createCustomizerDialog(
                 //Path to layer folder:
                 CUSTOMIZER_FOLDER_PATH,
                 //Lookup, which must contain, at least, the Project:
@@ -808,7 +808,7 @@ import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 
 public class GeneralCustomerProperties 
-    implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.html[ProjectCustomizer.CompositeCategoryProvider] {
+    implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.html[ProjectCustomizer.CompositeCategoryProvider] {
 
     private static final String GENERAL = "General";
 
@@ -865,12 +865,12 @@ Above, you can see that the "customer3" project has several folders. One of thos
 1. Following the instructions <<creatingtheprojectfactory,at the start of this tutorial>>, create a new  ``ProjectFactory``  that recognizes folders containing a file named "report.xml" as a project of type  ``ReportsSubProject`` . Define a  ``ProjectInformation``  and a  ``ProjectLogicalView``  for your  ``ReportsSubProject`` .
 
 [start=2]
-1. Create a  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/SubprojectProvider.html[SubprojectProvider]``  that looks inside the customer project's "reports" folder for projects of your type:
+1. Create a  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/SubprojectProvider.html[SubprojectProvider]``  that looks inside the customer project's "reports" folder for projects of your type:
 
 [source,java,subs="macros"]
 ----
 
-public class ReportsSubprojectProvider implements  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/SubprojectProvider.html[SubprojectProvider] {
+public class ReportsSubprojectProvider implements  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/SubprojectProvider.html[SubprojectProvider] {
 
     private final CustomerProject project;
 
@@ -947,7 +947,7 @@ public Lookup getLookup() {
 @NodeFactory.Registration(projectType = "org-customer-project", position = 20)
 public class ReportsSubProjectNodeFactory implements NodeFactory {
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-annotations-common/org/netbeans/api/annotations/common/StaticResource.html[@StaticResource()]
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-annotations-common/org/netbeans/api/annotations/common/StaticResource.html[@StaticResource()]
     public static final String SUB_ICON = "org/customer/project/sub/icon.png";
 
     @Override
@@ -1083,7 +1083,7 @@ image::images/projecttypes_72pics_proj-temp-3.png[]
 
 image::images/projecttypes_72pics_proj-temp-4.png[]
 
-You have now used the New Project Template wizard to register some project samples in your application. Also notice that you have some ZIP files containing your sample projects, created by the Project Template wizard, together with several classes from the NetBeans Wizard API. For further information, refer to the  link:https://netbeans.apache.org/tutorials/nbm-projectsamples.html[NetBeans Project Sample Module Tutorial].
+You have now used the New Project Template wizard to register some project samples in your application. Also notice that you have some ZIP files containing your sample projects, created by the Project Template wizard, together with several classes from the NetBeans Wizard API. For further information, refer to the  xref:nbm-projectsamples.adoc[NetBeans Project Sample Module Tutorial].
 
 
 [start=7]
@@ -1099,12 +1099,12 @@ Complete the wizard. At the end of the wizard, the ZIP file is unzipped and the
 
 You now have support for a new type of project, including a set of samples that your users can use to create skeleton projects of your type.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
-*  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
+*  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-projecttypeant.adoc b/netbeans.apache.org/src/content/tutorials/nbm-projecttypeant.adoc
index 7706c9830..6840f1947 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-projecttypeant.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-projecttypeant.adoc
@@ -32,7 +32,7 @@
 
 This tutorial demonstrates how to create a new project type for projects that need to use Ant as their build tool.
 
-This tutorial assumes you want to create a project type for projects that need to use Ant as their build tool. If this is not the case, you should use the  link:https://netbeans.apache.org/tutorials/nbm-projecttype.html[NetBeans Project Type Module Tutorial] instead.
+This tutorial assumes you want to create a project type for projects that need to use Ant as their build tool. If this is not the case, you should use the  xref:nbm-projecttype.adoc[NetBeans Project Type Module Tutorial] instead.
 
 
 
@@ -67,15 +67,15 @@ The following are the main NetBeans API classes we will be implementing in this
 |===
 |Class |Description 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[org.netbeans.api.project.Project]``  |Represents the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[org.netbeans.api.project.Project]``  |Represents the project. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[org.netbeans.spi.project.ui.LogicalViewProvider]``  |Provides the logical view for the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[org.netbeans.spi.project.ui.LogicalViewProvider]``  |Provides the logical view for the project. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[org.netbeans.api.project.ProjectInformation]``  |Provides supplemental information for the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[org.netbeans.api.project.ProjectInformation]``  |Provides supplemental information for the project. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[org.netbeans.spi.project.ui.support.NodeFactory]``  |Provides one or more nodes for the logical view. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[org.netbeans.spi.project.ui.support.NodeFactory]``  |Provides one or more nodes for the logical view. 
 
-| `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ActionProvider.html[org.netbeans.spi.project.ActionProvider]``  |Provides one or more actions for the project. 
+| `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ActionProvider.html[org.netbeans.spi.project.ActionProvider]``  |Provides one or more actions for the project. 
 |===
 
 At the end of this tutorial, your module source structure will be as follows:
@@ -138,7 +138,7 @@ image::images/projecttypes_demo-7.png[]
 
 == Creating the Project
 
-Next, we implement the  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[org.netbeans.api.project.Project]``  class.
+Next, we implement the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[org.netbeans.api.project.Project]``  class.
 
 At the end of this section, when you open a folder containing a  ``nbprojects``  folder that has a  ``project.xml``  with content as defined below...
 
@@ -184,7 +184,7 @@ sharedName = "data",
 sharedNamespace = "https://netbeans.org/ns/demo-project/1",
 privateName = "project-private",
 privateNamespace = "https://netbeans.org/ns/demo-project-private/1")
-public class DemoProject implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[Project] {
+public class DemoProject implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[Project] {
 
     final AntProjectHelper helper;
 
@@ -204,7 +204,7 @@ public class DemoProject implements link:http://bits.netbeans.org/dev/javadoc/or
         return helper.getProjectDirectory();
     }
 
-    private final class Info implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[ProjectInformation] {
+    private final class Info implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[ProjectInformation] {
 
         @Override
         public String getName() {
@@ -242,7 +242,7 @@ public class DemoProject implements link:http://bits.netbeans.org/dev/javadoc/or
 
 == Creating the Logical View Provider
 
-Next, we implement the  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[org.netbeans.spi.project.ui.LogicalViewProvider]``  class.
+Next, we implement the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[org.netbeans.spi.project.ui.LogicalViewProvider]``  class.
 
 Once we have implemented the  ``LogicalViewProvider`` , we'll have filtered out everything from the Projects window, other than the project node.
 
@@ -265,7 +265,7 @@ Do the following:
 [source,java,subs="macros"]
 ----
 
-class DemoProjectLogicalView implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[LogicalViewProvider] {
+class DemoProjectLogicalView implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/LogicalViewProvider.html[LogicalViewProvider] {
 
     private final DemoProject project;
 
@@ -365,7 +365,7 @@ Create a new class called  ``DemoNodeFactory``  and define it as follows:
 ----
 
 @NodeFactory.Registration(projectType="org-netbeans-demo-project-DemoProject", position=200)
-public class DemoNodeFactory implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory] {
+public class DemoNodeFactory implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory] {
 
     public DemoNodeFactory() {
     }
@@ -418,7 +418,7 @@ In the next section, we will add a real node to the logical view in the Projects
 
 == Creating the Nodes
 
-Next, we work some more with the  `` link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[org.netbeans.spi.project.ui.support.NodeFactory]``  class and we extend the  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[org.openide.nodes.FilterNode]`` .
+Next, we work some more with the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[org.netbeans.spi.project.ui.support.NodeFactory]``  class and we extend the  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[org.openide.nodes.FilterNode]`` .
 
 At the end of this section, when you open a folder containing a  ``project.xml``  file as specified above, all the folders and files will be shown in the Projects window, just like the Files window, as shown below:
 
@@ -438,7 +438,7 @@ Do the following:
 ----
 
 @NodeFactory.Registration(projectType="org-netbeans-demo-project-DemoProject", position=200)
-public class DemoNodeFactory implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory] {
+public class DemoNodeFactory implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.html[NodeFactory] {
 
     public DemoNodeFactory() {
     }
@@ -468,7 +468,7 @@ Create a new class called  ``DemoFilterNode``  and define it as follows:
 [source,java,subs="macros"]
 ----
 
-public class DemoFilterNode extends link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
+public class DemoFilterNode extends link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] {
 
     private static Image smallImage =
             ImageUtilities.loadImage("org/netbeans/demo/project/icon1.png"); // NOI18N
@@ -535,7 +535,7 @@ sharedName = "data",
 sharedNamespace = "https://netbeans.org/ns/demo-project/1",
 privateName = "project-private",
 privateNamespace = "https://netbeans.org/ns/demo-project-private/1")
-public class DemoProject implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[Project] {
+public class DemoProject implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/Project.html[Project] {
 
     final AntProjectHelper helper;
 
@@ -557,7 +557,7 @@ public class DemoProject implements link:http://bits.netbeans.org/dev/javadoc/or
         return helper.getProjectDirectory();
     }
 
-    private final class Info implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[ProjectInformation] {
+    private final class Info implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/api/project/ProjectInformation.html[ProjectInformation] {
 
         @Override
         public String getName() {
@@ -588,7 +588,7 @@ public class DemoProject implements link:http://bits.netbeans.org/dev/javadoc/or
         }
     }
 
-    #private final class DemoActionProvider implements link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ActionProvider.html[ActionProvider] {
+    #private final class DemoActionProvider implements link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ActionProvider.html[ActionProvider] {
 
         private String[] supported = new String[]{
             ActionProvider.COMMAND_DELETE,
@@ -716,7 +716,7 @@ The root directory of the project should have a  ``build.xml``  file with conten
 image::images/projecttypes_demo-6.png[]
 
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -724,6 +724,6 @@ link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedba
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 
-*  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
+*  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-property-editors.adoc b/netbeans.apache.org/src/content/tutorials/nbm-property-editors.adoc
index e5fe84486..d4ba4ea29 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-property-editors.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-property-editors.adoc
@@ -52,9 +52,9 @@ Often you may have a property for which either the standard property editor is n
 
 This tutorial is intended as a follow-on to these preceding tutorials, and its code is based on the code from them:
 
-*  link:nbm-selection-1.html[Selection Management Tutorial I - Using a TopComponent's Lookup]
-*  link:nbm-selection-2.html[NetBeans Selection Management Tutorial II - Using Nodes]
-*  link:nbm-nodesapi2.html[Using the Nodes API]
+*  xref:nbm-selection-1.adoc[Selection Management Tutorial I - Using a TopComponent's Lookup]
+*  xref:nbm-selection-2.adoc[NetBeans Selection Management Tutorial II - Using Nodes]
+*  xref:nbm-nodesapi2.adoc[Using the Nodes API]
 
 If you have not yet done these tutorials, you should do them first; or at least ensure you are familiar with the content and approach used, and download the completed result of the third tutorial. 
 
@@ -397,7 +397,7 @@ Here is how to register `DatePropertyEditor` so that any property of the type `j
 
 
 [start=1]
-1. Annotate the  ``DatePropertyEditor``  class with link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/PropertyEditorRegistration.html[@PropertyEditorRegistration(targetType = ZonedDateTime.class)] so that it looks like:
+1. Annotate the  ``DatePropertyEditor``  class with link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/PropertyEditorRegistration.html[@PropertyEditorRegistration(targetType = ZonedDateTime.class)] so that it looks like:
 
 [source,java]
 ----
@@ -422,4 +422,4 @@ Now when you run, the application behaviour will be unchanged, but the EventNode
 
 While we won't cover it, it is worth mentioning that the property sheet is not the only place that `Node.Property` objects are useful; there is also a convenient UI class in the `org.openide.explorer.PropertySheet` class called `PropertyPanel`. It's function is to display one property, much as it is displayed in the property sheet, providing an editor field and a custom editor button, or you have called `somePropertyPanel.setPreferences(PropertyPanel.PREF_CUSTOM_EDITOR)`, it will display [...]
 
-link:https://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-propertyeditors-integration.adoc b/netbeans.apache.org/src/content/tutorials/nbm-propertyeditors-integration.adoc
index 27957cd62..c557db55c 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-propertyeditors-integration.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-propertyeditors-integration.adoc
@@ -951,7 +951,7 @@ You may have noticed that `ColorValueEditor` implements a NetBeans interface, `o
 * Get the `Node.Property` object which created the property editor and represents the property being useful, using `env.getFeatureDescriptor()`. This is useful for passing hints to the property sheet about how an editor should behave when in the property sheet. Two useful hints are
 * Call `env.getFeatureDescriptor().setValue("canEditAsText", Boolean.FALSE)` to make the property non-editable inside the property sheet (so the only way to change the property is to open the custom editor).
 * Call `env.getFeatureDescriptor().setValue("suppressCustomEditor", Boolean.TRUE)` from a `PropertyEditor` subclass, to hide the [...] custom editor button on a property that would otherwise have one.
-* Register an `InplaceEditor.Factory` which can provide the UI component that is shown in the property sheet when the user edits the property without opening a custom editor (a tutorial on how to do that can  link:https://netbeans.apache.org/tutorials/nbm-property-editors.html[be found here])
+* Register an `InplaceEditor.Factory` which can provide the UI component that is shown in the property sheet when the user edits the property without opening a custom editor (a tutorial on how to do that can  xref:nbm-property-editors.adoc[be found here])
 * Get the Node for the file being edited like this:
 
 [source,java]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-quick-search.adoc b/netbeans.apache.org/src/content/tutorials/nbm-quick-search.adoc
index 4f0bfec7e..b1fc23935 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-quick-search.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-quick-search.adoc
@@ -32,7 +32,7 @@
 
 This tutorial shows you how to write a module that plugs custom items into the NetBeans Quick Search feature.
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-quick-search.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-quick-search.html[the previous version of this document].
 
 
 
@@ -47,7 +47,7 @@ For troubleshooting purposes, you are welcome to download the  link:http://web.a
 
 The Quick Search feature, introduced in NetBeans Platform 6.5, consists of a text field in the top right corner of applications on the NetBeans Platform. As a search string is typed in the field, a drop-down list appears, showing matching items. By default, the items come from the names of actions registered in the IDE, as well as help topics in the IDE's Java Help. When an action item is selected, the action is invoked; when a help item is selected, the topic opens in JavaHelp.
 
-In addition, however, the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/overview-summary.html[Quick Search API] is exposed. You can use it to integrate your own search items into the Quick Search feature. You can use the feature either within the IDE or as part of your own application on top of the NetBeans Platform.
+In addition, however, the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/overview-summary.html[Quick Search API] is exposed. You can use it to integrate your own search items into the Quick Search feature. You can use the feature either within the IDE or as part of your own application on top of the NetBeans Platform.
 
 In this tutorial, you create a module that integrates items from  link:http://netbeans.dzone.com[NetBeans Zone] with the Quick Search feature:
 
@@ -206,11 +206,11 @@ Next, we will implement the API. The API's classes are as follows:
 |===
 |Class |Description 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/SearchProvider.html[SearchProvider] |The main interface of the Quick Search API. Implement this interface to provide a new group of results for your quick search. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/SearchProvider.html[SearchProvider] |The main interface of the Quick Search API. Implement this interface to provide a new group of results for your quick search. 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/SearchRequest.html[SearchRequest] |The description of the quick search request. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/SearchRequest.html[SearchRequest] |The description of the quick search request. 
 
-| link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/SearchResponse.html[SearchResponse] |The response object for collecting the results of the SearchRequest. 
+| link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/SearchResponse.html[SearchResponse] |The response object for collecting the results of the SearchRequest. 
 |===
 
 Below, we set dependencies on the required modules and then implement them in our own module.
@@ -414,7 +414,7 @@ image::images/qsearch_72_app-result-1.png[]
 
 image::images/qsearch_72_app-result-2.png[]
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
@@ -422,5 +422,5 @@ link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedba
 For more information about creating and developing NetBeans modules, see the following resources:
 
 *  link:https://netbeans.apache.org/platform/index.html[NetBeans Platform Homepage]
-*  link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API List (Current Development Version)]
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API List (Current Development Version)]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-quick-start-visual.adoc b/netbeans.apache.org/src/content/tutorials/nbm-quick-start-visual.adoc
index 99ea8b74d..57b63e0ce 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-quick-start-visual.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-quick-start-visual.adoc
@@ -30,7 +30,7 @@
 :description: NetBeans Visual Library Tutorial for Standard Java SE Applications - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, NetBeans Visual Library Tutorial for Standard Java SE Applications
 
-In this tutorial, you will learn how to use the main features provided by the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[NetBeans Visual Library API].
+In this tutorial, you will learn how to use the main features provided by the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[NetBeans Visual Library API].
 
 
 
@@ -432,14 +432,14 @@ protected Widget attachNodeWidget(String arg0) {
 
 image::images/vislib_vislib-java-6.png[]
 
-Now that you have a basic idea of the features that the Visual Library API provides, see the section called "NetBeans APIs for Visualizing Data" on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail].
+Now that you have a basic idea of the features that the Visual Library API provides, see the section called "NetBeans APIs for Visualizing Data" on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
 For more information about using NetBeans APIs, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc b/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
index 84300d403..0abf83c94 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-quick-start.adoc
@@ -35,11 +35,11 @@ Welcome to the  link:https://netbeans.apache.org/platform/[*NetBeans Platform*]!
 
 The NetBeans Platform is a generic application framework primarily for Java desktop applications. The main benefit of the NetBeans Platform is its predefined modular architecture. Secondary benefits are the NetBeans Platform's reusable solutions such as its docking framework and its out-of-the-box pluggable components, in combination with the tools provided by its SDK, NetBeans IDE, in particular its award winning "Matisse" GUI Builder for designing GUI components.
 
-In this quick start, you are introduced to the benefits and usages of modularity on the Java desktop via a very simple example, contributed by Thomas Würthinger, a PhD student at the Johannes Kepler University in Linz, Austria. Once you have grasped the concepts introduced in this quick start, you will be ready to step onto the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail], providing a very rich variety of tutorials for many different scenarios [...]
+In this quick start, you are introduced to the benefits and usages of modularity on the Java desktop via a very simple example, contributed by Thomas Würthinger, a PhD student at the Johannes Kepler University in Linz, Austria. Once you have grasped the concepts introduced in this quick start, you will be ready to step onto the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail], providing a very rich variety of tutorials for many different scenarios relating to the NetBeans [...]
 
 If you are new to the NetBeans Platform, it is highly recommended to get hold of  link:https://leanpub.com/nbp4beginners[NetBeans Platform for Beginners] (published in 2014).
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-quick-start.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-quick-start.html[the previous version of this document].
 
 
 
@@ -660,8 +660,8 @@ Two important concepts have been covered in this tutorial.
 
 2. Secondly, the  `Lookup`  class has been introduced as a mechanism for communicating between modules. Implementations are loaded via their interfaces. Without using any code from an implementation, the "WordEditorCore" module is able to display the service provided by the implementor. This enables loose coupling in the Apache NetBeans Platform applications.
 
-To continue learning about modularity and the NetBeans Platform, head on to the four-part "NetBeans Platform Selection Management" series,  link:https://netbeans.apache.org/tutorials/nbm-selection-1.html[which starts here]. After that, get started with the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail], choosing the tutorials that are most relevant to your particular business scenario. Also, whenever you have questions about the NetBeans Platfor [...]
+To continue learning about modularity and the NetBeans Platform, head on to the four-part "NetBeans Platform Selection Management" series,  xref:nbm-selection-1.adoc[which starts here]. After that, get started with the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail], choosing the tutorials that are most relevant to your particular business scenario. Also, whenever you have questions about the NetBeans Platform, of any kind, feel free to write to the mailing list, dev@pla [...]
 
 Have fun with the NetBeans Platform and see you on the mailing list!
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-ribbonbar.adoc b/netbeans.apache.org/src/content/tutorials/nbm-ribbonbar.adoc
index e6fecb35e..66d28bbc4 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-ribbonbar.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-ribbonbar.adoc
@@ -39,7 +39,7 @@ Based on this work, Chris Bohme from  link:http://pinkmatter.com/[PinkMatter Sol
 
 NOTE:  The instructions that follow focus on a lot of XML tags. None of these need to be typed by hand. Instead, as described in the section entitled "Using Annotations to Register the NetBeans Ribbon Bar", you do not need to use any XML tags at all since these can be generated at compile-time by a NetBeans Platform annotation processor. However, it helps to understand how the Ribbon integration works and therefore we begin by looking at XML tags. Once you are familiar with them, you can [...]
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-ribbonbar.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-ribbonbar.html[the previous version of this document].
 
 
 
@@ -730,4 +730,4 @@ This concludes the NetBeans Platform Ribbon Bar Integration Tutorial. This docum
 *  link:http://netbeans.dzone.com/news/intelligence-gathering[Interview: Intelligence Gathering Software on the NetBeans Platform]
 *  link:http://netbeans.dzone.com/news/office-laf-netbeans-platform[OfficeLAF for NetBeans Platform]
 *  link:http://netbeans.dzone.com/how-create-tabbed-toolbar-on-nb[Tabbed Toolbar for NetBeans Platform]
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-runtime-container.adoc b/netbeans.apache.org/src/content/tutorials/nbm-runtime-container.adoc
index 291a332da..42c8396a8 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-runtime-container.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-runtime-container.adoc
@@ -32,7 +32,7 @@
 
 This tutorial covers the most fundamental concept in the NetBeans Platform: the runtime container. The runtime container is the execution environment for the modules that make up a NetBeans Platform application. It consists of modules provided by the NetBeans Platform. In this tutorial, we will look at these modules, and use them in a very simple modular application.
 
-Before going further, you can watch this video series, which covers the same material as the rest of this tutorial:  link:nbm-10-top-apis.html[Top 10 NetBeans APIs]
+Before going further, you can watch this video series, which covers the same material as the rest of this tutorial:  xref:nbm-10-top-apis.adoc[Top 10 NetBeans APIs]
 
 For troubleshooting purposes, you are welcome to download the link:https://github.com/bradh/NetBeansRuntimeTutorial[completed tutorial source code].
 
@@ -231,7 +231,7 @@ In this tutorial, you have used the minimal set of NetBeans Platform modules tha
 
 Notice that you did not need to create a main method because the NetBeans runtime container contains one already. The "module" concept was also predefined in the NetBeans runtime container. Other features of the NetBeans runtime container will be introduced as you take the next steps outlined below.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
@@ -239,6 +239,6 @@ link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedba
 To continue your journey on the NetBeans Platform, see:
 
 *  link:https://netbeans.org/features/platform/features.html[NetBeans Platform Features]
-*  link:nbm-quick-start.html[NetBeans Platform Quick Start]
-*  link:nbm-selection-1.html[NetBeans Selection Management Tutorial I—Using a TopComponent's Lookup]
-*  link:nbm-10-top-apis.html[Top 10 NetBeans APIs]
+*  xref:nbm-quick-start.adoc[NetBeans Platform Quick Start]
+*  xref:nbm-selection-1.adoc[NetBeans Selection Management Tutorial I—Using a TopComponent's Lookup]
+*  xref:nbm-10-top-apis.adoc[Top 10 NetBeans APIs]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-selection-1.adoc b/netbeans.apache.org/src/content/tutorials/nbm-selection-1.adoc
index 3a45dbbbe..cde456432 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-selection-1.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-selection-1.adoc
@@ -39,7 +39,7 @@ This tutorial is part 1 of a series. Part 2 builds on this tutorial to explain h
 
 == Introduction to Selection
 
-"Selection" is an important concept for any non-trivial application. NetBeans has two basic concepts of selection - the contents of the focused link:https://netbeans.apache.org/wiki/devfaqwindowstopcomponent.asciidoc[TopComponent]'s link:https://netbeans.apache.org/wiki/devfaqlookup.asciidoc[Lookup], and the focused `TopComponent`'s  link:https://netbeans.apache.org/wiki/devfaqwhatisanode.asciidoc[ activated `Node`(s)]. Here you will deal only with the  `Lookup`  portion of selection - d [...]
+"Selection" is an important concept for any non-trivial application. NetBeans has two basic concepts of selection - the contents of the focused xref:../wiki/DevFaqWindowsTopComponent.adoc[TopComponent]'s xref:../wiki/DevFaqLookup.adoc[Lookup], and the focused `TopComponent`'s  xref:../wiki/DevFaqWhatIsANode.adoc[ activated `Node`(s)]. Here you will deal only with the  `Lookup`  portion of selection - doing more advanced things will be covered later in this series.
 
 Selection enables things such as context sensitive actions (actions that are enabled or disabled depending on what is displayed), and palette windows such as the Property Sheet or Navigator components in the IDE, which each display some aspect of whatever is selected.
 
@@ -524,7 +524,7 @@ So the key point of this tutorial is the way the code is split into three module
 
 To really picture the value of this, imagine `Event` were something much more complex; imagine that `MyEditor` is an image editor, and ` Event` represents an image being edited. The thing that's powerful here is that you could replace `MyEditor` with, say, an SVG vector-based editor, and the viewer component (presumably showing attributes of the currently edited image) will work transparently with that new editor. It is this model of doing things that is the reason you can add new tools  [...]
 
-This is very much the way NetBeans works with Java and other source files-in their case, the thing that is available from the editor's Lookup is a ` link:https://netbeans.apache.org/wiki/devfaqdataobject.asciidoc[DataObject]`, and components like Navigator and the Property Sheet are simply watching what object is being made available by the focused `TopComponent`.
+This is very much the way NetBeans works with Java and other source files-in their case, the thing that is available from the editor's Lookup is a ` xref:../wiki/DevFaqDataObject.adoc[DataObject]`, and components like Navigator and the Property Sheet are simply watching what object is being made available by the focused `TopComponent`.
 
 Another valuable thing about this approach is that often people are migrating existing applications to the NetBeans Platform. The object that is part of the data model, in that case, is probably existing, working code that should not be changed in order to integrate it into NetBeans. By keeping the data model's API in a separate module, the NetBeans integration can be kept separate from the core business logic.
 
@@ -582,7 +582,7 @@ public class MyEditor extends TopComponent {
     private final InstanceContent content = new InstanceContent();
 ----
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent] is a class which allows us to modify the content of a Lookup (specifically an instance of `AbstractLookup`) on the fly.
+link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent] is a class which allows us to modify the content of a Lookup (specifically an instance of `AbstractLookup`) on the fly.
 
 
 [start=5]
@@ -635,10 +635,10 @@ As an example, it is very common in NetBeans to provide context sensitive action
 
 So the pattern in practice is to provide more than just a single object from your component's `Lookup`- different auxillary components and different actions will be interested in different aspects of the object being edited. These aspects can be cleanly separated into interfaces which those auxillary components and actions can depend on and listen for.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
 
-By now you may have noticed that some components have more granular selection logic, and even involve multiple selection. In the link:nbm-selection-2.html[next tutorial] you will cover how to use the link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API] to handle that.
+By now you may have noticed that some components have more granular selection logic, and even involve multiple selection. In the xref:nbm-selection-2.adoc[next tutorial] you will cover how to use the link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API] to handle that.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-selection-2.adoc b/netbeans.apache.org/src/content/tutorials/nbm-selection-2.adoc
index eee556fe0..72139c9df 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-selection-2.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-selection-2.adoc
@@ -31,7 +31,7 @@
 :description: NetBeans Selection Management Tutorial II - Using Nodes - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, NetBeans Selection Management Tutorial II - Using Nodes
 
-This tutorial is part 2 of a series. The link:nbm-selection-1.html[previous tutorial] covered the basics of component-wide selection handling in NetBeans - how to provide objects from a ` link:https://netbeans.apache.org/wiki/devfaqwindowstopcomponent.asciidoc[TopComponent]`'s ` link:https://netbeans.apache.org/wiki/devfaqlookup[Lookup]`, and how to write other components that are sensitive to the `Lookup` of whatever component has focus. This tutorial assumes that you have completed the [...]
+This tutorial is part 2 of a series. The xref:nbm-selection-1.adoc[previous tutorial] covered the basics of component-wide selection handling in NetBeans - how to provide objects from a ` xref:../wiki/DevFaqWindowsTopComponent.adoc[TopComponent]`'s ` xref:../wiki/DevFaqLookup.adoc[Lookup]`, and how to write other components that are sensitive to the `Lookup` of whatever component has focus. This tutorial assumes that you have completed the previous tutorial, and have the source code to h [...]
 
 This tutorial focuses on the  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API], which makes it possible to do more granular views and selection than just component-level selection. Of course, you could write a component that reads and writes into its own Lookup whatever it wants, and provides more granular selection logic that way. But the Nodes API makes it very easy to do this, and offers a number of advantages over doing it yourself.
 
@@ -62,7 +62,7 @@ Thanks to the components in the Explorer API, it is very easy to create your own
 
 == Creating an Explorer View
 
-The first thing you will do is some substantial modifications to your `MyEditor` editor component (from the link:nbm-selection-1.html[previous tutorial]). This starts with opening it in the editor.
+The first thing you will do is some substantial modifications to your `MyEditor` editor component (from the xref:nbm-selection-1.adoc[previous tutorial]). This starts with opening it in the editor.
 
 
 [start=1]
@@ -331,11 +331,11 @@ To review a few of the concepts you've covered here:
 * Just as `Utilities.actionsGlobalContext` proxies the `Lookup` of TopComponents (so you can just ask that lookup for a result and listen for changes in it, rather than having to track focus changes yourself), the `Lookup` created by `ExplorerUtils.createLookup(ExplorerManager, ActionMap)` will create a `Lookup` which automatically proxies the `Lookup` of whatever `Node`(s) are selected in an Explorer component.
 
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
 == Next Steps
 
-So you now have a view that can display `Node` s that expose some underlying model object (`Event` in your case). In the  link:nbm-nodesapi2.html[next tutorial], you will cover how to enhance the Nodes you have already created with actions, properties and more colorful display names.
+So you now have a view that can display `Node` s that expose some underlying model object (`Event` in your case). In the  xref:nbm-nodesapi2.adoc[next tutorial], you will cover how to enhance the Nodes you have already created with actions, properties and more colorful display names.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-server-plugin.adoc b/netbeans.apache.org/src/content/tutorials/nbm-server-plugin.adoc
index 25ee37bce..442bcb523 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-server-plugin.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-server-plugin.adoc
@@ -30,7 +30,7 @@
 :description: NetBeans Server-Skeleton Module Tutorial - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, NetBeans Server-Skeleton Module Tutorial
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Feedback]
+xref:../community/mailing-lists.adoc[Feedback]
 
 This tutorial is intended to ease the _initial_ phase of developing NetBeans modules that provide support for web deployment servers, such as the Tomcat Web Server or the Sun Java System Application Server. It provides the code for a skeleton server module, together with a detailed procedure for creating it from scratch and a full description of each of its parts. Since this is "just" a _skeleton_ module, server-specific features that relate to starting and stopping, deploying, undeployi [...]
 
@@ -63,7 +63,7 @@ The following topics are covered below:
 
 Once the software is installed, this tutorial can be completed in 60 minutes.
 
-For more information on working with NetBeans modules, see the  link:https://netbeans.apache.org/kb/docs/platform.html[ NetBeans Module and Rich-Client Application tutorials page] on the NetBeans website. If you have questions, visit the  link:http://wiki.netbeans.org/wiki/view/NetBeansDeveloperFAQ[ NetBeans Developer FAQ] or use the feedback link at the top of this page.
+For more information on working with NetBeans modules, see the  xref:../kb/docs/platform.adoc[ NetBeans Module and Rich-Client Application tutorials page] on the NetBeans website. If you have questions, visit the  xref:../wiki/NetBeansDeveloperFAQ.adoc[ NetBeans Developer FAQ] or use the feedback link at the top of this page.
 
 
 == Getting to Know the Sample
@@ -177,7 +177,7 @@ The factories are introduced in alphabetical order:
 
 | ``<<MyDeploymentFactory,MyDeploymentFactory.java>>``  |An implementation of the  `` link:https://docs.oracle.com/javaee/1.4/api/javax/enterprise/deploy/spi/factories/DeploymentFactory.html[DeploymentFactory]``  interface, which produces instances of  `` link:https://docs.oracle.com/javaee/1.4/api/javax/enterprise/deploy/spi/DeploymentManager.html[DeploymentManager]``  interface implementations, such as <<MyDeploymentManager, ``MyDeploymentManager`` >>. 
 
-| ``<<MyJ2eePlatformFactory,MyJ2eePlatformFactory.java>>``  |An implementation of the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/J2eePlatformFactory.html[J2eePlatformFactory]``  abstract class, which produces instances of  `` link:https://bits.netbeans.org/dev/javadocorg-netbeans-modules-j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/J2eePlatformImpl.html[J2eePlatformImpl]``  abstract class  [...]
+| ``<<MyJ2eePlatformFactory,MyJ2eePlatformFactory.java>>``  |An implementation of the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/J2eePlatformFactory.html[J2eePlatformFactory]``  abstract class, which produces instances of  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/J2eePlatformImpl.html[J2eePlatformImpl]``  abstract class [...]
 
 | ``<<MyOptionalFactory,MyOptionalFactory.java>>``  |An implementation of the  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/OptionalDeploymentManagerFactory.html[OptionalDeploymentManagerFactory]``  abstract class. Although its name implies that it is _optional_, it isn't. You need to at least implement its methods for starting, stopping, and registering the server in the IDE. Therefore, the  ``<<MyOptional [...]
 
@@ -258,7 +258,7 @@ The IDE creates the  ``My Server Module``  project. The project contains all of
 
 image::images/myserver_projects-window-original.png[]
 
-For basic information on each of the files created by the New Project wizard, see the  link:https://netbeans.apache.org/tutorials/quickstart-nbm.html[Introduction to NetBeans Module Development].
+For basic information on each of the files created by the New Project wizard, see the  xref:quickstart-nbm.adoc[Introduction to NetBeans Module Development].
 
 
 === Specifying the Module's Dependencies
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-test.adoc b/netbeans.apache.org/src/content/tutorials/nbm-test.adoc
index 270207c86..425b3cfd8 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-test.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-test.adoc
@@ -36,8 +36,8 @@ Since then, however, there is inherent support for testing NetBeans Platform app
 
 In this tutorial, you are introduced to setting up the "simpletests" infrastructure and to using the NetBeans Platform's unit testing and functional testing frameworks. These are:
 
-* * link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/overview-summary.html[NB Junit.]* NetBeans Platform extension to the  link:http://www.junit.org/[JUnit] testing framework.
-* * link:http://wiki.netbeans.org/JellyTools[Jelly Tools.]* NetBeans Platform extension to the  link:https://hg.openjdk.java.net/code-tools/jemmy/v2/file/7f1077e65e78/[Jemmy] testing framework.
+* * link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/overview-summary.html[NB Junit.]* NetBeans Platform extension to the  link:http://www.junit.org/[JUnit] testing framework.
+* * xref:../wiki/JellyTools.adoc[Jelly Tools.]* NetBeans Platform extension to the  link:https://hg.openjdk.java.net/code-tools/jemmy/v2/file/7f1077e65e78/[Jemmy] testing framework.
 
 By the end of this tutorial, you should know how to set up the NetBeans Platform testing infrastructure, how to create unit tests, and how to create functional tests.
 
@@ -128,7 +128,7 @@ You have now set up everything needed for creating unit tests and functional tes
 
 == Unit Testing on the NetBeans Platform
 
-The NetBeans Platform's extension to JUnit is named " link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/overview-summary.html[NB JUnit]". It is a separate library with additional support for memory leak tests, deadlock tests, and extended use of logging. More info and motivation can be found at  link:http://openide.netbeans.org/tutorial/test-patterns.html[Test Patterns in Java]. The basic test class for NB JUnit is  link:http://bits.netbeans.org/dev/javadoc/org-netbe [...]
+The NetBeans Platform's extension to JUnit is named " link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/overview-summary.html[NB JUnit]". It is a separate library with additional support for memory leak tests, deadlock tests, and extended use of logging. More info and motivation can be found at  link:http://openide.netbeans.org/tutorial/test-patterns.html[Test Patterns in Java]. The basic test class for NB JUnit is  link:https://bits.netbeans.org/dev/javadoc/org-net [...]
 
 An example unit test for the NetBeans Platform Paint sample:
 
@@ -139,7 +139,7 @@ An example unit test for the NetBeans Platform Paint sample:
 import org.netbeans.junit.*;
 import org.netbeans.paint.PaintCanvas;
 
-public class PaintCanvasTest extends link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/org/netbeans/junit/NbTestCase.html[NbTestCase] {
+public class PaintCanvasTest extends link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/org/netbeans/junit/NbTestCase.html[NbTestCase] {
 
     public PaintCanvasTest(java.lang.String testName) {
         super(testName);
@@ -172,15 +172,15 @@ image::images/test_result-3.png[]
 Typical questions relating to unit testing on the NetBeans Platform relate to specific NetBeans API objects and the central registry (also known as "System FileSystem"). For information on how to test these parts of your application, see the following resources:
 
 *  link:http://openide.netbeans.org/tutorial/test-patterns.html[Typical Test Patterns]
-*  link:http://wiki.netbeans.org/TestingThingsThatUseFileObjectDataObjectDataFolder[Writing Tests with FileObjects, DataObjects, and DataFolders]
-*  link:https://netbeans.apache.org/wiki/devfaqtestdataobject[Writing Tests with DataObjects and DataLoaders]
-*  link:http://wiki.netbeans.org/InitializationOfDefaultLookup[Writing Tests with Lookup]
-*  link:https://netbeans.apache.org/wiki/devfaqtestusingsystemfilesystem[How do I test something which uses the System Filesystem?]
+*  xref:../wiki/TestingThingsThatUseFileObjectDataObjectDataFolder.adoc[Writing Tests with FileObjects, DataObjects, and DataFolders]
+*  xref:../wiki/DevFaqTestDataObject.adoc[Writing Tests with DataObjects and DataLoaders]
+*  xref:../wiki/InitializationOfDefaultLookup.adoc[Writing Tests with Lookup]
+*  xref:../wiki/DevFaqTestUsingSystemFileSystem.adoc[How do I test something which uses the System Filesystem?]
 
 
 == Functional Testing on the NetBeans Platform
 
-The NetBeans Platform's extension to Jemmy is named  link:http://wiki.netbeans.org/JellyTools[JellyTools]. It provides a set of operators that are tailored to UI components used specifically in the NetBeans Platform, such as  ``TopComponentOperator`` .
+The NetBeans Platform's extension to Jemmy is named  xref:../wiki/JellyTools.adoc[JellyTools]. It provides a set of operators that are tailored to UI components used specifically in the NetBeans Platform, such as  ``TopComponentOperator`` .
 
 An example functional test for the NetBeans Platform Paint sample.
 
@@ -405,7 +405,7 @@ image::images/test_result-7.png[]
 
 image::images/test_result-8.png[]
 
-Further reading, advice, and warnings related to code coverage can be found  link:http://wiki.netbeans.org/CodeCoverage[here].
+Further reading, advice, and warnings related to code coverage can be found  xref:../wiki/CodeCoverage.adoc[here].
 
 
 == See Also
@@ -413,15 +413,15 @@ Further reading, advice, and warnings related to code coverage can be found  lin
 This concludes the NetBeans Platform Testing Tutorial. This document has described how to add unit testing and functional testing functionality to a NetBeans Platform application. For more information about testing on the NetBeans Platform, see the following resources:
 
 *  link:http://openide.netbeans.org/tutorial/test-patterns.html[Typical Test Patterns]
-*  link:http://wiki.netbeans.org/NetBeansDeveloperTestFAQ[ NetBeans Developer Test FAQ]
+*  xref:../wiki/NetBeansDeveloperTestFAQ.adoc[ NetBeans Developer Test FAQ]
 *  link:http://blogs.oracle.com/coreqa/entry/xtest_is_dead_long_live[XTest is Dead Long Live Simpletests]
-*  link:http://wiki.netbeans.org/FitnessTestsWithoutX[FitnessTestsWithoutX]
-*  link:https://netbeans.apache.org/wiki/devfaqusingsimpletests[Using Simpletests]
+*  xref:../wiki/FitnessTestsWithoutX.adoc[FitnessTestsWithoutX]
+*  xref:../wiki/DevFaqUsingSimpletests.adoc[Using Simpletests]
 *  link:http://forums.netbeans.org/topic10210.html[http://forums.netbeans.org/topic10210.html]
-*  link:http://wiki.netbeans.org/JellyTools[JellyTools]
-*  link:https://netbeans.apache.org/wiki/devrunningtestsplatformapp[Running tests on a platform application]
-*  link:http://wiki.netbeans.org/TestingThingsThatUseFileObjectDataObjectDataFolder[ Testing things that use FileObjects]
-*  link:https://netbeans.apache.org/wiki/devfaqtestdataobject[ Writing Tests for DataObjects and DataLoaders]
-*  link:https://netbeans.apache.org/wiki/devfaqtestusingsystemfilesystem[ How do I test something which uses the System Filesystem?]
+*  xref:../wiki/JellyTools.adoc[JellyTools]
+*  xref:../wiki/DevRunningTestsPlatformApp.adoc[Running tests on a platform application]
+*  link:../wiki/TestingThingsThatUseFileObjectDataObjectDataFolder.adoc[ Testing things that use FileObjects]
+*  xref:../wiki/DevFaqTestDataObject.adoc[ Writing Tests for DataObjects and DataLoaders]
+*  xref:../wiki/DevFaqTestUsingSystemFileSystem.adoc[ How do I test something which uses the System Filesystem?]
 *  link:http://performance.netbeans.org/insane/index.html[INSANE]
-*  link:http://wiki.netbeans.org/CodeCoverage[Code Coverage]
+*  link:../wiki/CodeCoverage.adoc[Code Coverage]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-visual_library.adoc b/netbeans.apache.org/src/content/tutorials/nbm-visual_library.adoc
index 68572010f..7615fb449 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-visual_library.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-visual_library.adoc
@@ -30,13 +30,13 @@
 :description: NetBeans Visual Library Tutorial - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, NetBeans Visual Library Tutorial
 
-In this tutorial, you will learn how to use the main features provided by the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[NetBeans Visual Library API]. The library provides a set of reusable pieces, called "widgets". When you compose them together, you are able to create a visualization in a simple and flexible way. Each widget has, built into it, various properties, such as "layout", "border", and "actions". The set of predefined widgets prov [...]
+In this tutorial, you will learn how to use the main features provided by the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[NetBeans Visual Library API]. The library provides a set of reusable pieces, called "widgets". When you compose them together, you are able to create a visualization in a simple and flexible way. Each widget has, built into it, various properties, such as "layout", "border", and "actions". The set of predefined widgets pro [...]
 
 All the pluggable pieces are declared as interfaces or abstract classes, such as "WidgetAction", "Anchor", "AnchorShape", "PointShape", "Animator", "Border", "GraphLayout", "LookFeel", "Layout", "SceneLayout", "Router", and "CollisionsCollector".
 
 In summary, the Visual Library API is a visualization API, useful in the context of modeling and graphing features.
 
-NOTE: This document uses NetBeans Platform 7.1 and NetBeans IDE 7.1. If you are using an earlier version, see  link:70/nbm-visual_library.html[the previous version of this document].
+// NOTE: This document uses NetBeans Platform 7.1 and NetBeans IDE 7.1. If you are using an earlier version, see  link:70/nbm-visual_library.html[the previous version of this document].
 
 
 
@@ -178,11 +178,11 @@ image::images/vislib_firstscene.png[]
 
 == Creating a Component Palette for the Scene
 
-To do something useful with the Visual Library API, we will implement the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/overview-summary.html[Palette API] so that we end up with a Component Palette containing the shapes shown at the start of this tutorial. Later, we will add the Visual Library API's drag and drop functionality so that we can drag and drop the shapes into the scene. After that, we will be able to enrich the scene with additional features, such as the [...]
+To do something useful with the Visual Library API, we will implement the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-palette/overview-summary.html[Palette API] so that we end up with a Component Palette containing the shapes shown at the start of this tutorial. Later, we will add the Visual Library API's drag and drop functionality so that we can drag and drop the shapes into the scene. After that, we will be able to enrich the scene with additional features, such as th [...]
 
 
 [start=1]
-1. Since the focus of this tutorial is the Visual Library API, and not the Palette API, no time will be spent here explaining how the Palette API works. Many tutorials exist on this subject already ( link:https://netbeans.apache.org/kb/docs/platform.html[here]). Therefore, you can simply copy and paste the following files into a new package called  ``org.netbeans.shapesample.palette`` :
+1. Since the focus of this tutorial is the Visual Library API, and not the Palette API, no time will be spent here explaining how the Palette API works. Many tutorials exist on this subject already ( xref:../kb/docs/platform.adoc[here]). Therefore, you can simply copy and paste the following files into a new package called  ``org.netbeans.shapesample.palette`` :
 
 *  link:images/vislib_Category.java[Category.java]
 *  link:images/vislib_CategoryChildren.java[CategoryChildren.java]
@@ -227,7 +227,7 @@ When you try to drag and drop a widget onto the scene, nothing happens because y
 
 == Adding a LayerWidget
 
-A  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/LayerWidget.html[LayerWidget] represents a glasspane, similar to JGlassPane in Swing. It is transparent by default. So, before we go any further, we will add a LayerWidget to the scene, so that we have somewhere to place the visible widgets that we will drag and drop onto the scene.
+A  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/LayerWidget.html[LayerWidget] represents a glasspane, similar to JGlassPane in Swing. It is transparent by default. So, before we go any further, we will add a LayerWidget to the scene, so that we have somewhere to place the visible widgets that we will drag and drop onto the scene.
 
 
 [start=1]
@@ -252,14 +252,14 @@ addChild (mainLayer);
 
 Now, when we drag and drop items from the palette as widgets to the scene, we will add them as children of the LayerWidget. Because LayerWidgets are transparent by default, you could have various LayerWidgets transparently on top of each other so that, for example, you can add a background image to the scene.
 
-For details, see  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/LayerWidget.html[LayerWidget] in the Javadoc.
+For details, see  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/LayerWidget.html[LayerWidget] in the Javadoc.
 
 
 == Adding an IconNodeWidget via Drag and Drop Functionality
 
 Earlier, we used the  ``GraphSceneImpl``  class's constructor to pass a scene to the TopComponent's JScrollPane. So far, the scene exists but has no behavior. Behavior is added through actions. The action that we will look at in this section is called  `` link:https://netbeans.apache.org/graph/documentation.html#AcceptAction[AcceptAction]`` . This action enables drag and drop functionality. The drag and drop functionality could be applied to a widget, but here we apply it to the scene itself.
 
-We use  ``createAcceptAction``  to specify what should happen when an item from the palette is dragged over the scene. Two methods are involved here. The first,  ``isAcceptable()`` , is used to determine whether the item is acceptable to the scene. Here you can test the item, by using the transferable. You can also set the drag image, which is all that we do in the implementation below. If  ``true``  is returned, the  ``accept``  method is called. Here we get the image from the transfera [...]
+We use  ``createAcceptAction``  to specify what should happen when an item from the palette is dragged over the scene. Two methods are involved here. The first,  ``isAcceptable()`` , is used to determine whether the item is acceptable to the scene. Here you can test the item, by using the transferable. You can also set the drag image, which is all that we do in the implementation below. If  ``true``  is returned, the  ``accept``  method is called. Here we get the image from the transfera [...]
 
 All the code in this section is interrelated, and you will receive red error underlines in your code until all the methods below have been added, but we will try to add everything in some kind of logical order anyway!
 
@@ -500,7 +500,7 @@ widget.getActions().addAction(createObjectHoverAction());
 
 
 [start=6]
-1. Next, you need to think about the order of the actions that you have created. For details, see the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#OrderOfActions[Order of Actions] section in the documentation. After you have reordered the actions, the  ``attachNodeWidget``  should look as follows:
+1. Next, you need to think about the order of the actions that you have created. For details, see the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#OrderOfActions[Order of Actions] section in the documentation. After you have reordered the actions, the  ``attachNodeWidget``  should look as follows:
 
 [source,java]
 ----
@@ -533,7 +533,7 @@ protected Widget attachNodeWidget(MyNode node) {
 
 Congratulations, you have completed your first Visual Library scene.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == Next Steps
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-visual_library2.adoc b/netbeans.apache.org/src/content/tutorials/nbm-visual_library2.adoc
index 6d2b71038..66281d696 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-visual_library2.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-visual_library2.adoc
@@ -45,12 +45,12 @@ All the information you need to know for working with the Visual Library API, as
 
 *  link:https://netbeans.apache.org/graph/[Visual Library Project Page]
 *  link:https://netbeans.apache.org/graph/documentation.html[Visual Library 2.0 - Documentation]
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library API Javadoc]
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/overview-summary.html[Database Explorer API Javadoc]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library API Javadoc]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/overview-summary.html[Database Explorer API Javadoc]
 
 Also, see  link:http://www.javalobby.org/eps/netbeans_visual_library/[Roman Strobl's Visual Library Screencast] on Javalobby.
 
-Before continuing, you are assumed to have read the  link:https://netbeans.apache.org/tutorials/nbm-visual_library.html[NetBeans Visual Library Tutorial], which gives you the basics for working with the Visual Library. The basics discussed in that tutorial will not be repeated here.
+Before continuing, you are assumed to have read the  xref:nbm-visual_library.adoc[NetBeans Visual Library Tutorial], which gives you the basics for working with the Visual Library. The basics discussed in that tutorial will not be repeated here.
 
 
 == Setting Up the Module
@@ -76,12 +76,12 @@ The IDE creates the  ``DatabaseExplorerDemo``  project. The project contains all
 
 [start=5]
 1. Right-click the project, choose Properties, click Libraries in the Project Properties dialog box and declare a dependency on the following APIs:
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/overview-summary.html[Database Explorer]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[UI Utilities API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-util/overview-summary.html[Utilities API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library API]
-*  link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/overview-summary.html[Window System API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/overview-summary.html[Database Explorer]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[UI Utilities API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-util/overview-summary.html[Utilities API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library API]
+*  link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/overview-summary.html[Window System API]
 
 NOTE:  You need to set an implementation dependency on the Database Explorer API. Do so by selecting the Database Explorer item in the Libraries panel of the Project Properties dialog, clicking Edit, and then clicking 'Implementation Version'. By doing this, you are setting a dependency on internal classes that will change in future releases. Currently there is no other way of completing the scenario in this tutorial than to set an implementation dependency.
 
@@ -534,7 +534,7 @@ image::images/db_69-db-1.png[]
 
 Congratulations, you have completed a Visual Library scene that connects to a database and visually displays its content.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 [[
@@ -547,8 +547,8 @@ For more information on working with the Visual Library API, see:
 *  link:http://www.javalobby.org/eps/netbeans_visual_library/[Roman Strobl's Visual Library Screencast] on Javalobby.
 *  link:https://netbeans.apache.org/graph/[Visual Library Project Page]
 *  link:https://netbeans.apache.org/graph/documentation.html[Visual Library 2.0 - Documentation]
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library API Javadoc]
-*  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/overview-summary.html[Database Explorer API Javadoc]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library API Javadoc]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/overview-summary.html[Database Explorer API Javadoc]
 
-With thanks to Toni Epple, who wrote the first version of this tutorial,  link:http://wiki.netbeans.org/VisualDatabaseExplorer[A Visual Database Explorer for NetBeans].
+With thanks to Toni Epple, who wrote the first version of this tutorial,  xref:../wiki/VisualDatabaseExplorer.adoc[A Visual Database Explorer for NetBeans].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-visual_library3.adoc b/netbeans.apache.org/src/content/tutorials/nbm-visual_library3.adoc
index a6a125c78..fbd5fbd85 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-visual_library3.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-visual_library3.adoc
@@ -30,7 +30,7 @@
 :description: NetBeans Visual Library Tutorial for Java Applications - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, NetBeans Visual Library Tutorial for Java Applications
 
-In this tutorial, you will learn how to use the main features provided by the  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[NetBeans Visual Library API].
+In this tutorial, you will learn how to use the main features provided by the  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[NetBeans Visual Library API].
 
 
 
@@ -350,5 +350,5 @@ getActions().addAction(ActionFactory.createZoomAction());
 [start=4]
 1. Run the application. Scroll the middle mousebutton, or do whatever your operating system requires for "zooming", and notice that the whole scene increases/decreases in size.
 
-Now that you have a basic idea of the features that the Visual Library API provides, see the section called "NetBeans APIs for Visualizing Data" on the  link:https://netbeans.apache.org/kb/docs/platform.html[NetBeans Platform Learning Trail].
+Now that you have a basic idea of the features that the Visual Library API provides, see the section called "NetBeans APIs for Visualizing Data" on the  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-visual_library4.adoc b/netbeans.apache.org/src/content/tutorials/nbm-visual_library4.adoc
index 6440c093c..1cac71023 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-visual_library4.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-visual_library4.adoc
@@ -32,9 +32,9 @@
 
 In this tutorial, you will learn about a different approach to creating widgets in Visual Library scenes. Other approaches are described in other tutorials:
 
-*  link:https://netbeans.apache.org/tutorials/nbm-visual_library.html[NetBeans Visual Library Tutorial.] In this introductory tutorial to the Visual Library, you are shown how widgets can be created when the user drags-and-drops an item from the Component Palette.
-*  link:https://netbeans.apache.org/tutorials/nbm-visual_library2.html[NetBeans Visual Database Explorer Tutorial.] In this tutorial, you are shown how widgets can be created from tables in a database via a database connection in the Services window.
-*  link:https://netbeans.apache.org/tutorials/nbm-visual_library3.html[NetBeans Visual Library Tutorial for Java Applications.] In this tutorial aimed at general Java SE applications, you are shown how widgets can be generated from the constructor of a NetBeans Visual Library Scene class.
+*  xref:nbm-visual_library.adoc[NetBeans Visual Library Tutorial.] In this introductory tutorial to the Visual Library, you are shown how widgets can be created when the user drags-and-drops an item from the Component Palette.
+*  xref:nbm-visual_library2.adoc[NetBeans Visual Database Explorer Tutorial.] In this tutorial, you are shown how widgets can be created from tables in a database via a database connection in the Services window.
+*  xref:nbm-visual_library3.adoc[NetBeans Visual Library Tutorial for Java Applications.] In this tutorial aimed at general Java SE applications, you are shown how widgets can be generated from the constructor of a NetBeans Visual Library Scene class.
 
 In this tutorial, widgets are created in a slightly different way, more common to typical Visual Library scenarios. When the user clicks in a scene, a dialog will appear, where the user can specify certain attributes of the widget, after which the widget itself will be created. In other words, in contrast to the above tutorials, widgets will be created on-demand, that is, when the user requires them, when clicking in the scene, that is, without using the Component Palette.
 
@@ -210,7 +210,7 @@ image::images/vislib4_result-4.png[]
 Congratulations, you have completed your first Visual Library scene.
 
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-wizard.adoc b/netbeans.apache.org/src/content/tutorials/nbm-wizard.adoc
index a91b27d20..f62e8859f 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-wizard.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-wizard.adoc
@@ -30,15 +30,15 @@
 :description: NetBeans Wizard Module Tutorial - Apache NetBeans
 :keywords: Apache NetBeans Platform, Platform Tutorials, NetBeans Wizard Module Tutorial
 
-In this tutorial, you will learn how to use the main features provided by the Wizard classes of the  link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/package-summary.html[NetBeans Dialogs API].
+In this tutorial, you will learn how to use the main features provided by the Wizard classes of the  link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/package-summary.html[NetBeans Dialogs API].
 
-NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-wizard.html[the previous version of this document].
+// NOTE: If you are using an earlier version of Apache NetBeans, see  link:74/nbm-wizard.html[the previous version of this document].
 
 
 
 
 
-In NetBeans Platform applications, many different kinds of wizards can be created. If you want to create a wizard that appears in the New Project dialog, see the  link:https://netbeans.apache.org/tutorials/nbm-projectsamples.html[Project Sample Module Tutorial]. If you want to create a wizard that appears in the New File dialog, see the  link:https://netbeans.apache.org/tutorials/nbm-filetemplates.html[File Template Module Tutorial]. In this tutorial, you create a general wizard that app [...]
+In NetBeans Platform applications, many different kinds of wizards can be created. If you want to create a wizard that appears in the New Project dialog, see the  xref:nbm-projectsamples.adoc[Project Sample Module Tutorial]. If you want to create a wizard that appears in the New File dialog, see the  xref:nbm-filetemplates.adoc[File Template Module Tutorial]. In this tutorial, you create a general wizard that appears when you click a button in the toolbar.
 
 
 
@@ -99,7 +99,7 @@ In the Projects window, you should now see this:
 
 image::images/wizard_70_projects-window.png[]
 
-Read through the NetBeans wizard javadoc in the  link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/[NetBeans Dialogs API] and compare the classes generated above to the classes described in the  link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/package-summary.html[javadoc], which will prepare you for the next sections.
+Read through the NetBeans wizard javadoc in the  link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/[NetBeans Dialogs API] and compare the classes generated above to the classes described in the  link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/package-summary.html[javadoc], which will prepare you for the next sections.
 
 
 == Registering the Wizard Action Class
@@ -167,10 +167,10 @@ public final class DemoWizardAction implements ActionListener {
 
 [source,java,subs="macros"]
 ----
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID]
 (category="Demo", id="org.demo.wizard.DemoWizardAction")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration](displayName="Open Demo Wizard")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](path="Menu/Tools", position=10)
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration](displayName="Open Demo Wizard")
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](path="Menu/Tools", position=10)
 ----
 
 When the module is compiled, you will find a " ``generated-layer.xml`` " file, if you switch to the Files window and look in the  ``build/classes/META-INF``  folder, as shown below:
@@ -178,7 +178,7 @@ When the module is compiled, you will find a " ``generated-layer.xml`` " file, i
 
 image::images/wizard_70_generated-layer.png[]
 
-The  ``generated-layer.xml``  file provides contributions to the NetBeans central registry (also known as the 'system filesystem'), where fixed folders (such as "Actions" and "Menu") provide placeholders for the registration of the content of menubars, toolbars, and many other NetBeans Platform features. For details, see  link:https://netbeans.apache.org/wiki/devfaqsystemfilesystem[http://wiki.netbeans.org/DevFaqSystemFilesystem].
+The  ``generated-layer.xml``  file provides contributions to the NetBeans central registry (also known as the 'system filesystem'), where fixed folders (such as "Actions" and "Menu") provide placeholders for the registration of the content of menubars, toolbars, and many other NetBeans Platform features. For details, see  xref:../wiki/DevFaqSystemFilesystem.adoc[DevFaqSystemFilesystem].
 
 
 [start=3]
@@ -313,7 +313,7 @@ if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION)
 }
 ----
 
-The  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.html[NotifyDescriptor]``  can be used in other ways too, as indicated by the code completion box:
+The  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.html[NotifyDescriptor]``  can be used in other ways too, as indicated by the code completion box:
 
 
 image::images/wizard_70_notifydescriptor.png[]
@@ -327,7 +327,7 @@ In this section, you learn how to validate the user input when "Next" is clicked
 
 
 [start=1]
-1. In  ``DemoWizardPanel1`` , change the class signature, implementing  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/WizardDescriptor.ValidatingPanel.html[WizardDescriptor.ValidatingPanel]``  instead of  ``WizardDescriptor.Panel`` :
+1. In  ``DemoWizardPanel1`` , change the class signature, implementing  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/WizardDescriptor.ValidatingPanel.html[WizardDescriptor.ValidatingPanel]``  instead of  ``WizardDescriptor.Panel`` :
 
 
 [source,java]
@@ -339,7 +339,7 @@ public class DemoWizardPanel1 implements WizardDescriptor.ValidatingPanel<Wizard
 
 
 [start=2]
-1. Implement the required abstract method that throws a  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/WizardValidationException.html[WizardValidationException]``  like this:
+1. Implement the required abstract method that throws a  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/WizardValidationException.html[WizardValidationException]``  like this:
 
 [source,java]
 ----
@@ -468,7 +468,7 @@ image::images/wizard_70_nbpref3.png[]
 
 You now know how to persist wizard data across restarts.
 
-For more information on the  ``NbPreferences``  class, used above, see the  link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[ ``NbPreferences``  javadoc], as well as the  link:https://netbeans.apache.org/tutorials/nbm-options.html[NetBeans Options Window Tutorial].
+For more information on the  ``NbPreferences``  class, used above, see the  link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[ ``NbPreferences``  javadoc], as well as the  xref:nbm-options.adoc[NetBeans Options Window Tutorial].
 
 
 == Branding the Wizard
@@ -563,6 +563,6 @@ The sample is especially useful in showing how to validate user data.
 *  link:http://blogs.oracle.com/geertjan/entry/how_wizards_work_part_4[How Wizards Work: Part 4—Your Own Iterator ]
 *  link:http://blogs.oracle.com/geertjan/entry/how_wizards_work_part_5[How Wizards Work: Part 5—Reusing and Embedding Existing Panels ]
 *  link:http://blogs.oracle.com/geertjan/entry/creating_a_better_java_class[Creating a Better Java Class Wizard]
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[ Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-workflow.adoc b/netbeans.apache.org/src/content/tutorials/nbm-workflow.adoc
index 7dca76732..afa6d5c51 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-workflow.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-workflow.adoc
@@ -56,7 +56,7 @@ image::images/workflow_72_objectreservoir_thumb.jpg[role="left", link="https://n
 
 In this tutorial, we imagine we're creating a prediction system consisting of three steps, "specify", "diagnose", and "forecast". Each step in the sequence is supported by a "canvas", which consists of multiple "windows". The user switches from canvas to canvas via a control panel. Changes made by the user to the size and position of windows in a canvas are automatically stored on disk and are automatically available upon restarts of the application.
 
-NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-workflow.html[the previous version of this document].
+// NOTE:  This document uses NetBeans IDE 8.0 and NetBeans Platform 8.0. If you are using an earlier version, see  link:74/nbm-workflow.html[the previous version of this document].
 
 
 
@@ -197,13 +197,13 @@ image::images/workflow_72_new-control-3.png[]
 
 package org.prediction.control;
 
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/OnStart.html[org.openide.modules.OnStart];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/OnStart.html[org.openide.modules.OnStart];
 import org.openide.windows.WindowManager;
 import org.openide.windows.WindowSystemEvent;
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/WindowSystemListener.html[org.openide.windows.WindowSystemListener];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/WindowSystemListener.html[org.openide.windows.WindowSystemListener];
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/OnStart.html[@OnStart]
-public class Installer implements Runnable, link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/WindowSystemListener.html[WindowSystemListener]  {
+link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/OnStart.html[@OnStart]
+public class Installer implements Runnable, link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/WindowSystemListener.html[WindowSystemListener]  {
 
     @Override
     public void run() {
@@ -212,7 +212,7 @@ public class Installer implements Runnable, link:http://bits.netbeans.org/dev/ja
 
     @Override
     public void beforeLoad(WindowSystemEvent wse) {
-        link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/WindowManager.html#setRole(java.lang.String)[WindowManager.getDefault().setRole("specify")];
+        link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/WindowManager.html#setRole(java.lang.String)[WindowManager.getDefault().setRole("specify")];
         WindowManager.getDefault().removeWindowSystemListener(this);
     }
 
@@ -250,26 +250,26 @@ package org.prediction.specify;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[org.openide.awt.ActionID];
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[org.openide.awt.ActionReference];
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[org.openide.awt.ActionRegistration];
-import link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[org.openide.util.NbBundle.Messages];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[org.openide.awt.ActionID];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[org.openide.awt.ActionReference];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[org.openide.awt.ActionRegistration];
+import link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[org.openide.util.NbBundle.Messages];
 import org.openide.windows.WindowManager;
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID](
         category = "Window",
         id = "org.prediction.specify.SwitchToSpecifyRole")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration](
         displayName = "#CTL_SwitchToSpecifyRole")
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference](
         path = "Menu/Window", 
         position = 250)
-link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]("CTL_SwitchToSpecifyRole=Switch to Specify Role")
+link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@Messages]("CTL_SwitchToSpecifyRole=Switch to Specify Role")
 public final class SwitchToSpecifyRole implements ActionListener {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-      link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/WindowManager.html#setRole(java.lang.String)[WindowManager.getDefault().setRole("specify")];
+      link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/WindowManager.html#setRole(java.lang.String)[WindowManager.getDefault().setRole("specify")];
     }
     
 }
@@ -317,6 +317,6 @@ You also have an installer class which sets the initial role in the application.
 The tutorial is complete. You have created a modular application on the NetBeans Platform, providing the infrastructure for a workflow application.
 
 
-link:http://netbeans.apache.org/community/mailing-lists.html[ Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-xmleditor.adoc b/netbeans.apache.org/src/content/tutorials/nbm-xmleditor.adoc
index f733fcfbf..f69e79d79 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-xmleditor.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-xmleditor.adoc
@@ -34,7 +34,7 @@ This tutorial demonstrates how to create a module that extends the functionality
 
 In this tutorial, you add an action to the XML editor. After you create and install the module, and you open an XML file, the editor's contextual menu will include a menu item that displays the XML file's tags in the Output Window.
 
-NOTE: This document uses NetBeans Platform 8.0 and above with NetBeans IDE 8.0 and above. If you are using an earlier version of NetBeans IDE or the NetBeans Platform, see  link:74/nbm-xmleditor.html[the previous version of this document].
+// NOTE: This document uses NetBeans Platform 8.0 and above with NetBeans IDE 8.0 and above. If you are using an earlier version of NetBeans IDE or the NetBeans Platform, see  link:74/nbm-xmleditor.html[the previous version of this document].
 
 == Setting up the Module Project
 
@@ -83,7 +83,7 @@ In this section, you use the New Action wizard to create a new Java class, which
 1. Right-click the project node and choose New > Other. Under Categories, select Module Development. Under Projects, select Action. Click Next.
 
 [start=2]
-1. In the Action Type panel, click Conditionally Enabled. Select  `` link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/cookies/EditorCookie.html[EditorCookie]`` . Because of this selection, the Action will be enabled when an EditorCookie is available in the Lookup. That will be the case whenever a document is open in the Source Editor. Click Next.
+1. In the Action Type panel, click Conditionally Enabled. Select  `` link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/cookies/EditorCookie.html[EditorCookie]`` . Because of this selection, the Action will be enabled when an EditorCookie is available in the Lookup. That will be the case whenever a document is open in the Source Editor. Click Next.
 
 [start=3]
 1. In the GUI Registration panel, select the Edit category in the Category drop-down list. The Category drop-down list controls where an Action is shown in the Keyboard Shortcuts editor in the IDE.
@@ -224,11 +224,11 @@ The module is built and installed in the target IDE or Platform. The target IDE
 [start=2]
 1. Choose the menu item and notice that the tag handler prints all the elements and attributes to the Output window (Ctrl-4), which is at at the bottom of the IDE.
 
-link:http://netbeans.apache.org/community/mailing-lists.html[Send Us Your Feedback]
+xref:../community/mailing-lists.adoc[Send Us Your Feedback]
 
 == Next Steps
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/kb/docs/platform.html[Other Related Tutorials]
+*  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/wiki/APIDevelopment.adoc b/netbeans.apache.org/src/content/wiki/APIDevelopment.adoc
index 0f9dc976a..2063d97d3 100644
--- a/netbeans.apache.org/src/content/wiki/APIDevelopment.adoc
+++ b/netbeans.apache.org/src/content/wiki/APIDevelopment.adoc
@@ -35,7 +35,7 @@
 == Overview
 
 The xref:../index.adoc[NetBeans] project provides a rich set of
-link:http://bits.netbeans.org/dev/javadoc/[APIs] that is being developed as
+link:https://bits.netbeans.org/dev/javadoc/[APIs] that is being developed as
 part of work of various groups. By distributing development of the
 xref:API_Design.adoc[API]s to multiple people we can increase the amount of designed,
 reviewed, implemented, tuned and maintained contracts but as each module is
@@ -367,7 +367,7 @@ Also consider to subscribe to link:http://beetle.czech:8080/unittest/[notificati
 [[Deploying_the_APIs]]
 == Deploying the APIs
 
-The important part in a xref:API_Design#life.adoc[life cycle] of an API (as well as any other product) is the feedback from the users. In order to get it one should let your users know that there is an API and allow they to try it. For that purpose NetBeans use its "Alpha Update Center". Curious users may enable it and
+The important part in a xref:API_Design.adoc#life[life cycle] of an API (as well as any other product) is the feedback from the users. In order to get it one should let your users know that there is an API and allow they to try it. For that purpose NetBeans use its "Alpha Update Center". Curious users may enable it and
 that way be informed about latest development achievements.
 
 To get a module into the "Alpha Update Center" one needs to make sure that the module's `build.xml` file has `netbeans`, `clean`, and `nbm` targets that work in the normal way - normally this is accomplished trivially by making a projectized module and not overriding any targets from the default build harness.Then one can add entries for the new module to `nbbuild/build.properties` in the list `config.modules.daily-alpha-nbms`. Use<pre>
diff --git a/netbeans.apache.org/src/content/wiki/Authenticator.adoc b/netbeans.apache.org/src/content/wiki/Authenticator.adoc
index c32842bd2..2326e83c3 100644
--- a/netbeans.apache.org/src/content/wiki/Authenticator.adoc
+++ b/netbeans.apache.org/src/content/wiki/Authenticator.adoc
@@ -108,7 +108,7 @@ Eclipse is solving similar problem. Anyone knows how that is handled? org.eclips
 
 The link:https://bits.netbeans.org/dev/javadoc/org-netbeans-libs-git/index.html?overview-summary.html[git client library] is  xref:../index.adoc[NetBeans] independent and can be shared in other products. Should it use _suppressAuthenticationDialog_ by itself or should each caller wrap their calls into _suppressAuthenticationDialog_ *Callable*?
 
-NetBeans uses link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-keyring/org/netbeans/api/keyring/Keyring.html[Keyring API] for secure storage for user's passwords. _Keyring_ uses native support in given platform. Consider using _Keyring_ in SPI for dynamic network credentials.
+NetBeans uses link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-keyring/org/netbeans/api/keyring/Keyring.html[Keyring API] for secure storage for user's passwords. _Keyring_ uses native support in given platform. Consider using _Keyring_ in SPI for dynamic network credentials.
 
 
 [NOTE]
diff --git a/netbeans.apache.org/src/content/wiki/BackwardCompatibilityPatches.adoc b/netbeans.apache.org/src/content/wiki/BackwardCompatibilityPatches.adoc
index 815c8e2d8..d1fc6b3a1 100644
--- a/netbeans.apache.org/src/content/wiki/BackwardCompatibilityPatches.adoc
+++ b/netbeans.apache.org/src/content/wiki/BackwardCompatibilityPatches.adoc
@@ -50,7 +50,7 @@ The following techniques can be used for backward compatibility:
 
 A compatible implementation may need to access the internals possibly from a
 different module (classloader).
-link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/PatchedPublic.html[@PatchedPublic]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/PatchedPublic.html[@PatchedPublic]
 annotation currently serves this purpose. 
 
 The annotated method is *patched* to be public at runtime, while the class is
diff --git a/netbeans.apache.org/src/content/wiki/BugtrackingCookbook.adoc b/netbeans.apache.org/src/content/wiki/BugtrackingCookbook.adoc
index ddc2646e5..d2623b712 100644
--- a/netbeans.apache.org/src/content/wiki/BugtrackingCookbook.adoc
+++ b/netbeans.apache.org/src/content/wiki/BugtrackingCookbook.adoc
@@ -68,7 +68,7 @@ specifics.
 == How To
 
 Please note that until not mentioned otherwise, all classes are from the
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/package-summary.html[org.netbeans.modules.bugtracking.spi]
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/package-summary.html[org.netbeans.modules.bugtracking.spi]
 package.
 
 
@@ -104,13 +104,13 @@ Invoked by user action from the Tasks Dashboard.
 
 * the method `BugtrackingConnector|createRepository()` will be invoked when a new repository is supposed to be created. The infrastructure opens then a repository editor dialog and takes care for storing the confirmed repository data.
 * see the javadoc on `RepositoryController` to find out how the repository editor UI is handled.
-* those repository data are used the next time when that repository is needed and no object is created yet (e.g. in a new IDE session). This will be done via `link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingConnector.html#createRepository(org.netbeans.modules.bugtracking.spi.RepositoryInfo)[BugtrackingConnector.createRepository(RepositoryInfo)]`
+* those repository data are used the next time when that repository is needed and no object is created yet (e.g. in a new IDE session). This will be done via `link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingConnector.html#createRepository(org.netbeans.modules.bugtracking.spi.RepositoryInfo)[BugtrackingConnector.createRepository(RepositoryInfo)]`
 
 
 [[Setup_2]]
 ==== Setup
 
-use the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules.bugtracking.spi.IssuePriorityProvider,%20org.netbeans.modules.bugtracking.spi.IssueFinder)[BugtrackingSupport.createRepository(R, ...)]
+use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules.bugtracking.spi.IssuePriorityProvider,%20org.netbeans.modules.bugtracking.spi.IssueFinder)[BugtrackingSupport.createRepository(R, ...)]
  method when  creating a Repository instance, so that the the infrastructure
 can setup your repo instance with additional feature providers.
 
@@ -150,7 +150,7 @@ Query at that place.
 Invoked by user action from the Tasks Dashboard or in automatically by a customisable time interval.
 
 * see the javadoc on:
-** link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/QueryProvider.html#setIssueContainer(Q,%20org.netbeans.modules.bugtracking.spi.QueryProvider.IssueContainer)[`QueryProvider.setIssueContainer(Q, IssueContainer)`]
+** link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/QueryProvider.html#setIssueContainer(Q,%20org.netbeans.modules.bugtracking.spi.QueryProvider.IssueContainer)[`QueryProvider.setIssueContainer(Q, IssueContainer)`]
 ** `QueryProvider|refresh(Q)`
 ** `IssueContainer`
 
@@ -179,8 +179,8 @@ Invoked by user action from the Tasks Dashboard.
 ** `QueryProvider|refresh(Q)`
 ** `IssueContainer`
 * by Issue ID or text criteria - see the javadoc on:
-** link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/RepositoryProvider.html#getIssues(R,%20java.lang.String...)[`RepositoryProvider.getIssues(R, String)`]
-** link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/RepositoryProvider.html#simpleSearch(R,%20java.lang.String)[`RepositoryProvider.simpleSearch(R, String)`]
+** link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/RepositoryProvider.html#getIssues(R,%20java.lang.String...)[`RepositoryProvider.getIssues(R, String)`]
+** link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/RepositoryProvider.html#simpleSearch(R,%20java.lang.String)[`RepositoryProvider.simpleSearch(R, String)`]
 
 
 [[Status_-_local_and_remote_changes]]
@@ -188,7 +188,7 @@ Invoked by user action from the Tasks Dashboard.
 
 Outgoing and incoming Issue changes are annotated (via coloring) in Query result lists in the Tasks Dashboard. 
 
-In case you want to provide status values for changes in your Issues then you have to implement the `IssueStatusProvider` interface and provide it via the `link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules.bugtracking.spi.IssuePriorityProvid [...]
+In case you want to provide status values for changes in your Issues then you have to implement the `IssueStatusProvider` interface and provide it via the `link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules.bugtracking.spi.IssuePriorityProvi [...]
 
 * for more info see:
 ** javadoc on `IssueStatusProvider`
@@ -202,7 +202,7 @@ In case you want to provide status values for changes in your Issues then you ha
 
 In the Tasks Dashboard it is possible to set user local scheduling information (e.g. what date the user plans to start working on the issue) and accordingly to categorise Issues given by that scheduling data (e.g list Issues scheduled for Today, This Week, etc.).
 
-In case you want to provide local scheduling information for your Issues then you have to implement the `IssueScheduleProvider` interface and provide it via the `link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules.bugtracking.spi.IssuePriority [...]
+In case you want to provide local scheduling information for your Issues then you have to implement the `IssueScheduleProvider` interface and provide it via the `link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules.bugtracking.spi.IssuePriorit [...]
 
 * for more info see:
 **  javadoc on `IssueScheduleProvider`
@@ -213,7 +213,7 @@ In case you want to provide local scheduling information for your Issues then yo
 [[Priority]]
 ==== Priority
 
-In case you want the Tasks Dashboard to show an priority icon next to an Issue in a Query result list then you have to implement the `IssuePriorityProvider` interface and provide it via the `link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules. [...]
+In case you want the Tasks Dashboard to show an priority icon next to an Issue in a Query result list then you have to implement the `IssuePriorityProvider` interface and provide it via the `link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules [...]
 
 * for more info see:
 **  javadoc on `IssuePriorityProvider`
@@ -234,20 +234,20 @@ The infrastructure parses for some default patters (e.g. Issue #12345), but in
 case your remote repository comes with and untypical issue format, like for
 example in case of JIRA, where the issue key is more complex ("Issue
 #JIRAPOJECT-12345") you can provide your own `IssueFinder` implementation via
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules.bugtracking.spi.IssuePriorityProvider,%20org.netbeans.modules.bugtracking.spi.IssueFinder)[`BugtrackingSupport.html.createRepository(R, ...)`].
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/BugtrackingSupport.html#createRepository(R,%20org.netbeans.modules.bugtracking.spi.IssueStatusProvider,%20org.netbeans.modules.bugtracking.spi.IssueScheduleProvider,%20org.netbeans.modules.bugtracking.spi.IssuePriorityProvider,%20org.netbeans.modules.bugtracking.spi.IssueFinder)[`BugtrackingSupport.html.createRepository(R, ...)`].
 * for more info see javadoc on `IssueFinder`
 
 
 [[Versioning_Commits]]
 ==== Versioning Commits
 
-On a versioning commit it is possible to select an issue and to add commit info and to close it eventually. All that has to be done to support this case is to implement `link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/IssueProvider.html#addComment(I,%20java.lang.String,%20boolean)[IssueProvider.addComment(I, String, boolean)]`.
+On a versioning commit it is possible to select an issue and to add commit info and to close it eventually. All that has to be done to support this case is to implement `link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/IssueProvider.html#addComment(I,%20java.lang.String,%20boolean)[IssueProvider.addComment(I, String, boolean)]`.
 
 
 [[Attaching_Patches]]
 ==== Attaching Patches
 
-When creating an patch via Versioning, it is possible to select an issue and to attach that patch to the issue. All that has to be done to support this case is to implement `link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/IssueProvider.html#attachFile(I,%20java.io.File,%20java.lang.String,%20boolean)[IssueProvider.attachFile(I, File, String, boolean)]`.
+When creating an patch via Versioning, it is possible to select an issue and to attach that patch to the issue. All that has to be done to support this case is to implement `link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-bugtracking/org/netbeans/modules/bugtracking/spi/IssueProvider.html#attachFile(I,%20java.io.File,%20java.lang.String,%20boolean)[IssueProvider.attachFile(I, File, String, boolean)]`.
 
 
 [NOTE]
diff --git a/netbeans.apache.org/src/content/wiki/CompatibilityPolicy.adoc b/netbeans.apache.org/src/content/wiki/CompatibilityPolicy.adoc
index 1895f387c..ff64c2ff4 100644
--- a/netbeans.apache.org/src/content/wiki/CompatibilityPolicy.adoc
+++ b/netbeans.apache.org/src/content/wiki/CompatibilityPolicy.adoc
@@ -55,11 +55,11 @@ We can call such an API _separable_ and changes to such APIs are relatively stra
 
 When a whole class is deprecated, it is best to move this class to a deprecated module.
 Over time we can collect deprecated classes and safely package them up.
-A link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#deprecation[deprecated module]
+A link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#deprecation[deprecated module]
 is marked with `OpenIDE-Module-Deprecated: true`
 and can include a localizable `OpenIDE-Module-Deprecation-Message` as well.
 
-You can use the link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#refactoring[module refactoring facility]
+You can use the link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#refactoring[module refactoring facility]
 to retain binary compatibility for old client modules still referring to the class
 in its original module.
 They can migrate on their own schedule.
diff --git a/netbeans.apache.org/src/content/wiki/DefFaqMapApisToTasks.adoc b/netbeans.apache.org/src/content/wiki/DefFaqMapApisToTasks.adoc
index beca0f927..b73333ad6 100644
--- a/netbeans.apache.org/src/content/wiki/DefFaqMapApisToTasks.adoc
+++ b/netbeans.apache.org/src/content/wiki/DefFaqMapApisToTasks.adoc
@@ -35,19 +35,19 @@ Here is a list of common things people need to do, and a very short description
 
 === Show my component in the main window
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/overview-summary.html[Window System API].  You will want to create a subclass of link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent], a JPanel-like class, and call its `open()` method to show it.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/overview-summary.html[Window System API].  You will want to create a subclass of link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent], a JPanel-like class, and call its `open()` method to show it.
 
 === Write to the output window
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-openide-io/overview-summary.html[I/O API].  Call `IOProvider.getDefault().getInputOutput("Something")`.  The object returned has getters for standard output, standard error and input streams which write to and read from a tab in the output window.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-openide-io/overview-summary.html[I/O API].  Call `IOProvider.getDefault().getInputOutput("Something")`.  The object returned has getters for standard output, standard error and input streams which write to and read from a tab in the output window.
 
 === Show a Tree, List or other control with a list of some objects
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API] to create a hierarchy of link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html[Node] objects, each representing one object in your data model.  Then use the link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/overview-summary.html[Explorer API] to show the Nodes - it contains tree, list, table, combo box and other controls which can show a hier [...]
+Use the link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API] to create a hierarchy of link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html[Node] objects, each representing one object in your data model.  Then use the link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/overview-summary.html[Explorer API] to show the Nodes - it contains tree, list, table, combo box and other controls which can show a h [...]
 
 === Provide an Editor for a particular kind of file
 
-Use the new File Type template.  You will end up using the link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/overview-summary.html[Data Systems API] (DataObject, DataLoader, etc.) and link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API] primarily, plus the link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/overview-summary.html[Filesystems API] for accessing and parsing the file.  The link:http://bits.netbeans.org/dev/jav [...]
+Use the new File Type template.  You will end up using the link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/overview-summary.html[Data Systems API] (DataObject, DataLoader, etc.) and link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/overview-summary.html[Nodes API] primarily, plus the link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/overview-summary.html[Filesystems API] for accessing and parsing the file.  The link:https://bits.netbeans.org/dev [...]
 
 === Add a menu item to the main menu
 
@@ -55,15 +55,15 @@ No specific NetBeans APIs are needed - you can just create a subclass of Swing's
 
 === Show content in the Navigator window when a file of a certain type is selected
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-navigator/overview-summary.html[Navigator API] to create a navigator panel provider;  you then somehow parse the file and can create any component you want to show in the Navigator, and populate it with whatever you want.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-navigator/overview-summary.html[Navigator API] to create a navigator panel provider;  you then somehow parse the file and can create any component you want to show in the Navigator, and populate it with whatever you want.
 
 === Show a progress bar
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-progress/overview-summary.html[Progress API] - call `ProgressHandleFactory` to create a `ProgressHandle` for you.  That is an object with methods for setting the progress, status text, number of steps, etc. and is fairly self-explanatory.  Remember to make sure the code showing progress is not running in the AWT Event thread.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-progress/overview-summary.html[Progress API] - call `ProgressHandleFactory` to create a `ProgressHandle` for you.  That is an object with methods for setting the progress, status text, number of steps, etc. and is fairly self-explanatory.  Remember to make sure the code showing progress is not running in the AWT Event thread.
 
 === Set the main window's statusbar text
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[UI Utilities API].  Simply call `StatusDisplayer.getDefault().setStatusText()`.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[UI Utilities API].  Simply call `StatusDisplayer.getDefault().setStatusText()`.
 
 === Allow other modules to register objects and then find those objects dynamically at runtime
 
@@ -71,23 +71,23 @@ Define a folder in the xref:DevFaqSystemFilesystem.adoc[System Filesystem] in th
 
 === Save some settings persistently
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-openide-util/overview-summary.html[Utilities API], specifically link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences] - which is just an implementation of the JDK's Preferences API which stores things in the user's settings directory rather than globally.  It's just like using standard JDK Preferences.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-openide-util/overview-summary.html[Utilities API], specifically link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences] - which is just an implementation of the JDK's Preferences API which stores things in the user's settings directory rather than globally.  It's just like using standard JDK Preferences.
 
 === Run some code at application startup/shutdown
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/overview-summary.html[Module System API].  Implement a subclass of link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html[ModuleInstall] and override `restored()`, `close()`, etc.  Remember it is best to avoid running code on startup unless you really need to.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/overview-summary.html[Module System API].  Implement a subclass of link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html[ModuleInstall] and override `restored()`, `close()`, etc.  Remember it is best to avoid running code on startup unless you really need to.
 
 === Add a Panel to the Options dialog
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html[Options API], implementing link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsCategory.html[OptionsCategory] to define the category in the dialog and link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.html[OptionsPanelController] to manage the UI component.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html[Options API], implementing link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsCategory.html[OptionsCategory] to define the category in the dialog and link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.html[OptionsPanelController] to manage the UI component.
 
 === Find/listen to/manipulate the set of open projects
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/overview-summary.html[Project UI API], specifically link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/api/project/ui/OpenProjects.html[OpenProjects].
+Use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/overview-summary.html[Project UI API], specifically link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/api/project/ui/OpenProjects.html[OpenProjects].
 
 === Create a graph editor such as the Mobility Pack uses
 
-Use the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library], which builds on top of Swing to make animated, graph-oriented UIs easy to build.  More info, tutorials and webcasts can be found in the link:http://platform.netbeans.org/graph[platform.netbeans.org/graph] project.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library], which builds on top of Swing to make animated, graph-oriented UIs easy to build.  More info, tutorials and webcasts can be found in the link:http://platform.netbeans.org/graph[platform.netbeans.org/graph] project.
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectOwnTypePopUp.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectOwnTypePopUp.adoc
index ce28fb631..bfec2dcdd 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectOwnTypePopUp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionAddProjectOwnTypePopUp.adoc
@@ -89,7 +89,7 @@ public @Override Action[] getActions(boolean context) {
 * To add the other actions specified in the Project API such as `closeProjectAction`, just add it to the list of actions of your node.
 * To add an action you created yourself, just add it to the list of actions of your node.
 
-See also: link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/CommonProjectActions.html[Common Project Actions]
+See also: link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/CommonProjectActions.html[Common Project Actions]
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionAddTools.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionAddTools.adoc
index 8efde1858..46306cbab 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionAddTools.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionAddTools.adoc
@@ -36,7 +36,7 @@ Register to
 
 NOTE: The tools menu is available in the context menu of a file in the project view/files view
 
-See link:http://bits.netbeans.org/dev/javadoc/org-openide-actions/architecture-summary.html[http://bits.netbeans.org/dev/javadoc/org-openide-actions/architecture-summary.html]
+See link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/architecture-summary.html[http://bits.netbeans.org/dev/javadoc/org-openide-actions/architecture-summary.html]
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqActionContextSensitive.adoc b/netbeans.apache.org/src/content/wiki/DevFaqActionContextSensitive.adoc
index 1fede2e5d..3c886ff8c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqActionContextSensitive.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqActionContextSensitive.adoc
@@ -77,7 +77,7 @@ If you need something more featureful, there are a few options, old and new:
 
 === NodeAction
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/util/actions/NodeAction.html[NodeAction] is somewhat more flexible, but requires more code to implement.  It is just passed the array of activated nodes whenever that changes, and can choose to enable or disable itself as it wishes.  Essentially this is just an action that automagically xref:DevFaqTrackingExplorerSelections.adoc[tracks the global Node selection].
+link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/util/actions/NodeAction.html[NodeAction] is somewhat more flexible, but requires more code to implement.  It is just passed the array of activated nodes whenever that changes, and can choose to enable or disable itself as it wishes.  Essentially this is just an action that automagically xref:DevFaqTrackingExplorerSelections.adoc[tracks the global Node selection].
 
 === Roll your own
 
@@ -139,9 +139,9 @@ public class FooAction extends AbstractAction implements LookupListener, Context
 
 === Deprecated CookieAction
 
-In many older (pre-NB 6.8) examples you may find link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/util/actions/CookieAction.html[CookieAction]. It should be (but is not) deprecated. The original info is left here for reference and/or old code maintenance:
+In many older (pre-NB 6.8) examples you may find link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/util/actions/CookieAction.html[CookieAction]. It should be (but is not) deprecated. The original info is left here for reference and/or old code maintenance:
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/util/actions/CookieAction.html[CookieAction] is used to write actions that are sensitive to what is in the selected Node(s) xref:DevFaqLookup.adoc[Lookup].  You can specify one or more classes that must be present in the selected xref:DevFaqWhatIsANode.adoc[Node]'s Lookup, and some other semantics about enablement.
+link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/util/actions/CookieAction.html[CookieAction] is used to write actions that are sensitive to what is in the selected Node(s) xref:DevFaqLookup.adoc[Lookup].  You can specify one or more classes that must be present in the selected xref:DevFaqWhatIsANode.adoc[Node]'s Lookup, and some other semantics about enablement.
 
 Being an older class, under the hood it is using xref:DevFaqLookupCookie.adoc[Node.getCookie()], so your action will only be sensitive to things actually returned by that method - in other words, only objects that implement the marker interface `Node.Cookie` can work here.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAddFileTemplateToNewFileContentMenu.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAddFileTemplateToNewFileContentMenu.adoc
index 7ebdbee77..359bbc7ad 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAddFileTemplateToNewFileContentMenu.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAddFileTemplateToNewFileContentMenu.adoc
@@ -30,7 +30,7 @@
 == 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:http://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]
+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]
 
 Example:
 `
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAnnotationDevelopDebug.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAnnotationDevelopDebug.adoc
index 986af3a86..72efe86b5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAnnotationDevelopDebug.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAnnotationDevelopDebug.adoc
@@ -32,7 +32,7 @@
 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 wit [...]
 
 The relevant NetBeans platform APIs are described at
-link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/annotations/package-summary.html[Package org.openide.filesystems.annotations]. Note that link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/annotations/LayerBuilder.File.html[Class LayerBuilder.File] has the methods for adding specific attributes to a layer file. Near the end of the package description there is mention of _AnnotationProcessorTestUtils_ this is  [...]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/annotations/package-summary.html[Package org.openide.filesystems.annotations]. Note that link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/annotations/LayerBuilder.File.html[Class LayerBuilder.File] has the methods for adding specific attributes to a layer file. Near the end of the package description there is mention of _AnnotationProcessorTestUtils_ this i [...]
 
 Much of the following is found in messages of the thread link:https://forums.netbeans.org/topic63404.html[Debugging Platform annotations], from the platform mailing list.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAnnotationList.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAnnotationList.adoc
index 4c399f98f..1133883c5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAnnotationList.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAnnotationList.adoc
@@ -31,67 +31,67 @@
 
 === Actions
 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionID.html[@ActionID]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReference.html[@ActionReference]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionReferences.html[@ActionReferences]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/ActionRegistration.html[@ActionRegistration]
 
 === Editor
 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.Registration.html[@DataObject.Registration] (new in 7.2)
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/api/editor/EditorActionRegistration.html[@EditorActionRegistration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/api/editor/EditorActionRegistrations.html[@EditorActionRegistrations]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/spi/editor/mimelookup/MimeLocation.html[@MimeLocation]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeRegistration.html[@MimeRegistration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeRegistrations.html[@MimeRegistrations]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.ExtensionRegistration.html[@MIMEResolver.ExtensionRegistration] (new in 7.2)
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.NamespaceRegistration.html[@MIMEResolver.NamespaceRegistration] (new in 7.2)
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.Registration.html[@MIMEResolver.Registration] (new in 7.2)
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.Registration.html[@DataObject.Registration] (new in 7.2)
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/api/editor/EditorActionRegistration.html[@EditorActionRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-lib2/org/netbeans/api/editor/EditorActionRegistrations.html[@EditorActionRegistrations]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/spi/editor/mimelookup/MimeLocation.html[@MimeLocation]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeRegistration.html[@MimeRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-editor-mimelookup/org/netbeans/api/editor/mimelookup/MimeRegistrations.html[@MimeRegistrations]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.ExtensionRegistration.html[@MIMEResolver.ExtensionRegistration] (new in 7.2)
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.NamespaceRegistration.html[@MIMEResolver.NamespaceRegistration] (new in 7.2)
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.Registration.html[@MIMEResolver.Registration] (new in 7.2)
 
 === Lookup
 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ServiceProvider.html[@ServiceProvider]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ServiceProviders.html[@ServiceProviders]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/LookupMerger.Registration.html[@LookupMerger.Registration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/LookupProvider.Registration.html[@LookupProvider.Registration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/LookupProvider.Registration.ProjectType.html[@LookupProvider.Registration.ProjectType]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ServiceProvider.html[@ServiceProvider]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ServiceProviders.html[@ServiceProviders]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/LookupMerger.Registration.html[@LookupMerger.Registration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/LookupProvider.Registration.html[@LookupProvider.Registration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/LookupProvider.Registration.ProjectType.html[@LookupProvider.Registration.ProjectType]
 
 === Navigator
 
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-navigator/org/netbeans/spi/navigator/NavigatorPanel.Registration.html[@NavigatorPanel.Registration] (new in 7.2)
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-spi-navigator/org/netbeans/spi/navigator/NavigatorPanel.Registrations.html[@NavigatorPanel.Registrations] (new in 7.2)
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-navigator/org/netbeans/spi/navigator/NavigatorPanel.Registration.html[@NavigatorPanel.Registration] (new in 7.2)
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-navigator/org/netbeans/spi/navigator/NavigatorPanel.Registrations.html[@NavigatorPanel.Registrations] (new in 7.2)
 
 === Nodes
 
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.Registration.html[@NodeFactory.Registration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-core-ide/org/netbeans/api/core/ide/ServicesTabNodeRegistration.html[@ServicesTabNodeRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/NodeFactory.Registration.html[@NodeFactory.Registration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-core-ide/org/netbeans/api/core/ide/ServicesTabNodeRegistration.html[@ServicesTabNodeRegistration]
 
 === Options Window
 
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.ContainerRegistration.html[@OptionsPanelController.ContainerRegistration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.SubRegistration.html[@OptionsPanelController.SubRegistration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.TopLevelRegistration.html[@OptionsPanelController.TopLevelRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.ContainerRegistration.html[@OptionsPanelController.ContainerRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.SubRegistration.html[@OptionsPanelController.SubRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/org/netbeans/spi/options/OptionsPanelController.TopLevelRegistration.html[@OptionsPanelController.TopLevelRegistration]
 
 === Project System
 
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-project-ant/org/netbeans/spi/project/support/ant/AntBasedProjectRegistration.html[@AntBasedProjectRegistration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.CompositeCategoryProvider.Registration.html[@ProjectCustomizer.CompositeCategoryProvider.Registration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectServiceProvider.html[@ProjectServiceProvider]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-project-ant/org/netbeans/spi/project/support/ant/AntBasedProjectRegistration.html[@AntBasedProjectRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/support/ProjectCustomizer.CompositeCategoryProvider.Registration.html[@ProjectCustomizer.CompositeCategoryProvider.Registration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/ProjectServiceProvider.html[@ProjectServiceProvider]
 
 === Window System
 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.OpenActionRegistration.html[@TopComponent.OpenActionRegistration]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Registration.html[@TopComponent.Registration]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.OpenActionRegistration.html[@TopComponent.OpenActionRegistration]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Registration.html[@TopComponent.Registration]
 
 === Miscellaneous
 
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-settings/org/netbeans/api/settings/ConvertAsJavaBean.html[@ConvertAsJavaBean]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-settings/org/netbeans/api/settings/ConvertAsProperties.html[@ConvertAsProperties]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@NbBundle.Messages]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-versioning/org/netbeans/modules/versioning/spi/VersioningSystem.Registration.html[@VersioningSystem.Registration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/MultiViewElement.Registration.html[@MultiViewElement.Registration]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-sendopts/org/netbeans/spi/sendopts/Arg.html[@Arg] (new in 7.2)
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-annotations-common/org/netbeans/api/annotations/common/StaticResource.html[@StaticResource] (new in 7.2)
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-settings/org/netbeans/api/settings/ConvertAsJavaBean.html[@ConvertAsJavaBean]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-settings/org/netbeans/api/settings/ConvertAsProperties.html[@ConvertAsProperties]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.Messages.html[@NbBundle.Messages]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-versioning/org/netbeans/modules/versioning/spi/VersioningSystem.Registration.html[@VersioningSystem.Registration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/MultiViewElement.Registration.html[@MultiViewElement.Registration]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-sendopts/org/netbeans/spi/sendopts/Arg.html[@Arg] (new in 7.2)
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-annotations-common/org/netbeans/api/annotations/common/StaticResource.html[@StaticResource] (new in 7.2)
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqApisBasics.adoc b/netbeans.apache.org/src/content/wiki/DevFaqApisBasics.adoc
index e44193060..cfd503f20 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqApisBasics.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqApisBasics.adoc
@@ -58,7 +58,7 @@ Other basic topics that are worth reading to get the lay of the land are:
 * xref:DevFaqFileSystem.adoc[Overview of filesystems]
 * xref:DevFaqWindowsGeneral.adoc[The windowing system]
 
-There are xref:DevFaqTutorialsIndex.adoc[various tutorials], and the canonical reference to NetBeans APIs is the link:http://bits.netbeans.org/dev/javadoc/index.html[API javadoc].
+There are xref:DevFaqTutorialsIndex.adoc[various tutorials], and the canonical reference to NetBeans APIs is the link:https://bits.netbeans.org/dev/javadoc/index.html[API javadoc].
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAppLifecycleHooks.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAppLifecycleHooks.adoc
index 6f736ce9c..ebb5b73f6 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAppLifecycleHooks.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAppLifecycleHooks.adoc
@@ -37,7 +37,7 @@ replace the main class used to start NetBeans
 with your own class and then delegate back to NetBeans' normal main class.
 This offers you a hook early in the startup sequence without having to modify the launchers or shell scripts.
 
-Any module may provide a link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html[ModuleInstall] implementation.  The `validate` method will be called before your module is even loaded, so it is the first module-level hook available in the startup sequence.  Note that many services and classes offered by the platform are unlikely to be initialized at this point.
+Any module may provide a link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html[ModuleInstall] implementation.  The `validate` method will be called before your module is even loaded, so it is the first module-level hook available in the startup sequence.  Note that many services and classes offered by the platform are unlikely to be initialized at this point.
 
 A short time afterwards, the `restored` method will be called on each `ModuleInstall` class.
 More services and classes will be initialized at this point than with the `validate` method, but the GUI will probably not yet be realized.
@@ -68,7 +68,7 @@ even if you have taken care to execute any long-running tasks from its methods i
 It is always preferable to register objects declaratively,
 and/or run procedural code when it is first needed rather than eagerly.
 
-Another major class in platform development is the link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent] class.
+Another major class in platform development is the link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[TopComponent] class.
 It offers several methods which allow you to hook into its lifecycle.
 
 Here are some events you can hook into for when a `TopComponent` is opened:
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc
index 04a90c40a..5ac004572 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc
@@ -31,7 +31,7 @@
 
 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. AutoU [...]
 
-* Where to find Javadoc? link:http://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]
+* 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 link:http://platform.netbeans.org/platform-get.html[NetBeans Platform of the latest version] for the best performance.
 
 === Related articles
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqBecomingProficient.adoc b/netbeans.apache.org/src/content/wiki/DevFaqBecomingProficient.adoc
index 2428a29c3..6f70bc0d7 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqBecomingProficient.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqBecomingProficient.adoc
@@ -34,7 +34,7 @@ The NetBeans Platform has a learning curve.  The goal of this FAQ is to get you
 === Javadoc
 
 The reference documentation for all of NetBeans APIs can be found on the web here:
-link:http://bits.netbeans.org/dev/javadoc/index.html[http://bits.netbeans.org/dev/javadoc/index.html].
+link:https://bits.netbeans.org/dev/javadoc/index.html[http://bits.netbeans.org/dev/javadoc/index.html].
 
 If you want a local copy of it, you can either download it from the update center, or build it from your source checkout
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqChangeNodeAppearance.adoc b/netbeans.apache.org/src/content/wiki/DevFaqChangeNodeAppearance.adoc
index 10e6e6da1..9ee85753f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqChangeNodeAppearance.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqChangeNodeAppearance.adoc
@@ -56,7 +56,7 @@ public class MovieNode extends AbstractNode {
 
 ----
 
-The javadoc for the HtmlRenderer class link:http://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()`}.
+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.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCheckableActionPreferenceOption.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCheckableActionPreferenceOption.adoc
index b1c37c8e3..40bf1f592 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCheckableActionPreferenceOption.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCheckableActionPreferenceOption.adoc
@@ -30,7 +30,7 @@
 == How do I make a checkable action that represents a preference option?
 
 See 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html[org-openide-awt/org.openide.awt.Actions.checkbox(...)]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html[org-openide-awt/org.openide.awt.Actions.checkbox(...)]
 
 Here an example for a checkable action which represents the state of the "ignoreCase" property within the property file "org/netbeans/modules/diff.properties"
 `
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqClassLoaders.adoc b/netbeans.apache.org/src/content/wiki/DevFaqClassLoaders.adoc
index be5567294..a86fe51fc 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqClassLoaders.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqClassLoaders.adoc
@@ -31,7 +31,7 @@
 
 === Overview
 
-This FAQ item should be a companion to the main link:http://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.
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCustomizeWindowSystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCustomizeWindowSystem.adoc
index c161ecef6..3d45abc8d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCustomizeWindowSystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCustomizeWindowSystem.adoc
@@ -31,7 +31,7 @@ When developing an application based on NetBeans platform there's sometimes need
 
 == Use own JFrame instance as the main window
 
-It is possible to use any JFrame instance as the main window. Simply create the instance when your module is being loaded (link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html#restored()[ModuleInstall.restored()]) and set its name to _NbMainWindow_. When the window system loads it will pick this instance and initialize it with menu bar, status bar, toolbars, inner desktop hierarchy etc.
+It is possible to use any JFrame instance as the main window. Simply create the instance when your module is being loaded (link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html#restored()[ModuleInstall.restored()]) and set its name to _NbMainWindow_. When the window system loads it will pick this instance and initialize it with menu bar, status bar, toolbars, inner desktop hierarchy etc.
 
 == Mixing document and non-document windows
 
@@ -53,7 +53,7 @@ WindowManager.getDefault().findTopComponent("output").putClientProperty("netbean
 //nobody can close Output window now!
 ----
 
-* _netbeans.winsys.tc.closing_disabled_ - user cannot close the window - there is no close button and Close actions in the main menu is disabled. Closing the window by calling link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#close()[TopComponent.close()] naturally still works.
+* _netbeans.winsys.tc.closing_disabled_ - user cannot close the window - there is no close button and Close actions in the main menu is disabled. Closing the window by calling link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#close()[TopComponent.close()] naturally still works.
 
 * _netbeans.winsys.tc.sliding_disabled_ - user cannot minimize the window.
 
@@ -65,7 +65,7 @@ WindowManager.getDefault().findTopComponent("output").putClientProperty("netbean
 
 * _netbeans.winsys.tc.keep_preferred_size_when_slided_in_ - by default minimized windows take the whole main window height or width when being shown from minimize bar. Setting this client property to true will force the window system to use TopComponent's preferred size when it is being slided in from the minimize bar.
 
-* _netbeans.winsys.tc.draganddrop_copy_disabled_ - by default it is possible to link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/CloneableTopComponent.html#clone()[clone] a link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/CloneableTopComponent.html[CloneableTopComponent] by dragging its header while holding down CTRL key. To disable such cloning set this client property to true.
+* _netbeans.winsys.tc.draganddrop_copy_disabled_ - by default it is possible to link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/CloneableTopComponent.html#clone()[clone] a link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/CloneableTopComponent.html[CloneableTopComponent] by dragging its header while holding down CTRL key. To disable such cloning set this client property to true.
 
 == Turn some features on/off on window system level
 
@@ -121,7 +121,7 @@ Please note that tab group actions (close group, float group, move group etc) wi
 
 == External Link
 
-Up to date list of all Window System related properties and brading options should be available at link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/architecture-summary.html[architecture summary] page.
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqCutCopyPaste.adoc b/netbeans.apache.org/src/content/wiki/DevFaqCutCopyPaste.adoc
index 119e22eaf..9c59af11b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqCutCopyPaste.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqCutCopyPaste.adoc
@@ -31,7 +31,7 @@
 
 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:http://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.
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
index ab72b5d2d..4fd86b045 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
@@ -54,11 +54,11 @@ This registers the DataObject subclass `com.modules.foofile.FooDataObject` again
 
 === DataLoader Details
 
-link:http://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:http://en.wikipedia.org/wiki/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.
+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:http://en.wikipedia.org/wiki/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.
 
 MIME type is typically determined by the file extension, though it can depend on content for things like XML files. xref:DevFaqFileRecognition.adoc[(more about how NetBeans recognizes files)].
 
-DataLoaders are factories for xref:DevFaqDataObject.adoc[DataObjects].  Typically there is a 1:1 mapping between file-type:DataLoader-subclass and a 1:1 mapping from file:DataObject.  When a file is first encountered, and something calls [link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#find(org.openide.filesystems.FileObject[http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#find(org.openide.files [...]
+DataLoaders are factories for xref:DevFaqDataObject.adoc[DataObjects].  Typically there is a 1:1 mapping between file-type:DataLoader-subclass and a 1:1 mapping from file:DataObject.  When a file is first encountered, and something calls [link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#find(org.openide.filesystems.FileObject[http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#find(org.openide.file [...]
 
 Modules that provide the ability the system to open (or otherwise use) files of a particular type will register DataLoaders for those types. So typically for each file type (as defined by MIME type, which in practice usually means file name extension, or XML subtype) there is a matching DataObject
 subclass.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataObject.adoc
index d5414501b..b7b0fb243 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataObject.adoc
@@ -29,7 +29,7 @@
 
 == What is a DataObject?
 
-link:http://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
+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
 of file it represents, or what data it contains.  DataObject is part of the link:http://www.netbeans.org/download/dev/javadoc/org-openide-loaders/overview-summary.html[Loaders API] - a good overview of this API can be found link:http://www.netbeans.org/download/dev/javadoc/org-openide-loaders/overview-summary.html[here].
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDialogControlOKButton.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDialogControlOKButton.adoc
index 9893d4327..bca7f4d45 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDialogControlOKButton.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDialogControlOKButton.adoc
@@ -29,7 +29,7 @@
 
 == How can I control when the OK button is enabled?
 
-The link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/index.html?overview-summary.html[NetBeans Dialogs API] makes it easy to create consistent dialogs that behave as users would expect.  But since you don't directly create the OK button, it may not be obvious how you can enable it or disable it.
+The link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/index.html?overview-summary.html[NetBeans Dialogs API] makes it easy to create consistent dialogs that behave as users would expect.  But since you don't directly create the OK button, it may not be obvious how you can enable it or disable it.
 
 You can enable the OK button by calling <pre>setValid(true)</pre> and disable it by calling <pre>setValid(false)</pre>
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDialogsApiIntro.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDialogsApiIntro.adoc
index 255fcc2e7..3c0e9f60f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDialogsApiIntro.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDialogsApiIntro.adoc
@@ -29,7 +29,7 @@
 
 == What is the Dialogs API and How Do I Use It?
 
-The link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/[Dialogs API] provides support for dialogs and wizards.
+The link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/[Dialogs API] provides support for dialogs and wizards.
 
 Whenever you'd use JDialog or JOptionPane in Swing, using the Dialogs API provides some alternatives.  These are easier to use as they automatically take care of centering and other display details, but also allow you to later plug in a different implementation of how they're actually "displayed."  Instead of showing them on screen, for example, you could link:http://wiki.netbeans.org/DevFaqLookupHowToOverride[override the default] `DialogDisplayer` class to specify your own that logged  [...]
 
@@ -83,7 +83,7 @@ if (result != NotifyDescriptor.OK_OPTION) {
 String userInput = input.getInputText();
 ----
 
-And finally, the DialogDescriptor subclass, handles complex cases (there are many variants here; see link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDescriptor.html[Dialog Descriptor's Javadoc] for details):
+And finally, the DialogDescriptor subclass, handles complex cases (there are many variants here; see link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDescriptor.html[Dialog Descriptor's Javadoc] for details):
 
 image:CustomPanelDialog.png[]
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDotSettingsFiles.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDotSettingsFiles.adoc
index 0a5925bf2..c0a2d9154 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDotSettingsFiles.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDotSettingsFiles.adoc
@@ -32,12 +32,12 @@
 `.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.
 
-Since the introduction of [link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html] `NbPreferences`] to replace [link:http://bits.netbeans.org/dev/javadoc/org-openide-options/org/openide/options/SystemOption.html[http://bits.netbeans.org/dev/javadoc/org-openide-options/org/openide/options/SystemOption.html] `SystemOption`],
-very little new code uses these files, and they should be considered semi-deprecated.  They are difficult and error-prone to use, and have a fair amount of overhead.  The Window System still requires them to be used to persist the state of opened windows/tabs (caret position, what file is opened, or other state that should be restored when reopening a [link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[http://bits.netbeans.org/dev/javadoc/ [...]
+Since the introduction of [link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html] `NbPreferences`] to replace [link:https://bits.netbeans.org/dev/javadoc/org-openide-options/org/openide/options/SystemOption.html[http://bits.netbeans.org/dev/javadoc/org-openide-options/org/openide/options/SystemOption.html] `SystemOption`],
+very little new code uses these files, and they should be considered semi-deprecated.  They are difficult and error-prone to use, and have a fair amount of overhead.  The Window System still requires them to be used to persist the state of opened windows/tabs (caret position, what file is opened, or other state that should be restored when reopening a [link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html[http://bits.netbeans.org/dev/javadoc [...]
 
-A `.settings` file can encode the entire parent class and interface hierarchy of the object it represents, so that a query about _whether an object of a given type is present_ (such as using `link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/Lookups.html#forPath(java.lang.String)[Lookups.forPath](&quot;path/to/folder&quot;).allItems()`) can be answered without actually creating an instance of the object.  
+A `.settings` file can encode the entire parent class and interface hierarchy of the object it represents, so that a query about _whether an object of a given type is present_ (such as using `link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/Lookups.html#forPath(java.lang.String)[Lookups.forPath](&quot;path/to/folder&quot;).allItems()`) can be answered without actually creating an instance of the object.  
 
-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:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences]` will be both m [...]
+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  [...]
 
 === Example
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDotShadowFiles.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDotShadowFiles.adoc
index 7c4e8b949..1d5aa360a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDotShadowFiles.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDotShadowFiles.adoc
@@ -71,7 +71,7 @@ uses shadow files to link to real directories on disk.
 
 === Creating Shadow Files Programmatically
 
-If you need to create `.shadow` files programmatically, use [link: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[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 `FileObjec [...]
+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 `FileObje [...]
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDropdownMenuAddToolbar.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDropdownMenuAddToolbar.adoc
index f078b38cb..f4b8c0553 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDropdownMenuAddToolbar.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDropdownMenuAddToolbar.adoc
@@ -31,7 +31,7 @@
 
 To add a drop-down menu to a component in a toolbar, you can either extend `CallableSystemAction` and override
 `public Component getToolbarPresenter()`,
-or implement `javax.swing.Action` or any subclass thereof, and implement `link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/actions/Presenter.Toolbar.html[Presenter.Toolbar]`
+or implement `javax.swing.Action` or any subclass thereof, and implement `link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/actions/Presenter.Toolbar.html[Presenter.Toolbar]`
 which defines that method.
 
 You might want to create a `JToggleButton`, and when the button is pressed, show a `JPopupMenu`. (Also try `org.openide.awt.DropDownButtonFactory`.)
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDropdownMenuAddToolbarEnabled.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDropdownMenuAddToolbarEnabled.adoc
index a2c851391..fd880cae8 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDropdownMenuAddToolbarEnabled.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDropdownMenuAddToolbarEnabled.adoc
@@ -31,7 +31,7 @@
 
 Create an Action as described in xref:DevFaqDropdownMenuAddToolbar.adoc[the general FAQ for to add a dropdown menu to a toolbar].
 
-In this case, your action also needs to implement link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/ContextAwareAction.html[ContextAwareAction].  A ContextAwareAction is a factory for other Action instances which are tied to a specific Lookup (so that, if selection changes after the popup menu for a Node is shown, the Action does not operate on the wrong object).  You can start with a subclass of javax.swing.AbstractAction, and you will need two constructors:
+In this case, your action also needs to implement link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/ContextAwareAction.html[ContextAwareAction].  A ContextAwareAction is a factory for other Action instances which are tied to a specific Lookup (so that, if selection changes after the popup menu for a Node is shown, the Action does not operate on the wrong object).  You can start with a subclass of javax.swing.AbstractAction, and you will need two constructors:
 
 [source,java]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDynamicSystemFilesystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDynamicSystemFilesystem.adoc
index 7fc75efab..f337edcc5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDynamicSystemFilesystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDynamicSystemFilesystem.adoc
@@ -35,7 +35,7 @@ There are two ways to do it.  The most obvious way is to programmatically write
 
 === Using Dynamically Added Layers
 
-The alternative is quite simple:  Write a subclass of `link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MultiFileSystem.html[MultiFileSystem]`.  Put it in the xref:DevFaqLookupDefault.adoc[default lookup].
+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].
 
 At runtime, when you want to add contents to the system filesystem, simply add additional filesystems to your `MultiFileSystem`.  To remove the contents, simply remove those filesystems.
 
@@ -77,7 +77,7 @@ In NetBeans 7.2 and later, the above code can be simplified by using `Repository
 If finer grained control of what is added is needed at runtime, there are two possibilities, using this general approach:
 
 * If the new layer contents are fixed and known, but perhaps correspond to user roles which may be overlaid together, split up the functionality for each role into a separate XML file (hint: define an enum of roles, where each role can point to an XML file URL, use `link:http://java.sun.com/j2se/1.5.0/docs/api/java/util/EnumSet.html#of%28E,%20E...%29[EnumSet.of()]` and process that to decide what to enable)
-* Write contents programmatically, but write folders/files to an in-memory filesystem created using `link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#createMemoryFileSystem()[FileUtil.createMemoryFileSystem()]` so the contents disappear on VM exit
+* 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.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorTopComponent.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorTopComponent.adoc
index 5cbfbd053..7cb2a3fca 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorTopComponent.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorTopComponent.adoc
@@ -29,11 +29,11 @@
 
 == I want to create a TopComponent class to use as an editor, not a singleton
 
-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:http://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 [...]
+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: *Ne [...]
 
 If you want to create some other kind of editor, you will probably want to start by creating a xref:DevFaqNonSingletonTopComponents.adoc[non-singleton TopComponent] - a logical window, or tab, that can be opened in the editor area and can show your file or object in some way.
 
-Our editor component will be fairly simple.  It will have two constructors, one which takes a `link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[DataObject]` (the file) and one which has no arguments:
+Our editor component will be fairly simple.  It will have two constructors, one which takes a `link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[DataObject]` (the file) and one which has no arguments:
 
 [source,java]
 ----
@@ -179,10 +179,10 @@ So our persistence code looks like this:
 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
 
 * Modify it so that *Open* on it will open our editor TopComponent, not a normal text editor
-* We will implement our own subclass of `link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/OpenCookie.html[OpenCookie]`, which can create and open an instance of our editor, and remember and reuse that editor on subsequent invocations
+* We will implement our own subclass of `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/OpenCookie.html[OpenCookie]`, which can create and open an instance of our editor, and remember and reuse that editor on subsequent invocations
 * Modify it so that we can pass the text the user typed to it, and it will mark itself modified and become savable (causing *File > Save* and *File > Save All* to become enabled)
 * We will implement the setContent(String) method to
-* Make a `link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/SaveCookie.html[SaveCookie]` available, which is what the various built-in Save actions operate on
+* Make a `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/SaveCookie.html[SaveCookie]` available, which is what the various built-in Save actions operate on
 * Call `DataObject.setModified()`&mdash;this guarantees that the user will be given a chance to save the file if they shut down the application before saving.
 [source,java]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimePath.adoc b/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimePath.adoc
index 28a4ae476..2aa40c407 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimePath.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqEditorWhatIsMimePath.adoc
@@ -72,7 +72,7 @@ Platforms: All
 
 See also:
 xref:DevFaqEditorWhatIsMimeLookup.adoc[What is MimeLookup?],
-link:http://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/org/netbeans/api/editor/mimelookup/MimePath.html[MimePath Javadoc],
 link:http://www.netbeans.org/download/dev/javadoc/org-netbeans-modules-editor-mimelookup/index.html[MimeLookup API]
 
 == Apache Migration Information
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
index 9907ae23c..0b771ca02 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
@@ -31,7 +31,7 @@
 
 The idea is to register patterns for export/import into module's layer. 
 
-See the official API documentation at link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html]
+See the official API documentation at link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html]
 
 For historical interests the design document can be found at link:http://wiki.netbeans.org/ExportImportOptions#section-ExportImportOptions-ImplementationDetails[Export/Import Options in NetBeans - Proposal].
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsWindow.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsWindow.adoc
index 01a863d6f..27e740c42 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsWindow.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExtendOptionsWindow.adoc
@@ -29,7 +29,7 @@
 
 == Can I add new panels to the Options window?
 
-Use the link:http://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].
+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.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExternalExecution.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExternalExecution.adoc
index 0ddd40a09..f2c82949f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExternalExecution.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExternalExecution.adoc
@@ -31,8 +31,8 @@
 
 Use the "External Execution Support API".
 
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-extexecution/overview-summary.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-extexecution/overview-summary.html]
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-extexecution/org/netbeans/api/extexecution/ExecutionService.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-extexecution/org/netbeans/api/extexecution/ExecutionService.html]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-extexecution/overview-summary.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-extexecution/overview-summary.html]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-extexecution/org/netbeans/api/extexecution/ExecutionService.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-extexecution/org/netbeans/api/extexecution/ExecutionService.html]
 * link:https://blogs.oracle.com/phejl/entry/external_execution_support_1_2[https://blogs.oracle.com/phejl/entry/external_execution_support_1_2]
 * link:https://blogs.oracle.com/phejl/entry/external_execution_support_2_2[https://blogs.oracle.com/phejl/entry/external_execution_support_2_2]
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileAttributes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileAttributes.adoc
index c46854089..2d66d09d3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileAttributes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileAttributes.adoc
@@ -38,8 +38,8 @@ Attributes are perfectly safe to use freely in `layer.xml` files.
 
 In pre-4.0 NetBeans, they were relatively commonly used for user files on disk.  They still may be used for user files, but this is now discouraged - the infrastructure has been changed to store all attributes in the xref:DevFaqUserDir.adoc[userdir] rather than sprinking `.nbattrs` files in directories all over the user's disk.  Since they are now stored in a central location, the more attributes there are, the longer it takes to find attributes for any given file.  Using attributes for  [...]
 
-See `link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html#getAttribute(java.lang.String)[FileObject.getAttribute]` and
-`link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html#setAttribute(java.lang.String,%20java.lang.Object)[FileObject.setAttribute]`.
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileChoosers.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileChoosers.adoc
index 02359823c..e6f167934 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileChoosers.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileChoosers.adoc
@@ -29,7 +29,7 @@
 
 == I need to show a file chooser when my action runs. Can I remember the most recently used directories?
 
-As of NetBeans 6.7, `link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileChooserBuilder.html[org.openide.filesystems.FileChooserBuilder]` makes this easy.
+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.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileObject.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileObject.adoc
index b3a3f8b1e..e920fc800 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileObject.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileObject.adoc
@@ -39,8 +39,8 @@ FileObjects differ from `java.io.File` in certain ways:
 * You can listen for changes on FileObjects
 * `FileObjects` can have key-value pairs of ad-hoc xref:DevFaqFileAttributes.adoc[attributes ] associated with them
 
-They are part of the link:http://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:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html[here].
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
index 03516eb46..827ee3ac1 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
@@ -42,7 +42,7 @@ The way NetBeans detects files is this:
 
 * The "type" of a file is a link:http://en.wikipedia.org/wiki/MIME[MIME type], just as email attachments use - for example, a `.java` file has the MIME type `text/x-java` and a `.gif` file has the MIME type `image/gif`.
 
-* A module which wants to implement support for a file type registers a `link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.html[MIMEResolver]` that is given a chance to claim a file the first time the system sees it (typically you do not write your own MIMEResolver, you just declaratively register a MIME type against a file extension or XML DTD).
+* A module which wants to implement support for a file type registers a `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.html[MIMEResolver]` that is given a chance to claim a file the first time the system sees it (typically you do not write your own MIMEResolver, you just declaratively register a MIME type against a file extension or XML DTD).
 
 * That module (or some other one) also provides a `link:http://wiki.netbeans.org/DevFaqDataLoader[DataLoader]` &mdash; a factory for custom link:http://wiki.netbeans.org/DevFaqDataObject[DataObject]s that are specific to this file type.  The DataObject in turn provides the Node (icon, etc.) that you see in the user interface.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqGeneralWhereIsJavadoc.asciidoc b/netbeans.apache.org/src/content/wiki/DevFaqGeneralWhereIsJavadoc.asciidoc
index 59d785cb7..fc355cad6 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGeneralWhereIsJavadoc.asciidoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGeneralWhereIsJavadoc.asciidoc
@@ -31,7 +31,7 @@
 
 There is no separate set of Javadoc for the NetBeans Platform.  However, as the Platform is just a subset of the IDE, the Javadoc for the IDE will apply.
 
-You can link:http://bits.netbeans.org/dev/javadoc/index.html[browse the Javadoc online] (this link always points to the latest development version).
+You can link:https://bits.netbeans.org/dev/javadoc/index.html[browse the Javadoc online] (this link always points to the latest development version).
 
 You can also download the Javadoc for a particular NetBeans release:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqGetNameOfProjectGroup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqGetNameOfProjectGroup.adoc
index 0048c2ff6..e03110940 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqGetNameOfProjectGroup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqGetNameOfProjectGroup.adoc
@@ -39,7 +39,7 @@ org.netbeans.api.project.ui.OpenProjects.getDefault().getActiveProjectGroup().ge
 
 This approach uses a public API which is known to be stable for future versions. Since 7.3.
 
-See link:http://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(])
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHelpGuidelines.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHelpGuidelines.adoc
index db4daa31e..794bb6436 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHelpGuidelines.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHelpGuidelines.adoc
@@ -34,7 +34,7 @@
 1. In the IDE, right-click the node of the project to which you want to add the help set and choose New | Other.
 2. In the Module Development category, choose JavaHelp Help Set and complete the wizard.
 
-See also the documentation on link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/org/netbeans/api/javahelp/doc-files/api.html[NetBeans JavaHelp Integration API].
+See also the documentation on link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/org/netbeans/api/javahelp/doc-files/api.html[NetBeans JavaHelp Integration API].
 
 === What Modules are the NetBeans Help Sets In?
 
@@ -53,7 +53,7 @@ To change the position of a help set:
 
 === How should I set help IDs?
 
-See this document: link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/org/netbeans/api/javahelp/doc-files/help-guide.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/org/netbeans/api/javahelp/doc-files/help-guide.html]
+See this document: link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/org/netbeans/api/javahelp/doc-files/help-guide.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/org/netbeans/api/javahelp/doc-files/help-guide.html]
 
 This document boils down to two ways to set a help ID:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeUpdateCenterURL.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeUpdateCenterURL.adoc
index ce5f0c848..e2545b03b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeUpdateCenterURL.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHowToChangeUpdateCenterURL.adoc
@@ -29,7 +29,7 @@
 
 == How to change the update center URL via code?
 
-Use UpdateUnitProviderFactory link:http://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]
+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]
 
 [source,java,subs="verbatim,macros"]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHowToOpenURL.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHowToOpenURL.adoc
index 47ebade2b..fbd26ccac 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHowToOpenURL.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHowToOpenURL.adoc
@@ -38,7 +38,7 @@ HtmlBrowser.URLDisplayer.getDefault().showURL()
 HtmlBrowser.URLDisplayer.getDefault().showURLExternal()
 ----
 
-See link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/HtmlBrowser.URLDisplayer.html#HtmlBrowser.URLDisplayer()[org-openide-awt/org/openide/awt/HtmlBrowser.URLDisplayer.html#HtmlBrowser.URLDisplayer()]
+See link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/HtmlBrowser.URLDisplayer.html#HtmlBrowser.URLDisplayer()[org-openide-awt/org/openide/awt/HtmlBrowser.URLDisplayer.html#HtmlBrowser.URLDisplayer()]
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqHowToPrint.adoc b/netbeans.apache.org/src/content/wiki/DevFaqHowToPrint.adoc
index fd91bd90e..f00d65608 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqHowToPrint.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqHowToPrint.adoc
@@ -94,7 +94,7 @@ Otherwise, it tries to obtain printable components among the descendants of the
 
 If there are no printable components, printable data are retrieved from the selected nodes of the active top component. The Print manager gets EditorCookie from the DataObject of the Nodes. The StyledDocuments, returned by the editor cookies, contain printing information (text, font, color). This information is shown in the print preview. So, any textual documents (Java/C++/Php/... sources, html, xml, plain text, etc.) are printable by default. 
 
-See link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-print/org/netbeans/api/print/PrintManager.html[PrintManager] javadoc for details.
+See link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-print/org/netbeans/api/print/PrintManager.html[PrintManager] javadoc for details.
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqInstalledFileLocator.adoc b/netbeans.apache.org/src/content/wiki/DevFaqInstalledFileLocator.adoc
index 129aa1c7a..86f8b4015 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqInstalledFileLocator.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqInstalledFileLocator.adoc
@@ -53,7 +53,7 @@ _Note:_ If you are bundling third party software which *has its own installer* t
 
 Now your module includes the files you need.  You still need to get access to them at runtime.
 
-To do that, use `link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/InstalledFileLocator.html[InstalledFileLocator]`.  That is a class which can find a file which was installed by a module.  You simply give it your module's code-name (the thing you typed when you created the module, which looks like a package name) and a _relative path_ (i.e. not including the `release/` directory):
+To do that, use `link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/InstalledFileLocator.html[InstalledFileLocator]`.  That is a class which can find a file which was installed by a module.  You simply give it your module's code-name (the thing you typed when you created the module, which looks like a package name) and a _relative path_ (i.e. not including the `release/` directory):
 
 [source,java]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqInvokeActionProgrammatically.adoc b/netbeans.apache.org/src/content/wiki/DevFaqInvokeActionProgrammatically.adoc
index 9ef90775a..2e56a9ba3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqInvokeActionProgrammatically.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqInvokeActionProgrammatically.adoc
@@ -63,8 +63,8 @@ action.actionPerformed(ev);
 
 See 
 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#getConfigObject(java.lang.String,%20java.lang.Class[http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#getConfigObject(java.lang.String,%20java.lang.Class])
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html#forID(java.lang.String,%20java.lang.String[http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html#forID(java.lang.String,%20java.lang.String])
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#getConfigObject(java.lang.String,%20java.lang.Class[http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#getConfigObject(java.lang.String,%20java.lang.Class])
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html#forID(java.lang.String,%20java.lang.String[http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html#forID(java.lang.String,%20java.lang.String])
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelp.adoc b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelp.adoc
index 463acee11..297259cd3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelp.adoc
@@ -29,7 +29,7 @@
 
 == Is there a standard way to provide user documentation for my module?
 
-Yes. See the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/overview-summary.html[JavaHelp Integration API]
+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*;
 and you can provide rich context help
 rather easily, linking into the same documentation.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpOverrideCustom.adoc b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpOverrideCustom.adoc
index 97e4404b0..2a4b670bb 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpOverrideCustom.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqJavaHelpOverrideCustom.adoc
@@ -117,7 +117,7 @@ public class CustomHelp extends Help {
 
 === Step 3: Connecting UI To JavaHelp
 
-See link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-javahelp/org/netbeans/api/javahelp/doc-files/help-guide.html[Connecting Help In NetBeans].
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListenEditorChanges.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListenEditorChanges.adoc
index b0a135d71..adf0d6026 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListenEditorChanges.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListenEditorChanges.adoc
@@ -59,7 +59,7 @@ Please read javadoc on `EditorRegistry` to see details about the properties deli
 
 If you have a `EditorCookie` you can use `NbDocument.findRecentEditorPane`
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/NbDocument.html#findRecentEditorPane-org.openide.cookies.EditorCookie-[http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/NbDocument.html#findRecentEditorPane-org.openide.cookies.EditorCookie-]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/NbDocument.html#findRecentEditorPane-org.openide.cookies.EditorCookie-[http://bits.netbeans.org/dev/javadoc/org-openide-text/org/openide/text/NbDocument.html#findRecentEditorPane-org.openide.cookies.EditorCookie-]
 
 Applies to: Netbeans 6.x and later
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListenForChangesInNonExistentFile.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListenForChangesInNonExistentFile.adoc
index 1f8059311..d2459e19e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListenForChangesInNonExistentFile.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListenForChangesInNonExistentFile.adoc
@@ -31,7 +31,7 @@
 
 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:http://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
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListenForSaveEvents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListenForSaveEvents.adoc
index 16023da6a..b5ed83317 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListenForSaveEvents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListenForSaveEvents.adoc
@@ -29,9 +29,9 @@
 
 == How can I be notified when a file is modified and saved??
 
-The link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.Registry.html[DataObject.Registry] in link:http://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.
+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.
 
-If you have a FileObject and want to listen for save events, you will need to get its DataObject by calling `link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#find(org.openide.filesystems.FileObject)[DataObject.find()]`.
+If you have a FileObject and want to listen for save events, you will need to get its DataObject by calling `link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#find(org.openide.filesystems.FileObject)[DataObject.find()]`.
 
 To listen on a single DataObject for save events, simply add a `PropertyChangeListener` and listen for changes in `DataObject.PROP_MODIFIED`.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqListeningForFileChanges.adoc b/netbeans.apache.org/src/content/wiki/DevFaqListeningForFileChanges.adoc
index 1d03d9e96..8bc9af0c0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqListeningForFileChanges.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqListeningForFileChanges.adoc
@@ -29,7 +29,7 @@
 
 == I am listening for changes in a folder/file but when there are changes I do not receive an event
 
-If you are adding/deleting/changes using the FileSystems API - i.e. adding using link:http://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.
+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.
 
 If not, get the parent folder as a FileObject and call theFolder.getFileSystem().refresh().
 
@@ -40,7 +40,7 @@ The reasons for the way this is handled are twofold:
 1. There is not native support in Java for listening for changes in a file/folder (yet), though most OS's natively support it
 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:http://bits.netbeans.org/dev/javadoc/index.html[FileObject], not java.io.File and any nodes your UI shows for those files will automatically update.
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLogging.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLogging.adoc
index abe195bc8..4490bd740 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLogging.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLogging.adoc
@@ -272,7 +272,7 @@ INFO: There was 10 of adds and 1 of sum outputs, all adding: 45
 
 Indeed a structural logging can achive much more than shown in this simplistic example. Moreover it seems to be one of the most effective ways for logging, so it is highly recommended to use it where possible. 
 
-From: link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html[Logging in NetBeans].
+From: link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html[Logging in NetBeans].
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookup.adoc
index 33790f948..ce0442edd 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookup.adoc
@@ -29,13 +29,13 @@
 
 == What is a Lookup?
 
-link:http://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.
+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.
 
 The simplest way to think of `Lookup` is that it is a `Map` where the keys are `Class` objects and the value for each key is an instance of the key class.
 
 There is the xref:DevFaqLookupDefault.adoc[global lookup] which is used to find objects (often, but not always, singletons) that are registered throughout the system.  Also, many types of objects have a method getLookup() that enables other code to get things specific to that object.  In particular, `xref:DevFaqWhatIsANode.adoc[Node]`s and `Project` objects have a `Lookup`.
 
-The primary purpose of Lookup is decoupling - it makes it possible to use generic objects to get very specific information, without having to cast objects to a specific type.  Confused yet?  It's simple.  Take the example of link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/api/actions/Openable.html[Openable] - it has one method, `open()` that will open a file in the editor.
+The primary purpose of Lookup is decoupling - it makes it possible to use generic objects to get very specific information, without having to cast objects to a specific type.  Confused yet?  It's simple.  Take the example of link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/netbeans/api/actions/Openable.html[Openable] - it has one method, `open()` that will open a file in the editor.
 
 Say that I want to write some code that will open the selected file when the user does something.  It could be an Action, a button, or maybe my code has just created a file and I want to open it.  This is what I will do:
 
@@ -99,7 +99,7 @@ public abstract class GlobalService {
 
 ----
 
-Some other module entirely actually registers an implementation of this interface in the xref:DevFaqLookupDefault.adoc[default Lookup].  link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/StatusDisplayer.html[StatusDisplayer] is a good example of this pattern.
+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?
 
@@ -136,7 +136,7 @@ class ObjectInterestedInFooObjects implements LookupListener {
 
 Another question is, on the side that's providing the lookup, if you _have_ a collection already, how can you expose that in a `Lookup`.  For that, you can create your own `AbstractLookup` and use `InstanceContent` to provide the collection of objects that belong in your `Lookup`.
 
-If you need to merge together more than one lookup (for example, the lookup provided from `Node.getCookieSet().getLookup()` and one of your own which you will add and remove objects from), you can simply use [link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html[http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html] `ProxyLookup`] - i.e. `new ProxyLookup (lookup1, lookup2, Lookups.singlet [...]
+If you need to merge together more than one lookup (for example, the lookup provided from `Node.getCookieSet().getLookup()` and one of your own which you will add and remove objects from), you can simply use [link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html[http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html] `ProxyLookup`] - i.e. `new ProxyLookup (lookup1, lookup2, Lookups.single [...]
 
 Objects in a `Lookup` often are not instantiated until the first time they are requested;  depending on the implementation, they may be weakly referenced, so that if an object is not used for a while, it can be garbage collected to save memory. So `Lookup` additionally enables lazy instantiation of objects, which is useful for performance reasons.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupDefault.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupDefault.adoc
index 7394ec2c5..6635a90b3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupDefault.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupDefault.adoc
@@ -34,7 +34,7 @@ It is the registry for global singletons and instances of objects which have bee
 (In JDK 6, `ServiceLoader` operates on the same principle.)
 The default lookup searches in two places:
 
-* The link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/Lookups.html#metaInfServices(java.lang.ClassLoader)[META-INF/services/ Lookup] contains all objects registered by modules via the link:http://java.sun.com/j2se/1.4/docs/guide/extensions/[Java Extension Mechanism] - putting files in the `META-INF/services/` directory of their module JARs (typically done using the [link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/uti [...]
+* The link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/Lookups.html#metaInfServices(java.lang.ClassLoader)[META-INF/services/ Lookup] contains all objects registered by modules via the link:http://java.sun.com/j2se/1.4/docs/guide/extensions/[Java Extension Mechanism] - putting files in the `META-INF/services/` directory of their module JARs (typically done using the [link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/u [...]
 * The contents of the `Services/` folder of the xref:DevFaqSystemFilesystem.adoc[System (configuration) Filesystem] (this is harder and somewhat deprecated)
 
 Objects contained in the default lookup are instantiated lazily when first requested.  Objects returned by the default lookup _may_ (or may not) be garbage collected if they become unreferenced.
@@ -85,8 +85,8 @@ for (MyService s : Lookup.getDefault().lookupAll(MyService.class)) {
 === More About Lookup
 
 * xref:DevFaqLookup.adoc[DevFaqLookup]
-* link:http://bits.netbeans.org/dev/javadoc/usecases.html#usecase-Utilities[Extension Points Tutorial] 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[Javadoc for Lookup]
+* link:https://bits.netbeans.org/dev/javadoc/usecases.html#usecase-Utilities[Extension Points Tutorial] 
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[Javadoc for Lookup]
 
 
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupForDataNode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupForDataNode.adoc
index 5c8fd151b..a1432f282 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupForDataNode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupForDataNode.adoc
@@ -51,7 +51,7 @@ public SomeObject implements Lookup.Provider {
 
 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:http://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:http://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/ [...]
+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/de [...]
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupHowToOverride.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupHowToOverride.adoc
index 53f69499e..a8906ed38 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupHowToOverride.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupHowToOverride.adoc
@@ -71,7 +71,7 @@ com.tomwheeler.example.SpecialDialogDisplayerImpl
 
 ----
 
-More information about this and other Lookup-related topics, including how to set the order of registered services, can be link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/api.html[found in the Utilities API documentation].
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupImplement.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupImplement.adoc
index 3bbe6e7f9..fe54ad6a1 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupImplement.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupImplement.adoc
@@ -31,10 +31,10 @@
 
 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:
 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html[ProxyLookup] - a Lookup which takes an array of Lookups and merges them together.  Typical use is taking an existing lookup and providing it plus a lookup created with one of the convenience methods below
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/Lookups.html#fixed(java.lang.Object...)[Lookups.fixed(Object... arr)] - a static method that creates a Lookup with an array of persistent objects as its contents
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/Lookups.html#singleton(java.lang.Object)[Lookups.singleton (Object single)] - a static method that creates a Lookup with one object as its content
-* link:http://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:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent], which you can add/remove things from
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/ProxyLookup.html[ProxyLookup] - a Lookup which takes an array of Lookups and merges them together.  Typical use is taking an existing lookup and providing it plus a lookup created with one of the convenience methods below
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/Lookups.html#fixed(java.lang.Object...)[Lookups.fixed(Object... arr)] - a static method that creates a Lookup with an array of persistent objects as its contents
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/Lookups.html#singleton(java.lang.Object)[Lookups.singleton (Object single)] - a static method that creates a Lookup with one object as its content
+* 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].
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupLazyLoad.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupLazyLoad.adoc
index ae44de5ae..8f3828828 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupLazyLoad.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupLazyLoad.adoc
@@ -109,7 +109,7 @@ public class LazyLoadingDelegate implements InstanceContent.Convertor<Token, AnE
 
 ----
 
-Your link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html#context[context-sensitive action] will behave normally&mdash;it does not need to know about the lazy loading (code not relevant to lazy loading has been removed for the sake of brevity):
+Your link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html#context[context-sensitive action] will behave normally&mdash;it does not need to know about the lazy loading (code not relevant to lazy loading has been removed for the sake of brevity):
 
 [source,java]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqLookupVsHashmap.adoc b/netbeans.apache.org/src/content/wiki/DevFaqLookupVsHashmap.adoc
index 311fb36ef..9dfd61c19 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqLookupVsHashmap.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqLookupVsHashmap.adoc
@@ -40,7 +40,7 @@ There are some other capabilities of `Lookup` (such as getting the specific type
 
 `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:http://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`]
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMIMEResolver.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMIMEResolver.adoc
index 8ede0b9bd..3879eee72 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMIMEResolver.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMIMEResolver.adoc
@@ -31,7 +31,7 @@
 
 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.
 
-Description of declarative MIME resolve can be found in link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/HOWTO-MIME.html[this document]. In most cases it should be enough to resolve files only by their extensions as the wizard does (see link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/resolverDocumentation.html#ext[ext element]). Other types of resolution can be more time expensive, so u [...]
+Description of declarative MIME resolve can be found in link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/HOWTO-MIME.html[this document]. In most cases it should be enough to resolve files only by their extensions as the wizard does (see link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/resolverDocumentation.html#ext[ext element]). Other types of resolution can be more time expensive, so [...]
 
 ---
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMakeGroupTemplate.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMakeGroupTemplate.adoc
index 082299e69..be5510296 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMakeGroupTemplate.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMakeGroupTemplate.adoc
@@ -36,7 +36,7 @@ Just use an arbitrary empty file as the template, and declare it to have an `ins
 Here is an link:http://hg.netbeans.org/main/file/tip/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/[example of a wizard that creates a number of files].  This is the link:http://hg.netbeans.org/main/file/tip/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer.xml[layer file that declares it] (look at `emptyLibraryDescriptor`).
 
 You may wish to reuse a standard GUI panel for picking a folder and name, as in 
-`link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/templates/support/Templates.html#createSimpleTargetChooser(org.netbeans.api.project.Project,%20org.netbeans.api.project.SourceGroup[Templates.createSimpleTargetChooser]`.
+`link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectuiapi/org/netbeans/spi/project/ui/templates/support/Templates.html#createSimpleTargetChooser(org.netbeans.api.project.Project,%20org.netbeans.api.project.SourceGroup[Templates.createSimpleTargetChooser]`.
 
 The NetBeans 5.0 module development support has a (meta-)wizard *New Wizard*. Choose *New File* for *Registration Type* and follow the wizard steps.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMavenL10N.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMavenL10N.adoc
index e3d295535..83efd616f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMavenL10N.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMavenL10N.adoc
@@ -31,7 +31,7 @@
 
 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`.
 
-But to localize _other people's modules_, then as explained in link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html#placement[Physical Placement of Localized Resources] you will need to create `modules/locale/*_*.jar` JARs with the localized resources. (Simply bundling localized resources in your own module will not work, because these are usually searched for starting with the original module's `ClassLoader`, which cannot "see" y [...]
+But to localize _other people's modules_, then as explained in link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html#placement[Physical Placement of Localized Resources] you will need to create `modules/locale/*_*.jar` JARs with the localized resources. (Simply bundling localized resources in your own module will not work, because these are usually searched for starting with the original module's `ClassLoader`, which cannot "see"  [...]
 
 The simplest way to do this is to use the existing [link:http://mojo.codehaus.org/nbm-maven-plugin/branding-mojo.html[http://mojo.codehaus.org/nbm-maven-plugin/branding-mojo.html] `nbm:branding` goal], which despite its name can handle localization as well as branding. (These are nearly interchangeable in the NB Platform.) image:Localedemo.zip[] demonstrates how to localize parts of the Options dialog to Czech. Take note of:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMigratingToNewerPlatform.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMigratingToNewerPlatform.adoc
index 26fac3e70..6631d05d8 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMigratingToNewerPlatform.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMigratingToNewerPlatform.adoc
@@ -71,7 +71,7 @@ When migrating a module suite application to use a newer version of the platform
 ----
 
 * *API-changes/New or Deprecated API/Incompatibilities*
-* link:http://bits.netbeans.org/dev/javadoc/apichanges.html[http://bits.netbeans.org/dev/javadoc/apichanges.html]
+* link:https://bits.netbeans.org/dev/javadoc/apichanges.html[http://bits.netbeans.org/dev/javadoc/apichanges.html]
 
 == Further Resources
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModuleDependencies.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModuleDependencies.adoc
index c86d58b6b..3c97c6dd3 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModuleDependencies.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModuleDependencies.adoc
@@ -62,7 +62,7 @@ The data saved there is then used to generate the appropriate manifest entries f
 If you are writing a module that will use some third party libraries,
 you probably want to read xref:DevFaqWrapperModules.adoc[DevFaqWrapperModules] and also xref:DevFaqWhenUseWrapperModule.adoc[DevFaqWhenUseWrapperModule].
 
-For more details, see the link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/classpath.html[reference documentation about classloading in NetBeans].
+For more details, see the link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/classpath.html[reference documentation about classloading in NetBeans].
 
 
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModuleLoadUnloadNotification.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModuleLoadUnloadNotification.adoc
index 722e6495b..6ee3b9d7a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModuleLoadUnloadNotification.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModuleLoadUnloadNotification.adoc
@@ -65,15 +65,15 @@ Instead:
 
 If you simply want to run some code when _your_ module loads or unloads,
 registering an instance of
-link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html[ModuleInstall]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html[ModuleInstall]
 will do the trick.
 There is even a wizard in the IDE for setting this up.
 
 But in the very rare case that you want to be notified when _other_ modules are loaded or unloaded,
 it is possible because:
 
-1. You can use link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/Lookup.Result.html[Lookup.Result] to listen to changes in the contents of a `Lookup`, even the global lookup.
-2. Every module installs an instance of link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInfo.html[ModuleInfo] into the default `Lookup` so the module system (or other code) can find out details about the module including its code name base, version numbers and display name.
+1. You can use link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/Lookup.Result.html[Lookup.Result] to listen to changes in the contents of a `Lookup`, even the global lookup.
+2. Every module installs an instance of link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInfo.html[ModuleInfo] into the default `Lookup` so the module system (or other code) can find out details about the module including its code name base, version numbers and display name.
 
 By using these two facts together, it is possible to listen to changes in the installed modules by running code like this at some point in the application's lifecycle (xref:DevFaqAppLifecycleHooks.adoc[DevFaqAppLifecycleHooks]):
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
index d21eb72d8..869f10e04 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
@@ -35,11 +35,11 @@ Because of this, today, most of the APIs you will use to install things into the
 such as xref:DevFaqModulesLayerFile.adoc[putting something in an XML file]), or a plain-text file naming some classes in your JAR file's `META-INF/services` directory &mdash; _not_ running Java code.
 *A well-behaved module should do nothing on startup.*
 
-The main ways to accomplish this goal are to use either the [link:http://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`] annotation (which generates the aforementioned `META-INF/services` files at compile-time), or by registering files or objects in your module's xref:DevFaqModulesLayerFile.adoc[XML layer file].  [...]
+The main ways to accomplish this goal are to use either the [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`] annotation (which generates the aforementioned `META-INF/services` files at compile-time), or by registering files or objects in your module's xref:DevFaqModulesLayerFile.adoc[XML layer file]. [...]
 
 Using declarative mechanisms, your objects will be instantiated when they are needed to do actual work.  Until something really needs to call them, they don't need to be created and their classes are not loaded.
 
-If you really need to run some code on startup, create a subclass of `link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html[ModuleInstall]`
+If you really need to run some code on startup, create a subclass of `link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html[ModuleInstall]`
 
 xref:DevFaqWhenToUseWhatRegistrationMethod.adoc[More about registration mechanisms]
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMoreDocsOnCertainAPIs.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMoreDocsOnCertainAPIs.adoc
index 2cc4058f5..2f47d1e41 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMoreDocsOnCertainAPIs.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMoreDocsOnCertainAPIs.adoc
@@ -31,14 +31,14 @@
 
 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:
 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/doc-files/api.html[Actions API]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[DataSystems API]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[Explorer API]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[FileSystem API]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Module System API]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[Nodes API]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/api.html[Utilities API]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[Window System API]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/doc-files/api.html[Actions API]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[DataSystems API]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[Explorer API]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[FileSystem API]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Module System API]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[Nodes API]
+* 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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMultiViewChangeTabInCode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMultiViewChangeTabInCode.adoc
index ce3860fd0..7d102b507 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMultiViewChangeTabInCode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMultiViewChangeTabInCode.adoc
@@ -46,7 +46,7 @@ Using this handler you can call
 * `requestActive/requestVisible(MultiViewPerspective desc)` to activate the tab
 
 See also
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-core-multiview/org/netbeans/core/api/multiview/MultiViewHandler.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-core-multiview/org/netbeans/core/api/multiview/MultiViewHandler.html]
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-core-multiview/org/netbeans/core/api/multiview/MultiViewHandler.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-core-multiview/org/netbeans/core/api/multiview/MultiViewHandler.html]
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqMultipleTopComponentAction.adoc b/netbeans.apache.org/src/content/wiki/DevFaqMultipleTopComponentAction.adoc
index e8be8b3db..964d093ef 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqMultipleTopComponentAction.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqMultipleTopComponentAction.adoc
@@ -130,11 +130,11 @@ public class MultiTopComponent extends TopComponent {
 }
 ----
 
-This class contains _persistence_ code - particularly the `link:http://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 w [...]
+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  [...]
 
 === Writing an Action which provides an array of menu items
 
-The `link:http://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.
+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.
 
 Here we will create an action which produces an array of menu items.  All of them will be shown inline in the main menu:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNativeLibraries.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNativeLibraries.adoc
index 283589c55..20a800214 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNativeLibraries.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNativeLibraries.adoc
@@ -31,7 +31,7 @@
 
 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.
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#jni[API Reference: JNI in modules]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#jni[API Reference: JNI in modules]
 
 
 Applies to: NetBeans 6.8 and above
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNbIdiosyncracies.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNbIdiosyncracies.adoc
index d7d8c1d82..45823f41d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNbIdiosyncracies.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNbIdiosyncracies.adoc
@@ -31,15 +31,15 @@
 
 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:
 
-* *Loading images* - Don't use `ImageIO.read()` or `Toolkit.loadImage()` - instead, use link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/ImageUtilities.html#loadImage(java.lang.String)[ImageUtilities.loadImage()] - it has an optimized image caching strategy, and will play nicely with NetBeans module class loaders
-* *Creating icons from images* - Rather than use `new ImageIcon(someImage)`, use link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/ImageUtilities.html#image2Icon(java.awt.Image)[ImageUtilities.image2Icon(someImage)] which manages memory better.
-* *Loading resource bundles/localized strings* - Don't use `ResourceBundle` directly - instead, use link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.html#getMessage(java.lang.Class,%20java.lang.String)[NbBundle.getMessage()] - it will play nicely with NetBeans class loaders, and `String`s resolved this way can be branded using the standard branding mechanism (this is the way you change the title of your application from "NetBeans" to something else).   [...]
-* *Assigning mnemonics to labels and buttons* - use link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Mnemonics.html[Mnemonics] to assign text and mnemonic to a widget with one call using one key value pair in properties file and annotate the mnemonic with &amp; character. Also do not reuse the same text if it is used in different UI components. This is more freindly to localization.
+* *Loading images* - Don't use `ImageIO.read()` or `Toolkit.loadImage()` - instead, use link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/ImageUtilities.html#loadImage(java.lang.String)[ImageUtilities.loadImage()] - it has an optimized image caching strategy, and will play nicely with NetBeans module class loaders
+* *Creating icons from images* - Rather than use `new ImageIcon(someImage)`, use link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/ImageUtilities.html#image2Icon(java.awt.Image)[ImageUtilities.image2Icon(someImage)] which manages memory better.
+* *Loading resource bundles/localized strings* - Don't use `ResourceBundle` directly - instead, use link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbBundle.html#getMessage(java.lang.Class,%20java.lang.String)[NbBundle.getMessage()] - it will play nicely with NetBeans class loaders, and `String`s resolved this way can be branded using the standard branding mechanism (this is the way you change the title of your application from "NetBeans" to something else).  [...]
+* *Assigning mnemonics to labels and buttons* - use link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Mnemonics.html[Mnemonics] to assign text and mnemonic to a widget with one call using one key value pair in properties file and annotate the mnemonic with &amp; character. Also do not reuse the same text if it is used in different UI components. This is more freindly to localization.
 _Tip: Check 'Generate Mnemonics Code' checkbox in properties of your form if you are using NetBeans GUI editing support._
-* *Showing dialogs* - instead of creating a `JDialog` and showing it, or using `JOptionPane`, use link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.html[NotifyDescriptor] or link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDescriptor.html[DialogDescriptor] to define your dialog and its contents, then pass these to link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html#notify(or [...]
+* *Showing dialogs* - instead of creating a `JDialog` and showing it, or using `JOptionPane`, use link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/NotifyDescriptor.html[NotifyDescriptor] or link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDescriptor.html[DialogDescriptor] to define your dialog and its contents, then pass these to link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html#notify [...]
 * *Reading/writing/listing files* - in most cases, rather than work with `java.io.File`, you will want to work with `xref:DevFaqFileObject.adoc[org.openide.filesystems.FileObject]`.
 
-* *Quiting application* - you can of course still continue to quit using System.exit() but polite NBP apps should employ link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/LifecycleManager.html[LifecycleManager] instead. Typical Usage pattern is `LifecycleManager.getDefault().exit()` that is equals to `System.exit(0)` you don't provide custom LifecycleManager.
+* *Quiting application* - you can of course still continue to quit using System.exit() but polite NBP apps should employ link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/LifecycleManager.html[LifecycleManager] instead. Typical Usage pattern is `LifecycleManager.getDefault().exit()` that is equals to `System.exit(0)` you don't provide custom LifecycleManager.
 
 
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNoClassDefFound.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNoClassDefFound.adoc
index 63bc35bc3..3f9ac5c90 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNoClassDefFound.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNoClassDefFound.adoc
@@ -59,7 +59,7 @@ The message displayed states that when using this flag, you should _not_ use the
 
 For help on working with class paths, please see
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/classpath.html[http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/classpath.html]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/classpath.html[http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/classpath.html]
 
 Applies to: NetBeans 6.x
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeDeletionDialog.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeDeletionDialog.adoc
index 997c7d3c0..0f4d88646 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeDeletionDialog.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeDeletionDialog.adoc
@@ -33,7 +33,7 @@ By default, you will be prompted to confirm your intention whenever you try to d
 
 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:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExtendedDelete.html[ExtendedDelete] interface.
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
index 20c7cd8fa..182584604 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
@@ -50,11 +50,11 @@ You can use this pattern for properties, or whatever.  If you want your Node to
 
 First, be sure this is something you really need.  Typically, you expose some model object from your Node, and link:http://wiki.netbeans.org/DevFaqActionContextSensitive[write Actions that are sensitive to it].
 
-However, if you want to use built-in actions (such as link:http://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/OpenAction.html[OpenAction]) over your custom Nodes, and the module which created the Node does not provide the `Openable` or `OpenCookie` object which, for example, `OpenAction` needs, then you do need some way for other modules to inject contents into your lookup.  If you are both injecting an object into the lookup, and writing an action against that  [...]
+However, if you want to use built-in actions (such as link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/OpenAction.html[OpenAction]) over your custom Nodes, and the module which created the Node does not provide the `Openable` or `OpenCookie` object which, for example, `OpenAction` needs, then you do need some way for other modules to inject contents into your lookup.  If you are both injecting an object into the lookup, and writing an action against that [...]
 
 Lookup contents should not be added programmatically - that would mean every module that cares about a Node type would have to be called to add contents (which may never be used) to it - meaning a performance penalty.  Also this breaks things like FilterNode, which cannot transparently proxy methods that exist on the Node it is acting as a clone of.
 
-It is simple to create a declarative registry for lookup contents.  It makes use of the fact that the contents of an link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/AbstractLookup.html[AbstractLookup] are provided by a mutable link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent] object, and that a factory class can be added to an InstanceContent, link:http://bits.netbeans. [...]
+It is simple to create a declarative registry for lookup contents.  It makes use of the fact that the contents of an link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/AbstractLookup.html[AbstractLookup] are provided by a mutable link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/lookup/InstanceContent.html[InstanceContent] object, and that a factory class can be added to an InstanceContent, link:https://bits.netbea [...]
 
 Here is an example base Node class that will do this:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeSerialize.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeSerialize.adoc
index 208aef865..e5d32a716 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeSerialize.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeSerialize.adoc
@@ -31,7 +31,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.
 
-From link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html#serial[ Serialization and traversal] in the NetBeans Javadoc:
+From link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html#serial[ Serialization and traversal] in the NetBeans Javadoc:
 
 ''"If you need to store (serialize) a node for any reason, this is generally impossible due to the welter of Java-level references connecting it to the rest of the system. Rather, you must use a special serializable handle which represents the node by its position in the hierarchy, and permits finding the original node again after deserialization (if it still exists). To create a handle, just call Node.getHandle(), and to restore the node call Node.Handle.getNode().
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeSubclass.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeSubclass.adoc
index 26a168b0d..be9a0b545 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeSubclass.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeSubclass.adoc
@@ -42,10 +42,10 @@ return nue;
 
 If you are creating xref:DevFaqWhatIsANode.adoc[Node]s, you will typically deal with one of four things
 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html[AbstractNode] - create a Node which represents anything you want - you will implement all its logic, provide children, etc.  Typically most logic goes in the Children object. 
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/BeanNode.html[BeanNode] - a very convenient Node subclass, which can represent any JavaBean as a Node and expose its bean properties as Property objects that can be edited on the property sheet
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] - a Node subclass that proxies another Node.  You can subclass this to take an existing Node (possibly representing a file on disk or in the xref:DevFaqSystemFilesystem.adoc[system filesystem ] and keep most of its attributes, but provide different actions or display name or icons or properties
-* link:http://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
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/AbstractNode.html[AbstractNode] - create a Node which represents anything you want - you will implement all its logic, provide children, etc.  Typically most logic goes in the Children object. 
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/BeanNode.html[BeanNode] - a very convenient Node subclass, which can represent any JavaBean as a Node and expose its bean properties as Property objects that can be edited on the property sheet
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/FilterNode.html[FilterNode] - a Node subclass that proxies another Node.  You can subclass this to take an existing Node (possibly representing a file on disk or in the xref:DevFaqSystemFilesystem.adoc[system filesystem ] and keep most of its attributes, but provide different actions or display name or icons or properties
+* 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()].
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodesCustomLookup.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodesCustomLookup.adoc
index fccb77af3..57772a158 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodesCustomLookup.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodesCustomLookup.adoc
@@ -83,7 +83,7 @@ Your lookup will be updated to include all items in the InstanceContent.
 
 === Custom Lookup Contents with DataObjects
 
-DataObjects have a Lookup, but also use an older variant on the Lookup pattern, called a `link:http://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.
+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.
 
 However, it is possible to work with the more modern idioms of Lookup as described above, with a few caveats.  Such a DataObject typically looks like:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNonGuiPlatformApp.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNonGuiPlatformApp.adoc
index c000961c4..753e54e07 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNonGuiPlatformApp.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNonGuiPlatformApp.adoc
@@ -63,7 +63,7 @@ You will also need to suppress the splash screen by passing `--nosplash` argumen
 
 If your application performs some repetitive task like engineering analysis and you have some users who prefer using the command line and some who don't, you may be asked to modify your application so that it can run in either the normal GUI mode or in batch processing mode from the command line.
 
-The exact method for doing this will vary per application, but you will typically need to add a module to interpret some custom command-line arguments using the link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-sendopts/[Command Line Processing API].  Inside the process(Env env, Map<Option, String[]> map) method of your option processor, you'll invoke whatever code corresponds to the arguments the user specified (e.g. myapp --import path/to/file.txt might import some file).  
+The exact method for doing this will vary per application, but you will typically need to add a module to interpret some custom command-line arguments using the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-sendopts/[Command Line Processing API].  Inside the process(Env env, Map<Option, String[]> map) method of your option processor, you'll invoke whatever code corresponds to the arguments the user specified (e.g. myapp --import path/to/file.txt might import some file).  
 
 Remember that you should not use System.out, System.err and System.in for the output, error and input streams in the options processor but instead get them from the Env object passed as a parameter to the process method.  
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
index 1b7705a63..29ce5408a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
@@ -59,7 +59,7 @@ In your TopComponent's .java source file:
 * Delete the `getDefault()` method (typically somewhere around the middle of the file)
 * Delete the `findInstance()` method (which typically follows the `getDefault()` method)
 * Update the persistence code which saves your component's state on shutdown and restores it on restart to reopen your component as follows
-* Locate the `getPersistenceType` method and change its return value to either `link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#PERSISTENCE_NEVER[TopComponent.PERSISTENCE_NEVER]` or `link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#PERSISTENCE_ONLY_OPENED[TopComponent.PERSISTENCE_ONLY_OPENED]` (see below for why).
+* Locate the `getPersistenceType` method and change its return value to either `link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#PERSISTENCE_NEVER[TopComponent.PERSISTENCE_NEVER]` or `link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#PERSISTENCE_ONLY_OPENED[TopComponent.PERSISTENCE_ONLY_OPENED]` (see below for why).
 * If you have methods called `writeReplace()`and an inner class called `ResolvableHelper` (NetBeans 6.8 and earlier):
 * Delete the `writeReplace()` method (typically towards the end of the file)
 * Delete the `ResolvableHelper` inner class (typically towards the end of the file)
@@ -102,7 +102,7 @@ If you wrote your persistence code correctly, your components will magically reo
 
 === What About PERSISTENCE_ALWAYS?
 
-There is one other value you can return from `link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.html#getPersistenceType()[TopComponent.getPersistenceType()]`.  That value is `TopComponent.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`.
 
 While it is _legal_ to return this value from a non-singleton TopComponent, it is almost never what you want to do.  What will happen if you do this is:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqOpenOptionsAtCategory.adoc b/netbeans.apache.org/src/content/wiki/DevFaqOpenOptionsAtCategory.adoc
index 760ec7bdf..7359291e8 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqOpenOptionsAtCategory.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqOpenOptionsAtCategory.adoc
@@ -29,7 +29,7 @@
 
 == How do you open the option dialog with a preselected category?
 
-See link:http://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-]
+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-]
 
 For example
 `
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqPlatformAppAuthStrategies.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPlatformAppAuthStrategies.adoc
index e5755abcc..ed8d4eb1d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPlatformAppAuthStrategies.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPlatformAppAuthStrategies.adoc
@@ -31,11 +31,11 @@
 
 There are cases in which you want to exercise great control over who is allowed to use your application.  You might, for example, be required to check the user's network credentials, validate client-side certificate or check a license server before the platform application is even launched.
 
-It is important to note that because the platform has not been initialized at this point, none of the usual platform capabilities will be available. If you simply want to enable a single module based on some criteria (for example, the existence of a license file), you can use link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html#validate()[ModuleInstall.validate()].
+It is important to note that because the platform has not been initialized at this point, none of the usual platform capabilities will be available. If you simply want to enable a single module based on some criteria (for example, the existence of a license file), you can use link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html#validate()[ModuleInstall.validate()].
 
 A platform application is typically started from an executable launcher (Windows) or shell script (Unix).
 This invokes the `org.netbeans.core.startup.Main.main` method.
-However, as described in the link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/architecture-summary.html[Module System documentation], you can use the `netbeans.mainclass` xref:DevFaqPlatformRuntimeProperties.adoc[system property] to specify a different class to run at startup.  
+However, as described in the link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/architecture-summary.html[Module System documentation], you can use the `netbeans.mainclass` xref:DevFaqPlatformRuntimeProperties.adoc[system property] to specify a different class to run at startup.  
 
 This class should exist in a JAR file in the startup classpath (you can put it alongside `core.jar` in the `platform/core` directory).  This class must also have a main method which can invoke whatever authorization logic you like.  If authorization fails, you'll probably want to show a dialog and call `System.exit`.  If it succeeds, you can invoke the `org.netbeans.core.startup.Main` class' `main` method yourself to continue the normal NetBeans startup procedure.  But because `org.netbe [...]
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqPropertyEditorHints.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertyEditorHints.adoc
index 97a6e8067..38cf956ba 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertyEditorHints.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertyEditorHints.adoc
@@ -31,7 +31,7 @@
 
 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.
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html]
 
 Note that all of these are _hints_ - a property editor is free to ignore them or not support them in the future.  However all of these have been present since NetBeans 3.6 and are _should_ still work as of NetBeans 6.9.
 
@@ -42,7 +42,7 @@ Note that all of these are _hints_ - a property editor is free to ignore them or
 
 |Any |`valueIcon` |`javax.swing.Icon` |Causes the property not to show an icon beside the value (should be 16x16 or smaller) when not in edit mode 
 
-|Most editors (string, etc.) |`htmlDisplayValue` |`java.lang.String` |An HTML-ized string which should be rendered using HTML rendering, not literally.  The subset of HTML supported by link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/HtmlRenderer.html[org.openide.awt.HtmlRenderer] is supported.  Generally the value should be a formatted variant of the actual value - otherwise when the user edits the value, it will suddenly seem to have changed. 
+|Most editors (string, etc.) |`htmlDisplayValue` |`java.lang.String` |An HTML-ized string which should be rendered using HTML rendering, not literally.  The subset of HTML supported by link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/HtmlRenderer.html[org.openide.awt.HtmlRenderer] is supported.  Generally the value should be a formatted variant of the actual value - otherwise when the user edits the value, it will suddenly seem to have changed. 
 
 |All property editors |`nameIcon` |`java.awt.Image` or `javax.swing.Icon` |An icon which should be displayed next to the property name in the property sheet (16x16 or smaller) 
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetEditors.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetEditors.adoc
index 1a48156e3..99e7b4613 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetEditors.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetEditors.adoc
@@ -34,7 +34,7 @@
 
 
 *Issue:* How can I provide a new kind of inplace editor? For example, I want to have a property which should be shown at Property Sheet like a combo-box or a spinner control.
-*Solution:* See the docs for the link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/propertysheet/InplaceEditor.html[InplaceEditor] interface.
+*Solution:* See the docs for the link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/propertysheet/InplaceEditor.html[InplaceEditor] interface.
 
 
 *Issue:* How do I specify that a value is not editable in-place?
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetNodes.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetNodes.adoc
index 96f204fd8..e1e3a1787 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetNodes.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetNodes.adoc
@@ -31,7 +31,7 @@
 
 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?
 
-Listen for changes in the selected nodes in the [link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.html[http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.html] `ExplorerManager`], and set the `activatedNodes` property on the parent [[DevFaqWindowsTopComponent| `TopComponent`]] which contains your tree view:
+Listen for changes in the selected nodes in the [link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.html[http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/ExplorerManager.html] `ExplorerManager`], and set the `activatedNodes` property on the parent [[DevFaqWindowsTopComponent| `TopComponent`]] which contains your tree view:
 
 [source,java]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetReadonlyProperty.adoc b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetReadonlyProperty.adoc
index e4b7cc0d4..bfa5fe848 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetReadonlyProperty.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqPropertySheetReadonlyProperty.adoc
@@ -31,7 +31,7 @@
 
 You can customize your properties by using the setValue method.
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html]
 
 Example:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc b/netbeans.apache.org/src/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc
index 85d497369..9852382b5 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqRegisterObjectsViaInstanceOrSettingsFiles.adoc
@@ -40,7 +40,7 @@ There are a number of kinds of files which are treated (and can be transformed i
 [source,xml]
 ----
 
- If you want to use a factory method and set up some configuration of the object using your own xref:DevFaqFileAttributes.adoc[FileObject attributes], you can instead <ul><li>Create a public static method on some class, which takes a `link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html[FileObject]` as an argument, e.g.<blockquote>`<file name=&quot;x.instance&quot;>&nbsp;&nbsp;<attr name=&quot;instanceClass&quot; stringvalue=&quot;com. [...]
+ If you want to use a factory method and set up some configuration of the object using your own xref:DevFaqFileAttributes.adoc[FileObject attributes], you can instead <ul><li>Create a public static method on some class, which takes a `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileObject.html[FileObject]` as an argument, e.g.<blockquote>`<file name=&quot;x.instance&quot;>&nbsp;&nbsp;<attr name=&quot;instanceClass&quot; stringvalue=&quot;com [...]
 ----
  
 
@@ -49,9 +49,9 @@ There are a number of kinds of files which are treated (and can be transformed i
 |`.shadow` files |If you want your object to be a pseudo-singleton, but it will be registered in multiple folders, or the user may delete the shadow file and you need to provide a way for the user to recover it (i.e. a way to create a new `.shadow` file) |`xref:DevFaqDotShadowFiles.adoc[.shadow]` files are like unix symbolic links - they point to another file somewhere else in the xref:DevFaqSystemFilesystem.adoc[system filesystem] or on disk, and behave as if they were really that file. [...]
  An example of this is Menu and Toolbar actions &mdash; all actions are registered in subfolders of the `Actions/` folder in the system filesystem.  The user might manually delete or rearrange them;  the UI that allows this can also show all available actions, so that the user can replace accidentally deleted actions. 
 
-|`.ser` (serialized object) files |Basically never |Write a serialized object out to disk in a file with the extension `.ser`, either on the fly at runtime into some folder under `link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#getConfigFile(java.lang.String)[FileUtil.getConfigFile()]`, or serialize an object ahead of time somehow, copy it into your module sources, and register something like `<file name="foo.ser" url="relative/path [...]
+|`.ser` (serialized object) files |Basically never |Write a serialized object out to disk in a file with the extension `.ser`, either on the fly at runtime into some folder under `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileUtil.html#getConfigFile(java.lang.String)[FileUtil.getConfigFile()]`, or serialize an object ahead of time somehow, copy it into your module sources, and register something like `<file name="foo.ser" url="relative/pat [...]
 
-|Your own file type |Basically never |Any xref:DevFaqDataObject.adoc[DataObject] type which contains an `link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/InstanceCookie.html[InstanceCookie]` (and ideally also an `link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/InstanceCookie.Of.html[InstanceCookie.Of]`) can be registered in some folder. If this is done ` link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/op [...]
+|Your own file type |Basically never |Any xref:DevFaqDataObject.adoc[DataObject] type which contains an `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/InstanceCookie.html[InstanceCookie]` (and ideally also an `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/InstanceCookie.Of.html[InstanceCookie.Of]`) can be registered in some folder. If this is done ` link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org [...]
 Unless you are doing something very, very unusual, one of the existing registration mechanisms will almost always be sufficient.  
 This mechanism may be useful if you have existing code which reads and writes files in some format, and you cannot change that code. 
 |===
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqRenamingMenuItem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqRenamingMenuItem.adoc
index a77ad1d33..79d266f32 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqRenamingMenuItem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqRenamingMenuItem.adoc
@@ -39,7 +39,7 @@ When you enable branding on a suite the IDE automatically brands a few bundle st
 
 The Branding menu item on a suite (or Maven app project) lets you search for other strings and override them easily.
 
-See also link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html[Technical details]
+See also link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html[Technical details]
 
 Applies to: NetBeans 5.0, 5.5, 6.x
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessor.adoc b/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessor.adoc
index a8218959d..17769daec 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessor.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqRequestProcessor.adoc
@@ -33,7 +33,7 @@
 
 One of the most common threading bugs in NetBeans happens like this:
 
-* Someone needs to run a background operation, so they use [link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/RequestProcessor.html#getDefault([http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/RequestProcessor.html#getDefault(]) `RequestProcessor.getDefault()`, the global thread pool
+* Someone needs to run a background operation, so they use [link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/RequestProcessor.html#getDefault([http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/RequestProcessor.html#getDefault(]) `RequestProcessor.getDefault()`, the global thread pool
 * They don't realize that it is possible for either that code to be called repeatedly (by the user, in a loop or whatever)
 * The background work can take some time to run
 * A user notices that NetBeans is slow, takes a thread dump, and there are 40 background threads all doing the same thing at the same time
@@ -44,7 +44,7 @@ One of the most common threading bugs in NetBeans happens like this:
 
 `RequestProcessor.getDefault()` is useful for _one-off_ operations - you have some situation that happens once in a great while, and, say, while constructing some object, you need to do some work in the background;  that work will probably never need to be done again for the life of the Java VM.  That's a perfect case for `RequestProcessor.getDefault()`.
 
-Now here is the *anti-example*:  You are creating a `link:http://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 [...]
+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.  No [...]
 
 If you create your own RequestProcessor, please always use a name. If you get a deadlock it makes debugging much easier.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSetPrefs.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSetPrefs.adoc
index e1fc0a50b..bba09a31a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSetPrefs.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSetPrefs.adoc
@@ -29,7 +29,7 @@
 
 == How do I let the user set preferences/options/customization/configuration for my module/application?
 
-From 6.0 onwards, you can use the link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/NbPreferences.html[NbPreferences API].
+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].
 
 Read the following related blog entries:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSuppressExistingModule.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSuppressExistingModule.adoc
index bbd72d31f..84ef297ef 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSuppressExistingModule.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSuppressExistingModule.adoc
@@ -33,7 +33,7 @@ If you're building a complete application (for example, selecting the *Standalon
 
 If you have a single module which you want to install in an existing application (e.g. the NetBeans IDE) and disable another module, it's a little trickier. You can do it in your `ModuleInstall.restored()` method:
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#listing[Modules API - List of Modules]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#listing[Modules API - List of Modules]
 
 Sample:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSwitchingMenusByContext.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSwitchingMenusByContext.adoc
index b90bb7663..00d7de404 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSwitchingMenusByContext.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSwitchingMenusByContext.adoc
@@ -29,9 +29,9 @@
 
 == How can I change the contents of a menu according to the selected file in the editor?
 
-* Create your action and let it implement link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/actions/Presenter.Menu.html[Presenter.Menu]
-* Return a special `JMenuItem` subclass that implements link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/DynamicMenuContent.html[DynamicMenuContent] from `getMenuPresenter()`
-* Implement link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/DynamicMenuContent.html[DynamicMenuContent] methods to return the desired menu content, using link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Registry.html[TopComponent.Registry] for finding the selected file in the editor.
+* Create your action and let it implement link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/actions/Presenter.Menu.html[Presenter.Menu]
+* Return a special `JMenuItem` subclass that implements link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/DynamicMenuContent.html[DynamicMenuContent] from `getMenuPresenter()`
+* Implement link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/DynamicMenuContent.html[DynamicMenuContent] methods to return the desired menu content, using link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/TopComponent.Registry.html[TopComponent.Registry] for finding the selected file in the editor.
 
 link:https://bitbucket.org/jglick/dynamicmenudemo/[https://bitbucket.org/jglick/dynamicmenudemo/] also does something similar.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSysFsLookupRegistration.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSysFsLookupRegistration.adoc
index ed76b9db3..f929534ad 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSysFsLookupRegistration.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSysFsLookupRegistration.adoc
@@ -85,7 +85,7 @@ replace `instanceClass` with `instanceCreate`, e.g.:
 ----
 
 It is also possible to pass parameters to the factory method;
-see link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/api.html#instances[API documentation] for details.
+see link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/api.html#instances[API documentation] for details.
 
 Client code is unaware of the registration mechanism, so the code used to look up a registered implementation of the interface would be the same as always; for example:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSystemFilesystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSystemFilesystem.adoc
index ceba2e6d9..7a1deb397 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSystemFilesystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSystemFilesystem.adoc
@@ -74,7 +74,7 @@ There are several things which affect how objects are used, all or some of which
 
 === Available documentation on System Filesystem contents
 
-link:http://bits.netbeans.org/dev/javadoc/layers.html[List of files and folders in the system filesystem]
+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.
 Feel free to file documentation bugs for modules you know read other locations
 but which fail to list them in their `arch.xml` file.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqThreading.adoc b/netbeans.apache.org/src/content/wiki/DevFaqThreading.adoc
index b1dfe0d56..ca4275d48 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqThreading.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqThreading.adoc
@@ -33,7 +33,7 @@ First, ask yourself why you need to do this and if it is really necessary.  Gene
 
 NetBeans contains a thread pool `org.openide.util.RequestProcessor`. (You can use the thread pools that exist today in `java.util.concurrent` but it is more typical to use `RequestProcessor`.)  There is a general purpose built-in thread pool - `RequestProcessor.getDefault()`.  You can use that for things that only happen once in a while;  otherwise you are probably better off creating your own instance of `RequestProcessor`.  There is a xref:DevFaqRequestProcessor.adoc[FAQ item about how [...]
 
-Note that if you are doing something in the background, you may want to use the link:http://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).
+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 do [...]
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc b/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
index ad56432de..a361671e4 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
@@ -34,9 +34,9 @@ A few APIs come with built in multi-threading - if you want your code to run on
 Specifically they are
 
 * The Actions API - if you override `asynchronous` to return true (or don't override it - for historical reasons this is the default), your action's `performAction` method will run in the background
-* The Nodes API - to compute node children that are expensive to create, use `link:http://wiki.netbeans.org/DevFaqNodesChildFactory[ChildFactory]` and specify `true` as the boolean argument to `link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Children.html#create(org.openide.nodes.ChildFactory,%20boolean)[Children.create()]`
+* The Nodes API - to compute node children that are expensive to create, use `link:http://wiki.netbeans.org/DevFaqNodesChildFactory[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:http://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(...)]
+* 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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqToggleActionAddToEditorToolbar.adoc b/netbeans.apache.org/src/content/wiki/DevFaqToggleActionAddToEditorToolbar.adoc
index b8c30c856..14fa6ef41 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqToggleActionAddToEditorToolbar.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqToggleActionAddToEditorToolbar.adoc
@@ -29,7 +29,7 @@
 
 == How do I add a toggle-able action to the toolbar/main menu?
 
-* extend from link:http://bits.netbeans.org/dev/javadoc/org-openide-util-ui/org/openide/util/actions/BooleanStateAction.html[org.openide.util.actions.BooleanStateAction]
+* extend from link:https://bits.netbeans.org/dev/javadoc/org-openide-util-ui/org/openide/util/actions/BooleanStateAction.html[org.openide.util.actions.BooleanStateAction]
 * in the constructor add a property-change listener to the action itself and let the action implement `PropertyChangeListener `
 * within `PropertyChangeListener#propertyChange` check for the propertyName `PROP_BOOLEAN_STATE` to distinguish the toggle event from other events
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqTutorialsAPI.adoc b/netbeans.apache.org/src/content/wiki/DevFaqTutorialsAPI.adoc
index 27a54be82..c81802d07 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqTutorialsAPI.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqTutorialsAPI.adoc
@@ -29,8 +29,8 @@
 
 == Tutorial index
 
-* link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans Platform API starting point]
-* link:http://bits.netbeans.org/dev/javadoc/usecases.html[How to use certain NetBeans APIs] includes introductions to:
+* link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans Platform API starting point]
+* link:https://bits.netbeans.org/dev/javadoc/usecases.html[How to use certain NetBeans APIs] includes introductions to:
 * Actions
 * Ant-Based Project Support
 * Ant integration module
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUIGestures.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUIGestures.adoc
index c07a29da2..352a7bf12 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUIGestures.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUIGestures.adoc
@@ -33,7 +33,7 @@ A perfect tool to get you know users of your application. xref:UIGesturesCollect
 
 == How should the LogRecords be named
 
-Use link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html[structured logging] e.g. use just a machine name for a log record's message and keep its localized version in a Bundle. Set the logger name to be below the namespace {org.netbeans.ui} in some meaningful subpackage.
+Use link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html[structured logging] e.g. use just a machine name for a log record's message and keep its localized version in a Bundle. Set the logger name to be below the namespace {org.netbeans.ui} in some meaningful subpackage.
 
 The statistic on the server shall then recognize the logger name as well as the message.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUseNativeInstaller.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUseNativeInstaller.adoc
index 76435af86..542dc6c5e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUseNativeInstaller.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUseNativeInstaller.adoc
@@ -32,7 +32,7 @@
 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).
 
-link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/overview-summary.html[Autoupdate Services] primary handles NetBeans plugins based on xref:DevFaqWhatIsNbm.adoc[NBM] packaging. 
+link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/overview-summary.html[Autoupdate Services] primary handles NetBeans plugins based on xref:DevFaqWhatIsNbm.adoc[NBM] packaging. 
 
 In addition, Autoupdate Services offers the possibility to install/uninstall components which are not in NBM format. This possibility has been designed to support such use-cases - for example, to install an application Servers such as link:http://glassfish.dev.java.net[GlassFish] by running its own installer.  
 
@@ -42,11 +42,11 @@ To enable such possibility, Autoupdate Services API provides:
 
 * An SPI for providing such components
 * A custom installer can be assigned to the component which performs installation particular component into NetBeans
-* The ability to register that link:http://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
+* 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?
 
-Implement interface link:http://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:
+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:
 
 * Determine if the component is already installed on the target system. 
 * If so, it should be able to tell which version, so the system knows if the bundled version is older, newer or the same version
@@ -85,7 +85,7 @@ It has simple methods describing the provider, like this:
     }
 ----
 
-The essential method *`getUpdateItems`* will return link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/UpdateItem.html[UpdateItems] which matches these components. It has to return an `UpdateItem` both for installed component and for available component what has not been installed yet.
+The essential method *`getUpdateItems`* will return link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/UpdateItem.html[UpdateItems] which matches these components. It has to return an `UpdateItem` both for installed component and for available component what has not been installed yet.
 
 [source,java]
 ----
@@ -119,11 +119,11 @@ The essential method *`getUpdateItems`* will return link:http://bits.netbeans.or
     }
 ----
 
-There are two factory methods *`getInstalledUpdateItem`* and *`getAvailableUpdateItem`*.  Both are using SPI link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/UpdateItem.html#createNativeComponent(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.util.Set,%20java.lang.String,%20java.lang.String,%20java.lang.Boolean,%20java.lang.Boolean,%20java.lang.String,%20org.netbeans.spi.autoupdate.CustomInstaller,%20org.netb [...]
+There are two factory methods *`getInstalledUpdateItem`* and *`getAvailableUpdateItem`*.  Both are using SPI link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/UpdateItem.html#createNativeComponent(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.util.Set,%20java.lang.String,%20java.lang.String,%20java.lang.Boolean,%20java.lang.Boolean,%20java.lang.String,%20org.netbeans.spi.autoupdate.CustomInstaller,%20org.net [...]
 
 Add an `UpdateItem` matching available component first.  The provider has to specify a name, display name, download size and so forth. 
 
-The most important parts are link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/CustomInstaller.html[CustomInstaller] and link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/CustomUninstaller.html[CustomUninstaller]. For example:
+The most important parts are link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/CustomInstaller.html[CustomInstaller] and link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/org/netbeans/spi/autoupdate/CustomUninstaller.html[CustomUninstaller]. For example:
 
 [source,java]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUserDir.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUserDir.adoc
index cf5291088..689070a2e 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUserDir.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUserDir.adoc
@@ -57,7 +57,7 @@ tries to contact the running instance via a socket,
 to determine if the lock file is stale or not.
 If it does not make contact, it will display a warning
 and ask the user if startup should continue.
-This same protocol also supports link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-sendopts/overview-summary.html[command-line options].
+This same protocol also supports link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-sendopts/overview-summary.html[command-line options].
 
 You can find the path to the userdir at runtime if you need to,
 using the system property `netbeans.user`.
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
index 7b4607804..e3f23fd2f 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
@@ -31,7 +31,7 @@ During development of the 6.5 series, an effort was made to improve testing by i
 
 == NbModuleSuite
 
-Right xref:API_Design.adoc[API] for starting the test inside link:http://wiki.apidesign.org/wiki/NetBeans_Runtime_Container[NetBeans Runtime Container] is provided in form of link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/org/netbeans/junit/NbModuleSuite.html[NbModuleSuite]. Add *suite* method into your test class to fully emulate xref:../index.adoc[NetBeans] environment:
+Right xref:API_Design.adoc[API] for starting the test inside link:http://wiki.apidesign.org/wiki/NetBeans_Runtime_Container[NetBeans Runtime Container] is provided in form of link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-nbjunit/org/netbeans/junit/NbModuleSuite.html[NbModuleSuite]. Add *suite* method into your test class to fully emulate xref:../index.adoc[NetBeans] environment:
 
 [source,java]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWeakListener.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWeakListener.adoc
index 566ee9b0e..a481b86e2 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWeakListener.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWeakListener.adoc
@@ -35,7 +35,7 @@ In Java, any object that is referenced by another object which is still in use (
 
 Since listeners are often implemented as inner (non-static) classes of some other object, and an inner class keeps a reference to the object that created it, the outer object instance is kept in memory too.
 
-`link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/WeakListeners.html[WeakListeners]` is a factory class which wraps your event listener in another one, but it only _weakly_ (using `java.lang.ref.WeakReference`) references your actual listener.  That means that, even though you are listening for changes, that will not block your listener from being garbage collected if nothing _else_ still references it.
+`link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/WeakListeners.html[WeakListeners]` is a factory class which wraps your event listener in another one, but it only _weakly_ (using `java.lang.ref.WeakReference`) references your actual listener.  That means that, even though you are listening for changes, that will not block your listener from being garbage collected if nothing _else_ still references it.
 
 There is one caveat to using WeakListeners - if you do something like this:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWeakListenerWhen.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWeakListenerWhen.adoc
index b4ae70f7a..da225c765 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWeakListenerWhen.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWeakListenerWhen.adoc
@@ -33,7 +33,7 @@ You should use a xref:DevFaqWeakListener.adoc[WeakListener] any time you are add
 
 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:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/WeakListeners.html[WeakListeners]`
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
index 39cf7c9fa..32f23ca35 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
@@ -43,7 +43,7 @@ The NetBeans platform expects cluster directories to have a certain minimal stru
 
 A cluster may contain additional files and folders as needed.  For example, it is common for modules which bundle 3rd-party libraries to include those JAR files in `modules/ext/`.  A cluster can contain whatever other files a module needs at runtime - for example, a module that installs a mobile phone emulator would probably include the native emulator executable.
 
-To include additional files in your cluster, simply create a directory `release/` underneath your module's project directory (_not_ the `src/` directory for your module, but its parent folder - the one that _is_ your module project).  Anything under `$PROJECT/release/` will be copied into your cluster by the build process.  To find the file at runtime, use link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/InstalledFileLocator.html[InstalledFileLocator], e.g.
+To include additional files in your cluster, simply create a directory `release/` underneath your module's project directory (_not_ the `src/` directory for your module, but its parent folder - the one that _is_ your module project).  Anything under `$PROJECT/release/` will be copied into your cluster by the build process.  To find the file at runtime, use link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/InstalledFileLocator.html[InstalledFileLocator], e.g.
 
 [source,java]
 ----
@@ -67,7 +67,7 @@ Here's the history of clusters:
 * The platform, and other parts of NetBeans therefore should be able to be shared among multiple applications and used by them at the same time.
 * Therefore, a NetBeans-based application should not assume that all of its parts ("clusters" of modules which interdepend) are underneath the same directory on disk&mdash;the platform might be in one directory, while the Java modules are someplace else entirely.
 * Before this, a typical way to find a file underneath a NetBeans install was new File(System.getProperty("netbeans.home")) to get the NB install directory;  then you could try to find a file somewhere under that directory.
-* If there is not necessarily an "install directory" at all, then you need something like link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/InstalledFileLocator.html[InstalledFileLocator], which knows about the cluster directories being used in the running application, and can look in all of them.  That is much cleaner than you having to write the code to figure out where all of those directories are and look in each one.
+* If there is not necessarily an "install directory" at all, then you need something like link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/InstalledFileLocator.html[InstalledFileLocator], which knows about the cluster directories being used in the running application, and can look in all of them.  That is much cleaner than you having to write the code to figure out where all of those directories are and look in each one.
 
 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.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhenToUseWhatRegistrationMethod.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhenToUseWhatRegistrationMethod.adoc
index cbe659774..3b4d84412 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhenToUseWhatRegistrationMethod.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhenToUseWhatRegistrationMethod.adoc
@@ -33,9 +33,9 @@ As described in xref:DevFaqModulesGeneral.adoc[DevFaqModulesGeneral], there are
 
 * Use the `@ServiceProvider` annotation (or one of the xref:DevFaqWaysToRegisterInDefaultLookup.adoc[other registration mechanisms]) to register objects in the xref:DevFaqLookupDefault.adoc[default Lookup]
 * Add files to folders in the xref:DevFaqSystemFilesystem.adoc[system filesystem] 
-* Run some code on startup by implementing `link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html\[ModuleInstall]` and declaring your `ModuleInstall` subclass in your module's `manifest.mf`
+* Run some code on startup by implementing `link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/ModuleInstall.html\[ModuleInstall]` and declaring your `ModuleInstall` subclass in your module's `manifest.mf`
 
-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:http://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:DevFaqWaysToRegisterInDefault [...]
+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:DevFaqWaysToRegisterInDefaul [...]
 
 === Deciding On A Registration Mechanism For Clients Of Your Module
 
@@ -56,13 +56,13 @@ Below are typical registration mechanisms and patterns, and when each is useful:
 `OpenIDE-Module-Requires: com.mymodule.MyService`
  to the manifest.  If no module is present which _provides_ this token, your module will not be loaded on startup - the user will be offered an option of exiting or disabling your module.</li><li>*If you do provide some mock implementation of your service which is available in the case no other module is providing one* then add the line 
 `OpenIDE-Module-Recommends: com.mymodule.MyService`
- to the manifest.  Your module will be loaded, no matter what.  If no other module _provides_ this token, a warning will be logged.</li></ul></li><li>Document that modules which implement your service should include `OpenIDE-Module-Provides: com.mymodule.MyService` in their manifest(s). |<ul><li>The link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[UI Utilities API] defines `link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/StatusDisp [...]
+ to the manifest.  Your module will be loaded, no matter what.  If no other module _provides_ this token, a warning will be logged.</li></ul></li><li>Document that modules which implement your service should include `OpenIDE-Module-Provides: com.mymodule.MyService` in their manifest(s). |<ul><li>The link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/overview-summary.html[UI Utilities API] defines `link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/StatusDi [...]
   But the UI Utilities API does not provide the subclass of `StatusDisplayer` which is being called.
-  In fact, the module `core.windows`, which is responsible for creating NetBeans' main window _injects_ its own subclass into the default lookup, and that is what actually changes the status bar you see on the screen.  It is that subclass which you are actually calling when you set the main window's status text. But your module only depends on the API, not the windowing system. Your code doesn't have to care whose subclass of `StatusDisplayer` it is calling.  If a new version is created  [...]
+  In fact, the module `core.windows`, which is responsible for creating NetBeans' main window _injects_ its own subclass into the default lookup, and that is what actually changes the status bar you see on the screen.  It is that subclass which you are actually calling when you set the main window's status text. But your module only depends on the API, not the windowing system. Your code doesn't have to care whose subclass of `StatusDisplayer` it is calling.  If a new version is created  [...]
 
-|Define an interface or abstract class and look for multiple instances of it in the xref:DevFaqLookupDefault.adoc[default Lookup] and do something with those objects |The objects modules will register is are implementations/subclasses of a simple interface or class.  Your module only needs to find all such registered objects and use them.  Your module will need all of them at the same time. |<ul><li>Define an interface or class for others to implement.</li> <li> Document that there can b [...]
+|Define an interface or abstract class and look for multiple instances of it in the xref:DevFaqLookupDefault.adoc[default Lookup] and do something with those objects |The objects modules will register is are implementations/subclasses of a simple interface or class.  Your module only needs to find all such registered objects and use them.  Your module will need all of them at the same time. |<ul><li>Define an interface or class for others to implement.</li> <li> Document that there can b [...]
 
-|Define an interface or abstract class, and document your strategy for locating these objects in folders in the xref:DevFaqModulesLayerFile.adoc[system filesystem] |The objects modules will register is are implementations/subclasses of a simple interface or class, *but* not all objects are needed at any given time. At any time, some may be needed, based on what the user is doing (for example, the MIME type of the file the user is editing - MIME types map easily to folder paths, e.g. `Edi [...]
+|Define an interface or abstract class, and document your strategy for locating these objects in folders in the xref:DevFaqModulesLayerFile.adoc[system filesystem] |The objects modules will register is are implementations/subclasses of a simple interface or class, *but* not all objects are needed at any given time. At any time, some may be needed, based on what the user is doing (for example, the MIME type of the file the user is editing - MIME types map easily to folder paths, e.g. `Edi [...]
 
 |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>Othe [...]
 |===
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsComponentHowTo.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsComponentHowTo.adoc
index 36f49fb83..df20c04f6 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsComponentHowTo.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsComponentHowTo.adoc
@@ -51,7 +51,7 @@ public class MyAction extends AbstractAction {
 
 * Declarative XML descriptions of component are created following xref:DevFaqWindowsWstcrefAndFriends.adoc[declarative XML API] principles.
 
-TopComponents are part of the link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[Windows API].
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsMode.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsMode.adoc
index 9a8cdf3fb..8cc37026a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsMode.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsMode.adoc
@@ -37,7 +37,7 @@ Think of a `Mode` as synonymous with a one of the tabbed containers you see in t
 
 Modes can contain one or more xref:DevFaqWindowsTopComponent.adoc[TopComponent]s.  They may be visible or non-visible at any given time.
 
-The xref:DevFaqCustomWindowMode.adoc[DevFaqCustomWindowMode] page has a visual representation of the available modes, and link:http://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.
+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
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponent.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponent.adoc
index d2c897a89..f3d388b1b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponent.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsTopComponent.adoc
@@ -29,7 +29,7 @@
 
 == What is a TopComponent in the Window System?
 
-[link:http://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
+[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`.
 
 TopComponents live inside xref:DevFaqWindowsMode.adoc[Mode]s - docking containers.
@@ -42,7 +42,7 @@ TopComponents can have various states:
 
 Each `TopComponent` has a `xref:DevFaqLookup.adoc[Lookup]` and one or more `xref:DevFaqWhatIsANode.adoc[activated Node]`s.  These define the xref:DevFaqTrackGlobalSelection.adoc[selection context] for the window system, which determines what actions (menu items, toolbar buttons, etc.) are enabled, and in some cases, what they will do or operate on if invoked.
 
-`TopComponent`s are part of the link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[Windows API].
+`TopComponent`s are part of the link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[Windows API].
 
 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()`.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWindowsXmlApi.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWindowsXmlApi.adoc
index 47131e3aa..065798aba 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWindowsXmlApi.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWindowsXmlApi.adoc
@@ -53,7 +53,7 @@ by declaring them in your module's xref:DevFaqModulesLayerFile.adoc[layer file]:
 See also:
 
 * xref:DevFaqWindowsWstcrefAndFriends.adoc[How to use .wstcrf and other files]
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[The Window System API]
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[The Window System API]
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWrapperModules.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWrapperModules.adoc
index 080729ae4..20bcb0865 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWrapperModules.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWrapperModules.adoc
@@ -200,7 +200,7 @@ first cleans as usual, then cleans `my-project`.
 
 Some libraries come with a native counterpart.
 The current Library Wrapper wizard doesn't cater to this.
-As per the JNI section in link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#jni[this document],
+As per the JNI section in link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#jni[this document],
 you simply need to create a `lib` directory under `<my-wrapper>/release/modules`
 (which gets created by the wizard),
 alongside the `ext` directory mentioned earlier in this document.
diff --git a/netbeans.apache.org/src/content/wiki/FitnessViaTimersCounter.adoc b/netbeans.apache.org/src/content/wiki/FitnessViaTimersCounter.adoc
index 167be4142..04f2a7c2e 100644
--- a/netbeans.apache.org/src/content/wiki/FitnessViaTimersCounter.adoc
+++ b/netbeans.apache.org/src/content/wiki/FitnessViaTimersCounter.adoc
@@ -35,7 +35,7 @@
 
 Timers/counters (a.k.a Runtime watches) is a plugin that defined a convention
 based on
-link:http://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html#structured[structured logging] 
+link:https://bits.netbeans.org/dev/javadoc/org-openide-util/org/openide/util/doc-files/logging.html#structured[structured logging] 
 for communicating some performance metrics. It depends on <<Probes,probes>> spread over the code of
 interest, but the probes themselves don't depend on the plugin.
 
diff --git a/netbeans.apache.org/src/content/wiki/HtmlUIForTemplates.adoc b/netbeans.apache.org/src/content/wiki/HtmlUIForTemplates.adoc
index 8120cb9da..e2e8fab1b 100644
--- a/netbeans.apache.org/src/content/wiki/HtmlUIForTemplates.adoc
+++ b/netbeans.apache.org/src/content/wiki/HtmlUIForTemplates.adoc
@@ -46,7 +46,7 @@ for the template creation wizards.
 [[Your_Portable_HTML5_Wizard]]
 == Your Portable HTML5 Wizard
 
-To register your HTML based wizard with your template, use  link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-templates/org/netbeans/api/templates/TemplateRegistration.html[@TemplateRegistration] annotation and provide reference to your HTML page:
+To register your HTML based wizard with your template, use  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-templates/org/netbeans/api/templates/TemplateRegistration.html[@TemplateRegistration] annotation and provide reference to your HTML page:
 
 [source,java,subs="{markup-in-source}"]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/MavenBestPractices.adoc b/netbeans.apache.org/src/content/wiki/MavenBestPractices.adoc
index 93b8600e5..40a5900e8 100644
--- a/netbeans.apache.org/src/content/wiki/MavenBestPractices.adoc
+++ b/netbeans.apache.org/src/content/wiki/MavenBestPractices.adoc
@@ -43,7 +43,7 @@ Features added in newer versions are clearly marked with version number such as
 `NetBeans 6.5:` or `NetBeans 6.9`
 
 To learn about Maven in general or about particular aspects mentioned in this
-article, please visit the link:httpx://maven.apache.org/[project site] and read
+article, please visit the link:https://maven.apache.org/[project site] and read
 the link:https://maven.apache.org/articles.html[available books and articles] on
 the subject.
 
diff --git a/netbeans.apache.org/src/content/wiki/NbmIdioms.adoc b/netbeans.apache.org/src/content/wiki/NbmIdioms.adoc
index 3263b85a4..6cb87d05a 100644
--- a/netbeans.apache.org/src/content/wiki/NbmIdioms.adoc
+++ b/netbeans.apache.org/src/content/wiki/NbmIdioms.adoc
@@ -35,7 +35,7 @@
 This overview will quickly familiarize you with how NetBeans modules interact
 with the NetBeans Platform and with each other. It is not intended as a
 comprehensive document—the
-link:http://bits.netbeans.org/dev/javadoc/index.html[NetBeans API List], the
+link:https://bits.netbeans.org/dev/javadoc/index.html[NetBeans API List], the
 xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail], and the video series
 "xref:../tutorials/nbm-10-top-apis.adoc[Top 10 NetBeans APIs] go into greater detail—but should serve as a guide to
 understanding the basic concepts of NetBeans module development.
@@ -45,12 +45,12 @@ the same API or infrastructure does double-duty—playing one role in dealing
 with the user's files on disk, and another role when it comes to configuration
 information and runtime data. For example:
 
-* A link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileSystem.html[FileSystem] represents the 
+* A link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileSystem.html[FileSystem] represents the 
 user's files, but the xref:../tutorials/nbm-glossary.adoc[System Filesystem] represents the IDE's configuration data.
-* A link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[DataObject] represents the 
+* A link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[DataObject] represents the 
 parsed content of a Java or other file, but DataObjects also are used to instantiate a Java object installed by a module.
-* link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html#getDefault--[Lookup.getDefault()] is the way you 
-access global services and singletons, but you also call link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html#getLookup--[Node.getLookup()] to find services specific to an individual file or object.
+* link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html#getDefault--[Lookup.getDefault()] is the way you 
+access global services and singletons, but you also call link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html#getLookup--[Node.getLookup()] to find services specific to an individual file or object.
 
 It is this reuse that has led some to say the NetBeans APIs are confusing, and it is the purpose of this overview to rapidly familiarize you with what these things are and how they are used in both roles.
 
@@ -60,7 +60,7 @@ It is this reuse that has led some to say the NetBeans APIs are confusing, and i
 
 In NetBeans 3.x, adding items to the classpath was accomplished by "mounting" FileSystems - a FileSystem had a root directory and everything under it amounted to a virtual namespace in which files lived.
 
-Since NetBeans 4.0, the "mounting" is gone, and FileSystems are not a concept that users are exposed to in the UI - but the infrastructure behind FileSystems - link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileSystem.html[org.openide.filesystems.FileSystem] is alive and well under the hood. In coding NetBeans modules, you will typically interact with instances of link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/file [...]
+Since NetBeans 4.0, the "mounting" is gone, and FileSystems are not a concept that users are exposed to in the UI - but the infrastructure behind FileSystems - link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/FileSystem.html[org.openide.filesystems.FileSystem] is alive and well under the hood. In coding NetBeans modules, you will typically interact with instances of link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/fi [...]
 
 
 [[Differences_Between_java.io.File_and_FileObjects]]
@@ -179,18 +179,18 @@ The top layer to the system filesystem is the config/ subdirectory of the user's
 [[DataLoaders_and_DataObjects]]
 == DataLoaders and DataObjects
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[DataObject]link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[s] are wrappers for FileObjects. A FileObject simply represents a file-like entity; DataObjects are the level at which the system understands what the contents of a file are. So a module that implements handling for a particular file type provides its own subclass of DataObject and a  [...]
+link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[DataObject]link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html[s] are wrappers for FileObjects. A FileObject simply represents a file-like entity; DataObjects are the level at which the system understands what the contents of a file are. So a module that implements handling for a particular file type provides its own subclass of DataObject and  [...]
 
 The factory for these objects, which a module installs, is called a
-link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataLoader.html[DataLoader].
+link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataLoader.html[DataLoader].
 
-Unless you are writing support for a language or file-type, typically you will be using, not creating, DataObjects. Getting the DataObject for a file is simple: Just call link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#find(org.openide.filesystems.FileObject-[DataObject.find(someFileObject)].
+Unless you are writing support for a language or file-type, typically you will be using, not creating, DataObjects. Getting the DataObject for a file is simple: Just call link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#find(org.openide.filesystems.FileObject-[DataObject.find(someFileObject)].
 
 
 [[Using_DataObjects]]
 === Using DataObjects
 
-DataObjects don't do a lot in and of themselves - that is, it is almost always a mistake to be casting a DataObject as a particular subclass. The way to do most interesting interaction with DataObjects is via the method link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#getLookup--[getLookup()]. The pattern, which we will see in more detail in the section on <<Lookup,Lookup>> is:
+DataObjects don't do a lot in and of themselves - that is, it is almost always a mistake to be casting a DataObject as a particular subclass. The way to do most interesting interaction with DataObjects is via the method link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#getLookup--[getLookup()]. The pattern, which we will see in more detail in the section on <<Lookup,Lookup>> is:
 
 [source,java]
 ----
@@ -209,7 +209,7 @@ As another example, determining if an opened file has unsaved changes is as simp
 boolean needsSaving = someDataObject.getLookup().lookup(SaveCookie.class) != null;
 ----
 
-Modules can provide their own public interfaces, and make instances of those objects available via lookup. So, for example, a DataObject for an XML file might make a DOM tree or some other structural representation of the file available via lookup for other modules to use to manipulate the file's contents. Some common interfaces modules will typically use via lookup can be found in the package link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/package-summary [...]
+Modules can provide their own public interfaces, and make instances of those objects available via lookup. So, for example, a DataObject for an XML file might make a DOM tree or some other structural representation of the file available via lookup for other modules to use to manipulate the file's contents. Some common interfaces modules will typically use via lookup can be found in the package link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/package-summar [...]
 
 Note that the term "cookie" in this context has nothing to do with the web browser concept of cookies.
 
@@ -221,7 +221,7 @@ To illustrate the power of loaders and DataObjects, recall that loaders are regi
 
 What is actually happening is that the very same infrastructure (DataLoaders) that lets NetBeans recognize a user's .java file on disk and create an appropriate DataObject is what recognizes .instance files - after all, the System Filesystem is a filesystem too. There is simply a DataLoader registered in the system that claims all files with the .instance extension.
 
-Under the hood, what's really happening is that the DataObject for a .instance file provides an link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/InstanceCookie.html[InstanceCookie]. So to get the actual object in question manually, you would do something like this:
+Under the hood, what's really happening is that the DataObject for a .instance file provides an link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/cookies/InstanceCookie.html[InstanceCookie]. So to get the actual object in question manually, you would do something like this:
 
 [source,java]
 ----
@@ -244,13 +244,13 @@ MyClass theInstance = FileUtil.getConfigObject("someFolder/com-foo-mymodule-MyCl
 [[Nodes:_The_Presentation_Layer]]
 == Nodes: The Presentation Layer
 
-You've probably noticed that there are quite a few tree components in NetBeans - the Files and Projects tabs, and others. The link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[Nodes API] is what provides the contents to those trees. Think of DataObjects as being the data model; a Node is where interacting with the user comes in.
+You've probably noticed that there are quite a few tree components in NetBeans - the Files and Projects tabs, and others. The link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[Nodes API] is what provides the contents to those trees. Think of DataObjects as being the data model; a Node is where interacting with the user comes in.
 
-A link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html[Node] provides human-visible things like an icon and a (possibly localized) display name to DataObjects. And a Node provides a list of link:http://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html[Actions] that can appear in a popup menu for that node.
+A link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Node.html[Node] provides human-visible things like an icon and a (possibly localized) display name to DataObjects. And a Node provides a list of link:https://bits.netbeans.org/dev/javadoc/org-openide-awt/org/openide/awt/Actions.html[Actions] that can appear in a popup menu for that node.
 
 Nodes define _context_ for NetBeans - at any given moment, there is usually one or more _activated nodes_ which determine what menu and toolbar actions are enabled - they are the clue to the rest of the system as to what the user is doing. Each UI component (such as the Files tab or the Editor) provides an array of Nodes which are activated - selected. In a tree component, it is rather obvious how this works; but even when editing in the editor, the activated node triggers what actions a [...]
 
-So, to get the Node corresponding to a DataObject, simply call someDataObject.link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#getNodeDelegate()[getNodeDelegate()].
+So, to get the Node corresponding to a DataObject, simply call someDataObject.link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataObject.html#getNodeDelegate()[getNodeDelegate()].
 
 
 [[Nodes.2C_DataObjects_and_lookup_Patterns]]
@@ -268,7 +268,7 @@ A key thing to remember is that Nodes are intended as a presentation layer for a
 [[Lookup]]
 == Lookup
 
-link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[org.openide.util.Lookup] is NetBeans' form of the "service locator" and "adapter" patterns. As with DataObjects and FileObjects, it has two common usages:
+link:https://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/util/Lookup.html[org.openide.util.Lookup] is NetBeans' form of the "service locator" and "adapter" patterns. As with DataObjects and FileObjects, it has two common usages:
 
 * _Local lookup_ - asking an object for an instance of some interface, as we saw above with Node.getLookup().lookup(SomeClass.class)
 * _Global lookup_ - services - often singleton instances of some class - can be registered into the _default lookup_.
@@ -277,7 +277,7 @@ link:http://bits.netbeans.org/dev/javadoc/org-openide-util-lookup/org/openide/ut
 [[The_Default_Lookup]]
 === The Default Lookup
 
-The default lookup is an instance of Lookup returned by calling Lookup.getDefault(). The NetBeans APIs define a number of abstract service classes which allow you to get an instance of some object that is of general use - for example, link:http://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html[org.openide.DialogDisplayer], which displays dialogs to the user. These are typically things that there only needs to be one of in the system, so they are effecti [...]
+The default lookup is an instance of Lookup returned by calling Lookup.getDefault(). The NetBeans APIs define a number of abstract service classes which allow you to get an instance of some object that is of general use - for example, link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/org/openide/DialogDisplayer.html[org.openide.DialogDisplayer], which displays dialogs to the user. These are typically things that there only needs to be one of in the system, so they are effect [...]
 
 [source,java]
 ----
@@ -377,7 +377,7 @@ in the Explorer" in older documentation.
 [[The_Window_System]]
 === The Window System
 
-The API of the Window System is found in link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/package-summary.html[org.openide.windows]. A basic overview is that in NetBeans, you don't deal with JFrames or JDialogs - rather, you supply components which are displayed, and NetBeans window management system decides where and how they appear in terms of top-level frames. The main thing to know is that all components in NetBeans are subclasses or usages of link:ht [...]
+The API of the Window System is found in link:https://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/package-summary.html[org.openide.windows]. A basic overview is that in NetBeans, you don't deal with JFrames or JDialogs - rather, you supply components which are displayed, and NetBeans window management system decides where and how they appear in terms of top-level frames. The main thing to know is that all components in NetBeans are subclasses or usages of link:h [...]
 
 TopComponents can be instantiated and opened on the fly, but typically a module installs its UI components via several XML files inside its JAR file and pointers to those files in the module's XML layer file.
 
diff --git a/netbeans.apache.org/src/content/wiki/ParsingAPI.adoc b/netbeans.apache.org/src/content/wiki/ParsingAPI.adoc
index 2ad88ac03..6ae8b7126 100644
--- a/netbeans.apache.org/src/content/wiki/ParsingAPI.adoc
+++ b/netbeans.apache.org/src/content/wiki/ParsingAPI.adoc
@@ -34,7 +34,7 @@
 
 * http://netbeans.apache.org/tutorials/nbm-javacc-lexer.html
 * http://netbeans.apache.org/tutorials/nbm-javacc-parser.html
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/overview-summary.html[Official Doc (JavaDoc)]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-parsing-api/overview-summary.html[Official Doc (JavaDoc)]
 
 
 [[Motivation]]
diff --git a/netbeans.apache.org/src/content/wiki/RunConfigurations49636.adoc b/netbeans.apache.org/src/content/wiki/RunConfigurations49636.adoc
index 07d5e1367..d9e93fe97 100644
--- a/netbeans.apache.org/src/content/wiki/RunConfigurations49636.adoc
+++ b/netbeans.apache.org/src/content/wiki/RunConfigurations49636.adoc
@@ -35,7 +35,7 @@
 
 Links:
 
-* link:http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/doc-files/configurations.html[Technical specification]
+* link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-projectapi/org/netbeans/spi/project/doc-files/configurations.html[Technical specification]
 * link:http://www.netbeans.org/nonav/issues/show_bug.cgi?id=49636[Tracking issue for Java SE projects]
 * link:http://www.netbeans.org/nonav/issues/show_bug.cgi?id=49652[Tracking issue for API]
 * xref:NewAndNoteWorthyMilestone3#RunConfigurationsForJavaSEProjects.adoc[Release note]
diff --git a/netbeans.apache.org/src/content/wiki/VersioningPolicy.adoc b/netbeans.apache.org/src/content/wiki/VersioningPolicy.adoc
index e7fc0f84e..5280f2c2a 100644
--- a/netbeans.apache.org/src/content/wiki/VersioningPolicy.adoc
+++ b/netbeans.apache.org/src/content/wiki/VersioningPolicy.adoc
@@ -49,7 +49,7 @@ See also xref:CompatibilityPolicy.adoc[CompatibilityPolicy].
 [[Versioning_of_APIs]]
 == Versioning of APIs
 
-The link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Modules API] includes a detailed description of how versions and dependencies work
+The link:https://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[Modules API] includes a detailed description of how versions and dependencies work
 technically. This documented is intended to give a policy for how to use them
 on netbeans.org.
 


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

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