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/21 23:40:36 UTC

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

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 7a71f8c42 more xref (#624)
7a71f8c42 is described below

commit 7a71f8c424573849af4ae4dd6f49d85b61c4cfd4
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Oct 22 01:40:31 2022 +0200

    more xref (#624)
---
 netbeans.apache.org/src/content/index.adoc         |  12 +--
 netbeans.apache.org/src/content/kb/docs/cnd.adoc   |  10 +-
 .../content/kb/docs/cnd/beginning-jni-linux.adoc   |   4 +-
 .../src/content/kb/docs/cnd/c-unit-test.adoc       |   4 +-
 .../src/content/kb/docs/cnd/cpp-vcs.adoc           |   2 +-
 .../src/content/kb/docs/cnd/debugging.adoc         |   2 +-
 .../src/content/kb/docs/cnd/depchecking.adoc       |   2 +-
 .../kb/docs/cnd/development-environment.adoc       |   4 +-
 .../content/kb/docs/cnd/navigating-editing.adoc    |   2 +-
 .../src/content/kb/docs/cnd/quickstart.adoc        |   4 +-
 .../content/kb/docs/cnd/remotedev-tutorial.adoc    |   2 +-
 .../src/content/kb/docs/cnd/toolchain.adoc         |   2 +-
 .../src/content/kb/docs/contributing.adoc          |   4 +-
 .../src/content/kb/docs/ide/cvs.adoc               |   9 +-
 .../docs/ide/database-improvements-screencast.adoc |   5 +-
 .../content/kb/docs/ide/git_nb_ssh_screencast.adoc |   9 +-
 .../content/kb/docs/ide/github_nb_screencast.adoc  |   6 +-
 .../src/content/kb/docs/ide/index.adoc             |  20 ++--
 .../ide/install-and-configure-mysql-server.adoc    |   2 +-
 .../src/content/kb/docs/ide/macro-keywords.adoc    |   2 +-
 .../src/content/kb/docs/ide/mysql.adoc             |   2 +-
 .../content/kb/docs/ide/nb65-intro-screencast.adoc |   8 +-
 .../src/content/kb/docs/ide/oracle-db.adoc         |   2 +-
 .../kb/docs/ide/overview-screencast-smaller.adoc   |   7 +-
 .../content/kb/docs/ide/overview-screencast.adoc   |   9 +-
 .../kb/docs/ide/overview-screencast_731.adoc       |   9 +-
 .../content/kb/docs/ide/platform-screencast.adoc   |  10 +-
 .../src/content/kb/docs/ide/section.adoc           |  48 ++++-----
 .../src/content/kb/docs/ide/subversion.adoc        |   6 +-
 .../src/content/kb/docs/ide/team-servers.adoc      |   6 +-
 netbeans.apache.org/src/content/kb/docs/index.adoc |  22 ++--
 .../src/content/kb/docs/intro-screencasts.adoc     |  69 +++++++++----
 .../src/content/kb/docs/java-ee.adoc               |  36 +++----
 .../src/content/kb/docs/java-se.adoc               |  32 +++---
 .../content/kb/docs/java/annotations-custom.adoc   |   6 +-
 .../content/kb/docs/java/annotations-lombok.adoc   |   2 +-
 .../src/content/kb/docs/java/annotations.adoc      |  12 +--
 .../kb/docs/java/code-inspect-screencast.adoc      |   6 +-
 .../src/content/kb/docs/java/code-inspect.adoc     |   2 +-
 .../kb/docs/java/debug-deadlock-screencast.adoc    |  10 +-
 .../kb/docs/java/debug-evaluator-screencast.adoc   |  10 +-
 .../docs/java/debug-multithreaded-screencast.adoc  |  10 +-
 .../content/kb/docs/java/debug-multithreaded.adoc  |   2 +-
 .../kb/docs/java/debug-stepinto-screencast.adoc    |  10 +-
 .../kb/docs/java/debug-visual-screencast.adoc      |  12 +--
 .../content/kb/docs/java/editor-codereference.adoc |   2 +-
 .../kb/docs/java/editor-formatting-screencast.adoc |   2 +-
 .../kb/docs/java/gbcustomizer-advanced.adoc        |   6 +-
 .../content/kb/docs/java/gbcustomizer-basic.adoc   |   6 +-
 .../content/kb/docs/java/gui-automatic-i18n.adoc   |   2 +-
 .../src/content/kb/docs/java/gui-binding.adoc      |   6 +-
 .../kb/docs/java/gui-builder-screencast.adoc       |   7 +-
 .../src/content/kb/docs/java/gui-filechooser.adoc  |   6 +-
 .../content/kb/docs/java/gui-functionality.adoc    |   7 +-
 .../content/kb/docs/java/hibernate-java-se.adoc    |  22 ++--
 .../src/content/kb/docs/java/index.adoc            |  50 ++++-----
 .../java/introduce-refactoring-screencast.adoc     |   8 +-
 .../kb/docs/java/java-editor-screencast.adoc       |   6 +-
 .../src/content/kb/docs/java/javase-deploy.adoc    |   2 +
 .../src/content/kb/docs/java/javase-intro.adoc     |   4 +-
 .../src/content/kb/docs/java/javase-jdk7.adoc      |   6 +-
 .../src/content/kb/docs/java/javase-jdk8.adoc      |   6 +-
 .../content/kb/docs/java/jdk7-nb70-screencast.adoc |   4 +-
 .../kb/docs/java/jdk8-migration-screencast.adoc    |   6 +-
 .../src/content/kb/docs/java/jmx-getstart.adoc     |  12 +--
 .../content/kb/docs/java/jmx-manager-tutorial.adoc |   6 +-
 .../src/content/kb/docs/java/jmx-tutorial.adoc     |   4 +-
 .../content/kb/docs/java/maven-hib-java-se.adoc    |  12 +--
 .../src/content/kb/docs/java/nb_fx_screencast.adoc |   6 +-
 .../kb/docs/java/profile-loadgenerator.adoc        |   8 +-
 .../src/content/kb/docs/java/profiler-intro.adoc   |   2 +-
 .../kb/docs/java/profiler-profilingpoints.adoc     |  10 +-
 .../content/kb/docs/java/profiler-screencast.adoc  |   4 +-
 .../kb/docs/java/quickstart-gui-legend.adoc        |   4 +-
 .../src/content/kb/docs/java/quickstart-gui.adoc   |   2 +-
 .../src/content/kb/docs/java/quickstart.adoc       |   4 +-
 .../kb/docs/java/refactoring-nb71-screencast.adoc  |   6 +-
 .../src/content/kb/docs/java/section.adoc          | 112 ++++++++++-----------
 .../content/kb/docs/java/testng-screencast.adoc    |  12 +--
 .../src/content/kb/docs/javaee/cdi-events.adoc     |   2 +-
 .../src/content/kb/docs/javaee/cdi-inject.adoc     |   2 +-
 .../src/content/kb/docs/javaee/cdi-intro.adoc      |   4 +-
 .../src/content/kb/docs/javaee/cdi-validate.adoc   |   2 +-
 .../kb/docs/javaee/ecommerce/conclusion.adoc       |   5 +-
 .../kb/docs/javaee/ecommerce/data-model.adoc       |   2 +-
 .../content/kb/docs/javaee/ecommerce/design.adoc   |   3 +-
 .../kb/docs/javaee/ecommerce/entity-session.adoc   |   4 +-
 .../content/kb/docs/javaee/ecommerce/index.adoc    |   2 +-
 .../content/kb/docs/javaee/ecommerce/intro.adoc    |  12 +--
 .../kb/docs/javaee/ecommerce/manage-sessions.adoc  |   6 +-
 .../javaee/ecommerce/page-views-controller.adoc    |   8 +-
 .../content/kb/docs/javaee/ecommerce/section.adoc  |   2 +-
 .../content/kb/docs/javaee/ecommerce/security.adoc |   4 +-
 .../docs/javaee/ecommerce/setup-dev-environ.adoc   |   4 +-
 .../content/kb/docs/javaee/ecommerce/setup.adoc    |   2 +-
 .../kb/docs/javaee/ecommerce/test-profile.adoc     |  12 +--
 .../kb/docs/javaee/ecommerce/transaction.adoc      |   2 +-
 .../src/content/kb/docs/javaee/entappclient.adoc   |   2 +-
 .../content/kb/docs/javaee/javaee-entapp-ejb.adoc  |   2 +-
 .../kb/docs/javaee/javaee-entapp-junit.adoc        |   4 +-
 .../javaee-gettingstarted-js-screencast.adoc       |   4 +-
 .../javaee-gettingstarted-pf-screencast.adoc       |   2 +-
 .../javaee/javaee-gettingstarted-screencast.adoc   |   2 +-
 .../kb/docs/javaee/javaee-gettingstarted.adoc      |   2 +-
 .../src/content/kb/docs/javaee/javaee-intro.adoc   |   2 +-
 .../kb/docs/javaee/jpa-eclipselink-screencast.adoc |   2 +-
 .../kb/docs/javaee/maven-entapp-testing.adoc       |   4 +-
 .../src/content/kb/docs/javaee/maven-entapp.adoc   |   2 +-
 .../kb/docs/javaee/maven-osgiservice-cdi.adoc      |   2 +-
 .../docs/javaee/maven-primefaces-screencast.adoc   |   3 +-
 .../docs/javaee/maven-websocketapi-screencast.adoc |   2 +-
 .../content/kb/docs/javaee/maven-websocketapi.adoc |   2 +-
 .../content/kb/docs/javaee/profiler-javaee.adoc    |  12 +--
 .../src/content/kb/docs/javaee/section.adoc        |   2 +-
 .../src/content/kb/docs/javaee/secure-ejb.adoc     |   2 +-
 .../docs/javaee/weblogic-javaee-m1-screencast.adoc |   2 +-
 .../src/content/kb/docs/javame/imp-ng.adoc         |  14 +--
 .../src/content/kb/docs/javame/index.adoc          |  14 +--
 .../src/content/kb/docs/javame/java-card.adoc      |   8 +-
 .../src/content/kb/docs/javame/javacard.adoc       |   8 +-
 .../content/kb/docs/javame/nb_me8_screencast.adoc  |   9 +-
 .../kb/docs/javame/nb_me_plugins_screencast.adoc   |   6 +-
 .../src/content/kb/docs/javame/section.adoc        |  14 +--
 .../src/content/kb/docs/php/ajax-quickstart.adoc   |   2 +-
 .../src/content/kb/docs/php/editor-screencast.adoc |   2 +-
 .../php/namespace-code-completion-screencast.adoc  |   2 +-
 .../content/kb/docs/php/php-editor-screencast.adoc |   6 +-
 .../kb/docs/php/php-variables-screencast.adoc      |   5 +-
 .../kb/docs/php/project-config-screencast.adoc     |   6 +-
 .../src/content/kb/docs/php/wish-list-lesson1.adoc |   2 +-
 .../src/content/kb/docs/web/jsf20-crud.adoc        |   2 +-
 .../src/content/kb/docs/web/jsf20-intro.adoc       |   2 +-
 .../src/content/kb/docs/web/jsf20-support.adoc     |   2 +-
 .../kb/docs/webclient/cordova-gettingstarted.adoc  |  18 ++--
 .../kb/docs/webclient/html5-editing-css.adoc       |  26 ++---
 .../kb/docs/webclient/html5-gettingstarted.adoc    |  12 +--
 .../kb/docs/webclient/html5-js-support.adoc        |  14 +--
 .../docs/webclient/html5-knockout-screencast.adoc  |   6 +-
 .../src/content/kb/docs/webclient/index.adoc       |  38 +++----
 .../src/content/kb/docs/webclient/ojet-cca.adoc    |  10 +-
 .../content/kb/docs/webclient/ojet-chatbot.adoc    |  10 +-
 .../content/kb/docs/webclient/ojet-cookbook.adoc   |   8 +-
 .../src/content/kb/docs/webclient/ojet-crud.adoc   |  10 +-
 .../kb/docs/webclient/ojet-databinding.adoc        |  10 +-
 .../src/content/kb/docs/webclient/ojet-flex.adoc   |  10 +-
 .../kb/docs/webclient/ojet-gettingstarted.adoc     |  11 +-
 .../kb/docs/webclient/ojet-intermodular.adoc       |  10 +-
 .../content/kb/docs/webclient/ojet-porting.adoc    |  11 +-
 .../src/content/kb/docs/webclient/ojet-rest.adoc   |  10 +-
 .../content/kb/docs/webclient/ojet-settingup.adoc  |   8 +-
 .../content/kb/docs/webclient/ojet-working.adoc    |  12 +--
 .../src/content/kb/docs/webclient/section.adoc     |  38 +++----
 .../src/content/kb/docs/websvc/client.adoc         |  12 +--
 .../src/content/kb/docs/websvc/flower-code-ws.adoc |  14 +--
 .../content/kb/docs/websvc/flower_overview.adoc    |  22 ++--
 .../src/content/kb/docs/websvc/flower_swing.adoc   |  12 +--
 .../src/content/kb/docs/websvc/flower_ws.adoc      |  14 +--
 .../content/kb/docs/websvc/flower_wsdl_schema.adoc |  14 +--
 .../src/content/kb/docs/websvc/index.adoc          |  28 +++---
 .../src/content/kb/docs/websvc/intro-ws.adoc       |  12 +--
 .../src/content/kb/docs/websvc/jax-ws.adoc         |  20 ++--
 .../kb/docs/websvc/pet-catalog-screencast.adoc     |   7 +-
 .../src/content/kb/docs/websvc/rest.adoc           |  10 +-
 .../src/content/kb/docs/websvc/section.adoc        |  28 +++---
 .../src/content/kb/docs/websvc/wsit.adoc           |  18 ++--
 .../src/content/kb/docs/websvc/zillow.adoc         |   8 +-
 netbeans.apache.org/src/content/kb/index.adoc      |  22 ++--
 .../src/content/tutorials/index.adoc               |   2 +-
 .../src/content/tutorials/nbm-ant.adoc             |   6 +-
 .../src/content/tutorials/nbm-feedreader.adoc      |   2 +-
 .../src/content/tutorials/nbm-google.adoc          |   4 +-
 .../src/content/tutorials/nbm-java-hint.adoc       |   2 +-
 .../content/tutorials/nbm-maven-modulesuite.adoc   |   6 +-
 .../content/tutorials/nbm-maven-quickstart.adoc    |   2 +-
 .../src/content/tutorials/nbm-povray-1.adoc        |   2 +-
 .../src/content/tutorials/nbm-povray-10.adoc       |   2 +-
 .../src/content/tutorials/nbm-povray-2.adoc        |   2 +-
 .../tutorials/nbm-propertyeditors-integration.adoc |   8 +-
 .../src/content/tutorials/nbm-server-plugin.adoc   |   4 +-
 .../src/content/tutorials/nbm-test.adoc            |   4 +-
 180 files changed, 831 insertions(+), 782 deletions(-)

diff --git a/netbeans.apache.org/src/content/index.adoc b/netbeans.apache.org/src/content/index.adoc
index b090e8714..9ccea3cf0 100644
--- a/netbeans.apache.org/src/content/index.adoc
+++ b/netbeans.apache.org/src/content/index.adoc
@@ -37,27 +37,27 @@
 
 [.card.blue]
 .icon:edit[] Fast & Smart Editing
-Apache NetBeans is much more than a text editor. It highlights source code link:/kb/docs/java/editor-codereference.html[syntactically and semantically], lets you easily link:/kb/docs/java/editor-inspect-transform.html[refactor code], with a range of handy and powerful tools.
+Apache NetBeans is much more than a text editor. It highlights source code xref:kb/docs/java/editor-codereference.adoc[syntactically and semantically], lets you easily xref:kb/docs/java/editor-inspect-transform.adoc[refactor code], with a range of handy and powerful tools.
 
 [.card.green]
 .icon:wrench[] Java, JavaScript, PHP, HTML5, CSS, and More
-Apache NetBeans provides editors, wizards, and templates to help you create applications in link:/kb/docs/java/index.html[Java], link:/kb/docs/php/index.html[PHP] and many other languages.
+Apache NetBeans provides editors, wizards, and templates to help you create applications in xref:kb/docs/java/index.adoc[Java], xref:kb/docs/php/index.adoc[PHP] and many other languages.
 
 [.card.magenta]
 .icon:download[] Cross Platform
-Apache NetBeans can be link:/download/index.html[installed] on all operating systems that support Java, i.e, Windows, Linux, Mac OSX and BSD. Write Once, Run Anywhere, applies to NetBeans too. 
+Apache NetBeans can be xref:download/index.adoc[installed] on all operating systems that support Java, i.e, Windows, Linux, Mac OSX and BSD. Write Once, Run Anywhere, applies to NetBeans too. 
 
 [.card.green]
 .icon:users[] Join us
-Subscribe to our link:/community/mailing-lists.html[mailing lists], or follow us in link:https://twitter.com/netbeans[Twitter], link:https://tinyurl.com/netbeans-slack-signup/[Slack], link:https://www.facebook.com/NetBeans[FaceBook] or link:https://www.youtube.com/user/netbeansvideos[YouTube].
+Subscribe to our xref:community/mailing-lists.adoc[mailing lists], or follow us in link:https://twitter.com/netbeans[Twitter], link:https://tinyurl.com/netbeans-slack-signup/[Slack], link:https://www.facebook.com/NetBeans[FaceBook] or link:https://www.youtube.com/user/netbeansvideos[YouTube].
 
 [.card.magenta]
 .icon:arrow-right[] Participate
-See how you can participate by link:/participate/submit-pr.html[submitting pull requests], link:participate/report-issue.html[filing issues], or joining the link:https://cwiki.apache.org/confluence/display/NETBEANS/NetCAT[NetCAT] program.
+See how you can participate by xref:participate/submit-pr.adoc[submitting pull requests], xref:participate/report-issue.adoc[filing issues], or joining the link:https://cwiki.apache.org/confluence/display/NETBEANS/NetCAT[NetCAT] program.
 
 [.card.blue]
 .icon:book[] Learn
-We are currently reviewing the tutorials. See how you can link:http://netbeans.apache.org/kb/docs/contributing.html[help us] review the link:http://netbeans.apache.org/kb/docs/java/[Java] and link:http://netbeans.apache.org/kb/docs/php/[PHP] tutorials.
+We are currently reviewing the tutorials. See how you can xref:kb/docs/contributing.adoc[help us] review the xref:kb/docs/java/index.adoc[Java] and xref:kb/docs/php/index.adoc[PHP] tutorials.
 
 
 ****
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd.adoc b/netbeans.apache.org/src/content/kb/docs/cnd.adoc
index 70875ea2a..e5c2ce633 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd.adoc
@@ -35,7 +35,7 @@ When you install the NetBeans IDE with C/C++ support, the IDE includes project t
 
 == Getting Started 
 
-* link:../../community/releases/80/cpp-setup-instructions.html[+ Configuring NetBeans IDE for C/C++/Fortran+]
+* xref:../../community/releases/80/cpp-setup-instructions.adoc[+ Configuring NetBeans IDE for C/C++/Fortran+]
 
 == Tutorials and Articles
 
@@ -66,11 +66,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 
 == Community-Contributed Docs
 
-* link:http://wiki.netbeans.org/HowToCreate64-BitC/C++WindowsProgramWithNetBeans[+Setting up NetBeans IDE to Create 64-bit C/C++ Windows Executables+]
-* link:http://wiki.netbeans.org/HowToSetup64-BitQt5WithNetBeans8.0OnWindows[+Setting up 64-bit Qt 5 on Windows to use with NetBeans IDE+]
+* xref:../../wiki/HowToCreate64-BitC/C++WindowsProgramWithNetBeans.adoc[+Setting up NetBeans IDE to Create 64-bit C/C++ Windows Executables+]
+* xref:../../wiki/HowToSetup64-BitQt5WithNetBeans8.adoc.0OnWindows[+Setting up 64-bit Qt 5 on Windows to use with NetBeans IDE+]
 
 == Other Resources
 
-* link:../72/cnd/index.html[+C/C++ Documentation for Earlier Releases+]
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack[+NetBeans C/C++ Plugin FAQs+]
+* xref:../72/cnd/index.adoc[+C/C++ Documentation for Earlier Releases+]
+* xref:../../wiki/NetBeansUserFAQ.adoc#NetBeans_C.2FC.2B.2B_Development_Pack[+NetBeans C/C++ Plugin FAQs+]
 * link:https://netbeans.org/projects/cnd/lists[+NetBeans C/C++ Mailing Lists+]
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/beginning-jni-linux.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/beginning-jni-linux.adoc
index 6c7f29ed5..f44f11e29 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/beginning-jni-linux.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/beginning-jni-linux.adoc
@@ -46,10 +46,10 @@ The tutorial is specific to Linux.
 
 |Java Developer Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[version 7 or 8] 
 
-|C and C++ compilers,  ``make`` ,  ``gdb``  |link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran] 
+|C and C++ compilers,  ``make`` ,  ``gdb``  |xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran] 
 |===
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE 8.0 Installation Instructions] and link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran] for information on downloading and installing the required software.
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE 8.0 Installation Instructions] and xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran] for information on downloading and installing the required software.
 
 
 == Setting Up Your Environment for the Tutorial
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/c-unit-test.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/c-unit-test.adoc
index 0f5117851..81185444d 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/c-unit-test.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/c-unit-test.adoc
@@ -48,7 +48,7 @@ March 2014_ [Revision number: V8.0-1]
 |===
 
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE Installation Instructions] and link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran]
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE Installation Instructions] and xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran]
 for information about downloading and installing the required NetBeans software.
 
 
@@ -271,7 +271,7 @@ In Cygwin you can install CUnit using the standard Cygwin installer, setup-x86.e
 
 Be sure to use the correct version. You must use 64-bit Cygwin and CUnit if you are running 64-bit NetBeans IDE.
 
-If you have not yet installed Cygwin, see the general Cygwin installation info in link:../../../community/releases/80/cpp-setup-instructions.html#cygwin[Configuring NetBeans IDE for C/C{pp}/Fortran]. You can install CUnit by selecting it in the Libs category in the setup program.
+If you have not yet installed Cygwin, see the general Cygwin installation info in xref:../../../community/releases/80/cpp-setup-instructions.adoc#cygwin[Configuring NetBeans IDE for C/C{pp}/Fortran]. You can install CUnit by selecting it in the Libs category in the setup program.
 
 
 == Create the Project for the Tutorial
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/cpp-vcs.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/cpp-vcs.adoc
index f291f0141..9a05ce6cd 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/cpp-vcs.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/cpp-vcs.adoc
@@ -48,7 +48,7 @@ Starting with NetBeans IDE 7.3 storing NetBeans C/C++ projects (mostly projects
 |===
 
 
-See the link:../../../community/releases/74/install.html[NetBeans IDE Installation Instructions] and link:../../../community/releases/74/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran] documents for information about downloading and installing the required software.
+See the xref:../../../community/releases/74/install.adoc[NetBeans IDE Installation Instructions] and xref:../../../community/releases/74/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran] documents for information about downloading and installing the required software.
 
 
 == VCS Controlled Project Issues Resolved in NetBeans IDE
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/debugging.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/debugging.adoc
index ef8b6df95..656bd903d 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/debugging.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/debugging.adoc
@@ -47,7 +47,7 @@ The following short tutorial takes you through some of the features for debuggin
 |Java Developer Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[version 7 or 8] 
 |===
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE Installation Instructions] and link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran] for information on downloading and installing the required software.
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE Installation Instructions] and xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran] for information on downloading and installing the required software.
 
 
 == Creating the Sample Project
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/depchecking.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/depchecking.adoc
index f345f48e7..9efdfa151 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/depchecking.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/depchecking.adoc
@@ -52,7 +52,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE Installation Instructions] and link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran]
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE Installation Instructions] and xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran]
 for information about downloading and installing the required software.
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/development-environment.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/development-environment.adoc
index 07e0da565..73b0222e3 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/development-environment.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/development-environment.adoc
@@ -51,12 +51,12 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE Installation Instructions] for information on downloading and installing the required software.
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE Installation Instructions] for information on downloading and installing the required software.
 
 
 == Installing Tool Collections
 
-The Netbeans C/C++ module minimally requires a C compiler, C++ compiler, make utility, and gdb debugger. See link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran] for instructions on installing and configuring the required compilers and tools.
+The Netbeans C/C++ module minimally requires a C compiler, C++ compiler, make utility, and gdb debugger. See xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran] for instructions on installing and configuring the required compilers and tools.
 
 
 == Specifying the Build Host
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/navigating-editing.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/navigating-editing.adoc
index 560fe4787..2228fb05c 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/navigating-editing.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/navigating-editing.adoc
@@ -48,7 +48,7 @@ The following short tutorial takes you through some of the features for navigati
 |===
 
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE 8.0 Installation Instructions] and link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran]
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE 8.0 Installation Instructions] and xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran]
 for information about downloading and installing the required software.
 
 *Sample Projects*
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/quickstart.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/quickstart.adoc
index a2554bcc6..bc001d735 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/quickstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/quickstart.adoc
@@ -50,11 +50,11 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 
 |Java Developer Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[version 6, 7, or 8] 
 
-|C and C++ compilers,  ``make`` ,  ``gdb``  |link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran] 
+|C and C++ compilers,  ``make`` ,  ``gdb``  |xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran] 
 |===
 
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE Installation Instructions] and link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran]
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE Installation Instructions] and xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran]
 for information about downloading and installing the required software.
 
 *Sample Projects*
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/remotedev-tutorial.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/remotedev-tutorial.adoc
index 121b6e212..7bbfc3846 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/remotedev-tutorial.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/remotedev-tutorial.adoc
@@ -47,7 +47,7 @@ This document describes how to use remote development features of the NetBeans I
 |===
 
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE Installation Instructions] and link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran]
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE Installation Instructions] and xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran]
 for information about downloading and installing the required software.
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/toolchain.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/toolchain.adoc
index f2e1d06ea..e67773215 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/toolchain.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/toolchain.adoc
@@ -47,7 +47,7 @@ image::images/netbeans-stamp.png[title="Content on this page applies to the NetB
 |===
 
 
-See the link:../../../community/releases/80/install.html[NetBeans IDE Installation Instructions] and link:../../../community/releases/80/cpp-setup-instructions.html[Configuring the NetBeans IDE for C/C{pp}/Fortran] for information about downloading and installing the required software.
+See the xref:../../../community/releases/80/install.adoc[NetBeans IDE Installation Instructions] and xref:../../../community/releases/80/cpp-setup-instructions.adoc[Configuring the NetBeans IDE for C/C{pp}/Fortran] for information about downloading and installing the required software.
 
 
 == Introduction
diff --git a/netbeans.apache.org/src/content/kb/docs/contributing.adoc b/netbeans.apache.org/src/content/kb/docs/contributing.adoc
index a68b3588b..7bba471b1 100644
--- a/netbeans.apache.org/src/content/kb/docs/contributing.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/contributing.adoc
@@ -36,7 +36,7 @@ This page describes some tips, tricks and conventions for reviewing tutorials fo
 
 == The NetBeans Web Site
 
-The NetBeans website is written mainly in link:http://asciidoc.org/[AsciiDoc], a way of creating technical components using plain text files. 
+The NetBeans website is written mainly in link:https://asciidoc.org/[AsciiDoc], a way of creating technical components using plain text files. 
 
 We then generate HTML for the web using Groovy Server Page templates (these live in https://github.com/apache/netbeans-website/tree/master/netbeans.apache.org/src/content/templates ). These templates (and some other stuff like SCSS) are responsible for the layout of the web pages. 
 
@@ -313,5 +313,5 @@ kbd:[Ctrl+\ ]
 === New features
 
 If you need to include a new feature in the page then 
-please request it using our link:http://netbeans.apache.org/community/mailing-lists.html[Dev Mailing List].
+please request it using our xref:../../community/mailing-lists.adoc[Dev Mailing List].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/cvs.adoc b/netbeans.apache.org/src/content/kb/docs/ide/cvs.adoc
index 6d1052c02..a93dc3404 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/cvs.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/cvs.adoc
@@ -78,9 +78,9 @@ The IDE supports a number of `CVSROOT` formats, depending on whether the CVS rep
 
 Depending on the method you are using you may need to specify other information, such as a password and proxy settings for connecting to a remote repository (e.g. for `pserver`). Click Next. 
 
-NOTE: If you are trying to set up public key SSH authentication, see: link:http://wiki.netbeans.org/wiki/view/FaqHowToSetUpSSHAuth[+How to set up public key SSH authentication?+]. 
+NOTE: If you are trying to set up public key SSH authentication, see: xref:../../../wiki/FaqHowToSetUpSSHAuth.adoc[+How to set up public key SSH authentication?+]. 
 
-For more help with accessing local repositories, see: link:http://wiki.netbeans.org/wiki/view/FaqHowToAccessLocalCVS[+How can I access local repositories?+]
+For more help with accessing local repositories, see: xref:../../../wiki/FaqHowToSetUpSSHAuthFaqHowToAccessLocalCVS.adoc[+How can I access local repositories?+]
 
 
 1. In the Modules to Checkout panel of the wizard, specify the module that you want to check out in the Module field. If you do not know the name of the module you want to check out, click the Browse button to view the repository's contents. From the Browse CVS Module dialog that appears, select any of the listed modules and click OK. Your selection is then added to the Module field:
@@ -121,7 +121,7 @@ image::images/folder-to-import-small.png[role="left", link="images/folder-to-imp
 1. In the Import Message text area, enter a description of the project you are importing into the repository.
 2. Specify the location in the repository where you want to import the project by typing in the path in the Repository Folder text field. Alternatively, click the Browse button to navigate to a specific location in the repository. Click Finish to initiate the import. The IDE uploads the project files to the repository and the Output window opens to display the progress.
 
-NOTE: The CVS client does not handle binary file imports by default. The best practice for importing binary sources is to create a `cvswrappers` file within the repository. See link:http://wiki.netbeans.org/FaqCVSHowToImportBinaries[+How to Import Binary Files Correctly+] for more details.
+NOTE: The CVS client does not handle binary file imports by default. The best practice for importing binary sources is to create a `cvswrappers` file within the repository. See xref:../../../wiki/FaqCVSHowToImportBinaries.adoc[+How to Import Binary Files Correctly+] for more details.
 
 === Editing Sources
 
@@ -484,7 +484,8 @@ To perform the commit:
 
 1. Type in a commit message in the Commit Message text area. Alternatively, click the Recent Messages ( image:images/recent-msgs.png[] ) icon located in the upper right corner to view and select from a list of messages that you have previously used.
 2. After specifying actions for individual files, click Commit. The IDE executes the commit and sends your local changes to the repository. The IDE's status bar, located in the bottom right of the interface, displays as the commit action takes place. Upon a successful commit, versioning badges disappear in the Projects, Files and Favorites windows, and the color encoding of committed files returns to black.
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20CVS%20Support%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 === Conclusion
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/database-improvements-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/ide/database-improvements-screencast.adoc
index c433e44df..36ab9cbef 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/database-improvements-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/database-improvements-screencast.adoc
@@ -32,11 +32,12 @@
 |===
 |This 6-minute screencast demonstrates some features of database support in NetBeans IDE. These features include support for MySQL and the Sakila database, an SQL Editor with code completion, displaying multiple rowsets, and SQL history.
 
-You can read more about database functionality at link:mysql.html[+Connecting to a MySQL Database+].
+You can read more about database functionality at xref:mysql.adoc[+Connecting to a MySQL Database+].
 
 Author: Andrei Badea
 Time: 5:49
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Database%20Support%20Improvements%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
+
  |           
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/git_nb_ssh_screencast.adoc b/netbeans.apache.org/src/content/kb/docs/ide/git_nb_ssh_screencast.adoc
index e0ef15453..da48c9b15 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/git_nb_ssh_screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/git_nb_ssh_screencast.adoc
@@ -44,14 +44,15 @@ link:http://bits.netbeans.org/media/git_nb_ssh.mp4[+Watch full size/Download+] (
 
 NOTE: Closed captioning is available for this video. Click the CC button at the bottom of the video to turn closed captions on.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Screencast%20-%20Cloning%20a%20Git%20Repository%20Using%20NetBeans%20IDE[+Send Us Your Feedback+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
+
  |  |  
 |===
 
 
 == Related links
 
-* link:http://wiki.netbeans.org/NewAndNoteworthyNB74[+NetBeans 74 New And Noteworthy+]
-* link:git.html[+Using Git Support in NetBeans IDE+]
+* xref:../../../wiki/NewAndNoteworthyNB74.adoc[+NetBeans 74 New And Noteworthy+]
+* xref:git.adoc[+Using Git Support in NetBeans IDE+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG234[+Versioning Applications with Version Control+] in _Developing Applications with NetBeans IDE_
-* link:git_nb_screencast.html[+Video of Setting Up a GitHub Repository Using NetBeans IDE+]
+* xref:github_nb_screencast.adoc[+Video of Setting Up a GitHub Repository Using NetBeans IDE+]
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/github_nb_screencast.adoc b/netbeans.apache.org/src/content/kb/docs/ide/github_nb_screencast.adoc
index c3ab00f63..9b057b79f 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/github_nb_screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/github_nb_screencast.adoc
@@ -43,13 +43,13 @@ Time: 5:52
 
 link:http://bits.netbeans.org/media/github_nb.mp4[+Watch full size/Download+] (.mp4) (Ctrl-Click to download, 11,3 MB)
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Screencast%20-%20Setting%20Up%20a%20GitHub%20Repository%20Using%20NetBeans%20IDE[+Send Us Your Feedback+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |  
 |===
 
 
 == Related links
 
-* link:http://wiki.netbeans.org/NewAndNoteworthyNB74[+NetBeans 74 New And Noteworthy+]
-* link:https://netbeans.org/kb/docs/ide/git.html[+Using Git Support in NetBeans IDE+]
+* xref:../../../wiki/NewAndNoteworthyNB74.adoc[+NetBeans 74 New And Noteworthy+]
+* xref:../ide/git.adoc[+Using Git Support in NetBeans IDE+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG234[+Versioning Applications with Version Control+] in _Developing Applications with NetBeans IDE_
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/index.adoc b/netbeans.apache.org/src/content/kb/docs/ide/index.adoc
index c0cc3498d..e6cd336dc 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/index.adoc
@@ -32,19 +32,19 @@ To facilitate development of various types of applications, the NetBeans IDE pro
 
 === Databases
 
-- link:oracle-db.html[Connecting to Oracle Database from NetBeans IDE]
-- link:java-db.html[Working with the Java DB (Derby) Database]
-- link:mysql.html[Connecting to a MySQL Database]
-- link:install-and-configure-mysql-server.html[Setting Up the MySQL Database Server in the Windows Operating System]
+- xref:oracle-db.adoc[Connecting to Oracle Database from NetBeans IDE]
+- xref:java-db.adoc[Working with the Java DB (Derby) Database]
+- xref:mysql.adoc[Connecting to a MySQL Database]
+- xref:install-and-configure-mysql-server.adoc[Setting Up the MySQL Database Server in the Windows Operating System]
 
 === Source Code Management
 
-- link:git.html[Using Git in Apache NetBeans]
-- link:mercurial.html[Using Mercurial in Apache NetBeans]
-- link:mercurial-queues.html[Using Mercurial Queues in Apache NetBeans]
-- link:subversion.html[Using Subversion in Apache NetBeans]
-- link:cvs.html[Using CVS in Apache NetBeans]
-- link:clearcase.html[Using ClearCase in Apache NetBeans]
+- xref:git.adoc[Using Git in Apache NetBeans]
+- xref:mercurial.adoc[Using Mercurial in Apache NetBeans]
+- xref:mercurial-queues.adoc[Using Mercurial Queues in Apache NetBeans]
+- xref:subversion.adoc[Using Subversion in Apache NetBeans]
+- xref:cvs.adoc[Using CVS in Apache NetBeans]
+- xref:clearcase.adoc[Using ClearCase in Apache NetBeans]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/install-and-configure-mysql-server.adoc b/netbeans.apache.org/src/content/kb/docs/ide/install-and-configure-mysql-server.adoc
index b6717841f..41af17947 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/install-and-configure-mysql-server.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/install-and-configure-mysql-server.adoc
@@ -35,7 +35,7 @@ This document recommends a sequence of steps to set up the MySQL database server
 
 For information about installing and configuring MySQL database server for other operating systems, refer to the link:http://dev.mysql.com/doc/refman/5.6/en/installing.html[+Installing and Upgrading MySQL+] documentation.
 
-NOTE: The link:../../72/ide/install-and-configure-mysql-server.html[+Setting Up the MySQL Database Server 5.1 versions in the Windows Operating System+] document provides the instructions on setting up the 5.1 versions of MySQL Server on Windows.
+// NOTE: The link:../../72/ide/install-and-configure-mysql-server.html[+Setting Up the MySQL Database Server 5.1 versions in the Windows Operating System+] document provides the instructions on setting up the 5.1 versions of MySQL Server on Windows.
 
 
 == Starting the Download
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/macro-keywords.adoc b/netbeans.apache.org/src/content/kb/docs/ide/macro-keywords.adoc
index c2b8e365a..c79c9d606 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/macro-keywords.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/macro-keywords.adoc
@@ -31,5 +31,5 @@
 
 The contents you are looking for have been moved to a new location.
 
-Please see the complete list of macro keywords at link:http://wiki.netbeans.org/FaqEditorMacros[+http://wiki.netbeans.org/FaqEditorMacros+] and link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG2405[+How to Record Macros+] in _Developing Applications with NetBeans IDE_.
+Please see the complete list of macro keywords at xref:../../../wiki/FaqEditorMacros.adoc[FaqEditorMacros] and link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG2405[+How to Record Macros+] in _Developing Applications with NetBeans IDE_.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/mysql.adoc b/netbeans.apache.org/src/content/kb/docs/ide/mysql.adoc
index dc39666ee..2929c0f67 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/mysql.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/mysql.adoc
@@ -33,7 +33,7 @@ This document demonstrates how to set up a connection to a MySQL database from t
 
 link:http://www.mysql.com/[+MySQL+] is a popular Open Source relational database management system (RDBMS) commonly used in web applications due to its speed, flexibility and reliability. MySQL employs SQL, or _Structured Query Language_, for accessing and processing data contained in databases.
 
-NOTE: This tutorial assumes that you already have the MySQL RDBMS installed and configured on your computer. If you are installing for the first time, please refer to the official link:http://dev.mysql.com/doc/refman/5.0/en/installing-cs.html[+MySQL documentation+] for help. You can also refer to link:install-and-configure-mysql-server.html[+Setting Up the MySQL Database Server in the Windows Operating System+].
+NOTE: This tutorial assumes that you already have the MySQL RDBMS installed and configured on your computer. If you are installing for the first time, please refer to the official link:http://dev.mysql.com/doc/refman/5.0/en/installing-cs.html[+MySQL documentation+] for help. You can also refer to xref:install-and-configure-mysql-server.adoc[+Setting Up the MySQL Database Server in the Windows Operating System+].
 
 == Configuring MySQL Server Properties
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/nb65-intro-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/ide/nb65-intro-screencast.adoc
index 980ba5d36..065955652 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/nb65-intro-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/nb65-intro-screencast.adoc
@@ -32,7 +32,7 @@
 |===
 |In this screencast, Sridhar Reddy shows new Java developers NetBeans IDE 6.5 editor features and gives a short introduction on how to edit, compile and run Java programs and use the productivity features in NetBeans IDE.
 
-This tutorial is part of the link:../intro-screencasts.html[+Guided Video Tour of NetBeans IDE 6.5+].
+This tutorial is part of the xref:../intro-screencasts.adoc[+Guided Video Tour of NetBeans IDE 6.5+].
 
 Author: Sridhar Reddy
 Time: 14:21
@@ -43,9 +43,11 @@ link:http://mediacast.sun.com/users/sridharpreddy/media/IntroToNB65_sml.flv[+Dow
 
 * link:http://java.sun.com/developer/onlineTraining/[+Java Online Training+]
 * link:http://java.sun.com/javase/6/docs/[+Java SE Documentation+]
-* link:https://netbeans.org/kb/index.html[+NetBeans IDE Tutorials+]
+* xref:../index.adoc[+NetBeans IDE Tutorials+]
 * link:http://java.sun.com/javase/[+Java SE Overview+]
 * link:http://developers.sun.com/events/techdays/[+Sun Tech Days+]
-link:/about/contact_form.html?to=3&subject=Feedback: NB 6.5 intro screencast[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
+
  |  
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/oracle-db.adoc b/netbeans.apache.org/src/content/kb/docs/ide/oracle-db.adoc
index ca309bce7..054d9e887 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/oracle-db.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/oracle-db.adoc
@@ -326,7 +326,7 @@ If you were following this tutorial, you already used the capabilities of the Ne
 
 You can use the OCI 8 PHP extension and the NetBeans IDE for PHP to write PHP code that communicates with an Oracle database. To use NetBeans IDE for PHP and an Oracle database:
 
-1. Set up the PHP environment as described in the Configuring Your Environment for PHP Development section of the link:../../trails/php.html[+PHP Learning Trail+]. Note that NetBeans IDE supports only PHP 5.2 or 5.3.
+1. Set up the PHP environment as described in the Configuring Your Environment for PHP Development section of the xref:../php.adoc[+PHP Learning Trail+]. Note that NetBeans IDE supports only PHP 5.2 or 5.3.
 2. Open your  ``php.ini``  file in an editor. Make certain that the  ``extension_dir``  property is set to the PHP extensions directory. This directory is usually  ``PHP_HOME/ext`` . For example, with PHP 5.2.9 installed to the root directory of  ``C:`` , the  ``extension_dir``  setting should be  ``extension_dir="C:\php-5.2.9\ext"`` .
 3. Locate and uncomment the line  ``extension=php_oci8_11g.dll``  (for Oracle 11g) or  ``extension=php_oci8.dll``  (for Oracle 10.2 or XE). Only one of these extensions can be enabled at one time.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast-smaller.adoc b/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast-smaller.adoc
index 1317c9af6..70fd81623 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast-smaller.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast-smaller.adoc
@@ -41,8 +41,9 @@ link:http://bits.netbeans.org/media/nb71_overview_video_smaller.mp4[+Download th
 
 == Related Links
 
-* link:https://netbeans.org/kb/index.html[+NetBeans IDE Tutorials+]
-* link:https://netbeans.org/community/index.html[+NetBeans Community+]
-link:/about/contact_form.html?to=3&subject=Feedback:%20Netbeans%207.0%20overview%20screencast[+Send Us Your Feedback+]
+* xref:../index.adoc[+NetBeans IDE Tutorials+]
+* xref:../../../community/index.adoc[+NetBeans Community+]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast.adoc
index dd183b35e..5a960445a 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast.adoc
@@ -41,9 +41,10 @@ link:http://bits.netbeans.org/media/nb80_overview_video.mp4[+Download this video
 
 == Related Links
 
-* link:../../../kb/index.html[+NetBeans IDE Tutorials+]
-* link:../intro-screencasts.html[+NetBeans IDE Screencasts+]
-* link:../../../community/index.html[+NetBeans Community+]
-link:/about/contact_form.html?to=3&subject=Feedback:%20NetBeans%207.4%20overview%20screencast[+Send Us Your Feedback+]
+* xref:../index.adoc[+NetBeans IDE Tutorials+]
+* xref:../intro-screencasts.adoc[+NetBeans IDE Screencasts+]
+* xref:../../../community/index.adoc[+NetBeans Community+]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast_731.adoc b/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast_731.adoc
index 779c81fb6..3ffea4981 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast_731.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/overview-screencast_731.adoc
@@ -41,9 +41,10 @@ link:http://bits.netbeans.org/media/nb731-javaee7-launch-final-with-sound.mp4[+D
 
 == Related Links
 
-* link:../../../kb/index.html[+NetBeans IDE Tutorials+]
-* link:../intro-screencasts.html[+NetBeans IDE Screencasts+]
-* link:../../../community/index.html[+NetBeans Community+]
-link:/about/contact_form.html?to=3&subject=Feedback:%20NetBeans%207.3.1%20overview%20screencast[+Send Us Your Feedback+]
+* xref:../index.adoc[+NetBeans IDE Tutorials+]
+* xref:../intro-screencasts.adoc[+NetBeans IDE Screencasts+]
+* xref:../../../community/index.adoc[+NetBeans Community+]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/platform-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/ide/platform-screencast.adoc
index 66152d160..b825673d6 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/platform-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/platform-screencast.adoc
@@ -32,13 +32,15 @@
 |===
 |See this video for an in-depth overview of the powerful NetBeans Platform, which is a Swing-based framework for developing desktop applications. Geertjan Wielenga also demonstrates new and cool features that were added to the NetBeans Platform in the latest 6.9 release, such as OSGi interoperability, enhanced Maven support, and REST client support for RCP applications.
 
-This video is part of the link:../intro-screencasts.html[+Guided Video Tour of NetBeans IDE 6.9+] that shows you first-hand how to get started.
+This video is part of the xref:../intro-screencasts.adoc[+Guided Video Tour of NetBeans IDE 6.9+] that shows you first-hand how to get started.
 
 
 == Related links
 
-* link:https://netbeans.org/kb/index.html[+NetBeans IDE Tutorials+]
-* link:https://netbeans.org/community/index.html[+NetBeans Community+]
-link:/about/contact_form.html?to=3&subject=Feedback: Platform 6.9 screencast[+Send Feedback on This Tutorial+]
+* xref:../index.adoc[+NetBeans IDE Tutorials+]
+* xref:../../../community/index.adoc[+NetBeans Community+]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
+
  |  
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/section.adoc b/netbeans.apache.org/src/content/kb/docs/ide/section.adoc
index c2705d60f..59e1e1d8a 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/section.adoc
@@ -19,30 +19,30 @@
 
 .NetBeans IDE Tutorials
 ************************************************
-- link:mysql.html[Connecting to a MySQL Database]
-- link:oracle-db.html[Connecting to Oracle Database from NetBeans IDE]
-- link:platform-screencast.html[Creating Applications on NetBeans Platform 6.9]
-- link:nb65-intro-screencast.html[Introduction to NetBeans IDE 6.5]
-- link:NetBeans_DTrace_GUI_Plugin_0_4.html[NetBeans DTrace GUI Plug-in]
-- link:overview-screencast-smaller.html[NetBeans IDE 7.1 Overview]
-- link:overview-screencast_731.html[NetBeans IDE 7.3.1 Overview]
-- link:overview-screencast.html[NetBeans IDE 8.0 Overview]
-- link:index.html[NetBeans IDE Tutorials]
-- link:overview-screencast_74.html[]
-- link:macro-keywords.html[Redirect Page]
-- link:database-improvements-screencast.html[Screencast: Database Support in NetBeans IDE]
-- link:section.html[]
-- link:install-and-configure-mysql-server.html[Setting Up the MySQL Database Server in the Windows Operating System]
-- link:clearcase.html[Using ClearCase Support in NetBeans IDE]
-- link:cvs.html[Using CVS Support in NetBeans IDE]
-- link:git.html[Using Git Support in NetBeans IDE]
-- link:mercurial.html[Using Mercurial Support in NetBeans IDE]
-- link:subversion.html[Using Subversion Support in NetBeans IDE]
-- link:mercurial-queues.html[Using Support for Mercurial Queues in NetBeans IDE]
-- link:git_nb_ssh_screencast.html[Video of Cloning a Git Repository Using NetBeans IDE]
-- link:github_nb_screencast.html[Video of Setting Up a GitHub Repository Using NetBeans IDE]
-- link:team-servers.html[Working With a Team Server in NetBeans IDE]
-- link:java-db.html[Working with the Java DB (Derby) Database]
+- xref:mysql.adoc[Connecting to a MySQL Database]
+- xref:oracle-db.adoc[Connecting to Oracle Database from NetBeans IDE]
+- xref:platform-screencast.adoc[Creating Applications on NetBeans Platform 6.9]
+- xref:nb65-intro-screencast.adoc[Introduction to NetBeans IDE 6.5]
+- xref:NetBeans_DTrace_GUI_Plugin_0_4.adoc[NetBeans DTrace GUI Plug-in]
+- xref:overview-screencast-smaller.adoc[NetBeans IDE 7.1 Overview]
+- xref:overview-screencast_731.adoc[NetBeans IDE 7.3.1 Overview]
+- xref:overview-screencast.adoc[NetBeans IDE 8.0 Overview]
+- xref:index.adoc[NetBeans IDE Tutorials]
+- xref:overview-screencast_74.adoc[]
+- xref:macro-keywords.adoc[Redirect Page]
+- xref:database-improvements-screencast.adoc[Screencast: Database Support in NetBeans IDE]
+- xref:section.adoc[]
+- xref:install-and-configure-mysql-server.adoc[Setting Up the MySQL Database Server in the Windows Operating System]
+- xref:clearcase.adoc[Using ClearCase Support in NetBeans IDE]
+- xref:cvs.adoc[Using CVS Support in NetBeans IDE]
+- xref:git.adoc[Using Git Support in NetBeans IDE]
+- xref:mercurial.adoc[Using Mercurial Support in NetBeans IDE]
+- xref:subversion.adoc[Using Subversion Support in NetBeans IDE]
+- xref:mercurial-queues.adoc[Using Support for Mercurial Queues in NetBeans IDE]
+- xref:git_nb_ssh_screencast.adoc[Video of Cloning a Git Repository Using NetBeans IDE]
+- xref:github_nb_screencast.adoc[Video of Setting Up a GitHub Repository Using NetBeans IDE]
+- xref:team-servers.adoc[Working With a Team Server in NetBeans IDE]
+- xref:java-db.adoc[Working with the Java DB (Derby) Database]
 ************************************************
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/subversion.adoc b/netbeans.apache.org/src/content/kb/docs/ide/subversion.adoc
index 031314ccc..7276f61f9 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/subversion.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/subversion.adoc
@@ -132,9 +132,9 @@ NOTE: The IDE's drop-down menus are context-sensitive, i.e. the available option
 
 Depending on the protocol you are using, you may need to enter other information, such as username and password (e.g. for `http://`, `https://`, or `svn://`), or in the case of `svn+ssh://`, you must supply the command to establish the external tunnel. 
 
-NOTE: If you are trying to implement certificated authentication with `https`, see: link:http://wiki.netbeans.org/wiki/view/FaqSslUserCert[+How to connect to a Subversion repository using user-certified authentication?+] 
+NOTE: If you are trying to implement certificated authentication with `https`, see: xref:../../../wiki/FaqSslUserCert.adoc[+How to connect to a Subversion repository using user-certified authentication?+] 
 
-For more help with `svn+ssh`, see: link:http://wiki.netbeans.org/wiki/view/FaqSubversionSSH[+How do I set up SSH with Subversion?+]
+For more help with `svn+ssh`, see: xref:../../../wiki/FaqSubversionSSH.adoc[+How do I set up SSH with Subversion?+]
 
 
 . If you are using a proxy, be sure to click the Proxy Configuration button and enter any required information. When you are certain your connection settings to the repository are correct, click Next.
@@ -162,7 +162,7 @@ NOTE: While you are actually _exporting_ files from your system, the term 'impor
 To import a project to a repository:
 
 1. From the Projects window (Ctrl-1 on Windows/Cmd-1 on OS X), select an unversioned project and choose Versioning > Import into Subversion Repository from the node's right-click menu. The Subversion Import wizard opens.
-2. In the Subversion Repository panel of the Import wizard, specify the <<protocolTypes,protocol>> and location of the Subversion repository as defined by the Subversion URL. Depending on your selection, you may need to specify further settings, such as repository username and password, or, in the case of `svn+ssh://`, you must specify the tunnel command to establish the external tunnel. See the link:http://wiki.netbeans.org/wiki/view/NetBeansUserFAQ#section-NetBeansUserFAQ-VersionContro [...]
+2. In the Subversion Repository panel of the Import wizard, specify the <<protocolTypes,protocol>> and location of the Subversion repository as defined by the Subversion URL. Depending on your selection, you may need to specify further settings, such as repository username and password, or, in the case of `svn+ssh://`, you must specify the tunnel command to establish the external tunnel. See the xref:../../../wiki/NetBeansUserFAQ.adoc#section-NetBeansUserFAQ-VersionControlSystems[+Subver [...]
 3. In the Repository Folder panel, specify the repository folder in which you want to place the project in the repository. A folder containing the name of your project is suggested for you in the Repository Folder text field by default.
 4. In the text area beneath Specify the Message, enter a description of the project you are importing into the repository.
 5. Click Finish to initiate the import, or optionally, click Next to continue to a third panel that enables you to preview all files that are prepared for import. From this panel, you can choose to exclude individual files from the import (as shown below), or identify the MIME types of files before importing.
diff --git a/netbeans.apache.org/src/content/kb/docs/ide/team-servers.adoc b/netbeans.apache.org/src/content/kb/docs/ide/team-servers.adoc
index 59b7b12cf..fc5e2139a 100644
--- a/netbeans.apache.org/src/content/kb/docs/ide/team-servers.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/ide/team-servers.adoc
@@ -137,7 +137,7 @@ When you click Get From Team Server, the IDE will create a local repository and
 
 After checkout is complete, you will be prompted to open any NetBeans project that were checked out. You can click Open Project in the dialog to select the projects that you would like to open in the IDE. Select Cancel if you do not want to open any of the checked out projects.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Working%20With%20a%20Team%20Server%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -145,6 +145,6 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Working%20With%20a%20Team
 
 For additional information on using NetBeans IDE in a collaborative environment, see the following resources.
 
-* link:subversion.html[+Guided Tour of Subversion+]
-* link:../../trails/tools.html[+Integration with External Tools and Services Learning Trail+]
+* xref:subversion.adoc[+Guided Tour of Subversion+]
+* xref:../tools.adoc[+Integration with External Tools and Services Learning Trail+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG348[+Working in a Collaborative Environment+] in _Developing Applications with NetBeans IDE_
diff --git a/netbeans.apache.org/src/content/kb/docs/index.adoc b/netbeans.apache.org/src/content/kb/docs/index.adoc
index 76410b6ab..2708bfefc 100644
--- a/netbeans.apache.org/src/content/kb/docs/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/index.adoc
@@ -33,47 +33,47 @@
 
 [.card]
 .icon:graduation-cap[]
-link:cnd.html[C/C++ Application Learning Trail]
+xref:cnd.adoc[C/C{pp} Application Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:java-se.html[General Java Development Learning Trail]
+xref:java-se.adoc[General Java Development Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:intro-screencasts.html[Guided Video Tours of NetBeans IDE]
+xref:intro-screencasts.adoc[Guided Video Tours of NetBeans IDE]
 
 [.card]
 .icon:graduation-cap[]
-link:tools.html[Integration with External Tools and Services]
+xref:tools.adoc[Integration with External Tools and Services]
 
 [.card]
 .icon:graduation-cap[]
-link:java-ee.html[Java EE &amp; Java Web Learning Trail]
+xref:java-ee.adoc[Java EE &amp; Java Web Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:matisse.html[Java GUI Applications Learning Trail]
+xref:matisse.adoc[Java GUI Applications Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:mobility.html[Java ME Embedded and Java Card Application Technology Trail]
+xref:mobility.adoc[Java ME Embedded and Java Card Application Technology Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:platform.html[NetBeans Platform Learning Trail]
+xref:platform.adoc[NetBeans Platform Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:index.html[NetBeans Tutorials]
+xref:index.adoc[NetBeans Tutorials]
 
 [.card]
 .icon:graduation-cap[]
-link:php.html[PHP and HTML5 Learning Trail]
+xref:php.adoc[PHP and HTML5 Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:web.html[Web Services Learning Trail]
+xref:web.adoc[Web Services Learning Trail]
 
 ****
 
diff --git a/netbeans.apache.org/src/content/kb/docs/intro-screencasts.adoc b/netbeans.apache.org/src/content/kb/docs/intro-screencasts.adoc
index 578968995..d531fd04c 100644
--- a/netbeans.apache.org/src/content/kb/docs/intro-screencasts.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/intro-screencasts.adoc
@@ -35,8 +35,8 @@ Tour the screencasts below to discover the new and noteworthy features of NetBea
 == NetBeans IDE 8.0 Overview
 
 |===
-|link:java/jdk8-migration-screencast.html[+ +]image:../../images_www/v7/2/nb72-video-thumb.png[]
- |link:../../community/releases/80/index.html[+*NetBeans IDE 8.0*+] delivers full support for the latest Java 8 technologies--Java SE 8, Java SE Embedded 8, and Java ME Embedded 8. The IDE also provides a range of new enhancements for Maven and Java EE with PrimeFaces; new tools for HTML5, in particular for AngularJS; and improvements to PHP and C/C++ support. 
+|xref:java/jdk8-migration-screencast.adoc[+ +]image:../../images_www/v7/2/nb72-video-thumb.png[]
+ |xref:../../community/releases/80/index.adoc[+*NetBeans IDE 8.0*+] delivers full support for the latest Java 8 technologies--Java SE 8, Java SE Embedded 8, and Java ME Embedded 8. The IDE also provides a range of new enhancements for Maven and Java EE with PrimeFaces; new tools for HTML5, in particular for AngularJS; and improvements to PHP and C/C++ support. 
 
 Watch the xref:ide/overview-screencast.adoc[NetBeans IDE 8.0 Overview Video] to find out what's new and noteworthy in this latest release.
  
@@ -45,48 +45,81 @@ Watch the xref:ide/overview-screencast.adoc[NetBeans IDE 8.0 Overview Video] to
 
 == NetBeans IDE 8.0 Screencasts
 
-|===
-|image::images/smartmigration.png[role="left", link="java/jdk8-migration-screencast.html"] 
+[cols="1a,1a"]
+|============================================================
+|
+
+[cols="1,1",grid="none",frame="none"]
+!================================
+a!image::images/smartmigration.png[link="java/jdk8-migration-screencast.html"] 
+//role="left", 
 
 Time: 14:00
-link:http://bits.netbeans.org/media/smart-migration-java8.mp4[+*Download*+] [60 MB]
+//link:http://bits.netbeans.org/media/smart-migration-java8.mp4[+*Download*+] [60 MB]
 
- |link:java/jdk8-migration-screencast.html[+ Smart Migration to JDK 8+]
+!
+xref:java/jdk8-migration-screencast.adoc[+ Smart Migration to JDK 8+]
 
 This screencast is a guide to the key features of language enhancements in Java 8 and how you can use the IDE to help you migrate your code to Java 8.
 
- |  |image::images/primefaces.png[role="left", link="javaee/maven-primefaces-screencast.html"] 
+!================================
+
+|
+[cols="1,1",grid="none",frame="none"]
+!================================
+a!image::images/primefaces.png[link="javaee/maven-primefaces-screencast.html"] 
+//role="left", 
 
 Time: 4:39
-link:http://bits.netbeans.org/media/prime-faces-nb8.mp4[+*Download*+] [37 MB]
+//link:http://bits.netbeans.org/media/prime-faces-nb8.mp4[+*Download*+] [37 MB]
 
- |link:javaee/maven-primefaces-screencast.html[+ PrimeFaces Development with NetBeans IDE 8 +]
+!
+
+xref:javaee/maven-primefaces-screencast.adoc[+ PrimeFaces Development with NetBeans IDE 8 +]
 
 This screencast demonstrates how you can use NetBeans IDE 8.0 to create a complete CRUD application using Java EE 7, Maven, and PrimeFaces.
 
- 
+!================================
 
-|image::images/me8.png[role="left", link="javame/nb_me8_screencast.html"] 
+
+|
+[cols="1,1",grid="none",frame="none"]
+!================================
+a!image::images/me8.png[link="javame/nb_me8_screencast.html"] 
+role="left", 
 
 Time: 6:38
-link:http://bits.netbeans.org/media/nb_me_8.mp4[+*Download*+] [12 MB]
+//link:http://bits.netbeans.org/media/nb_me_8.mp4[+*Download*+] [12 MB]
+
+!
 
- |link:javame/nb_me8_screencast.html[+ NetBeans IDE Support for Java ME 8+]
+xref:javame/nb_me8_screencast.adoc[+ NetBeans IDE Support for Java ME 8+]
 
 This screencast demonstrates NetBeans IDE support for Oracle Java ME SDK 8 on the Windows operating system.
 
- |  |image:images/plugins.png[role="left", link="javame/nb_me_plugins_screencast.html"]
+!================================
+
+
+|
+[cols="1,1",grid="none",frame="none"]
+!================================
+a!image:images/plugins.png[link="javame/nb_me_plugins_screencast.html"]
+//role="left", 
 
 Time: 7:05
-link:http://bits.netbeans.org/media/nb_me_sdk_plugins.mp4[+*Download*+] [13,9 MB]
+//link:http://bits.netbeans.org/media/nb_me_sdk_plugins.mp4[+*Download*+] [13,9 MB]
 
 
- |link:javame/nb_me_plugins_screencast.html[+ Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE+]
+!
+
+xref:javame/nb_me_plugins_screencast.adoc[+ Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE+]
 
 This screencast demonstrates installation and usage of link:http://www.oracle.com/technetwork/java/javame/javamobile/download/sdk/default-303768.html[+Oracle Java ME SDK 8.0 Plugins+] in NetBeans IDE on the Windows operating system.
 
+!================================
  
-|===
+|============================================================
+
 
 
 == NetBeans IDE 7.4 Screencasts
@@ -229,5 +262,5 @@ This screencast demonstrates how to get a Git project by cloning an existing Git
 
 == More NetBeans IDE Screencasts
 
-Browse the link:../../community/media.html[+NetBeans Media Library+] and the link:http://www.youtube.com/user/netbeansvideos[+NetBeans YouTube Channel+] for additional video tutorials of the NetBeans IDE.
+Browse the xref:../../community/media.adoc[+NetBeans Media Library+] and the link:http://www.youtube.com/user/netbeansvideos[+NetBeans YouTube Channel+] for additional video tutorials of the NetBeans IDE.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java-ee.adoc b/netbeans.apache.org/src/content/kb/docs/java-ee.adoc
index badba1947..6921fb8aa 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-ee.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-ee.adoc
@@ -96,7 +96,7 @@ JavaScript is an object-oriented scripting language primarily used in client-sid
 
 * xref:web/oracle-cloud.adoc[+Running Web Applications on Oracle Cloud+]
 * link:https://blogs.oracle.com/javatraining/entry/oracle_cloud_development_with_netbeans[+Oracle Cloud Development with NetBeans and Eclipse (OEPE)+] (Java Training Beat blog)
-* NetBeans Wiki: link:http://wiki.netbeans.org/AmazonBeanstalkSupport[+Amazon Beanstalk Support+]
+* NetBeans Wiki: xref:../../wiki/AmazonBeanstalkSupport.adoc[+Amazon Beanstalk Support+]
 
 === EJB Technology and Java Persistence
 
@@ -107,13 +107,13 @@ JavaScript is an object-oriented scripting language primarily used in client-sid
 * xref:javaee/entappclient.adoc[+Creating and Running an Application Client on the GlassFish Server+]
 * xref:javaee/secure-ejb.adoc[+Building Secure Enterprise Beans+]
 * xref:javaee/profiler-javaee.adoc[+Profiling an Enterprise Application+]
-* link:http://wiki.netbeans.org/WebLogicJMS[+Using WebLogic JMS from NetBeans IDE+]
+* xref:../../wiki/WebLogicJMS.adoc[+Using WebLogic JMS from NetBeans IDE+]
 
 === Web Frameworks
 
 * xref:web/jsf20-intro.adoc[+Introduction to JavaServer Faces 2.x+]
 * xref:web/jsf20-support.adoc[+JSF 2.x Support+]
-* link:http://wiki.netbeans.org/VaadinPlugin[+Vaadin+]
+* xref:../../wiki/VaadinPlugin.adoc[+Vaadin+]
 * xref:web/quickstart-webapps-spring.adoc[+Spring Web MVC+]
 * xref:web/quickstart-webapps-struts.adoc[+Struts+]
 * xref:web/grails-quickstart.adoc[+Grails+]
@@ -159,25 +159,25 @@ JavaScript is an object-oriented scripting language primarily used in client-sid
 
 == Sample Applications
 
-* link:../samples/pet-catalog.html[+Pet Catalog - Java EE 6 Sample Application+]
-* link:../samples/scrum-toys.html[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
-* link:../samples/jsfjpa.html[+User Authentication Web App Using Java EE+]
-* link:../samples/webjpa.html[+Using the Java Persistence API in a Stand-Alone Web App+]
-* link:../samples/javaee-crud.html[+JSF CRUD Web Application with Java Persistence API+]
-* link:../samples/javaee-stateless.html[+Dependency Injection with Stateless Session Beans+]
+* xref:../samples/pet-catalog.adoc[+Pet Catalog - Java EE 6 Sample Application+]
+* xref:../samples/scrum-toys.adoc[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
+* xref:../samples/jsfjpa.adoc[+User Authentication Web App Using Java EE+]
+* xref:../samples/webjpa.adoc[+Using the Java Persistence API in a Stand-Alone Web App+]
+* xref:../samples/javaee-crud.adoc[+JSF CRUD Web Application with Java Persistence API+]
+* xref:../samples/javaee-stateless.adoc[+Dependency Injection with Stateless Session Beans+]
 
 == Community-Contributed Docs
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+Hierarchical Web Service Development with NetBeans IDE+] by Jayasurya Venug (Extension of NetBeans E-commerce Tutorial)
 * link:http://blog.mueller-bruehl.de/en/tutorial-web-development/[+Tutorial web development (with JSF)+] by Michael Muller
-* link:http://wiki.netbeans.org/DevelopJavaEE6App[+Develop JavaEE 6 application with JSF2, EJB3 and JPA+] (also at link:http://netbeans.dzone.com/articles/develop-java-ee-6-app-jsf2[+dzone+]) by Christopher Lam
-* link:http://wiki.netbeans.org/SecureJavaEE6App[+Securing JavaEE 6 application with JavaEE Security+] by Christopher Lam
-* link:http://wiki.netbeans.org/CreateReverseAjaxWebAppsWithDWR[+Create Reverse Ajax Web-Applications with DWR, GlassFish and NetBeans+] by Siegfried Bolz
-* link:http://wiki.netbeans.org/wiki/view/MavenAndNetBeansForGlassFish[+Developing Enterprise Applications for GlassFish using Maven and NetBeans+] by Wouter van Reeven
-* link:http://wiki.netbeans.org/SpringMVConNetBeansGlassFish[+Developing a Spring Framework MVC application using GlassFish+] by Arulazi Dhesiaseelan
-* link:http://wiki.netbeans.org/MavenSpringEJBsOnGlassfish[+EJB development for Glassfish using Maven2 and Spring+] by Kristian Rink
+* xref:../../wiki/DevelopJavaEE6App.adoc[+Develop JavaEE 6 application with JSF2, EJB3 and JPA+] (also at link:http://netbeans.dzone.com/articles/develop-java-ee-6-app-jsf2[+dzone+]) by Christopher Lam
+* xref:../../wiki/SecureJavaEE6App.adoc[+Securing JavaEE 6 application with JavaEE Security+] by Christopher Lam
+* xref:../../wiki/CreateReverseAjaxWebAppsWithDWR.adoc[+Create Reverse Ajax Web-Applications with DWR, GlassFish and NetBeans+] by Siegfried Bolz
+* xref:../../wiki/MavenAndNetBeansForGlassFish.adoc[+Developing Enterprise Applications for GlassFish using Maven and NetBeans+] by Wouter van Reeven
+* xref:../../wiki/SpringMVConNetBeansGlassFish.adoc[+Developing a Spring Framework MVC application using GlassFish+] by Arulazi Dhesiaseelan
+* xref:../../wiki/MavenSpringEJBsOnGlassfish.adoc[+EJB development for Glassfish using Maven2 and Spring+] by Kristian Rink
 * link:http://www.adam-bien.com/roller/abien/entry/simplest_possible_ejb_3_13[+Simplest Possible EJB 3.1/REST (JSR 311) Component+] by Adam Bien
-* link:http://wiki.netbeans.org/DevelopAjaxJSF2App[+Develop Ajax-based JSF2 applications with PrimeFaces using Netbeans 6.8+] by Christopher Lam
+* xref:../../wiki/DevelopAjaxJSF2App.adoc[+Develop Ajax-based JSF2 applications with PrimeFaces using Netbeans 6.8+] by Christopher Lam
 
 == Other Resources
 
@@ -192,8 +192,8 @@ JavaScript is an object-oriented scripting language primarily used in client-sid
 
 === FAQs
 
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebFrameworks[+NetBeans Web Framework FAQs+]
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-JavaEEDevelopment[+Java EE Development FAQs+]
+* xref:../../wiki/NetBeansUserFAQ.adoc#section-NetBeansUserFAQ-WebFrameworks[+NetBeans Web Framework FAQs+]
+* xref:../../wiki/NetBeansUserFAQ.adoc#section-NetBeansUserFAQ-JavaEEDevelopment[+Java EE Development FAQs+]
 
 === Tutorials and Other Docs
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java-se.adoc b/netbeans.apache.org/src/content/kb/docs/java-se.adoc
index cfabdb480..94a9cf6e7 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-se.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-se.adoc
@@ -64,15 +64,15 @@ In addition to being a platform for multi-platform desktop applications, the Jav
 
 === Maven
 
-- link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices+]
+- xref:../../wiki/MavenBestPractices.adoc[+Maven Best Practices+]
 - xref:java/maven-hib-java-se.adoc[+Creating a Maven Swing Application Using Hibernate+]
 
 === Profiling Source Code
 
 - xref:java/profiler-intro.adoc[+Introduction to Profiling Java Applications+]
 - xref:java/profiler-profilingpoints.adoc[+Using Profiling Points+]
-- link:../../../community/magazine/html/04/profiler.html[+Advanced Profiling: Theory in Practice+]
-- link:../../../competition/win-with-netbeans/case-study-nb-profiler.html[+Case Study of NetBeans Profiler+]
+- xref:../../community/magazine/html/04/profiler.adoc[+Advanced Profiling: Theory in Practice+]
+- xref:../../competition/win-with-netbeans/case-study-nb-profiler.adoc[+Case Study of NetBeans Profiler+]
 
 === Scripting Languages
 
@@ -87,10 +87,10 @@ In addition to being a platform for multi-platform desktop applications, the Jav
 === Community-Contributed Docs
 
 - link:http://java.dzone.com/articles/using-lambda-expression-sort[+Using Lambda Expression to sort a List in Java 8 using Netbeans Lambda Support+] (_by Mohamed Sanaulla_)
-- link:http://wiki.netbeans.org/CompactProfiles[+Compact Profiles in NetBeans IDE+] (_by Tomas Zezula _)
-- link:http://wiki.netbeans.org/PackagingADistributableJavaApp[+Setting up Netbeans to Generate a Distributable JAR File Using OneJAR+]
-- link:http://wiki.netbeans.org/TaT_ConfigNetBeansUsingBatchFiles[+Configure NetBeans using Batch Files+]
-- link:http://wiki.netbeans.org/Refactoring[+Refactoring Simplified+]
+- xref:../../wiki/CompactProfiles.adoc[+Compact Profiles in NetBeans IDE+] (_by Tomas Zezula _)
+- xref:../../wiki/PackagingADistributableJavaApp.adoc[+Setting up Netbeans to Generate a Distributable JAR File Using OneJAR+]
+- xref:../../wiki/TaT_ConfigNetBeansUsingBatchFiles.adoc[+Configure NetBeans using Batch Files+]
+- xref:../../wiki/Refactoring.adoc[+Refactoring Simplified+]
 
 === Other Resources
 
@@ -99,16 +99,16 @@ In addition to being a platform for multi-platform desktop applications, the Jav
 - link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG510[+Building Java Projects+] in _Developing Applications with NetBeans IDE_
 - link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG659[+Testing and Profiling Java Application Projects+] in _Developing Applications with NetBeans IDE_
 - link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG796[+Running and Debugging Java Application Projects+] in _Developing Applications with NetBeans IDE_
-- link:http://wiki.netbeans.org/Java_Hints[+List of NetBeans Java Hints+]
-- link:http://wiki.netbeans.org/NetBeansUserFAQ[+NetBeans User FAQs:+]
-- link:http://wiki.netbeans.org/NetBeansUserFAQ#Project_System_.28General.29[+General Project System+]
-- link:http://wiki.netbeans.org/NetBeansUserFAQ#Compiling_and_Building_Projects[+Compiling and Building+]
-- link:http://wiki.netbeans.org/NetBeansUserFAQ#Freeform_Projects[+Free-form Project+]
-- link:http://wiki.netbeans.org/NetBeansUserFAQ#Debugging[+Debugging+]
-- link:http://wiki.netbeans.org/NetBeansUserFAQ#Profiler[+Profiling+]
-- link:http://wiki.netbeans.org/NetBeansUserFAQ#Editing[+Editing+]
+- xref:../../wiki/Java_Hints.adoc[+List of NetBeans Java Hints+]
+- xref:../../wiki/NetBeansUserFAQ.adoc[+NetBeans User FAQs:+]
+- xref:../../wiki/NetBeansUserFAQ.adoc#Project_System_.28General.29[+General Project System+]
+- xref:../../wiki/NetBeansUserFAQ.adoc#Compiling_and_Building_Projects[+Compiling and Building+]
+- xref:../../wiki/NetBeansUserFAQ.adoc#Freeform_Projects[+Free-form Project+]
+- xref:../../wiki/NetBeansUserFAQ.adoc#Debugging[+Debugging+]
+- xref:../../wiki/NetBeansUserFAQ.adoc#Profiler[+Profiling+]
+- xref:../../wiki/NetBeansUserFAQ.adoc#Editing[+Editing+]
 - link:http://www.mysql.com/why-mysql/java/[+MySQL and Java - Resources +]
 - link:http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql[+MySQL On-Demand Web Seminars +]
-- link:../../kb/articles/learn-java.html[+Learning Java - Resources+]
+- xref:../../kb/articles/learn-java.adoc[+Learning Java - Resources+]
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/annotations-custom.adoc b/netbeans.apache.org/src/content/kb/docs/java/annotations-custom.adoc
index 38966bea1..16c1e5af7 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/annotations-custom.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/annotations-custom.adoc
@@ -29,11 +29,11 @@
 :description: Annotation Processors Support in the NetBeans IDE, Part II: Using Own Custom Annotation Processors in the IDE - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Annotation Processors Support in the NetBeans IDE, Part II: Using Own Custom Annotation Processors in the IDE
 
-The previous part of the annotations tutorial (link:annotations-lombok.html[Part I: Using Lombok for Custom Annotations]) showed how custom annotations work within NetBeans.
+The previous part of the annotations tutorial (xref:annotations-lombok.adoc[Part I: Using Lombok for Custom Annotations]) showed how custom annotations work within NetBeans.
 
 In this section of the tutorial, you will learn how to add a self-written custom annotation processor to a project in the IDE. This tutorial does not teach you how to write an annotation processor. It explains how to add it to a NetBeans IDE project.
 
-The sample application used in this section was created by Jesse Glick and published as an link:http://wiki.netbeans.org/FaqApt[+FAQ entry+] for the previous IDE releases.
+The sample application used in this section was created by Jesse Glick and published as an xref:../../../wiki/FaqApt.adoc[+FAQ entry+] for the previous IDE releases.
 
 The annotation processor used as the example generates a parent class for the annotated class. The generated parent class also contains a method that is called from the annotated class. Follow the instructions below on how to create and add a custom annotation processor to an IDE's project.
 
@@ -458,7 +458,7 @@ image::images/demo-run.png[title="Projects window with Generated Sources"]
 
 See the following resources for more information about annotations in Java applications:
 
-* The previous part of the annotations tutorial: link:annotations-lombok.html[Part I: Using Lombok for Custom Annotations]).
+* The previous part of the annotations tutorial: xref:annotations-lombok.adoc[Part I: Using Lombok for Custom Annotations]).
 * Java SE Documentation - link:http://download.oracle.com/javase/6/docs/technotes/guides/language/annotations.html[+Annotations+]
 * Java SE Tutorial - link:http://download.oracle.com/javase/tutorial/java/javaOO/annotations.html[+Annotations+]
 * link:http://download.oracle.com/javase/6/docs/technotes/tools/windows/javac.html#processing[+Java Compiler: Annotation Processing Options+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/annotations-lombok.adoc b/netbeans.apache.org/src/content/kb/docs/java/annotations-lombok.adoc
index f5ddd1fd5..0786dbfdc 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/annotations-lombok.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/annotations-lombok.adoc
@@ -243,7 +243,7 @@ You can see that the artifacts generated by the Lombok annotation processor are
 
 == Next Step
 
-* link:annotations-custom.html[+Part II: Using Own Custom Annotation Processor in the IDE+]
+* xref:annotations-custom.adoc[+Part II: Using Own Custom Annotation Processor in the IDE+]
 * Java SE Documentation - link:http://download.oracle.com/javase/6/docs/technotes/guides/language/annotations.html[+Annotations+]
 * Java SE Tutorial - link:http://download.oracle.com/javase/tutorial/java/javaOO/annotations.html[+Annotations+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/annotations.adoc b/netbeans.apache.org/src/content/kb/docs/java/annotations.adoc
index b3d78c5e6..2e42bdc98 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/annotations.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/annotations.adoc
@@ -31,9 +31,9 @@
 
 This two-part tutorial demonstrates how you can attach annotation processors to a project and use them while working on your code in the IDE. NetBeans IDE includes built-in support for custom annotation processors. Now you can conveniently specify annotation processors to run with your project and see the results of annotation processing directly in the Java Editor through code completion and navigation.
 
-The link:annotations-lombok.html[+first part of the tutorial+] shows the use of the third-party annotation processor, link:http://projectlombok.org/[+Project Lombok+], in the NetBeans IDE.
+The xref:annotations-lombok.adoc[+first part of the tutorial+] shows the use of the third-party annotation processor, link:http://projectlombok.org/[+Project Lombok+], in the NetBeans IDE.
 
-The link:annotations-custom.html[+second part of the tutorial+] provides explanations of how to add a self-written annotation processor to a project. The sample code for this part of the tutorial is contributed by Jesse Glick.
+The xref:annotations-custom.adoc[+second part of the tutorial+] provides explanations of how to add a self-written annotation processor to a project. The sample code for this part of the tutorial is contributed by Jesse Glick.
 
 
 == Requirements
@@ -44,7 +44,7 @@ To complete this tutorial, you need the following software and resources.
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.apache.org/download/index.html[+NetBeans IDE+] | 9.0 or later
+|xref:../../../download/index.adoc[+NetBeans IDE+] | 9.0 or later
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 |===
@@ -61,7 +61,7 @@ For starting information about annotations in JDK 6, refer to the following reso
 * Java SE Documentation - link:http://download.oracle.com/javase/6/docs/technotes/guides/language/annotations.html[+Annotations+]
 * Java SE Tutorial - link:http://download.oracle.com/javase/tutorial/java/javaOO/annotations.html[+Annotations+]
 
-In practice, annotations are most widely used in combination with Java Persistence API (JPA), which is part of the Java EE specification, and some other technologies, such as JAXB (Java Architecture for XML Binding). Using JPA, Java classes can be annotated as entities that later can be persisted to a storage. To develop JPA-based applications, it is convenient to use frameworks, for example, EclipseLink that is bundled with the IDE. As a starting point for more information on writing JP [...]
+In practice, annotations are most widely used in combination with Java Persistence API (JPA), which is part of the Java EE specification, and some other technologies, such as JAXB (Java Architecture for XML Binding). Using JPA, Java classes can be annotated as entities that later can be persisted to a storage. To develop JPA-based applications, it is convenient to use frameworks, for example, EclipseLink that is bundled with the IDE. As a starting point for more information on writing JP [...]
 
 
 == Map of javac Options and IDE Commands for Annotation Processing
@@ -120,6 +120,6 @@ Add options that should be passed to the annotation processor associated with yo
 
 Read the following parts of the tutorial to learn how to use annotations in the IDE.
 
-* link:annotations-lombok.html[+Part I: Using Project Lombok for Custom Annotations+]
-* link:annotations-custom.html[+Part II: Using Own Custom Annotation Processor in the IDE+]
+* xref:annotations-lombok.adoc[+Part I: Using Project Lombok for Custom Annotations+]
+* xref:annotations-custom.adoc[+Part II: Using Own Custom Annotation Processor in the IDE+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/code-inspect-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/code-inspect-screencast.adoc
index d0fd1de24..dcc3950d4 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/code-inspect-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/code-inspect-screencast.adoc
@@ -38,13 +38,13 @@ Time: 3:47
 link:http://bits.netbeans.org/media/code-inspect.swf[+Watch full size/Download+] (.swf) (Ctrl-Click to download, 2,7 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20the%20Static%20Analysis%20Feature%20in%20the%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  
 |===
 
 
 == Related links
 
-* link:http://wiki.netbeans.org/Java_Hints[+NetBeans Java Hints+]
-* link:https://netbeans.apache.org/tutorials/nbm-java-hint.html[+NetBeans Java Hint Module Tutorial+]
+* xref:../../../wiki/Java_Hints.adoc[+NetBeans Java Hints+]
+* xref:../../../tutorials/nbm-java-hint.adoc[+NetBeans Java Hint Module Tutorial+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG613[+Using Hints in Source Code Analysis and Refactoring+] in _Developing Applications with NetBeans IDE_
diff --git a/netbeans.apache.org/src/content/kb/docs/java/code-inspect.adoc b/netbeans.apache.org/src/content/kb/docs/java/code-inspect.adoc
index 0e4ee1ccc..f62c9641e 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/code-inspect.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/code-inspect.adoc
@@ -352,7 +352,7 @@ image::images/delete-confirm.png[]
 
 The  ``renamedConfig``  configuration is deleted from the Configurations list.
 
-NOTE: Refer to the link:https://netbeans.apache.org/tutorials/nbm-java-hint.html[+NetBeans Java Hint Module Tutorial+] for information on how to create a NetBeans module that provides one or more NetBeans Java hints.
+NOTE: Refer to the xref:../../../tutorials/nbm-java-hint.adoc[+NetBeans Java Hint Module Tutorial+] for information on how to create a NetBeans module that provides one or more NetBeans Java hints.
 
 == Running Single Inspections
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/debug-deadlock-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/debug-deadlock-screencast.adoc
index 9d09020d9..71d25552f 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/debug-deadlock-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/debug-deadlock-screencast.adoc
@@ -38,14 +38,14 @@ Time: 3:02
 link:http://bits.netbeans.org/media/deadlock-detection.mp4[+Watch full size+] (Ctrl-Click to download, 5 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Deadlock%20Detection%20Using%20the%20NetBeans%20Debugger[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |      
 |===
 
 
 == Related links
 
-* Demo: link:debug-stepinto-screencast.html[+Visual Step Into Action in NetBeans Debugger+]
-* Demo: link:debug-multithreaded-screencast.html[+Multithreaded Debugging with the NetBeans IDE+]
-* Demo: link:debug-evaluator-screencast.html[+Using the Code Snippet Evaluator in the NetBeans Debugger+]
-* link:debug-multithreaded.html[+Debugging Multithreaded Applications in NetBeans IDE+]
+* Demo: xref:debug-stepinto-screencast.adoc[+Visual Step Into Action in NetBeans Debugger+]
+* Demo: xref:debug-multithreaded-screencast.adoc[+Multithreaded Debugging with the NetBeans IDE+]
+* Demo: xref:debug-evaluator-screencast.adoc[+Using the Code Snippet Evaluator in the NetBeans Debugger+]
+* xref:debug-multithreaded.adoc[+Debugging Multithreaded Applications in NetBeans IDE+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/debug-evaluator-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/debug-evaluator-screencast.adoc
index 5c7b01725..a7a30624b 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/debug-evaluator-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/debug-evaluator-screencast.adoc
@@ -38,14 +38,14 @@ Time: 4:00
 link:http://bits.netbeans.org/media/debugger-evaluator.mp4[+Watch full size+] (Ctrl-Click to download, 6 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Code%20Snippet%20Evaluator%20Using%20the%20NetBeans%20Debugger[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |         
 |===
 
 
 == Related links
 
-* Demo: link:debug-stepinto-screencast.html[+Visual Step Into Action in NetBeans Debugger+]
-* Demo: link:debug-deadlock-screencast.html[+Deadlock Detection Using the NetBeans Debugger+]
-* Demo: link:debug-multithreaded-screencast.html[+Multithreaded Debugging with the NetBeans IDE+]
-* link:debug-multithreaded.html[+Debugging Multithreaded Applications in NetBeans IDE+]
+* Demo: xref:debug-stepinto-screencast.adoc[+Visual Step Into Action in NetBeans Debugger+]
+* Demo: xref:debug-deadlock-screencast.adoc[+Deadlock Detection Using the NetBeans Debugger+]
+* Demo: xref:debug-multithreaded-screencast.adoc[+Multithreaded Debugging with the NetBeans IDE+]
+* xref:debug-multithreaded.adoc[+Debugging Multithreaded Applications in NetBeans IDE+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/debug-multithreaded-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/debug-multithreaded-screencast.adoc
index 5c523802d..5f418bdcc 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/debug-multithreaded-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/debug-multithreaded-screencast.adoc
@@ -38,14 +38,14 @@ Time: 7:19
 link:http://bits.netbeans.org/media/netbeans-multithreaded-debugging.mp4[+Watch full size+] (Ctrl-Click to download, 6.5 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Multithreaded%20Debugging%20With%20the%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |       
 |===
 
 
 == Related links
 
-* link:debug-multithreaded.html[+Debugging Multithreaded Applications in NetBeans IDE+]
-* Demo: link:debug-stepinto-screencast.html[+Visual Step Into Action in NetBeans Debugger+]
-* Demo: link:debug-deadlock-screencast.html[+Deadlock Detection Using the NetBeans Debugger+]
-* Demo: link:debug-evaluator-screencast.html[+Using the Code Snippet Evaluator in the NetBeans Debugger+]
+* xref:debug-multithreaded.adoc[+Debugging Multithreaded Applications in NetBeans IDE+]
+* Demo: xref:debug-stepinto-screencast.adoc[+Visual Step Into Action in NetBeans Debugger+]
+* Demo: xref:debug-deadlock-screencast.adoc[+Deadlock Detection Using the NetBeans Debugger+]
+* Demo: xref:debug-evaluator-screencast.adoc[+Using the Code Snippet Evaluator in the NetBeans Debugger+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/debug-multithreaded.adoc b/netbeans.apache.org/src/content/kb/docs/java/debug-multithreaded.adoc
index d3eac6682..73998c256 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/debug-multithreaded.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/debug-multithreaded.adoc
@@ -66,7 +66,7 @@ When you click Finish, the IDE initializes the local folder as a Subversion repo
 
 . Click Open Project in the dialog that appears when checkout is complete.
 
-*Note.* For more about checking out sources with Subversion, see the section on link:../ide/subversion.html#settingUp[+Setting up Subversion+] in the link:../ide/subversion.html[+Guide to Subversion in NetBeans IDE+].
+*Note.* For more about checking out sources with Subversion, see the section on xref:../ide/subversion.adoc#settingUp[+Setting up Subversion+] in the xref:../ide/subversion.adoc[+Guide to Subversion in NetBeans IDE+].
 
 == Opening the Projects
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/debug-stepinto-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/debug-stepinto-screencast.adoc
index acea0e264..8b91558bc 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/debug-stepinto-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/debug-stepinto-screencast.adoc
@@ -38,14 +38,14 @@ Time: 3:24
 link:http://bits.netbeans.org/media/stepinto-debugger.mp4[+Watch full size+] (Ctrl-Click to download, 4 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Visual%20Step%20Into%20Action%20in%20NetBeans%20Debugger[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |         
 |===
 
 
 == Related links
 
-* Demo: link:debug-deadlock-screencast.html[+Deadlock Detection Using the NetBeans Debugger+]
-* Demo: link:debug-evaluator-screencast.html[+Using the Code Snippet Evaluator in the NetBeans Debugger+]
-* Demo: link:debug-multithreaded-screencast.html[+Multithreaded Debugging with the NetBeans IDE+]
-* link:debug-multithreaded.html[+Debugging Multithreaded Applications in NetBeans IDE+]
+* Demo: xref:debug-deadlock-screencast.adoc[+Deadlock Detection Using the NetBeans Debugger+]
+* Demo: xref:debug-evaluator-screencast.adoc[+Using the Code Snippet Evaluator in the NetBeans Debugger+]
+* Demo: xref:debug-multithreaded-screencast.adoc[+Multithreaded Debugging with the NetBeans IDE+]
+* xref:debug-multithreaded.adoc[+Debugging Multithreaded Applications in NetBeans IDE+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/debug-visual-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/debug-visual-screencast.adoc
index 3a002ff3a..6684b35d4 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/debug-visual-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/debug-visual-screencast.adoc
@@ -38,15 +38,15 @@ Time: 5:15
 link:http://bits.netbeans.org/media/visual-debug-screencast.mov[+Watch full size/Download+] (.mov) (Ctrl-Click to download, 36 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20the%20Visual%20Debugger%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |  
 |===
 
 
 == Related links
 
-* link:gui-functionality.html[+Introduction to Java GUI Building+]
-* link:debug-visual.html[+Using the Visual Debugger+]
-* Demo: link:debug-multithreaded-screencast.html[+Debugging a Multithreaded Application in NetBeans IDE+]
-* Demo: link:debug-stepinto-screencast.html[+Visual Step Into Action in NetBeans Debugger+]
-* Demo: link:debug-deadlock-screencast.html[+Deadlock Detection Using the NetBeans Debugger+]
+* xref:gui-functionality.adoc[+Introduction to Java GUI Building+]
+* xref:debug-visual.adoc[+Using the Visual Debugger+]
+* Demo: xref:debug-multithreaded-screencast.adoc[+Debugging a Multithreaded Application in NetBeans IDE+]
+* Demo: xref:debug-stepinto-screencast.adoc[+Visual Step Into Action in NetBeans Debugger+]
+* Demo: xref:debug-deadlock-screencast.adoc[+Deadlock Detection Using the NetBeans Debugger+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/editor-codereference.adoc b/netbeans.apache.org/src/content/kb/docs/java/editor-codereference.adoc
index 17f0d1479..e884665d7 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/editor-codereference.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/editor-codereference.adoc
@@ -485,7 +485,7 @@ Use the *New* and *Remove* buttons to modify the templates list. To edit an exis
 
 Choose your peferred key from the *Expand Template on:* list, to activate your template. The default key is  kbd:[Tab] . Finally, select an action from the *On Template Expansion:* list.
 
-See link:../php/code-templates.html[+Code Templates in NetBeans IDE for PHP+], for more information about templates.
+See xref:../php/code-templates.adoc[+Code Templates in NetBeans IDE for PHP+], for more information about templates.
 
 //========================================================= Code Templates (End)
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/editor-formatting-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/editor-formatting-screencast.adoc
index cdc2437e9..f691acdcd 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/editor-formatting-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/editor-formatting-screencast.adoc
@@ -44,7 +44,7 @@ Time: 7:40
 
 link:http://bits.netbeans.org/media/editor-formatting.mp4[+Watch full size/Download+] (.mp4) (Ctrl-Click to download, 19,2 MB)
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20the%20Code%20Formatting%20Features%20in%20the%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |  
 |===
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/gbcustomizer-advanced.adoc b/netbeans.apache.org/src/content/kb/docs/java/gbcustomizer-advanced.adoc
index ed965db8c..2be3babc3 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/gbcustomizer-advanced.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/gbcustomizer-advanced.adoc
@@ -34,10 +34,10 @@ The series is intended as a guide to show how you can layout your GUI components
 
 Each document in this series covers specific set of features.
 
-* Part 1: link:../java/gbcustomizer-basic.html[+Designing a Basic Java Form Using the GridBag Customizer+]
+* Part 1: xref:gbcustomizer-basic.adoc[+Designing a Basic Java Form Using the GridBag Customizer+]
 * Part 2: Designing an Advanced Java Form Using the GridBag Customizer
 
-The link:../java/gbcustomizer-basic.html[+first tutorial in the series+] demonstrated how to modify a simple Java form using the basic features of the NetBeans IDE GridBag Customizer. In this tutorial you will learn how to use the GridBag Customizer advanced features to change the existing form layout.
+The xref:gbcustomizer-basic.adoc[+first tutorial in the series+] demonstrated how to modify a simple Java form using the basic features of the NetBeans IDE GridBag Customizer. In this tutorial you will learn how to use the GridBag Customizer advanced features to change the existing form layout.
 
 
 *To follow this tutorial, you need the following software and resources.*
@@ -356,7 +356,7 @@ image::images/finallayout.png[]
 
 In this tutorial, you modified an existing form by adding new components, inserting rows, etc. When designing the layout you learned how to use the advanced features of the GridBag Customizer to reorganize the layout of the form.
 
-Go to link:../java/gbcustomizer-basic.html[+Designing a Basic Java Form Using the GridBag Customizer+]
+Go to xref:gbcustomizer-basic.adoc[+Designing a Basic Java Form Using the GridBag Customizer+]
 
 <<top,top>>
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/gbcustomizer-basic.adoc b/netbeans.apache.org/src/content/kb/docs/java/gbcustomizer-basic.adoc
index d340f4ff4..2e1388e44 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/gbcustomizer-basic.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/gbcustomizer-basic.adoc
@@ -35,7 +35,7 @@ The series is intended as a guide to show how you can layout your GUI components
 Each document in this series covers specific set of features.
 
 * Part 1: Designing a Basic Java Form Using the GridBag Customizer
-* Part 2: link:../java/gbcustomizer-advanced.html[+Designing an Advanced Java Form Using the GridBag Customizer+]
+* Part 2: xref:gbcustomizer-advanced.adoc[+Designing an Advanced Java Form Using the GridBag Customizer+]
 
 *To follow this tutorial, you need the software and resources listed below.*
 
@@ -275,11 +275,11 @@ image::images/contactsbasicfinal-small.png[role="left", link="images/contactsbas
 In this short tutorial, you designed a simple form. When editing the layout you learned how to use the basic features of the GridBag Customizer.
 You can now go to the second in a two-part series tutorial where you will modify the  ``ContactsAdvancedInitial``  form to get familiar with the GridBag Customizer advanced features.
 
-Go to link:../java/gbcustomizer-advanced.html[+Designing an Advanced Java Form Using the GridBag Customizer+]
+Go to xref:gbcustomizer-advanced.adoc[+Designing an Advanced Java Form Using the GridBag Customizer+]
 
 <<top,top>>
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Designing%20a%20Basic%20Java%20Form%20Using%20the%20GridBag%20Customizer[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/gui-automatic-i18n.adoc b/netbeans.apache.org/src/content/kb/docs/java/gui-automatic-i18n.adoc
index d4f29f5ec..5b737a220 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/gui-automatic-i18n.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/gui-automatic-i18n.adoc
@@ -206,7 +206,7 @@ image::images/run_small.png[role="left", link="images/run.png"]
 
 == Internationalizing an Entire Project
 
-Generally, we have several files in the default locale and we are asked to adapt them in order to be translated to other languages. The Internationalization Wizard is the perfect tool for this task, as it can internationalize multiple files at once. We will show this feature on the GUI Form examples project, which contains the form created in the link:quickstart-gui.html[+Designing a Swing GUI+] tutorial.
+Generally, we have several files in the default locale and we are asked to adapt them in order to be translated to other languages. The Internationalization Wizard is the perfect tool for this task, as it can internationalize multiple files at once. We will show this feature on the GUI Form examples project, which contains the form created in the xref:quickstart-gui.adoc[+Designing a Swing GUI+] tutorial.
 
 
 === Creating a Sample Project
diff --git a/netbeans.apache.org/src/content/kb/docs/java/gui-binding.adoc b/netbeans.apache.org/src/content/kb/docs/java/gui-binding.adoc
index a5b36438e..e6733b201 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/gui-binding.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/gui-binding.adoc
@@ -459,14 +459,14 @@ Below is a list of the synthetic properties added by the beans binding libraries
 
 |text_ON_ACTION_OR_FOCUS_LOST |The text property of a JTextComponent; notifies of change only when the component notifies of actionPerformed or when focus is lost on the component. 
 |===
-link:/about/contact_form.html?to=3&subject=Feedback:%20Binding%20Beans%20and%20Data%20in%20Java%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
 == See Also
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG2649[+Working with Database Applications and Beans Binding+] in _Developing Applications with NetBeans IDE_
-* link:gui-functionality.html[+Introduction to GUI Building+]
+* xref:gui-functionality.adoc[+Introduction to GUI Building+]
 * link:http://java.net/projects/beansbinding/[+Beans Binding - Java.net+]
 * link:http://docs.oracle.com/javase/tutorial/javabeans/index.html[+JavaBeans™ trail of the Java Tutorial+]
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#GUI_Editor_.28Matisse.29[+GUI Editor FAQ+]
+* xref:../../../wiki/NetBeansUserFAQ.adoc#GUI_Editor_.28Matisse.29[+GUI Editor FAQ+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/gui-builder-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/gui-builder-screencast.adoc
index 48db09118..a1a87cc9c 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/gui-builder-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/gui-builder-screencast.adoc
@@ -29,7 +29,7 @@
 :description: Designing a Swing GUI in NetBeans IDE - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Designing a Swing GUI in NetBeans IDE
 
-These screencasts walk you through designing a Swing GUI in the NetBeans IDE described in the link:../java/quickstart-gui.html[+Designing a Swing GUI in NetBeans IDE+] tutorial.
+These screencasts walk you through designing a Swing GUI in the NetBeans IDE described in the xref:quickstart-gui.adoc[+Designing a Swing GUI in NetBeans IDE+] tutorial.
 
 In the screencasts, you will see how to add, insert, align, resize, and indent components to layout a GUI front-end that enables you to view and edit contact information of individuals included in an employee database. You will learn how to effectively use the capabilities of the IDE's GUI Builder.
 
@@ -78,9 +78,10 @@ Time: 08:03
 
 == Related links
 
-* link:../intro-screencasts.html[+Guided Video Tour of the NetBeans IDE+]
+* xref:../intro-screencasts.adoc[+Guided Video Tour of the NetBeans IDE+]
 * link:https://netbeans.org/kb/index.html[+NetBeans IDE Tutorials: General Java Development +]
 * link:https://netbeans.org/kb/index.html[+NetBeans IDE Documentation +]
-link:/about/contact_form.html?to=3&subject=Feedback:%20Designing%20a%20Swing%20GUI%20in%20NetBeans%20IDE%20Screencast[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/gui-filechooser.adoc b/netbeans.apache.org/src/content/kb/docs/java/gui-filechooser.adoc
index 4cdf958e2..9e5111b5e 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/gui-filechooser.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/gui-filechooser.adoc
@@ -320,13 +320,13 @@ image::images/result_jfilechooserdemo-small.png[role="left", link="images/result
 
 Have a look at other useful Swing windows and dialogs like the ColorChooser or the OptionPane in the GUI Palette.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Adding%20a%20FileChooser[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
 == Next Steps
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG920[+Implementing Java GUIs+] in _Developing Applications with NetBeans IDE_
-* link:gui-binding.html[+Binding Beans and Data in a Java Application with NetBeans IDE+]
-* link:gui-automatic-i18n.html[+Internationalizing a GUI Form with NetBeans IDE+]
+* xref:gui-binding.adoc[+Binding Beans and Data in a Java Application with NetBeans IDE+]
+* xref:gui-automatic-i18n.adoc[+Internationalizing a GUI Form with NetBeans IDE+]
 * link:http://docs.oracle.com/javase/tutorial/uiswing/components/filechooser.html[+Java Tutorial: How to use File Choosers+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/gui-functionality.adoc b/netbeans.apache.org/src/content/kb/docs/java/gui-functionality.adoc
index 87492b2d8..89e046af5 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/gui-functionality.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/gui-functionality.adoc
@@ -35,8 +35,9 @@ This beginner tutorial teaches you how to create a simple graphical user interfa
 
 We will work through the layout and design of a GUI and add a few buttons and text fields. The text fields will be used for receiving user input and also for displaying the program output. The button will initiate the functionality built into the front end. The application we create will be a simple but functional calculator.
 
-For a more comprehensive guide to the GUI Builder's design features, including video demonstrations of the various design features, see link:quickstart-gui.html[+Designing a Swing GUI in NetBeans IDE+].
+For a more comprehensive guide to the GUI Builder's design features, including video demonstrations of the various design features, see xref:quickstart-gui.adoc[+Designing a Swing GUI in NetBeans IDE+].
 
+[[Exercise_1]]
 == Exercise 1: Creating a Project
 
 The first step is to create an IDE project for the application that we are going to develop. We will name our project  ``NumberAddition`` .
@@ -67,7 +68,7 @@ The IDE creates the `NumberAdditionUI` form and the `NumberAdditionUI` class wit
 
 === Adding Components: Making the Front End
 
-Next we will use the Palette to populate our application's front end with a JPanel. Then we will add three JLabels, three JTextFields, and three JButtons. If you have not used the GUI Builder before, you might find information in the link:quickstart-gui.html[+Designing a Swing GUI in NetBeans IDE+] tutorial on positioning components useful.
+Next we will use the Palette to populate our application's front end with a JPanel. Then we will add three JLabels, three JTextFields, and three JButtons. If you have not used the GUI Builder before, you might find information in the xref:quickstart-gui.adoc[+Designing a Swing GUI in NetBeans IDE+] tutorial on positioning components useful.
 
 Once you are done dragging and positioning the aforementioned components, the JFrame should look something like the following screenshot.
 
@@ -206,7 +207,7 @@ NOTE: The location of the  ``NumberAddition``  project directory depends on the
 
 After a few seconds, the application should start.
 
-NOTE: If double-clicking the JAR file does not launch the application, see link:../../articles/javase-deploy.html#troubleshooting[+this article+] for information on setting JAR file associations in your operating system.
+NOTE: If double-clicking the JAR file does not launch the application, see xref:../../articles/javase-deploy.adoc#troubleshooting[+this article+] for information on setting JAR file associations in your operating system.
 
 You can also launch the application from the command line.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/hibernate-java-se.adoc b/netbeans.apache.org/src/content/kb/docs/java/hibernate-java-se.adoc
index 6a33550a3..daa5c0a6f 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/hibernate-java-se.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/hibernate-java-se.adoc
@@ -33,15 +33,15 @@ In this tutorial, you use the NetBeans IDE to create and deploy a Java Swing app
 
 Hibernate is framework that provides tools for object relational mapping (ORM). The tutorial demonstrates the support for the Hibernate framework included in the IDE and how to use wizards to create the necessary Hibernate files. After creating the Java objects and configuring the application to use Hibernate, you create a GUI interface for searching and displaying the data.
 
-The application that you build in this tutorial is a companion administration application for the link:../web/hibernate-webapp.html[+DVD Store web application+]. This tutorial covers how to create an application that allows you to query an actor's profile based on the match with first name or last name. If you wish you can extend the application to query film details and to add/update/delete items. This tutorial uses MySQL and the Sakila database, but you can use any supported database s [...]
+The application that you build in this tutorial is a companion administration application for the xref:../web/hibernate-webapp.adoc[+DVD Store web application+]. This tutorial covers how to create an application that allows you to query an actor's profile based on the match with first name or last name. If you wish you can extend the application to query film details and to add/update/delete items. This tutorial uses MySQL and the Sakila database, but you can use any supported database s [...]
 
 Before starting this tutorial you may want to familiarize yourself with the following documentation.
 
 * Hibernate documentation at link:http://www.hibernate.org/[+hibernate.org+].
-* link:gui-functionality.html[+Introduction to GUI Building+]
-* link:../ide/mysql.html[+Connecting to a MySQL Database+] tutorial.
+* xref:gui-functionality.adoc[+Introduction to GUI Building+]
+* xref:../ide/mysql.adoc[+Connecting to a MySQL Database+] tutorial.
 
-To build this application using Maven, see link:maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+].
+To build this application using Maven, see xref:maven-hib-java-se.adoc[+Creating a Maven Swing Application Using Hibernate+].
 
 
 image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to the NetBeans IDE 7.2, 7.3, 7.4 and 8.0"]
@@ -70,7 +70,7 @@ This tutorial uses a MySQL database called  ``sakila`` . The sample database is
 
 The Sakila database is a free sample MySQL database that is available from the MySQL site. To create the sakila database you can download and install the Sakila Sample Database plugin using the Plugins manager. After you install the plugin you can create the sakila database from the Services window. The sakila database is added to the list of databases in the Create MySQL database dialog box.
 
-For more information on configuring the IDE to work with MySQL, see the link:../ide/mysql.html[+Connecting to a MySQL Database+] tutorial.
+For more information on configuring the IDE to work with MySQL, see the xref:../ide/mysql.adoc[+Connecting to a MySQL Database+] tutorial.
 
 1. Open the Plugins manager and install the Sakila Sample Database plugin.
 2. After installing the plugin, start the MySQL database server by expanding the Databases node in the Services window, right-clicking the MySQL Server node and choosing Start.
@@ -245,7 +245,7 @@ Now that you have the POJO and necessary Hibernate-related files you can create
 
 In this exercise you will create a simple JFrame Form with some fields for entering and displaying data. You will also add a button that will trigger a database query to retrieve the data.
 
-If you are not familiar with using the GUI builder to create forms, you might want to review the link:gui-functionality.html[+Introduction to GUI Building+] tutorial.
+If you are not familiar with using the GUI builder to create forms, you might want to review the xref:gui-functionality.adoc[+Introduction to GUI Building+] tutorial.
 
 
 === Creating the JFrame Form
@@ -515,7 +515,7 @@ When you click Finish, the IDE initializes the local folder as a Subversion repo
 
 . Click Open Project in the dialog that appears when checkout is complete.
 
-*Note.* You need a Subversion client to checkout the sources. For more about installing Subversion, see the section on link:../ide/subversion.html#settingUp[+Setting up Subversion+] in the link:../ide/subversion.html[+Guide to Subversion in NetBeans IDE+].
+*Note.* You need a Subversion client to checkout the sources. For more about installing Subversion, see the section on xref:../ide/subversion.adoc#settingUp[+Setting up Subversion+] in the xref:../ide/subversion.adoc[+Guide to Subversion in NetBeans IDE+].
 
 
 == Creating POJOs and Mapping Files Individually
@@ -617,7 +617,7 @@ NOTE: By default, the generated  ``class``  element has a closing tag. Because y
 
 Creating individual POJOs and Hibernate mapping files might be a convenient way to further customizing your application.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20Hibernate%20in%20a%20Java%20Swing%20Application[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -625,6 +625,6 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20Hibernate%20in%20
 
 For additional information on creating Swing GUI applications, see the following tutorials.
 
-* link:quickstart-gui.html[+Designing a Swing GUI in NetBeans IDE+]
-* link:gui-functionality.html[+Introduction to GUI Building+]
-* link:../../trails/matisse.html[+Java GUI Applications Learning Trail+]
+* xref:quickstart-gui.adoc[+Designing a Swing GUI in NetBeans IDE+]
+* xref:gui-functionality.adoc[+Introduction to GUI Building+]
+* xref:../matisse.adoc[+Java GUI Applications Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/index.adoc b/netbeans.apache.org/src/content/kb/docs/java/index.adoc
index 2f17fff0a..4331607ba 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/index.adoc
@@ -33,36 +33,36 @@ In addition to being a platform for multi-platform desktop applications, the Jav
 
 == Getting Started
 
-- link:quickstart.html[Java Quick Start Tutorial]
-- link:editor-codereference.html[ Code Assistance in the NetBeans IDE Java Editor: A Reference Guide]
+- xref:quickstart.adoc[Java Quick Start Tutorial]
+- xref:editor-codereference.adoc[ Code Assistance in the NetBeans IDE Java Editor: A Reference Guide]
 
 == Developing Java Applications
 
-- link:javase-intro.html[Developing General Java Applications]
-- link:code-inspect.html[Static Code Analysis in the NetBeans IDE Java Editor]
-- link:editor-inspect-transform.html[Refactoring with Inspect and Transform in the NetBeans IDE Java Editor]
-- link:javase-embedded.html[Using Oracle Java SE Embedded Support in NetBeans IDE]
-- link:javase-deploy.html[Packaging and Distributing Java Desktop Applications]
+- xref:javase-intro.adoc[Developing General Java Applications]
+- xref:code-inspect.adoc[Static Code Analysis in the NetBeans IDE Java Editor]
+- xref:editor-inspect-transform.adoc[Refactoring with Inspect and Transform in the NetBeans IDE Java Editor]
+- xref:javase-embedded.adoc[Using Oracle Java SE Embedded Support in NetBeans IDE]
+- xref:javase-deploy.adoc[Packaging and Distributing Java Desktop Applications]
 
 == Building, Debugging, and Testing
 
-- link:debug-visual.html[Using the Visual Debugger in NetBeans IDE]
-- link:junit-intro.html[Writing JUnit Tests in NetBeans IDE]
-- link:debug-multithreaded.html[Debugging Multi-threaded Applications in NetBeans IDE]
+- xref:debug-visual.adoc[Using the Visual Debugger in NetBeans IDE]
+- xref:junit-intro.adoc[Writing JUnit Tests in NetBeans IDE]
+- xref:debug-multithreaded.adoc[Debugging Multi-threaded Applications in NetBeans IDE]
 
 == Maven
 
-- link:http://wiki.netbeans.org/MavenBestPractices[Maven Best Practices]
-- link:maven-hib-java-se.html[Creating a Maven Swing Application Using Hibernate - NetBeans IDE Tutorial]
+- xref:../../../wiki/MavenBestPractices.adoc[Maven Best Practices]
+- xref:maven-hib-java-se.adoc[Creating a Maven Swing Application Using Hibernate - NetBeans IDE Tutorial]
 
 == Profiling Source Code
 
-- link:profiler-intro.html[Introduction to Profiling Java Applications in NetBeans IDE]
-- link:profiler-profilingpoints.html[Using Profiling Points in NetBeans IDE]
+- xref:profiler-intro.adoc[Introduction to Profiling Java Applications in NetBeans IDE]
+- xref:profiler-profilingpoints.adoc[Using Profiling Points in NetBeans IDE]
 
 == Scripting Languages
 
-- link:groovy-quickstart.html[Introduction to Groovy]
+- xref:groovy-quickstart.adoc[Introduction to Groovy]
 
 == JavaFX
 
@@ -74,13 +74,13 @@ In addition to being a platform for multi-platform desktop applications, the Jav
 
 == Java Swing
 
-- link:gui-functionality.html[Introduction to GUI Building]
-- link:native_pkg.html[Native Packaging in NetBeans IDE]
-- link:quickstart-gui-legend.html[GUI Builder Visual Feedback Legend]
-- link:gui-image-display.html[Handling Images in a Java GUI Application]
-- link:quickstart-gui.html[Designing a Swing GUI in NetBeans IDE]
-- link:gui-gaps.html[Gap Editing Support in the NetBeans GUI Builder]
-- link:gui-automatic-i18n.html[Internationalizing a GUI Form]
-- link:gbcustomizer-basic.html[Designing a Basic Java Form Using the GridBag Customizer]
-- link:gbcustomizer-advanced.html[Designing an Advanced Java Form Using the GridBag Customizer]
-- link:hibernate-java-se.html[Using Hibernate in a Java Swing Application]
+- xref:gui-functionality.adoc[Introduction to GUI Building]
+- xref:native_pkg.adoc[Native Packaging in NetBeans IDE]
+- xref:quickstart-gui-legend.adoc[GUI Builder Visual Feedback Legend]
+- xref:gui-image-display.adoc[Handling Images in a Java GUI Application]
+- xref:quickstart-gui.adoc[Designing a Swing GUI in NetBeans IDE]
+- xref:gui-gaps.adoc[Gap Editing Support in the NetBeans GUI Builder]
+- xref:gui-automatic-i18n.adoc[Internationalizing a GUI Form]
+- xref:gbcustomizer-basic.adoc[Designing a Basic Java Form Using the GridBag Customizer]
+- xref:gbcustomizer-advanced.adoc[Designing an Advanced Java Form Using the GridBag Customizer]
+- xref:hibernate-java-se.adoc[Using Hibernate in a Java Swing Application]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/introduce-refactoring-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/introduce-refactoring-screencast.adoc
index 43d2925a8..89aed22cd 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/introduce-refactoring-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/introduce-refactoring-screencast.adoc
@@ -47,13 +47,13 @@ Time: 7:56
 link:http://bits.netbeans.org/media/introduce-refactoring.swf[+Watch full size/Download+] (.swf) (Ctrl-Click to download, 5,6 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Refactoring%20Options%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  
 |===
 
 
 == Related links
 
-* link:editor-inspect-transform.html[+Refactoring with Inspect and Transform in the NetBeans IDE Java Editor+]
-* link:editor-codereference.html[+Code Assistance in the NetBeans IDE Java Editor: A Reference Guide+]
-* link:http://wiki.netbeans.org/Refactoring[+Refactoring Simplified+]
+* xref:editor-inspect-transform.adoc[+Refactoring with Inspect and Transform in the NetBeans IDE Java Editor+]
+* xref:editor-codereference.adoc[+Code Assistance in the NetBeans IDE Java Editor: A Reference Guide+]
+* xref:../../../wiki/Refactoring.adoc[+Refactoring Simplified+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/java-editor-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/java-editor-screencast.adoc
index a9fb339c8..d39533107 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/java-editor-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/java-editor-screencast.adoc
@@ -46,9 +46,11 @@ If you are having problems viewing the screencast on the right, allow the screen
 
 == Related links
 
-* link:../intro-screencasts.html[+Guided Video Tour of NetBeans IDE 6.9+]
+* xref:../intro-screencasts.adoc[+Guided Video Tour of NetBeans IDE 6.9+]
 * link:https://netbeans.org/kb/index.html[+NetBeans IDE Tutorials: General Java Development +]
 * link:https://netbeans.org/kb/index.html[+NetBeans IDE Documentation +]
-link:/about/contact_form.html?to=3&subject=Feedback: Editing Java Code in NetBeans IDE 6.9.1 Screencast[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
+
  |         
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/java/javase-deploy.adoc b/netbeans.apache.org/src/content/kb/docs/java/javase-deploy.adoc
index 2944560f1..913d5b624 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/javase-deploy.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/javase-deploy.adoc
@@ -279,6 +279,7 @@ You can see that only nine arguments are passed to the program at a time (in one
 
 More about batch scripting can be found on link:http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/batch.mspx[+this page+].
 
+[[troubleshooting]]
 == Troubleshooting Tips
 
 === Specifying JAR File Associations
@@ -361,6 +362,7 @@ NOTE: Starting with Windows Vista advanced file associations can be set via RegE
 
 For UNIX and Linux systems, the procedure for changing file associations depends on which desktop environment (such as GNOME or KDE) that you are using. Look in your desktop environment's preference settings or consult the documentation for the desktop environment.
 
+[[path]]
 === Setting the PATH Environment Variable
 
 If you can not run a Java class or JAR file on your system without pointing to the location of the JDK or JRE on your system, you might need to modify the value of your system's  ``PATH``  variable.
diff --git a/netbeans.apache.org/src/content/kb/docs/java/javase-intro.adoc b/netbeans.apache.org/src/content/kb/docs/java/javase-intro.adoc
index 04ffdddf6..1e4f812b0 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/javase-intro.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/javase-intro.adoc
@@ -41,7 +41,7 @@ The following short tutorial takes you through some of the basic steps of develo
 
 You will create an application that converts several words into a single word that contains one letter from each of the other words. The resulting word is called an _acrostic_.
 
-This tutorial takes approximately 30 minutes to complete. If you would like to do a quicker *Hello World* tutorial, see the link:quickstart.html[+NetBeans IDE Java Quick Start Tutorial+].
+This tutorial takes approximately 30 minutes to complete. If you would like to do a quicker *Hello World* tutorial, see the xref:quickstart.adoc[+NetBeans IDE Java Quick Start Tutorial+].
 
 //=============================================================== Preamble (End)
 
@@ -343,7 +343,7 @@ Press kbd:[F7] or, select *Debug > Step Into* from the menu bar to step through
 
 When the program reaches the end, the debugger windows close.
 
-For more information, see link:junit-intro.html[+Writing JUnit Tests in NetBeans IDE+].
+For more information, see xref:junit-intro.adoc[+Writing JUnit Tests in NetBeans IDE+].
 
 //================================== Testing and Debugging the Application (End)
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/javase-jdk7.adoc b/netbeans.apache.org/src/content/kb/docs/java/javase-jdk7.adoc
index 94852d1d9..f51d73aad 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/javase-jdk7.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/javase-jdk7.adoc
@@ -274,7 +274,7 @@ image::images/converted-small.png[role="left", link="images/converted.png"]
 
 --
 
-link:/about/contact_form.html?to=3&subject=Feedback: Overview of JDK 7 Support in NetBeans IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -288,6 +288,6 @@ For more information about JDK 7 and the NetBeans IDE, see:
 
 For more information about developing Java applications in the NetBeans IDE, see:
 
-* link:javase-intro.html[+Developing General Java Applications+]
-* link:../../trails/java-se.html[+General Java Development Learning Trail+]
+* xref:javase-intro.adoc[+Developing General Java Applications+]
+* xref:../java-se.adoc[+General Java Development Learning Trail+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG366[+Creating Java Projects+] in _Developing Applications with NetBeans IDE_
diff --git a/netbeans.apache.org/src/content/kb/docs/java/javase-jdk8.adoc b/netbeans.apache.org/src/content/kb/docs/java/javase-jdk8.adoc
index 6f014ef8e..280e7d055 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/javase-jdk8.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/javase-jdk8.adoc
@@ -309,8 +309,8 @@ NetBeans IDE support for repeating annotations allows you to write code with the
 
 * a repeatable annotation type must be marked with  ``@Repeatable ()`` , otherwise you get an error at compilation
 * a containing annotation type must have a  ``value``  element with an array type; the component type of the array type must be the repeatable annotation type
-link:/about/contact_form.html?to=3&subject=Feedback:%20Overview%20of%20JDK%208%20Support%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
 
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == See Also
@@ -326,5 +326,5 @@ For more information about JDK 8, see:
 For more information about developing Java applications in the NetBeans IDE, see:
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG366[+Creating Java Projects+] in _Developing Applications with NetBeans IDE_
-* link:javase-intro.html[+Developing General Java Applications+]
-* link:../../trails/java-se.html[+General Java Development Learning Trail+]
+* xref:javase-intro.adoc[+Developing General Java Applications+]
+* xref:../java-se.adoc[+General Java Development Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jdk7-nb70-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/jdk7-nb70-screencast.adoc
index e52b37959..a07d2261b 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jdk7-nb70-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jdk7-nb70-screencast.adoc
@@ -38,11 +38,11 @@ Time: 6:11
 link:http://bits.netbeans.org/media/jdk7-nb70.swf[+Watch full size/Download+] (.swf) (Ctrl-Click to download, 6,5 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20JDK%207%20Support%20in%20NetBeans%20IDE%207%20.%200[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  
 |===
 
 
 == Related links
 
-* link:javase-jdk7.html[+Overview of JDK 7 Support in NetBeans IDE+]
+* xref:javase-jdk7.adoc[+Overview of JDK 7 Support in NetBeans IDE+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jdk8-migration-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/jdk8-migration-screencast.adoc
index 582077f0b..d07df5f51 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jdk8-migration-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jdk8-migration-screencast.adoc
@@ -40,15 +40,15 @@ link:http://bits.netbeans.org/media/smart-migration-java8.mp4[+Download / Watch
  
 
 |
-link:/about/contact_form.html?to=3&subject=Feedback: Smart Migration to JDK 8 in NetBeans IDE[+Send Feedback on This Tutorial+] 
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 |===
 
 
 == Related links
 
 * link:http://openjdk.java.net/projects/jdk8/[+JDK 8 Project Page+]
-* link:https://netbeans.org/kb/docs/java/javase-jdk8.html[+Overview of JDK 8 Support in NetBeans IDE+]
+* xref:javase-jdk8.adoc[+Overview of JDK 8 Support in NetBeans IDE+]
 * link:https://netbeans.org/features/java/index.html[+NetBeans Feature Pages: Java+]
-* link:https://netbeans.org/kb/trails/java-se.html[+General Java Development NetBeans Learning Trail+]
+* xref:../java-se.adoc[+General Java Development NetBeans Learning Trail+]
 * link:http://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html[+The Java Tutorials: Lambda Expressions+]
 * link:http://apex.oracle.com/pls/apex/f?p=44785:24:114639602012411::::P24_CONTENT_ID,P24_PREV_PAGE:7919,24[+Oracle Learning Library: Java SE 8 Lambda Series+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jmx-getstart.adoc b/netbeans.apache.org/src/content/kb/docs/java/jmx-getstart.adoc
index 63e7cebc8..297c9628f 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jmx-getstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jmx-getstart.adoc
@@ -33,7 +33,7 @@ The NetBeans JMX Module integrates JMX technology right into your workflow in th
 
 This document has been updated for the JMX Wizard module version 3.0, for NetBeans IDE 6.5 and newer, and running on top of JDK 6 or JDK 7. You can download the JMX module from the Update Center.
 
-NOTE: This document is a short and quick introduction to the JMX module for NetBeans IDE. For more detailed information, complete the JMX Module Tutorial link:jmx-tutorial.html[+Adding JMX Instrumentation to a Java Application+].
+NOTE: This document is a short and quick introduction to the JMX module for NetBeans IDE. For more detailed information, complete the JMX Module Tutorial xref:jmx-tutorial.adoc[+Adding JMX Instrumentation to a Java Application+].
 
 This getting started document gives you an overview of the JMX module features:
 
@@ -48,7 +48,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 * Sample application based on the Anagram game that shows you how to add JMX power to your application.
 * Wizard to generate a management properties file, that allows you to launch a secure manageable JVM.
 * Online help.
-* Tutorials accessible from the link:../../index.html[+netbeans.org+] site.
+* Tutorials accessible from the xref:../../index.adoc[+netbeans.org+] site.
 
 
 == Prerequisites
@@ -98,7 +98,7 @@ You can add attributes and operations to your MBeans with the JMX contextual men
 
 To update an MBean, either select the MBean class Java file in the Project tree and access the JMX popup menu by right-clicking on the node, or simply right-click in the editor's window where your MBean class Java file is opened and access the JMX popup menu.
 
-These actions are demonstrated in Exercise 3 of the link:jmx-tutorial.html#Exercise_3[+ Adding JMX Instrumentation to a Java Application+] tutorial.
+These actions are demonstrated in Exercise 3 of the xref:jmx-tutorial.adoc#Exercise_3[+ Adding JMX Instrumentation to a Java Application+] tutorial.
 
 
 == Registering MBeans
@@ -111,7 +111,7 @@ Starting with JDK 5, the Java Platform provides a default MBean Server, called t
 
 Depending on its logic, determine where in your application code you want your MBeans to be registered, typically in the initialization phase of your Main class. Right-Click in your editor's window at the location where you want the MBean's registration code to be generated, select the JMX submenu and then the "Generate MBean Registration..." action.
 
-This action is demonstrated in Exercise 5 of the link:jmx-tutorial.html#Exercise_5[+ Adding JMX Instrumentation to a Java Application+] tutorial.
+This action is demonstrated in Exercise 5 of the xref:jmx-tutorial.adoc#Exercise_5[+ Adding JMX Instrumentation to a Java Application+] tutorial.
 
 
 == Implementing and Executing Manageable Applications
@@ -190,7 +190,7 @@ image::images/jmx-jconsole1.png[title="JConsole window"]
 
 image::images/jmx-jconsole2.png[title="JConsole window showing updated values"]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20JMX%20Monitoring[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -198,4 +198,4 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 
 This document was a short and quick introduction to the JMX module for NetBeans IDE. For more detailed information, see the following JMX module tutorial:
 
-* link:jmx-tutorial.html[+Adding JMX Instrumentation to a Java Application+]
+* xref:jmx-tutorial.adoc[+Adding JMX Instrumentation to a Java Application+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jmx-manager-tutorial.adoc b/netbeans.apache.org/src/content/kb/docs/java/jmx-manager-tutorial.adoc
index bdaa92cdf..00c75589d 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jmx-manager-tutorial.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jmx-manager-tutorial.adoc
@@ -279,7 +279,7 @@ BUILD SUCCESSFUL (total time: 1 second)
 *Yes, you are done! Great job!*
 We hope that this tutorial helped you understand how to develop manager applications in order to access information exported thanks to JMX.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Developing%20a%20Java%20Management%20Extensions%20Manager[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -287,5 +287,5 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Developing%20a%20Java%20M
 
 For more information, see the following:
 
-* link:jmx-getstart.html[+Getting Started with JMX Monitoring in NetBeans IDE+]
-* link:jmx-tutorial.html[+Adding Java Management Extensions (JMX) Instrumentation to a Java Application+]
+* xref:jmx-getstart.adoc[+Getting Started with JMX Monitoring in NetBeans IDE+]
+* xref:jmx-tutorial.adoc[+Adding Java Management Extensions (JMX) Instrumentation to a Java Application+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jmx-tutorial.adoc b/netbeans.apache.org/src/content/kb/docs/java/jmx-tutorial.adoc
index 87f5267e7..44bb2e42e 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jmx-tutorial.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jmx-tutorial.adoc
@@ -568,7 +568,7 @@ You can experiment with the JConsole interface and the Anagrams Game. For exampl
 
 *And now, you are done! You did a really good job, congratulations! *
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Adding%20Java%20Management%20Extensions%20(JMX)%20Instrumentation[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -576,4 +576,4 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Adding%20Java%20Managemen
 
 For more information, see the following:
 
-* link:jmx-getstart.html[+Getting Started with JMX Monitoring in NetBeans IDE+]
+* xref:jmx-getstart.adoc[+Getting Started with JMX Monitoring in NetBeans IDE+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/maven-hib-java-se.adoc b/netbeans.apache.org/src/content/kb/docs/java/maven-hib-java-se.adoc
index 4b8a55ddb..009281e06 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/maven-hib-java-se.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/maven-hib-java-se.adoc
@@ -33,9 +33,9 @@ In this tutorial, you use the NetBeans IDE to create a Java Swing application fr
 
 Support for Maven is fully integrated in NetBeans IDE and Maven 3 is bundled with the IDE. You can create applications from the bundled Maven archetypes or from archetypes in remote repositories in the New Project wizard. The Maven Repository Browser enables you to explore your local and remote Maven repositories, examine artifacts and add project dependencies to the project's POM.
 
-To build this application using Ant, see link:hibernate-java-se.html[+Using Hibernate in a Java Swing Application+].
+To build this application using Ant, see xref:hibernate-java-se.adoc[+Using Hibernate in a Java Swing Application+].
 
-To build a Maven Java EE application, see link:../javaee/maven-entapp.html[+Creating an Enterprise Application Using Maven+].
+To build a Maven Java EE application, see xref:../javaee/maven-entapp.adoc[+Creating an Enterprise Application Using Maven+].
 
 *To follow this tutorial, you need the following software and resources.*
 
@@ -61,7 +61,7 @@ This tutorial uses a MySQL database called  ``sakila`` . The sample database is
 
 The sakila database is a free sample MySQL database that is available from the MySQL site. To create the sakila database you can download and install the Sakila Sample Database plugin using the Plugins manager. After you install the plugin you can create the sakila database from the Services window. The sakila database is added to the list of databases in the Create MySQL database dialog box.
 
-For more information on configuring the IDE to work with MySQL, see the link:../ide/mysql.html[+Connecting to a MySQL Database+] tutorial.
+For more information on configuring the IDE to work with MySQL, see the xref:../ide/mysql.adoc[+Connecting to a MySQL Database+] tutorial.
 
 1. Open the Plugins manager and install the Sakila Sample Database plugin.
 2. After installing the plugin, start the MySQL database server by expanding the Databases node in the Services window, right-clicking the MySQL Server node and choosing Start.
@@ -118,7 +118,7 @@ When your cursor is over an artifact, the IDE displays a tooltip with the artifa
 
 You can search for an artifact by right-clicking the Maven Repositories node in the Services window and choosing Find.
 
-For more about managing Maven classpath dependencies and working with Maven repositories in the IDE, see the link:http://wiki.netbeans.org/MavenBestPractices#section-MavenBestPractices-DependencyManagement[+Dependency Management+] section of link:http://wiki.netbeans.org/MavenBestPractices[+Best Practices for Apache Maven in NetBeans IDE+].
+For more about managing Maven classpath dependencies and working with Maven repositories in the IDE, see the xref:../../../wiki/MavenBestPractices.adoc#section-MavenBestPractices-DependencyManagement[+Dependency Management+] section of xref:../../../wiki/MavenBestPractices.adoc[+Best Practices for Apache Maven in NetBeans IDE+].
 
 *Notes for NetBeans IDE 7.1 and earlier versions of the IDE.*
 
@@ -298,7 +298,7 @@ Now that you have the POJO and necessary Hibernate-related files you can create
 
 In this exercise you will create a simple JFrame Form with some fields for entering and displaying data. You will also add a button that will trigger a database query to retrieve the data.
 
-If you are not familiar with using the GUI builder to create forms, you might want to review the link:gui-functionality.html[+Introduction to GUI Building+] tutorial.
+If you are not familiar with using the GUI builder to create forms, you might want to review the xref:gui-functionality.adoc[+Introduction to GUI Building+] tutorial.
 
 === Creating the JFrame Form
 
@@ -606,7 +606,7 @@ When you click Finish, the IDE initializes the local folder as a Subversion repo
 *Notes.*
 
 * Steps for checking out sources from Kenai only apply to NetBeans IDE 6.7 and 6.8.
-* You need a Subversion client to checkout the sources from Kenai. For more about installing Subversion, see the section on link:../ide/subversion.html#settingUp[+Setting up Subversion+] in the link:../ide/subversion.html[+Guide to Subversion in NetBeans IDE+].
+* You need a Subversion client to checkout the sources from Kenai. For more about installing Subversion, see the section on xref:../ide/subversion.adoc#settingUp[+Setting up Subversion+] in the xref:../ide/subversion.adoc[+Guide to Subversion in NetBeans IDE+].
 
 == Creating POJOs and Mapping Files Individually
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/nb_fx_screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/nb_fx_screencast.adoc
index c025e1bb8..175031f7b 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/nb_fx_screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/nb_fx_screencast.adoc
@@ -42,13 +42,13 @@ Time: 7:04
 
 link:http://bits.netbeans.org/media/netbeans_fx.mp4[+Watch full size/Download+] (.mp4) (Ctrl-Click to download, 19,5 MB)
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Screencast%20-%20JavaFX%20Support%20in%20NetBeans%20IDE[+Send Us Your Feedback+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |  
 |===
 
 
 == Related links
 
-* link:http://wiki.netbeans.org/NewAndNoteworthyNB74[+NetBeans 74 New And Noteworthy+]
-* link:http://wiki.netbeans.org/JavaFX[+JavaFX - NetBeans Wiki+]
+* xref:../../../wiki/NewAndNoteworthyNB74.adoc[+NetBeans 74 New And Noteworthy+]
+* xref:../../../wiki/JavaFX.adoc[+JavaFX - NetBeans Wiki+]
 * link:http://docs.oracle.com/javafx/[+JavaFX 2 Documentation Home+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/profile-loadgenerator.adoc b/netbeans.apache.org/src/content/kb/docs/java/profile-loadgenerator.adoc
index 06af85990..46bf3b95d 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/profile-loadgenerator.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/profile-loadgenerator.adoc
@@ -150,12 +150,12 @@ This basic overview shows how to use a JMeter load testing script from within th
 
 * link:http://jakarta.apache.org/jmeter[+Apache JMeter Load Testing Tool+]
 * link:http://jakarta.apache.org/jmeter/usermanual/index.html[+JMeter User Manual+]
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20a%20Load%20Generator[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
 == See Also
 
-* link:../web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:profiler-intro.html[+Introduction to Profiling Java Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../web/quickstart-webapps.adoc[+Introduction to Developing Web Applications+]
+* xref:profiler-intro.adoc[+Introduction to Profiling Java Applications+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/profiler-intro.adoc b/netbeans.apache.org/src/content/kb/docs/java/profiler-intro.adoc
index 4d7cd0379..b6677efde 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/profiler-intro.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/profiler-intro.adoc
@@ -295,7 +295,7 @@ image::images/profile-java-compare.png[title="tab showing results of Liveness Co
 
 The snapshot comparison looks similar to a memory snapshot but only displays the differences between the two compared snapshots. When you look at the numbers in the columns you can see that a plus sign ( + ) indicates that the value increased and a minus sign ( - ) indicates that the value decreased. In the Live Bytes column a graphical bar enables you to easily see the difference in the bytes allocated. If the left half of the cell in that column is green it means that the number of all [...]
 
-*Note.* You can also set Take Snapshot profiling points for more precise control over when snapshots are taken. For more on how to take snapshots using profiling points, see link:../../docs/java/profiler-profilingpoints.html[+Using Profiling Points in NetBeans IDE+].
+*Note.* You can also set Take Snapshot profiling points for more precise control over when snapshots are taken. For more on how to take snapshots using profiling points, see xref:profiler-profilingpoints.adoc[+Using Profiling Points in NetBeans IDE+].
 
 == Conclusion
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/profiler-profilingpoints.adoc b/netbeans.apache.org/src/content/kb/docs/java/profiler-profilingpoints.adoc
index b2cc6c6e3..78c7c9417 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/profiler-profilingpoints.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/profiler-profilingpoints.adoc
@@ -44,7 +44,7 @@ This document will demonstrate how to use profiling points to obtain profiling d
 
 Before starting this tutorial you may want to familiarize yourself with using the profiling tool by reading the following documentation.
 
-* link:profiler-intro.html[+Introduction to Profiling Java Applications in NetBeans IDE+]
+* xref:profiler-intro.adoc[+Introduction to Profiling Java Applications in NetBeans IDE+]
 
 == Profiling Point Basics
 
@@ -182,7 +182,7 @@ When you click Run, the IDE launches the Anagram Game application and starts the
 
 image::images/ppoints-result-stopwatch.png[title="Screenshot of report of results for Stopwatch profiling point"]
 
-*Note.* If this is the first time that you are profiling a project, see link:profiler-intro.html[+Introduction to Profiling Java Applications in NetBeans IDE+] for details on calibration and profiler integration.
+*Note.* If this is the first time that you are profiling a project, see xref:profiler-intro.adoc[+Introduction to Profiling Java Applications in NetBeans IDE+] for details on calibration and profiler integration.
 
 === Taking a Snapshot or Heap Dump
 
@@ -224,7 +224,7 @@ image::images/saved-snapshots.png[title="Screenshot of New Reset Results pane"]
 
 For more about working with snapshots and heap dumps, see the following documents.
 
-* See the Taking Snapshots section of the link:profiler-intro.html[+Introduction to Profiling+] tutorial for more about viewing and comparing snapshots.
+* See the Taking Snapshots section of the xref:profiler-intro.adoc[+Introduction to Profiling+] tutorial for more about viewing and comparing snapshots.
 
 === Resetting Profiling Results
 
@@ -253,7 +253,9 @@ If you click *Show active profiling points* you can view the profiling points th
 
 When you click Run, the IDE launches the Anagram Game application and starts the profiling session. If you open the Profiling Points window you can see if the Reset Results profiling point was hit. If the profiling point was hit, you can click *report* in the Results column to open a window displaying data about the profiling point.
 
-image::images/ppoints-results-reset.png[title="Screenshot of report of results for Reset profiling point"]link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20Profiling%20Points[+Send Feedback on This Tutorial+]
+image::images/ppoints-results-reset.png[title="Screenshot of report of results for Reset profiling point"]
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 == Conclusion
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/profiler-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/profiler-screencast.adoc
index 81f81fbd1..3d7824511 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/profiler-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/profiler-screencast.adoc
@@ -39,9 +39,9 @@ link:http://mediacast.sun.com/details.jsp?id=4030[+Download+] ( 11.8 MB )
 
 If you experience problems with playing the video, you can stream it into a new browser page from this link:https://netbeans.org/download/flash/netbeans_60/profiler/profiler.html[+mirror site+].
 
-link:../../../community/media.html[+All NetBeans IDE Screencasts+]
+xref:../../../community/media.adoc[+All NetBeans IDE Screencasts+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Screencast%20-%20Profiling%20Points,%20Drill%20Down%20Graph,%20Heap%20Walker[+Send Feedback on This Tutorial+] |
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback] |
 
 Unable to load Flash player.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/quickstart-gui-legend.adoc b/netbeans.apache.org/src/content/kb/docs/java/quickstart-gui-legend.adoc
index f3b604f9e..32cf86a29 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/quickstart-gui-legend.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/quickstart-gui-legend.adoc
@@ -111,11 +111,11 @@ Once components have snapped into position, solid anchoring indicators appear il
 
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20GUI%20Builder%20Visual%20Feedback%20Legend,%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
 == See Also
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG920[+Implementing Java GUIs+] in _Developing Applications with NetBeans IDE_
-* link:../index.html[+General Java Development Learning Trail+]
+* xref:../index.adoc[+General Java Development Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/quickstart-gui.adoc b/netbeans.apache.org/src/content/kb/docs/java/quickstart-gui.adoc
index b890e45be..926dd5610 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/quickstart-gui.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/quickstart-gui.adoc
@@ -37,7 +37,7 @@ In this tutorial you will learn how to: use the GUI Builder Interface, create a
 
 The IDE's GUI Builder makes it possible to build professional-looking GUIs without an intimate understanding of layout managers. You can lay out your forms by simply placing components where you want them.
 
-For descriptions of the GUI Builder's visual feedback, you can use the link:quickstart-gui-legend.html[+GUI Builder Visual Feedback Legend+].
+For descriptions of the GUI Builder's visual feedback, you can use the xref:quickstart-gui-legend.adoc[+GUI Builder Visual Feedback Legend+].
 
 === Creating a Project
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/quickstart.adoc b/netbeans.apache.org/src/content/kb/docs/java/quickstart.adoc
index a87fd56ae..b53c180d9 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/quickstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/quickstart.adoc
@@ -141,7 +141,7 @@ image::images/editor-cc-maven2-small.png[role="left", link="images/editor-cc-mav
 
 --
 
-For a full description of editor assistance features, see link:https://netbeans.apache.org/kb/docs/java/editor-codereference.html[Code Assistance in the NetBeans IDE Java Editor: A Reference Guide].
+For a full description of editor assistance features, see xref:editor-codereference.adoc[Code Assistance in the NetBeans IDE Java Editor: A Reference Guide].
 
 == Running the Application
 
@@ -155,4 +155,4 @@ Congratulations! Your application works.
 
 You can view the build output by opening the Files window (from the Window menu) and expanding the `target` node.
 
-You now know how to accomplish the most common Java development tasks. To learn the complete Java development workflow, including testing and debugging, see link:https://netbeans.apache.org/kb/docs/java/javase-intro.html[Developing General Java Applications].
+You now know how to accomplish the most common Java development tasks. To learn the complete Java development workflow, including testing and debugging, see xref:javase-intro.adoc[Developing General Java Applications].
diff --git a/netbeans.apache.org/src/content/kb/docs/java/refactoring-nb71-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/refactoring-nb71-screencast.adoc
index 748ce979b..82b9dd91d 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/refactoring-nb71-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/refactoring-nb71-screencast.adoc
@@ -38,13 +38,13 @@ Time: 9:12
 link:http://bits.netbeans.org/media/refactor-nb71.swf[+Watch full size/Download+] (.swf) (Ctrl-Click to download, 9,4 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20the%20Inspect%20and%20Refactoring%20Feature%20in%20NetBeans%20IDE%207%20.%201[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  
 |===
 
 
 == Related links
 
-* link:editor-inspect-transform.html[+Refactoring with Inspect and Transform in the NetBeans IDE Java Editor+]
+* xref:editor-inspect-transform.adoc[+Refactoring with Inspect and Transform in the NetBeans IDE Java Editor+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG478[+Working with Java Code+] in _Developing Applications with NetBeans IDE_
-* link:http://wiki.netbeans.org/Refactoring[+Refactoring Simplified+]
+* xref:../../../wiki/Refactoring.adoc[+Refactoring Simplified+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/section.adoc b/netbeans.apache.org/src/content/kb/docs/java/section.adoc
index 6d4e6f6db..0cdbeef6f 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/section.adoc
@@ -19,62 +19,62 @@
 
 .Java Tutorials
 ************************************************
-- link:gui-filechooser.html[Adding a File Chooser to a Java Application]
-- link:jmx-tutorial.html[Adding Java Management Extensions (JMX) Instrumentation to a Java Application]
-- link:annotations.html[Annotation Processors Support in the NetBeans IDE]
-- link:annotations-lombok.html[Annotation Processors Support in the NetBeans IDE, Part I: Using Project Lombok]
-- link:annotations-custom.html[Annotation Processors Support in the NetBeans IDE, Part II: Using Own Custom Annotation Processors in the IDE]
-- link:gui-binding.html[Binding Beans and Data in a Java Application]
-- link:editor-codereference.html[ Code Assistance in the NetBeans IDE Java Editor: A Reference Guide]
-- link:maven-hib-java-se.html[Creating a Maven Swing Application Using Hibernate - NetBeans IDE Tutorial]
-- link:debug-multithreaded.html[Debugging Multi-threaded Applications in NetBeans IDE]
-- link:gbcustomizer-basic.html[Designing a Basic Java Form Using the GridBag Customizer]
-- link:gbcustomizer-advanced.html[Designing an Advanced Java Form Using the GridBag Customizer]
-- link:gui-builder-screencast.html[Designing a Swing GUI in NetBeans IDE]
-- link:quickstart-gui.html[Designing a Swing GUI in NetBeans IDE]
-- link:jmx-manager-tutorial.html[Developing a Java Management Extensions (JMX) Manager and Connecting to a Remote JMX Agent]
-- link:javase-intro.html[Developing General Java Applications]
-- link:java-editor-screencast.html[Editing Java Code in NetBeans IDE 6.9.1]
-- link:gui-gaps.html[Gap Editing Support in the NetBeans GUI Builder]
-- link:jmx-getstart.html[Getting Started with JMX Monitoring in NetBeans IDE]
-- link:quickstart-gui-legend.html[GUI Builder Visual Feedback Legend]
-- link:gui-image-display.html[Handling Images in a Java GUI Application]
-- link:gui-automatic-i18n.html[Internationalizing a GUI Form]
-- link:groovy-quickstart.html[Introduction to Groovy]
-- link:gui-functionality.html[Introduction to GUI Building]
-- link:profiler-intro.html[Introduction to Profiling Java Applications in NetBeans IDE]
-- link:index.html[Java Tutorials]
-- link:native_pkg.html[Native Packaging in NetBeans IDE]
-- link:quickstart.html[NetBeans IDE Java Quick Start Tutorial]
-- link:javase-jdk7.html[Overview of JDK 7 Support in NetBeans IDE]
-- link:javase-jdk8.html[Overview of JDK 8 Support in NetBeans IDE]
-- link:javase-deploy.html[Packaging and Distributing Java Desktop Applications]
-- link:profile-loadgenerator.html[]
-- link:profiler-screencast.html[Profiling Points, Drill Down Graph, Heap Walker in NetBeans IDE]
-- link:import-eclipse.html[Redirect Page]
-- link:project-setup.html[Redirect Page]
-- link:editor-inspect-transform.html[Refactoring with Inspect and Transform in the NetBeans IDE Java Editor]
-- link:section.html[]
-- link:code-inspect.html[Static Code Analysis in the NetBeans IDE Java Editor]
-- link:hibernate-java-se.html[Using Hibernate in a Java Swing Application]
-- link:javase-embedded.html[Using Oracle Java SE Embedded Support in NetBeans IDE]
-- link:profiler-profilingpoints.html[Using Profiling Points in NetBeans IDE]
-- link:debug-visual.html[Using the Visual Debugger in NetBeans IDE]
-- link:debug-deadlock-screencast.html[Video of Deadlock Detection Using the NetBeans Debugger]
-- link:nb_fx_screencast.html[Video of JavaFX Support in NetBeans IDE]
-- link:jdk8-nb74-screencast.html[Video of JDK 8 Support in NetBeans IDE 7.4]
-- link:jdk7-nb70-screencast.html[Video of NetBeans IDE Support for JDK 7]
-- link:jdk8-migration-screencast.html[Video of Smart Migration to JDK 8 in NetBeans IDE]
-- link:editor-formatting-screencast.html[Video of the Code Formatting Features in the NetBeans IDE]
-- link:refactoring-nb71-screencast.html[Video of the Inspect and Transform Refactoring Feature in NetBeans IDE]
-- link:debug-multithreaded-screencast.html[Video of the Multithreaded Debugging with the NetBeans IDE]
-- link:introduce-refactoring-screencast.html[Video of the Refactoring Options in NetBeans IDE]
-- link:code-inspect-screencast.html[Video of the Static Code Analysis Feature in the NetBeans IDE]
-- link:debug-visual-screencast.html[Video of the Using the Visual Debugger in NetBeans IDE]
-- link:testng-screencast.html[Video of Using TestNG in NetBeans IDE]
-- link:debug-evaluator-screencast.html[Video of Using the Code Snippet Evaluator in the NetBeans Debugger]
-- link:debug-stepinto-screencast.html[Video of Visual Step Into Action in NetBeans Debugger]
-- link:junit-intro.html[Writing JUnit Tests in NetBeans IDE]
+- xref:gui-filechooser.adoc[Adding a File Chooser to a Java Application]
+- xref:jmx-tutorial.adoc[Adding Java Management Extensions (JMX) Instrumentation to a Java Application]
+- xref:annotations.adoc[Annotation Processors Support in the NetBeans IDE]
+- xref:annotations-lombok.adoc[Annotation Processors Support in the NetBeans IDE, Part I: Using Project Lombok]
+- xref:annotations-custom.adoc[Annotation Processors Support in the NetBeans IDE, Part II: Using Own Custom Annotation Processors in the IDE]
+- xref:gui-binding.adoc[Binding Beans and Data in a Java Application]
+- xref:editor-codereference.adoc[ Code Assistance in the NetBeans IDE Java Editor: A Reference Guide]
+- xref:maven-hib-java-se.adoc[Creating a Maven Swing Application Using Hibernate - NetBeans IDE Tutorial]
+- xref:debug-multithreaded.adoc[Debugging Multi-threaded Applications in NetBeans IDE]
+- xref:gbcustomizer-basic.adoc[Designing a Basic Java Form Using the GridBag Customizer]
+- xref:gbcustomizer-advanced.adoc[Designing an Advanced Java Form Using the GridBag Customizer]
+- xref:gui-builder-screencast.adoc[Designing a Swing GUI in NetBeans IDE]
+- xref:quickstart-gui.adoc[Designing a Swing GUI in NetBeans IDE]
+- xref:jmx-manager-tutorial.adoc[Developing a Java Management Extensions (JMX) Manager and Connecting to a Remote JMX Agent]
+- xref:javase-intro.adoc[Developing General Java Applications]
+- xref:java-editor-screencast.adoc[Editing Java Code in NetBeans IDE 6.9.1]
+- xref:gui-gaps.adoc[Gap Editing Support in the NetBeans GUI Builder]
+- xref:jmx-getstart.adoc[Getting Started with JMX Monitoring in NetBeans IDE]
+- xref:quickstart-gui-legend.adoc[GUI Builder Visual Feedback Legend]
+- xref:gui-image-display.adoc[Handling Images in a Java GUI Application]
+- xref:gui-automatic-i18n.adoc[Internationalizing a GUI Form]
+- xref:groovy-quickstart.adoc[Introduction to Groovy]
+- xref:gui-functionality.adoc[Introduction to GUI Building]
+- xref:profiler-intro.adoc[Introduction to Profiling Java Applications in NetBeans IDE]
+- xref:index.adoc[Java Tutorials]
+- xref:native_pkg.adoc[Native Packaging in NetBeans IDE]
+- xref:quickstart.adoc[NetBeans IDE Java Quick Start Tutorial]
+- xref:javase-jdk7.adoc[Overview of JDK 7 Support in NetBeans IDE]
+- xref:javase-jdk8.adoc[Overview of JDK 8 Support in NetBeans IDE]
+- xref:javase-deploy.adoc[Packaging and Distributing Java Desktop Applications]
+- xref:profile-loadgenerator.adoc[]
+- xref:profiler-screencast.adoc[Profiling Points, Drill Down Graph, Heap Walker in NetBeans IDE]
+- xref:import-eclipse.adoc[Redirect Page]
+- xref:project-setup.adoc[Redirect Page]
+- xref:editor-inspect-transform.adoc[Refactoring with Inspect and Transform in the NetBeans IDE Java Editor]
+- xref:section.adoc[]
+- xref:code-inspect.adoc[Static Code Analysis in the NetBeans IDE Java Editor]
+- xref:hibernate-java-se.adoc[Using Hibernate in a Java Swing Application]
+- xref:javase-embedded.adoc[Using Oracle Java SE Embedded Support in NetBeans IDE]
+- xref:profiler-profilingpoints.adoc[Using Profiling Points in NetBeans IDE]
+- xref:debug-visual.adoc[Using the Visual Debugger in NetBeans IDE]
+- xref:debug-deadlock-screencast.adoc[Video of Deadlock Detection Using the NetBeans Debugger]
+- xref:nb_fx_screencast.adoc[Video of JavaFX Support in NetBeans IDE]
+- xref:jdk8-nb74-screencast.adoc[Video of JDK 8 Support in NetBeans IDE 7.4]
+- xref:jdk7-nb70-screencast.adoc[Video of NetBeans IDE Support for JDK 7]
+- xref:jdk8-migration-screencast.adoc[Video of Smart Migration to JDK 8 in NetBeans IDE]
+- xref:editor-formatting-screencast.adoc[Video of the Code Formatting Features in the NetBeans IDE]
+- xref:refactoring-nb71-screencast.adoc[Video of the Inspect and Transform Refactoring Feature in NetBeans IDE]
+- xref:debug-multithreaded-screencast.adoc[Video of the Multithreaded Debugging with the NetBeans IDE]
+- xref:introduce-refactoring-screencast.adoc[Video of the Refactoring Options in NetBeans IDE]
+- xref:code-inspect-screencast.adoc[Video of the Static Code Analysis Feature in the NetBeans IDE]
+- xref:debug-visual-screencast.adoc[Video of the Using the Visual Debugger in NetBeans IDE]
+- xref:testng-screencast.adoc[Video of Using TestNG in NetBeans IDE]
+- xref:debug-evaluator-screencast.adoc[Video of Using the Code Snippet Evaluator in the NetBeans Debugger]
+- xref:debug-stepinto-screencast.adoc[Video of Visual Step Into Action in NetBeans Debugger]
+- xref:junit-intro.adoc[Writing JUnit Tests in NetBeans IDE]
 ************************************************
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/testng-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/testng-screencast.adoc
index 5a4352b14..3a23b7788 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/testng-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/testng-screencast.adoc
@@ -38,15 +38,15 @@ Time: 5:20
 link:http://bits.netbeans.org/media/testng-screencast.mp4[+Watch full size/Download+] (.mp4) (Ctrl-Click to download, 31 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Using%20TestNG%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |  
 |===
 
 
 == Related links
 
-* link:junit-intro.html[+Writing JUnit Tests in NetBeans IDE+]
-* link:debug-visual.html[+Using the Visual Debugger+]
-* Demo: link:debug-multithreaded-screencast.html[+Debugging a Multithreaded Application in NetBeans IDE+]
-* Demo: link:debug-stepinto-screencast.html[+Visual Step Into Action in NetBeans Debugger+]
-* Demo: link:debug-deadlock-screencast.html[+Deadlock Detection Using the NetBeans Debugger+]
+* xref:junit-intro.adoc[+Writing JUnit Tests in NetBeans IDE+]
+* xref:debug-visual.adoc[+Using the Visual Debugger+]
+* Demo: xref:debug-multithreaded-screencast.adoc[+Debugging a Multithreaded Application in NetBeans IDE+]
+* Demo: xref:debug-stepinto-screencast.adoc[+Visual Step Into Action in NetBeans Debugger+]
+* Demo: xref:debug-deadlock-screencast.adoc[+Deadlock Detection Using the NetBeans Debugger+]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/cdi-events.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-events.adoc
index c8327c467..c890ae84c 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/cdi-events.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-events.adoc
@@ -273,7 +273,7 @@ INFO: Saving exercise2.Item@3cae5788 [Value=89, Limit=32] to file
 
 Events are a great way to decouple parts of the system in a modular fashion, as event observers and producers know nothing about each other, nor do they require any configuration for them to do so. You can add pieces of code that subscribe to events with the event producer unaware of the observer. (Without using events, you would typically need to have the event producer call the observer manually.) For example, if someone updates an order status, you could add events to email the sales  [...]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Working%20with%20Events%20in%20CDI[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/cdi-inject.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-inject.adoc
index 820b2266a..0d7bdcf99 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/cdi-inject.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-inject.adoc
@@ -628,7 +628,7 @@ public void initBeans(@Demo ItemDao itemDao, @SomeQualifier SomeType someBean) {
 
 The same rules apply to bean matching regardless of how the injection point is defined. CDI will try to find the best match based on type and qualifiers and will fail on deployment if there are multiple matching beans, or no matching beans for an injection point.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Working%20with%20Injection%20and%20Qualifiers%20in%20CDI[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/cdi-intro.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-intro.adoc
index a4cc7a115..15e2d9720 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/cdi-intro.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-intro.adoc
@@ -237,7 +237,7 @@ Amazingly, we turned our POJO into a fully-featured EJB with just one annotation
 
 You can also try using the `@Stateful` annotation. Alternatively, you could try the new `@Singleton` annotation for singleton instances. If you do, you may notice that there is are two annotations: `javax.ejb.Singleton` and `javax.inject.Singleton`. Why two singletons? The CDI singleton (`javax.inject.Singleton`) lets you define a singleton instance outside of EJB in case you are using CDI in a non-EJB environment. The EJB singleton (`javax.ejb.Singleton`) provides all the features of an [...]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20CDI%20and%20JSF%202.0[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -264,7 +264,7 @@ For more information about CDI and JSF 2.0, see the following resources.
 
 * xref:../web/jsf20-intro.adoc[+Introduction to JavaServer Faces 2.x+]
 * xref:../web/jsf20-crud.adoc[+Generating a JavaServer Faces 2.x CRUD Application from a Database+]
-* link:../../samples/scrum-toys.html[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
+* xref:../../samples/scrum-toys.adoc[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
 * link:http://www.oracle.com/technetwork/java/javaee/javaserverfaces-139869.html[+JavaServer Faces Technology+] (Official homepage)
 * link:http://docs.oracle.com/javaee/7/tutorial/doc/jsf-page.htm[+The Java EE 7 Tutorial: Using JavaServer Faces Technology in Web Pages+]
 * link:http://jcp.org/en/jsr/summary?id=314[+JSR 314: Specification for JavaServer Faces 2.0+]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/cdi-validate.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-validate.adoc
index 79cf403ed..4b053f7fa 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/cdi-validate.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-validate.adoc
@@ -437,8 +437,8 @@ INFO: Saving exercise2.Item@6257d812 [Value=34, Limit=7] to file
 INFO: Saving exercise2.Item@752ab82e [Value=89, Limit=32] to file
 INFO: Closing file error reporter
 ----
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20CDI%20Injection%20to%20Perform%20Custom%20Validation[+Send Feedback on This Tutorial+]
 
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 [[seealso]]
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 7fa94950f..ffab912ff 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
@@ -238,8 +238,7 @@ As stated in the link:http://download.oracle.com/javaee/6/tutorial/doc/bnapj.htm
 
 Suppose that the Affable Bean staff commission you at a later point to prepare a mobile version of their site, so users can access it using a hand-held device. JSF APIs are a flexible rendering technology that enable you to attach multiple renderers to the component tree (i.e., View) of a JSF-enabled application. In other words, it is possible to create custom components that, for example, render HTML when requested by a browser, or WML when requested by a PDA.
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Conclusion[+Send Us Your Feedback+]
-
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 [[seeAlso]]
@@ -257,7 +256,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 * 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+]
+* xref:../../../samples/scrum-toys.adoc[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
 
 *Contexts and Dependency Injection*
 
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 ff957cff4..6da377370 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
@@ -512,7 +512,7 @@ xref:../../../../community/mailing-lists.adoc[+Send Us Your Feedback+]
 
 === NetBeans Resources
 
-* link:../../../articles/mysql.html[+MySQL and NetBeans IDE+]
+* xref:../../../articles/mysql.adoc[+MySQL and 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+]
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 7166bc068..c4784ebb5 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
@@ -357,7 +357,8 @@ In order to plan the project, you need to extrapolate functional tasks from the
 * Create user roles and permissions for administration console
 * Create security roles on server
 * Declare security roles, constraints in deployment descriptor
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Designing the Application[+Send Us Your Feedback+]
+
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
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 3f26568ce..80d09f414 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
@@ -714,7 +714,7 @@ You can download link:https://netbeans.org/projects/samples/downloads/download/S
 
 In the next unit you explore session management, and how to enable the application to remember a user's actions as he or she clicks through the site. This is key to implementing a shopping cart mechanism in an e-commerce application.
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Adding Entity Classes and Session Beans[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -731,7 +731,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 * 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+]
+* xref:../../../../community/media.adoc[+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 bde34229d..6150cd986 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
@@ -36,7 +36,7 @@
 - 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]
+- xref:netbeans-ecommerce-tutorial.adoc[The NetBeans E-commerce Tutorial - Introduction]
 - 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]
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 e02707888..32fb92db1 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
@@ -297,20 +297,20 @@ Finally, IDEs usually provide enhanced editor support. The editor is where you l
 
 The NetBeans IDE is a free, open-source integrated development environment written entirely in Java. It offers a range of tools for create professional desktop, enterprise, web, and mobile applications with the Java language, C/C++, and even scripting languages such as PHP, JavaScript, Groovy, and Ruby.
 
-People are saying great things about NetBeans. For a list of testimonials, see link:../../../../features/ide/testimonials.html[+NetBeans IDE Testimonials+]. Many developers are migrating their applications to NetBeans from other IDEs. For reasons why, read link:../../../../switch/realstories.html[+Real Stories From People Switching to NetBeans IDE+].
+People are saying great things about NetBeans. For a list of testimonials, see xref:../../../../features/ide/testimonials.adoc[+NetBeans IDE Testimonials+]. Many developers are migrating their applications to NetBeans from other IDEs. For reasons why, read xref:../../../../switch/realstories.adoc[+Real Stories From People Switching to NetBeans IDE+].
 
-The IDE provides many link:../../../../features/web/index.html[+features for web development+], and several advantages over other IDEs. Here are several noteworthy points:
+The IDE provides many xref:../../../../features/web/index.adoc[+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, 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.
+* *Profiling and Debugging Tools:* With NetBeans IDE xref:../../../../features/java/profiler.adoc[+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: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 xref:../../../index.adoc[+official knowledge base+] provides hundreds of online tutorials, articles and link:../../../../community/media.html[+screencasts+] that are continuously being updated.
+* *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 xref:../../../index.adoc[+official knowledge base+] provides hundreds of online tutorials, articles and xref:../../../../community/media.adoc[+screencasts+] that are continuously being updated.
 
-For a more extensive list of reasons why you should consider choosing NetBeans, see link:../../../../switch/why.html[+NetBeans IDE Connects Developers+].
+For a more extensive list of reasons why you should consider choosing NetBeans, see xref:../../../../switch/why.adoc[+NetBeans IDE Connects Developers+].
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Introduction[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
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 62149f5ca..52b691cbd 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
@@ -1050,7 +1050,7 @@ if (orderId != 0) {
 
 This is demonstrated in link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot8.zip[+project snapshot 8+] (and later snapshots).
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Managing Sessions[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -1060,11 +1060,11 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 === NetBeans Resources
 
-* link:../../../../features/java/debugger.html[+NetBeans IDE Features: Debugger+]
+* xref:../../../../features/java/debugger.adoc[+NetBeans IDE Features: 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+]
+* xref:../../../../community/media.adoc[+Video Tutorials and Demos for NetBeans IDE+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
 * xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
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 aea0232bb..b3ac96d4c 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
@@ -1018,7 +1018,7 @@ At this stage, you've created JSP pages that contain placeholders for functional
 
 If you'd like to compare your work with the sample solution for this unit, you can link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_snapshot2.zip[+download snapshot 2 of the AffableBean project+].
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Preparing the Page Views and Controller Servlet[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -1032,17 +1032,17 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 * 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+]
+* xref:../../../../community/media.adoc[+Video Tutorials and Demos for NetBeans IDE+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
 * xref:../../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 
 === NetBeans Books
 
-* link:https://netbeans.org/kb/articles/netbeans-tips-and-tricks-book.html[+100 NetBeans IDE Tips and Tricks+]
+* xref:../../../articles/netbeans-tips-and-tricks-book.adoc[+100 NetBeans IDE Tips and Tricks+]
 * link:http://www.apress.com/book/view/1590598954[+Pro NetBeans IDE 6 Rich Client Platform Edition+]
 * link:http://apress.com/book/view/1430219548[+Beginning Java EE 6 Platform with GlassFish 3: From Novice to Professional+]
-* link:https://netbeans.org/kb/articles/books.html[+More books about NetBeans IDE+]
+* xref:../../../articles/books.adoc[+More books about NetBeans IDE+]
 
 
 === External Resources
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 6f2ecbb79..c9a823c79 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
@@ -29,7 +29,7 @@
 - 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]
+- xref:netbeans-ecommerce-tutorial.adoc[The NetBeans E-commerce Tutorial - Introduction]
 - 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]
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 e61ba83eb..f10b005d8 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
@@ -877,7 +877,9 @@ You have now successfully secured the `AffableBean` application according to the
 
 You can compare your work with the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fecommerce%252FAffableBean_complete.zip[+completed `AffableBean` project+]. The completed project includes the security implementation demonstrated in this unit, and also provides a basic implementation for web page error customization, such as when a request for a nonexistent resource is made, and the server returns an HTTP 404 'Not Found' error message.
 
-image::images/http-404.png[title="The browser address bar indicates that a secure connection is established for customer checkout"]link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Securing the Application[+Send Us Your Feedback+]
+image::images/http-404.png[title="The browser address bar indicates that a secure connection is established for customer checkout"]
+
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
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 5ed49b935..f282378c6 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
@@ -440,7 +440,7 @@ image::images/db-conn-affable-bean.png[title="Database connections contain the d
 
 At this stage, you've connected to the MySQL server from the IDE and have created a new database named `affablebean` which you'll use throughout the tutorial. Also, you've created a Java web project in the IDE, and have confirmed that it can be successfully built and deployed to your development server, and opened in a browser when run. Now that your development environment is ready, you can begin drafting the application's data model.
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Setting up the Development Environment[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -451,7 +451,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 === NetBeans Resources
 
 * xref:../../java/project-setup.adoc[+Creating, Importing, and Configuring Java Projects+]
-* link:../../../articles/mysql.html[+MySQL and NetBeans IDE+]
+* xref:../../../articles/mysql.adoc[+MySQL and 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+]
 
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 3ff421b30..b3684202d 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
@@ -124,6 +124,6 @@ You have set up the MySQL server and can connect to it from the IDE's Services w
 
 You can now open and run any of the project snapshots provided for you in the tutorial units.
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Setup Instructions[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
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 2df1dba8f..25e95f43e 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
@@ -510,7 +510,7 @@ Keep in mind that when running tests in this manner, your local server is compet
 [[profile]]
 == Using the NetBeans Profiler
 
-The NetBeans Profiler is an link:http://www.developer.com/java/other/article.php/3795991/Winners-of-the-Developercom-Product-of-the-Year-2009-Are-Announced.htm[+award winning+] development utility that enables you to profile and monitor your application's CPU and memory usage, and thread status. The Profiler is an integral component of the IDE, and offers a click-of-the-button profiling environment that aids you when handling memory and performance-related issues. For an overview of the  [...]
+The NetBeans Profiler is an link:http://www.developer.com/java/other/article.php/3795991/Winners-of-the-Developercom-Product-of-the-Year-2009-Are-Announced.htm[+award winning+] development utility that enables you to profile and monitor your application's CPU and memory usage, and thread status. The Profiler is an integral component of the IDE, and offers a click-of-the-button profiling environment that aids you when handling memory and performance-related issues. For an overview of the  [...]
 
 When profiling web applications, you can use the Profiler to work in tandem with a load script, such as a test plan created in JMeter. Often, problems start to arise only after your application has been running in a host environment for a certain period of time, and has begun serving multiple concurrent requests. In order to get an idea of how the application will perform before it is migrated to a production environment, you can launch the Profiler, run a test script on the application, [...]
 
@@ -751,7 +751,7 @@ Connection pool settings can also be specified in the `sun-resources.xml` descri
 </jdbc-connection-pool>
 ----
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Testing and Profiling[+Send Us Your Feedback+]
+xref:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Testing and Profiling[+Send Us Your Feedback+]
 
 
 
@@ -763,15 +763,15 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 === NetBeans Resources
 
 * link:http://profiler.netbeans.org/[+NetBeans Profiler+] [product page]
-* link:../../../../features/java/profiler.html[+NetBeans Profiler Features+]
+* xref:../../../../features/java/profiler.adoc[+NetBeans Profiler Features+]
 * 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+]
+* xref:../../../../wiki/HeapWalkerDemo.adoc[+HeapWalker Demo+]
 * 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+]
+* xref:../../../articles/nb-profiler-uncoveringleaks_pt1.adoc[+Uncovering Memory Leaks Using NetBeans Profiler+]
+* xref:../../../../community/magazine/html/04/profiler.adoc[+Advanced Profiling: Theory in Practice with NetBeans+]
 * link:https://netbeans.org/download/magazine/01/nb01_profiler.pdf[+Exploring the NetBeans Profiler+] [pdf]
 * link:https://channelsun.sun.com/media/show/14757?n=playlist&nid=81[+The New NetBeans IDE 6 Profiler+] [screencast]
 * link:https://netbeans.org/project_downloads/www/flashdemo/profiler-demo1.swf[+Getting Started with NetBeans Profiler 5.0+] [screencast]
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 210bc8445..145e9731e 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
@@ -981,7 +981,7 @@ Validation will also accept the same number in the following format.
 
 Because of the ambiguous nature in which this piece of user data is acquired, it might be necessary to remove any hyphens ('`-`') or other non-numeric characters prior to processing payment. This step would likely occur before the data is placed in storage.
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutorial - Integrating Transactional Business Logic[+Send Us Your Feedback+]
+xref:../../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/entappclient.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/entappclient.adoc
index f0d7aeeed..fe9b49239 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/entappclient.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/entappclient.adoc
@@ -238,7 +238,7 @@ image::images/appclient-buildoutput.png[title="The result in the Output window"]
 
 If you want to create additional EJBs, you can simply add the new remote interfaces of the EJBs to the EJBRemoteInterface class library project.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20an%20Application%20Client[+Send Us Your Feedback+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-entapp-ejb.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-entapp-ejb.adoc
index 62b8b95f2..55a541103 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-entapp-ejb.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-entapp-ejb.adoc
@@ -715,7 +715,7 @@ The following resources should be registered with the GlassFish server:
 * a Connection Factory resource with the JNDI name  ``jms/NewMessageFactory``  and type  `` javax.jms.QueueConnectionFactory`` 
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20an%20Enterprise%20Application%20with%20EJB%203.1[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-entapp-junit.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-entapp-junit.adoc
index 271c4e5d6..179bdc075 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-entapp-junit.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-entapp-junit.adoc
@@ -50,7 +50,7 @@ This tutorial demonstrates how to create and run JUnit tests for a Java EE enter
 |===
 |Software or Resource |Version Required 
 
-|link:/downloads/[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE bundle 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 
@@ -605,7 +605,7 @@ When you click Finish, the IDE initializes the local folder as a Subversion repo
 NOTE: You need a Subversion client to checkout the sources. For more about installing Subversion, see the section on xref:../ide/subversion.adoc#settingUp[+Setting up Subversion+] in the xref:../ide/subversion.adoc[+Guide to Subversion in NetBeans IDE+].
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20the%20Embedded%20EJB%20Container[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-js-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-js-screencast.adoc
index fd8fed84e..13be1d230 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-js-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-js-screencast.adoc
@@ -44,7 +44,7 @@ For more about working with HTML5 applications in NetBeans IDE, watch the follow
 * xref:../web/html5-css-screencast.adoc[HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications]
 * xref:../web/html5-javascript-screencast.adoc[HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications]
 
-xref:../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
 //|===
 
@@ -54,5 +54,5 @@ xref:../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 * xref:../webclient/html5-gettingstarted.adoc[Getting Started with HTML5 Applications]
 * xref:../webclient/html5-editing-css.adoc[Working with CSS Style Sheets in HTML5 Applications]
 * xref:../webclient/html5-js-support.adoc[Debugging and Testing JavaScript in HTML5 Applications]
-* link:../../wiki/HTML5.adoc[HTML5 Support in NetBeans IDE wiki page]
+* xref:../../../wiki/HTML5.adoc[HTML5 Support in NetBeans IDE wiki page]
 * xref:../php.adoc[PHP and HTML5 Learning Trail]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-pf-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-pf-screencast.adoc
index ddfa3099a..0ca7b62da 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-pf-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-pf-screencast.adoc
@@ -37,7 +37,7 @@ link:http://bits.netbeans.org/media/javaee-html5-primefaces.mp4[+Download / Watc
  
 
 |
-link:/about/contact_form.html?to=3&subject=Feedback: Getting Started with PrimeFaces Development in Java EE Applications[+Send Feedback on This Tutorial+] 
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 |===
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-screencast.adoc
index f4fef68ad..df70a7101 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted-screencast.adoc
@@ -38,7 +38,7 @@ Time: 6:16
 link:http://bits.netbeans.org/media/nb68-gettingstarted-javaee6.mov[+Download / Watch full size+] (25 MB)
 
 
-link:/about/contact_form.html?to=3&subject=Feedback: Getting Started with Java EE Applications Demo[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
 |===
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted.adoc
index 8bf03a94c..e01da1453 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-gettingstarted.adoc
@@ -447,7 +447,7 @@ When you click Finish, the IDE initializes the local folder as a Subversion repo
 NOTE: You need a Subversion client to checkout the sources. For more about installing Subversion, see the section on xref:../ide/subversion.adoc#settingUp[+Setting up Subversion+] in the xref:../ide/subversion.adoc[+Guide to Subversion in NetBeans IDE+].
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Java%20EE%206%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-intro.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-intro.adoc
index 102a1204c..04db038a8 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/javaee-intro.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/javaee-intro.adoc
@@ -154,7 +154,7 @@ Note that asynchronous invocation support is entirely implemented on the client
 The IDE provides tools to work with JAX-WS. You can use templates in the New File wizard to generate JAX-WS artifacts. Asynchronous web services can be created by means of a Web Service Customization editor. The code completion functionality includes annotations that you can use in your web services.
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Intro%20to%20Java%20EE%205%20Technology[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/jpa-eclipselink-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/jpa-eclipselink-screencast.adoc
index 1255e85ea..ccaf2c30c 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/jpa-eclipselink-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/jpa-eclipselink-screencast.adoc
@@ -37,7 +37,7 @@ Time: 12:23
 
 link:http://bits.netbeans.org/media/eclipselink-demo.flv[+Download+] [44.3 MB]
 
-link:/about/contact_form.html?to=3&subject=Feedback: JPA EclipseLink Screencast[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
 |===
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp-testing.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp-testing.adoc
index 8f63e90ca..ab9710721 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp-testing.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp-testing.adoc
@@ -31,7 +31,7 @@
 
 This tutorial demonstrates how to test a simple enterprise application using NetBeans IDE and Maven archetypes. In this tutorial you create an enterprise application that contains an entity class and a session bean. You will use a wizard to create a simple test class for the bean class and then run the test in the IDE. The test class will create an instance of the GlassFish embedded EJB container to test the connection to the database.
 
-NOTE:  If you are using GlassFish 3.1.x, please see link:../../73/javaee/maven-entapp-testing.html[+Testing a Maven Enterprise Application with Embedded GlassFish Server 3.1+]
+NOTE:  If you are using GlassFish 3.1.x, please see xref:../../73/javaee/maven-entapp-testing.adoc[+Testing a Maven Enterprise Application with Embedded GlassFish Server 3.1+]
 
 *Tutorial Exercises*
 
@@ -465,7 +465,7 @@ Tests run: 9, Failures: 0, Errors: 0, Skipped: 8
 ----
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20an%20Enterprise%20Application%20Using%20Maven[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp.adoc
index c1162f117..e91fb4277 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp.adoc
@@ -729,7 +729,7 @@ When you click Finish, the IDE initializes the local folder as a Subversion repo
 NOTE:  For more about installing Subversion, see the section on xref:../ide/subversion.adoc#settingUp[+Setting up Subversion+] in the xref:../ide/subversion.adoc[+Guide to Subversion in NetBeans IDE+].
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20an%20Enterprise%20Application%20Using%20Maven[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/maven-osgiservice-cdi.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/maven-osgiservice-cdi.adoc
index a654d1216..181f1af65 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/maven-osgiservice-cdi.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/maven-osgiservice-cdi.adoc
@@ -883,7 +883,7 @@ NOTE:  You might be prompted to enter the username and password to view the list
 You can scroll down the list to view the status of registered OSGi bundles and start and stop individual bundles. If you sort the list by Id (highest to lowest), you will see that the three bundles that you have deployed are displayed near the top of the list.
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20CDI%20to%20Inject%20OSGi%20Bundles%20as%20Services[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/maven-primefaces-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/maven-primefaces-screencast.adoc
index d5ba38517..3629a356f 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/maven-primefaces-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/maven-primefaces-screencast.adoc
@@ -40,8 +40,7 @@ link:http://bits.netbeans.org/media/prime-faces-nb8.mp4[+Download / Watch full s
  
 
 |
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20PrimeFaces%20Development%20with%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
- 
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial] 
 |===
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/maven-websocketapi-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/maven-websocketapi-screencast.adoc
index 7a70662de..6d2a8e09d 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/maven-websocketapi-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/maven-websocketapi-screencast.adoc
@@ -43,7 +43,7 @@ link:http://bits.netbeans.org/media/websocketapi-screencast.mp4[+Download / Watc
 
 * xref:maven-websocketapi.adoc[+Using the WebSocket API in a Web Application+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Using%20the%20WebSocket%20API%20in%20a%20Web%20Application[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
 |===
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/maven-websocketapi.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/maven-websocketapi.adoc
index f42393e34..8ee35679b 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/maven-websocketapi.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/maven-websocketapi.adoc
@@ -941,7 +941,7 @@ image::images/websocket-onebrowser-binary.png[title="Web console in browser disp
 If you click Send Snapshot the binary data is sent to the endpoint and broadcast to the connected clients.
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20the%20WebSocket%20API%20in%20a%20Web%20Application[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/profiler-javaee.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/profiler-javaee.adoc
index e5a805067..7a7a088dc 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/profiler-javaee.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/profiler-javaee.adoc
@@ -56,7 +56,7 @@ If you are deploying an application to a local registered Tomcat, GlassFish serv
 [NOTE]
 ====
 * If you are using the profiler for the first time, it is recommended that you read the xref:../java/profiler-intro.adoc[+Introduction to Profiling Java Applications in NetBeans IDE+] which provides an overview of the monitoring and profiling tasks.
-//* If you are using NetBeans IDE 7.2 or earlier, see link:../../72/javaee/profiler-javaee.html[+Profiling an Enterprise Application in NetBeans IDE 7.2+]
+//* If you are using NetBeans IDE 7.2 or earlier, see xref:../../72/javaee/profiler-javaee.adoc[+Profiling an Enterprise Application in NetBeans IDE 7.2+]
 * In this document you will profile an enterprise application deployed to the GlassFish server. The preferred and the easiest configuration for profiling an enterprise or web application during development is when the the application is running on a local Tomcat, GlassFish or JBoss server.
 ====
 
@@ -408,8 +408,7 @@ image::images/profile-memory-results.png[title="Profiling Results tab showing re
 
 By default the results are sorted and displayed by the number of Live Bytes, but you can click a column header to change how the results are displayed. You can also filter the results by typing a class name in the filter box below the list.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Profiling%20Enterprise%20Applications[+Send Feedback on This Tutorial+]
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 == See Also
@@ -420,17 +419,16 @@ For more detailed information about profiling settings and features not covered
 
 For related documentation, see the following resources:
 
-* link:http://wiki.netbeans.org/wiki/view/NetBeansUserFAQ#section-NetBeansUserFAQ-Profiler[+NetBeans Profiler FAQs+]
+* xref:../../../wiki/NetBeansUserFAQ.adoc#section-NetBeansUserFAQ-Profiler[+NetBeans Profiler FAQs+]
 A document containing frequently asked questions regarding profiling applications in NetBeans IDE
-* link:http://wiki.netbeans.org/wiki/view/FaqProfilerProfileFreeForm[+FAQ: Profiling a Free-form project+]
+* xref:../../../wiki/FaqProfilerProfileFreeForm.adoc[+FAQ: Profiling a Free-form project+]
 * xref:../java/profiler-screencast.adoc[+Screencast: Profiling Points, Drill Down Graph, Heap Walker+]
 Demo showing some of the profiling features in NetBeans IDE.
-* link:../../../community/magazine/html/04/profiler.html[+Advanced Profiling: Theory in Practice+]
+* xref:../../../community/magazine/html/04/profiler.adoc[+Advanced Profiling: Theory in Practice+]
 * link:http://profiler.netbeans.org/index.html[+profiler.netbeans.org+]
 The NetBeans profiler project site
 * link:http://blogs.oracle.com/nbprofiler/[+NetBeans Profiler blog+]
 * link:http://profiler.netbeans.org/mailinglists.html[+NetBeans Profiler Mailing Lists+]
 * link:http://profiler.netbeans.org/docs/help/5.5/index.html[+Using NetBeans Profiler 5.5+]
 
-<<top,top>>
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/section.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/section.adoc
index ff3afb4be..22b05d5a4 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/section.adoc
@@ -29,7 +29,7 @@
 - xref:javaee-intro.adoc[Introduction to Support for Java EE Technology in NetBeans IDE]
 - xref:index.adoc[JavaEE Tutorials]
 - xref:profiler-javaee.adoc[Profiling an Enterprise Application in NetBeans IDE]
-- link:section.html[]
+- xref:section.adoc[]
 - xref:maven-entapp-testing.adoc[Testing a Maven Enterprise Application]
 - xref:maven-osgiservice-cdi.adoc[Using CDI to Inject OSGi Bundles as Services in NetBeans IDE]
 - xref:jpa-eclipselink-screencast.adoc[Using JPA Support with EclipseLink]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/secure-ejb.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/secure-ejb.adoc
index 3ab9dc7e4..79fd3a4db 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/secure-ejb.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/secure-ejb.adoc
@@ -345,7 +345,7 @@ The account contains 250$
 
 This very basic example demonstrates how to use Java annotations to secure a method in an enterprise bean.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Building%20Secure%20Enterprise%20Beans[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/weblogic-javaee-m1-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/weblogic-javaee-m1-screencast.adoc
index 97bdc4976..69ae16762 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/weblogic-javaee-m1-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/weblogic-javaee-m1-screencast.adoc
@@ -40,7 +40,7 @@ link:http://bits.netbeans.org/media/weblogic4.mp4[+Watch full size+] (Ctrl-Click
 If you are having problems viewing the screencast on the right, allow the screencast to download before starting. Alternatively, you can click the link above to view the full-size version of the screencast.
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:  Deploying a Java EE Application to the Oracle WebLogic Server[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  |         
 |===
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/imp-ng.adoc b/netbeans.apache.org/src/content/kb/docs/javame/imp-ng.adoc
index de2e3f888..b1a2b19a6 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/imp-ng.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/imp-ng.adoc
@@ -38,7 +38,7 @@ Mobile embedded applications are employed in small embedded devices such as indu
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE with Java ME+] |Version 7.3 and more recent 
+|xref:../../../download/index.adoc[+NetBeans IDE with Java ME+] |Version 7.3 and more recent 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit+] (JDK) |Version 6, 7, or 8 
 
@@ -182,7 +182,6 @@ An IMP-NG application with an IMLet is created in a standard IDE project.
 
 image::images/prjcreated.png[]
 
-<<top,top>>
 
 
 == Running the Application
@@ -252,8 +251,6 @@ The application resumes running.
 . To stop the application and close the emulator, click Stop and choose Application > Exit from the emulator's menu.
 The run process is terminated in the IDE.
 
-<<top,top>>
-
 
 == Debugging the Application
 
@@ -261,8 +258,6 @@ Debugging embedded projects is accomplished similarly to debugging general Java
 
 Right-click on the project, and choose Debug to start a debugging session. The emulator opens and the program execution stops at any set breakpoints.
 
-<<top,top>>
-
 
 == Profiling the Application
 
@@ -337,19 +332,16 @@ NOTE: To save the data collected during the emulation session for future referen
 
 * export the data to a `nps` file by clicking the Export to button (image:images/export.png[])
 * save a snapshot to a `png` file by clicking the Save Current View to Image button (image:images/image.png[])
-link:/about/contact_form.html?to=6&subject=Creating,%20Debugging,%20and%20Profiling%20an%20Embedded%20Application[+Send Feedback on This Tutorial+]
-
 
-<<top,top>>
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 == See Also
 
-* link:imp-ng-screencast.html[+Demo: Support for IMP-NG Profile in NetBeans IDE+]
+* xref:imp-ng-screencast.adoc[+Demo: Support for IMP-NG Profile in NetBeans IDE+]
 * link:http://www.oracle.com/technetwork/java/javame/javamobile/training/jmesdk/index.html[+Java Mobile - Start Learning+]
 * link:http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html[+Oracle Java ME Embedded Client Documentation+]
 * link:https://blogs.oracle.com/javamesdk/[+Java ME SDK Team Blog+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+Developing Java ME Applications+] in _Developing Applications with NetBeans IDE_
 
-<<top,top>>
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/index.adoc b/netbeans.apache.org/src/content/kb/docs/javame/index.adoc
index 4d6ebe375..b952ca230 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/index.adoc
@@ -26,13 +26,13 @@
 :toc-title:
 :description: JavaME Tutorials
 
-- link:imp-ng.html[Creating, Debugging, and Profiling a Mobile Embedded Application]
-- link:java-card.html[Java Card Development Quick Start Guide]
-- link:javacard.html[Java Card Development Quick Start Guide]
-- link:index.html[JavaME Tutorials]
-- link:section.html[]
-- link:nb_me_plugins_screencast.html[Video of Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE]
-- link:nb_me8_screencast.html[Video of NetBeans IDE Support for Java ME 8]
+- xref:imp-ng.adoc[Creating, Debugging, and Profiling a Mobile Embedded Application]
+- xref:java-card.adoc[Java Card Development Quick Start Guide]
+- xref:javacard.adoc[Java Card Development Quick Start Guide]
+- xref:index.adoc[JavaME Tutorials]
+- xref:section.adoc[]
+- xref:nb_me_plugins_screencast.adoc[Video of Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE]
+- xref:nb_me8_screencast.adoc[Video of NetBeans IDE Support for Java ME 8]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/java-card.adoc b/netbeans.apache.org/src/content/kb/docs/javame/java-card.adoc
index 8f49afacc..a19cd6d89 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/java-card.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/java-card.adoc
@@ -48,7 +48,7 @@ image::../../../images_www/articles/68/netbeans-stamp.gif[title="Content on this
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |6.8 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |6.8 
 
 |link:http://java.sun.com/javacard/downloads/index.jsp[+Java Card SDK+] |3.02 
 
@@ -173,9 +173,9 @@ Currently the tools only support the Java Card 3.0.2 Reference Implementation, b
 
 Deployment is done through a set of Ant tasks provided by the card vendor. This means that the projects created can be run outside the IDE, there is no lock-in. The sources for the Ant tasks that are part of the Java Card RI can be downloaded from the link:http://kenai.com/projects/javacard[+Java Card project portal+], along with NetBeans-ready sample projects.
 
-Are you a card vendor who has created Java Card deployment tools? Contact plugin author link:mailto:tboudreau@sun.com[+Tim Boudreau+] for details on link:http://wiki.netbeans.org/JavaCardPlatformIntegration[+how to integrate your card+]! Integration can be done at several levels, depending on how much support you wish to provide within the IDE for your card.
+Are you a card vendor who has created Java Card deployment tools? Contact plugin author link:mailto:tboudreau@sun.com[+Tim Boudreau+] for details on xref:../../../wiki/JavaCardPlatformIntegration.adoc[+how to integrate your card+]! Integration can be done at several levels, depending on how much support you wish to provide within the IDE for your card.
 
-link:/about/contact_form.html?to=6&subject=NetBeans%20Java%20Card%20Development%20Quick%20Start%20Guide[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -184,5 +184,5 @@ link:/about/contact_form.html?to=6&subject=NetBeans%20Java%20Card%20Development%
 * A lot of the credit for these modules goes to link:http://blogs.oracle.com/javacard/[+Anki Nelaturu+] and the rest of the Java Card team.
 * link:http://java.sun.com/javacard[+Sun's Official Java Card Portal+] — news, development kits, reference, specifications, FAQ.
 * link:http://kenai.com/projects/javacard/pages/Home[+Java Card project portal+] — sources, sample projects, forums, documentation.
-* link:http://wiki.netbeans.org/JavaCardPlatformIntegration[+Platform Integration for Card vendors+]
+* xref:../../../wiki/JavaCardPlatformIntegration.adoc[+Platform Integration for Card vendors+]
 * link:http://java.sun.com/developer/technicalArticles/javacard/javacard-servlets/[+Deploying Servlets on Smart Cards: Portable Web Servers with Java Card 3.0+]
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/javacard.adoc b/netbeans.apache.org/src/content/kb/docs/javame/javacard.adoc
index 06980be93..d9db74adf 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/javacard.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/javacard.adoc
@@ -48,7 +48,7 @@ image::../../../images_www/articles/69/netbeans-stamp.gif[title="Content on this
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |6.9 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |6.9 
 
 |link:http://java.sun.com/javacard/downloads/index.jsp[+Java Card SDK+] |3.02 
 
@@ -173,9 +173,9 @@ Currently the tools only support the Java Card 3.0.2 Reference Implementation, b
 
 Deployment is done through a set of Ant tasks provided by the card vendor. This means that the projects created can be run outside the IDE, there is no lock-in. The sources for the Ant tasks that are part of the Java Card RI can be downloaded from the link:http://kenai.com/projects/javacard[+Java Card project portal+], along with NetBeans-ready sample projects.
 
-Are you a card vendor who has created Java Card deployment tools? Contact plugin author link:mailto:tboudreau@sun.com[+Tim Boudreau+] for details on link:http://wiki.netbeans.org/JavaCardPlatformIntegration[+how to integrate your card+]! Integration can be done at several levels, depending on how much support you wish to provide within the IDE for your card.
+Are you a card vendor who has created Java Card deployment tools? Contact plugin author link:mailto:tboudreau@sun.com[+Tim Boudreau+] for details on xref:../../../wiki/JavaCardPlatformIntegration.adoc[+how to integrate your card+]! Integration can be done at several levels, depending on how much support you wish to provide within the IDE for your card.
 
-link:/about/contact_form.html?to=6&subject=NetBeans%20Java%20Card%20Development%20Quick%20Start%20Guide[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
 
@@ -184,5 +184,5 @@ link:/about/contact_form.html?to=6&subject=NetBeans%20Java%20Card%20Development%
 * A lot of the credit for these modules goes to link:https://blogs.oracle.com/javacard/[+Anki Nelaturu+] and the rest of the Java Card team.
 * link:http://java.sun.com/javacard[+Sun's Official Java Card Portal+] — news, development kits, reference, specifications, FAQ.
 * link:http://kenai.com/projects/javacard/pages/Home[+Java Card project portal+] — sources, sample projects, forums, documentation.
-* link:http://wiki.netbeans.org/JavaCardPlatformIntegration[+Platform Integration for Card vendors+]
+* xref:../../../wiki/JavaCardPlatformIntegration.adoc[+Platform Integration for Card vendors+]
 * link:http://java.sun.com/developer/technicalArticles/javacard/javacard-servlets/[+Deploying Servlets on Smart Cards: Portable Web Servers with Java Card 3.0+]
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/nb_me8_screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javame/nb_me8_screencast.adoc
index 4f55c314e..fca35e35e 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/nb_me8_screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/nb_me8_screencast.adoc
@@ -45,17 +45,18 @@ link:http://bits.netbeans.org/media/nb_me_8.mp4[+Watch full size/Download+] (.mp
 
 NOTE: Closed captioning is available for this video. Click the CC button at the bottom of the video to turn closed captions on.
 
-link:/about/contact_form.html?to=6&subject=Feedback:%20Screencast%20-%20NetBeans%20IDE%20Support%20for%20Java%20ME%208%20EA[+Send Us Your Feedback+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
+
  |  |  |  
 |===
 
 
 == Related Links
 
-* link:http://wiki.netbeans.org/JavaMEEmbeddedHowTo[+Java ME Embedded How To+]
+* xref:../../../wiki/JavaMEEmbeddedHowTo.adoc[+Java ME Embedded How To+]
 * link:http://docs.oracle.com/javame/embedded/embedded.html[+Oracle Java ME for Embedded Devices Documentation+]
 * link:http://www.oracle.com/technetwork/java/embedded/documentation/me-e-otn-faq-1852008.pdf[+Oracle Java ME Embedded Overview and Frequently Asked Questions+]
-* link:http://wiki.netbeans.org/JavaMESDKSupport[+FAQ on Java ME SDK Support in NetBeans IDE+]
-* link:https://netbeans.org/kb/trails/mobility.html[+Java ME and Java Card Application Technology Trail+]
+* xref:../../../wiki/JavaMESDKSupport.adoc[+FAQ on Java ME SDK Support in NetBeans IDE+]
+* xref:../mobility.adoc[+Java ME and Java Card Application Technology Trail+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+Developing Java ME Applications+] in _Developing Applications with NetBeans IDE_
 * link:http://www.oracle.com/technetwork/java/javame/javamobile/download/overview/index.html[+Java for Mobile Devices Download+]
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/nb_me_plugins_screencast.adoc b/netbeans.apache.org/src/content/kb/docs/javame/nb_me_plugins_screencast.adoc
index 141260158..032883c1f 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/nb_me_plugins_screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/nb_me_plugins_screencast.adoc
@@ -49,7 +49,7 @@ link:http://bits.netbeans.org/media/nb_me_sdk_plugins.mp4[+Watch full size/Downl
 
 NOTE: Closed captioning is available for this video. Click the CC button at the bottom of the video to turn closed captions on.
 
-link:/about/contact_form.html?to=6&subject=Feedback:%20Screencast%20-%20Installing%20and%20Using%20Java%20ME%20SDK%208.0%20Plugins%20in%20NetBeans%20IDE[+Send Us Your Feedback+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
  |  |  |  
 |===
 
@@ -58,6 +58,6 @@ link:/about/contact_form.html?to=6&subject=Feedback:%20Screencast%20-%20Installi
 
 * link:http://www.oracle.com/technetwork/java/javame/javamobile/download/sdk/default-303768.html[+Oracle Java ME SDK Download+]
 * link:http://docs.oracle.com/javame/developer/developer.html[+Oracle Java ME Developer Tools Documentation+]
-* link:http://wiki.netbeans.org/JavaMESDKSupport[+FAQ on Java ME SDK Support in NetBeans IDE+]
-* link:https://netbeans.org/kb/trails/mobility.html[+Java ME and Java Card Application Technology Trail+]
+* xref:../../../wiki/JavaMESDKSupport.adoc[+FAQ on Java ME SDK Support in NetBeans IDE+]
+* xref:../mobility.adoc[+Java ME and Java Card Application Technology Trail+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+Developing Java ME Applications+] in _Developing Applications with NetBeans IDE_
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/section.adoc b/netbeans.apache.org/src/content/kb/docs/javame/section.adoc
index d3ba3384a..dd7fc25f1 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/section.adoc
@@ -19,13 +19,13 @@
 
 .JavaME Tutorials
 ************************************************
-- link:imp-ng.html[Creating, Debugging, and Profiling a Mobile Embedded Application]
-- link:java-card.html[Java Card Development Quick Start Guide]
-- link:javacard.html[Java Card Development Quick Start Guide]
-- link:index.html[JavaME Tutorials]
-- link:section.html[]
-- link:nb_me_plugins_screencast.html[Video of Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE]
-- link:nb_me8_screencast.html[Video of NetBeans IDE Support for Java ME 8]
+- xref:imp-ng.adoc[Creating, Debugging, and Profiling a Mobile Embedded Application]
+- xref:java-card.adoc[Java Card Development Quick Start Guide]
+- xref:javacard.adoc[Java Card Development Quick Start Guide]
+- xref:index.adoc[JavaME Tutorials]
+- xref:section.adoc[]
+- xref:nb_me_plugins_screencast.adoc[Video of Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE]
+- xref:nb_me8_screencast.adoc[Video of NetBeans IDE Support for Java ME 8]
 ************************************************
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/ajax-quickstart.adoc b/netbeans.apache.org/src/content/kb/docs/php/ajax-quickstart.adoc
index 78b5ef446..881d95418 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/ajax-quickstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/ajax-quickstart.adoc
@@ -387,7 +387,7 @@ and a `callback()` function <<callback,must later be defined>>. The HTTP interac
 
 The NetBeans IDE provides comprehensive support for web development using PHP. You can set up your development environment using an *AMP package, enabling you to edit and deploy from the IDE quickly and efficiently. The IDE allows you to configure your environment with a local server, as well as remotely, using FTP or SFTP. You can also configure an external debugger, such as link:http://xdebug.org/[+Xdebug+], and set up unit testing with link:http://www.phpunit.de/[+PHPUnit+] from the I [...]
 
-For applications requiring a database, the IDE supports wide-ranging support for most main-stream databases, especially MySQL. See the link:../../articles/mysql.html[+NetBeans MySQL screencast+] and link:../../../features/ide/database.html[+Database Integration+] features for more details.
+For applications requiring a database, the IDE supports wide-ranging support for most main-stream databases, especially MySQL. See the xref:../../articles/mysql.adoc[+NetBeans MySQL screencast+] and xref:../../../features/ide/database.adoc[+Database Integration+] features for more details.
 
 The business logic for the auto-complete application that you are building needs to process requests by retrieving data from the data store, then prepare and send the response. This is implemented here using a PHP file named `autocomplete`. Before you begin coding the file, set up the data store and the functionality required by the file to access data.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/editor-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/php/editor-screencast.adoc
index 92bf74ddc..27baa53c9 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/editor-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/editor-screencast.adoc
@@ -39,7 +39,7 @@ link:http://bits.netbeans.org/media/NetBeans65PHP_demo_part_II.flv[+Download+] [
 *Related links*
 
 * xref:project-config-screencast.adoc[+Demo of PHP support in NetBeans 6.5 - Part I: Projects and Configuration+]
-* link:../../../features/php/index.html[+NetBeans IDE for PHP+]
+* xref:../../../features/php/index.adoc[+NetBeans IDE for PHP+]
 * xref:../php.adoc[+The PHP Learning Trail+]
 * link:http://blogs.oracle.com/netbeansphp/[+NetBeans for PHP Weblog+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/namespace-code-completion-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/php/namespace-code-completion-screencast.adoc
index 423f78637..4bac1f3b0 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/namespace-code-completion-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/namespace-code-completion-screencast.adoc
@@ -41,7 +41,7 @@ link:http://bits.netbeans.org/media/php-namespaces.flv[+Download+] [27.4 MB]
 
 == Related links
 
-* link:../../../features/php/index.html[+NetBeans IDE for PHP+]
+* xref:../../../features/php/index.adoc[+NetBeans IDE for PHP+]
 * xref:../php.adoc[+The PHP Learning Trail+]
 * link:http://blogs.oracle.com/netbeansphp/[+NetBeans PHP Blog+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/php-editor-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/php/php-editor-screencast.adoc
index 74708c399..067b878da 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/php-editor-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/php-editor-screencast.adoc
@@ -40,10 +40,12 @@ link:https://netbeans.org/files/documents/4/2028/php_demo.zip[+Download+] ( 6.35
 *Related links*
 
 * xref:editor-screencast.adoc[+Petr's NetBeans IDE 6.9-7.0 PHP Editor Screencast+]
-* link:../../../features/php/index.html[+NetBeans IDE for PHP+]
+* xref:../../../features/php/index.adoc[+NetBeans IDE for PHP+]
 * xref:../php.adoc[+The PHP Learning Trail+]
 * link:http://blogs.oracle.com/netbeansphp/[+NetBeans for PHP Weblog+]
-link:../../../about/contact_form.html?to=3&subject=Feedback: Roman's 6.5 PHP Editor screencast[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
+
  |
 
 Unable to load Flash player.
diff --git a/netbeans.apache.org/src/content/kb/docs/php/php-variables-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/php/php-variables-screencast.adoc
index b71379552..887b5b609 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/php-variables-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/php-variables-screencast.adoc
@@ -39,9 +39,10 @@ link:http://bits.netbeans.org/media/php-cc-screencast-67.mov[+Download+] [19 MB]
 
 == Related links
 
-* link:../../../features/php/index.html[+NetBeans IDE for PHP+]
+* xref:../../../features/php/index.adoc[+NetBeans IDE for PHP+]
 * xref:../php.adoc[+The PHP Learning Trail+]
 * link:http://blogs.oracle.com/netbeansphp/[+NetBeans PHP Blog+]
-link:/about/contact_form.html?to=3&subject=Feedback: NB 6.7 php editor (declaring variables) screencast[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  |   
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/php/project-config-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/php/project-config-screencast.adoc
index 2e34b071b..98f0361af 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/project-config-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/project-config-screencast.adoc
@@ -40,9 +40,11 @@ link:http://bits.netbeans.org/media/NetBeans65PHP_demo_part_I.flv[+Download+] [1
 == Related links
 
 * xref:editor-screencast.adoc[+Demo of PHP support in NetBeans 6.5 - Part II: Editor Features +]
-* link:../../../features/php/index.html[+NetBeans IDE for PHP+]
+* xref:../../../features/php/index.adoc[+NetBeans IDE for PHP+]
 * xref:../php.adoc[+The PHP Learning Trail+]
 * link:http://blogs.oracle.com/netbeansphp/[+NetBeans PHP Blog+]
-link:/about/contact_form.html?to=3&subject=Feedback: NB 6.5 php demo 1 screencast[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
+
  |   
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson1.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson1.adoc
index b954c1233..dba2fbede 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson1.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson1.adoc
@@ -267,7 +267,7 @@ xref:wish-list-lesson2.adoc[+Next Lesson >>+]
 
 xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
 
-xref:../../../community/mailing-lists.adoc[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 xref:../php.adoc[+Back to the PHP Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/web/jsf20-crud.adoc b/netbeans.apache.org/src/content/kb/docs/web/jsf20-crud.adoc
index d4ca683df..b726061eb 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/jsf20-crud.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/jsf20-crud.adoc
@@ -824,7 +824,7 @@ For more information about JSF 2.x, see the following resources.
 
 * xref:jsf20-intro.adoc[Introduction to JavaServer Faces 2.x in NetBeans IDE]
 * xref:jsf20-support.adoc[JSF 2.x Support in NetBeans IDE]
-* link:../../samples/scrum-toys.html[Scrum Toys - The JSF 2.0 Complete Sample Application]
+* xref:../../samples/scrum-toys.adoc[Scrum Toys - The JSF 2.0 Complete Sample Application]
 * xref:../javaee/javaee-gettingstarted.adoc[Getting Started with Java EE Applications]
 * xref:../java-ee.adoc[Java EE &amp; Java Web Learning Trail]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/web/jsf20-intro.adoc b/netbeans.apache.org/src/content/kb/docs/web/jsf20-intro.adoc
index 3862d3202..028d25166 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/jsf20-intro.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/jsf20-intro.adoc
@@ -976,7 +976,7 @@ For more information about JSF 2.x, see the following resources.
 
 * xref:jsf20-support.adoc[+JSF 2.x Support in NetBeans IDE+]
 * xref:jsf20-crud.adoc[+Generating a JavaServer Faces 2.x CRUD Application from a Database+]
-* link:../../samples/scrum-toys.html[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
+* xref:../../samples/scrum-toys.adoc[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
 * xref:../javaee/javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/web/jsf20-support.adoc b/netbeans.apache.org/src/content/kb/docs/web/jsf20-support.adoc
index 968e52400..29e539f45 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/jsf20-support.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/jsf20-support.adoc
@@ -522,7 +522,7 @@ For more information about JSF 2.x, see the following resources.
 
 * xref:jsf20-intro.adoc[+Introduction to JavaServer Faces 2.x in NetBeans IDE+]
 * xref:jsf20-crud.adoc[+Generating a JavaServer Faces 2.x CRUD Application from a Database+]
-* link:../../samples/scrum-toys.html[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
+* xref:../../samples/scrum-toys.adoc[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
 * xref:../javaee/javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/cordova-gettingstarted.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/cordova-gettingstarted.adoc
index bf97a7556..86cc15531 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/cordova-gettingstarted.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/cordova-gettingstarted.adoc
@@ -33,7 +33,7 @@ This document demonstrates how to create an HTML5 project in the IDE that is pac
 
 This document demonstrates how to install the software that is necessary to install and develop an application with Cordova. After you install Cordova you will use the Cordova template in the New Project wizard to create a Cordova application. You will then add some code and run the application in the mobile device simulator. This tutorial will use the iOS simulator, but the steps are similar if you want to use an Android device emulator.
 
-To watch a screencast that demonstrates deploying a Cordova application to the Android emulator, see link:../web/html5-cordova-screencast.html[+Video of Getting Started with Cordova Development+].
+To watch a screencast that demonstrates deploying a Cordova application to the Android emulator, see xref:../web/html5-cordova-screencast.adoc[+Video of Getting Started with Cordova Development+].
 
 
 == To complete this tutorial, you will need the following resources.
@@ -41,7 +41,7 @@ To watch a screencast that demonstrates deploying a Cordova application to the A
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE, Java+] |8.0 
+|xref:../../../download/index.adoc[+NetBeans IDE, Java+] |8.0 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 
 
@@ -59,7 +59,7 @@ iOS
 *Notes:*
 
 * This document assumes that a compatible target mobile platform SDK and device emulator is already installed.
-* This document assumes that you have some basic knowledge of, or programming experience with HTML, CSS, and JavaScript. For more details on HTML5 support in NetBeans IDE, see link:html5-gettingstarted.html[+Getting Started with HTML5 Applications+]
+* This document assumes that you have some basic knowledge of, or programming experience with HTML, CSS, and JavaScript. For more details on HTML5 support in NetBeans IDE, see xref:html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+]
 
 
 == Installing Cordova
@@ -243,7 +243,7 @@ When you choose Run the IDE deploys the Cordova application to the emulator.
 
 image::images/cordova-ios7-run.png[title="Application in the iOS Simulator"]
 
-*Note.* If you are deploying to the iOS Simulator the simulator should open automatically. If you are deploying the application to an Android emulator you will need to configure and start the emulator before you run the application. To watch a screencast that demonstrates deploying a Cordova application to the Android emulator, see link:../web/html5-cordova-screencast.html[+Video of Getting Started with Cordova Development+].
+*Note.* If you are deploying to the iOS Simulator the simulator should open automatically. If you are deploying the application to an Android emulator you will need to configure and start the emulator before you run the application. To watch a screencast that demonstrates deploying a Cordova application to the Android emulator, see xref:../web/html5-cordova-screencast.adoc[+Video of Getting Started with Cordova Development+].
 
 
 == Modifying the Application
@@ -553,7 +553,7 @@ image::images/cordova-network-monitor.png[title="Variables window"]
 
 In this tutorial you have learned how to install and setup the required software to create a Cordova application in the IDE. You also learned how to create a Cordova application and modify some of the Cordova configuration settings.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Creating%20a%20Cordova%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -561,11 +561,11 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
-* [Video] link:../web/html5-cordova-screencast.html[+Getting Started with Cordova Development+]
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* [Video] xref:../web/html5-cordova-screencast.adoc[+Getting Started with Cordova Development+]
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG2272[+Creating JavaScript Files+] in _Developing Applications with NetBeans IDE_.
 
 For more information about jQuery, refer to the official documentation:
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/html5-editing-css.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/html5-editing-css.adoc
index bf06bd866..93e1a762d 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/html5-editing-css.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/html5-editing-css.adoc
@@ -33,9 +33,9 @@ HTML5 applications typically combine HTML, CSS and JavaScript to create applicat
 
 The NetBeans Connector extension for the Chrome browser can help you view applications as they would appear on various devices. The extension enables the Chrome browser and the IDE to communicate with each other. The Inspect in NetBeans mode can help you locate elements in your source code by selecting them in the browser. After you select an element in the browser you can use the IDE to view the CSS rules and properties that are applied to that element.
 
-For details on how to install the NetBeans Connector extension for the Chrome browser, see the tutorial link:html5-gettingstarted.html[+Getting Started with HTML5 Applications+].
+For details on how to install the NetBeans Connector extension for the Chrome browser, see the tutorial xref:html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+].
 
-To watch a screencast of this tutorial, see link:../web/html5-css-screencast.html[+Video of Working with CSS Style Sheets in HTML5 Applications+].
+To watch a screencast of this tutorial, see xref:../web/html5-css-screencast.adoc[+Video of Working with CSS Style Sheets in HTML5 Applications+].
 
 
 == To complete this tutorial, you will need the following resources.
@@ -43,7 +43,7 @@ To watch a screencast of this tutorial, see link:../web/html5-css-screencast.htm
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE, Java+] |7.4, 8.0 
+|xref:../../../download/index.adoc[+NetBeans IDE, Java+] |7.4, 8.0 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |7 or 8 
 
@@ -51,7 +51,7 @@ To watch a screencast of this tutorial, see link:../web/html5-css-screencast.htm
 
 |link:https://chrome.google.com/webstore/detail/netbeans-connector/hafdlehgocfcodbgjnpecfajgkeejnaa?utm_source=chrome-ntp-icon[+NetBeans Connector Extension for Chrome+] |1.1 or newer 
 
-|link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[+HTML5DemoSiteTemplate.zip+] |-- 
+|xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[+HTML5DemoSiteTemplate.zip+] |-- 
 
 |CSS preprocessor |link:http://sass-lang.com/install[+Sass+] or
 link:http://lesscss.org/[+LESS+] 
@@ -59,18 +59,18 @@ link:http://lesscss.org/[+LESS+]
 
 *Notes:*
 
-* The link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[+HTML5DemoSiteTemplate.zip+] is a site template that you will use when you create the project.
-* If you would like to compare your project with a working solution, you can download the link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5DemoCssSiteTemplate.zip[+site template+] of the finished project.
+* The xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[+HTML5DemoSiteTemplate.zip+] is a site template that you will use when you create the project.
+* If you would like to compare your project with a working solution, you can download the xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5DemoCssSiteTemplate.zip[+site template+] of the finished project.
 * This document assumes you have some basic knowledge of, or programming experience with HTML, CSS, and JavaScript.
 
 
 == Creating the HTML5 Application
 
-In this tutorial you use a site template to create the HTML5 project. The site template that you use in this tutorial is the same template that was saved as a site template in the link:html5-gettingstarted.html[+Getting Started with HTML5 Applications+] tutorial. If you performed the steps in the Getting Started tutorial you can use the site template that you saved in the last section. Alternatively, you can download the HTML5DemoSiteTemplate.zip site template.
+In this tutorial you use a site template to create the HTML5 project. The site template that you use in this tutorial is the same template that was saved as a site template in the xref:html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+] tutorial. If you performed the steps in the Getting Started tutorial you can use the site template that you saved in the last section. Alternatively, you can download the HTML5DemoSiteTemplate.zip site template.
 
 Perform the following steps to create the application from a site template.
 
-1. Download the HTML5 site template (link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[+HTML5DemoSiteTemplate+])
+1. Download the HTML5 site template (xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[+HTML5DemoSiteTemplate+])
 2. Choose File > New Project (Ctrl-Shift-N; ⌘-Shift-N on Mac) in the main menu to open the New Project wizard.
 3. Select the *HTML5* category and then select *HTML5 Application*. Click Next.
 4. Type *HTML5DemoCss* for the project name and specify a location. Click Next.
@@ -85,7 +85,7 @@ When you click Finish the IDE creates the project and opens the  ``index.html``
 
 In this tutorial you will run the application in the Chrome browser with the NetBeans Connector extension installed. When the extension is installed you can use the NetBeans menu in the browser to easily resize the browser window to view the application as it would appear on some common devices.
 
-*Notes.* For this tutorial it is recommended that you use the Chrome browser and install the NetBeans extension for Chrome. See the tutorial link:html5-gettingstarted.html[+Getting Started with HTML5 Applications+] for details on how to install the NetBeans Connector extension.
+*Notes.* For this tutorial it is recommended that you use the Chrome browser and install the NetBeans extension for Chrome. See the tutorial xref:html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+] for details on how to install the NetBeans Connector extension.
 
 Perform the following steps to run the application in the Chrome browser.
 
@@ -427,7 +427,7 @@ When you save the file the page in the browser is automatically updated. You can
 
 In this tutorial, you learned how to add and modify the CSS rules of an HTML5 application to improve how the application is displayed on a device with a smaller screen size. You viewed the application in a browser that was resized to that of a standard smartphone. You used the Inspect in NetBeans Mode in the Chrome browser to help you locate CSS style rules and then modified the rules to optimize the layout for a smaller screen size.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Working%20With%20CSS%20Style%20Sheets%20in%20an%20HTML5%20Application[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -435,10 +435,10 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Working%20With%20CSS%20St
 [[seealso]]
 == See Also
 
-For more information about support for HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
-* link:html5-gettingstarted.html[+Getting Started with HTML5 Applications+]. A document that demonstrates how to install the NetBeans Connector extension for Chrome and creating and running a simple HTML5 application.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+]. A document that demonstrates how to install the NetBeans Connector extension for Chrome and creating and running a simple HTML5 application.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
 * link:http://docs.oracle.com/cd/E50453_01/doc.80/e50452/dev_html_apps.htm[+Developing HTML5 Applications+] chapter in the link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG[+Developing Applications with NetBeans IDE User's Guide+]
 
 For more information about jQuery, refer to the official documentation:
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/html5-gettingstarted.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/html5-gettingstarted.adoc
index b09aa487f..d3fe1fc35 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/html5-gettingstarted.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/html5-gettingstarted.adoc
@@ -33,7 +33,7 @@ This document demonstrates how to create an HTML5 project in the IDE and some of
 
 This document also demonstrates how to install the NetBeans Connector extension for the Chrome browser from the Chrome Web Store.
 
-For a tutorial on how to use jQuery in a NetBeans Java web application, see the tutorial link:../web/js-toolkits-jquery.html[+Using jQuery to Enhance the Appearance and Usability of a Web Page+].
+For a tutorial on how to use jQuery in a NetBeans Java web application, see the tutorial xref:../web/js-toolkits-jquery.adoc[+Using jQuery to Enhance the Appearance and Usability of a Web Page+].
 
 To complete this tutorial, you will need the following resources:
 
@@ -44,14 +44,14 @@ To complete this tutorial, you will need the following resources:
 
 |link:https://chrome.google.com/webstore/detail/netbeans-connector/hafdlehgocfcodbgjnpecfajgkeejnaa?utm_source=chrome-ntp-icon[+NetBeans Connector Extension for Chrome+] |1.0.0 or greater 
 
-|link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5Demo-projectresources.zip[+HTML5 Demo project resources+] |-- 
+|xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5Demo-projectresources.zip[+HTML5 Demo project resources+] |-- 
 
-|link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[Site template of finished project] |-- 
+|xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[Site template of finished project] |-- 
 |===
 
-NOTE: The link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5Demo-projectresources.zip[+project resources zip file+] contains the JPG images and the CSS file that you need to add to the project in this tutorial.
+NOTE: The xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5Demo-projectresources.zip[+project resources zip file+] contains the JPG images and the CSS file that you need to add to the project in this tutorial.
 
-NOTE: If you would like to compare your project with a working solution, you can download the link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[site template] of the finished project.
+NOTE: If you would like to compare your project with a working solution, you can download the xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5DemoSiteTemplate.zip[site template] of the finished project.
 
 == Using the IDE with the Chrome Browser
 
@@ -320,7 +320,7 @@ image::images/html5-bower-7.png[title="bower7"]
 
 In this exercise you will add the project resources to the project and edit the  ``index.html``  file to add links to the resources and add some CSS rules. You will see how a few simple CSS selectors when combined with JavaScript can significantly change how a page is displayed in a browser.
 
-1. Download the link:https://netbeans.org/projects/samples/downloads/download/Samples/Web%20Client/HTML5Demo-projectresources.zip[+project resources+] archive and extract the contents.
+1. Download the xref:../../../index.adocprojects/samples/downloads/download/Samples/Web%20Client/HTML5Demo-projectresources.zip[+project resources+] archive and extract the contents.
 
 The ZIP archive contains two folders with files that you need to add to the project:  ``pix``  and  ``css`` .
 
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/html5-js-support.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/html5-js-support.adoc
index cd04d3517..67fc74c88 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/html5-js-support.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/html5-js-support.adoc
@@ -35,11 +35,11 @@ When you want to debug the JavaScript files in your HTML5 application it is reco
 
 The IDE also enables you to easily configure and run unit tests on JavaScript files using the Jasmine testing framework and the Karma or the JS Test Driver test runners. You can configure the test runner to run unit tests against a variety of browsers and you can quickly specify the JavaScript libraries, scripts and tests that you want the IDE to load when running the tests. When a test fails you can use the debugger to help you locate the problematic code.
 
-For details on how to install the NetBeans Connector extension for the Chrome browser, see the tutorial link:html5-gettingstarted.html[+Getting Started with HTML5 Applications+].
+For details on how to install the NetBeans Connector extension for the Chrome browser, see the tutorial xref:html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+].
 
 For more information on the JavaScript editing features in the IDE, see link:http://docs.oracle.com/cd/E50453_01/doc.80/e50452/dev_html_apps.htm#BACFIFIG[+Creating JavaScript Files+] in the link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG[+Developing Applications with NetBeans IDE User's Guide+].
 
-To watch a screencast of this tutorial, see link:../web/html5-javascript-screencast.html[+Video of Testing and Debugging JavaScript in HTML5 Applications+].
+To watch a screencast of this tutorial, see xref:../web/html5-javascript-screencast.adoc[+Video of Testing and Debugging JavaScript in HTML5 Applications+].
 
 
 == To complete this tutorial, you will need the following resources.
@@ -47,7 +47,7 @@ To watch a screencast of this tutorial, see link:../web/html5-javascript-screenc
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE, Java+] |8.0 
+|xref:../../../download/index.adoc[+NetBeans IDE, Java+] |8.0 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |7 or 8 
 
@@ -440,7 +440,7 @@ Alternatively, you can choose Debug > Evaluate Expression in the main menu to op
 
 In this tutorial you learned how the IDE provides tools that can help you debug and run unit tests on JavaScript files. Debugging is automatically enabled for HTML5 applications when you run the application in the Chrome browser and the NetBeans Connector extension is enabled. The IDE also enables you to easily configure and run unit tests on JavaScript files using the Jasmine testing framework and the JS Test Driver server.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Debugging%20and%20Testing%20JavaScript%20in%20HTML5%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -448,10 +448,10 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Debugging%20and%20Testing
 [[seealso]]
 == See Also
 
-For more information about support for HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
-* link:html5-gettingstarted.html[+Getting Started with HTML5 Applications+]. A document that demonstrates how to install the NetBeans Connector extension for Chrome and creating and running a simple HTML5 application.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+]. A document that demonstrates how to install the NetBeans Connector extension for Chrome and creating and running a simple HTML5 application.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
 * link:http://docs.oracle.com/cd/E50453_01/doc.80/e50452/dev_html_apps.htm[+Developing HTML5 Applications+] chapter in the link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG[+Developing Applications with NetBeans IDE User's Guide+]
 
 For more information about running unit tests using JS Test Driver, refer to the following documentation:
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/html5-knockout-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/html5-knockout-screencast.adoc
index 5ccfc6e71..4d48a9e64 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/html5-knockout-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/html5-knockout-screencast.adoc
@@ -54,13 +54,13 @@ Author: John Jullion-Ceccarelli
  
 
 |
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Using%20KnockoutJS%20in%20an%20HTML5%20Application[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
 |===
 
 
 == Related links
 
-* link:html5-gettingstarted.html[+Getting Started with HTML5 Applications+]
+* xref:html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+]
 * link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans Web Client blog+]
-* link:../../trails/php.html[+PHP and HTML5 Learning Trail+]
+* xref:../php.adoc[+PHP and HTML5 Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/index.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/index.adoc
index 826922a17..7a425d14c 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/index.adoc
@@ -26,25 +26,25 @@
 :toc-title:
 :description: HTML5 Tutorials
 
-- link:ojet-chatbot.html[Chatbot Integration with Oracle JET]
-- link:ojet-cca.html[Composite Component Architecture in Oracle JET]
-- link:ojet-crud.html[CRUD Application Development with Oracle JET]
-- link:ojet-flex.html[CSS3 Flexible Box and Oracle JET]
-- link:html5-js-support.html[Debugging and Testing JavaScript in an HTML5 Application]
-- link:cordova-gettingstarted.html[Getting Started with Cordova Applications]
-- link:html5-gettingstarted.html[Getting Started with HTML5 Applications]
-- link:ojet-gettingstarted.html[Getting Started with Oracle JET in NetBeans IDE]
-- link:index.html[HTML5 Tutorials]
-- link:ojet-rest.html[Interacting with RESTful Web Services in Oracle JET]
-- link:ojet-porting.html[Porting an Application to Oracle JET]
-- link:section.html[]
-- link:ojet-settingup.html[Setting Up an Oracle JET Application]
-- link:ojet-intermodular.html[Strategies for Intermodular Communication in Oracle JET]
-- link:ojet-databinding.html[Using Data Bindings to Connect Components]
-- link:ojet-cookbook.html[Using the Oracle JET Cookbook]
-- link:html5-knockout-screencast.html[Video of Using KnockoutJS in an HTML5 Application]
-- link:html5-editing-css.html[Working with CSS Style Sheets in an HTML5 Application]
-- link:ojet-working.html[Working with Oracle JET Applications]
+- xref:ojet-chatbot.adoc[Chatbot Integration with Oracle JET]
+- xref:ojet-cca.adoc[Composite Component Architecture in Oracle JET]
+- xref:ojet-crud.adoc[CRUD Application Development with Oracle JET]
+- xref:ojet-flex.adoc[CSS3 Flexible Box and Oracle JET]
+- xref:html5-js-support.adoc[Debugging and Testing JavaScript in an HTML5 Application]
+- xref:cordova-gettingstarted.adoc[Getting Started with Cordova Applications]
+- xref:html5-gettingstarted.adoc[Getting Started with HTML5 Applications]
+- xref:ojet-gettingstarted.adoc[Getting Started with Oracle JET in NetBeans IDE]
+- xref:index.adoc[HTML5 Tutorials]
+- xref:ojet-rest.adoc[Interacting with RESTful Web Services in Oracle JET]
+- xref:ojet-porting.adoc[Porting an Application to Oracle JET]
+- xref:section.adoc[]
+- xref:ojet-settingup.adoc[Setting Up an Oracle JET Application]
+- xref:ojet-intermodular.adoc[Strategies for Intermodular Communication in Oracle JET]
+- xref:ojet-databinding.adoc[Using Data Bindings to Connect Components]
+- xref:ojet-cookbook.adoc[Using the Oracle JET Cookbook]
+- xref:html5-knockout-screencast.adoc[Video of Using KnockoutJS in an HTML5 Application]
+- xref:html5-editing-css.adoc[Working with CSS Style Sheets in an HTML5 Application]
+- xref:ojet-working.adoc[Working with Oracle JET Applications]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-cca.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-cca.adoc
index 015cf9503..bc5ce0b32 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-cca.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-cca.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 
 In this exercise you set up an Oracle JET application and explore its default content.
 
-1. Follow the steps described in link:ojet-settingup.html[+Setting Up an Oracle JET Application+].
+1. Follow the steps described in xref:ojet-settingup.adoc[+Setting Up an Oracle JET Application+].
 
 
 [start=2]
@@ -174,7 +174,7 @@ Also read link:http://docs.oracle.com/middleware/jet320/jet/developer/GUID-18F9F
 
 Congratulations! You have now learned how to create and load CCA components in your Oracle JET applications.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20CCA[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -182,8 +182,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-chatbot.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-chatbot.adoc
index 40e267e45..1fd652134 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-chatbot.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-chatbot.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 
 In this exercise you set up an Oracle JET application and explore its default content.
 
-1. Follow the steps described in link:ojet-settingup.html[+Setting Up an Oracle JET Application+].
+1. Follow the steps described in xref:ojet-settingup.adoc[+Setting Up an Oracle JET Application+].
 
 
 [start=2]
@@ -120,7 +120,7 @@ Also read link:http://docs.oracle.com/middleware/jet320/jet/developer/GUID-18F9F
 
 Congratulations! You have now learned how to create and load CCA components in your Oracle JET applications.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20CCA[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -128,8 +128,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-cookbook.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-cookbook.adoc
index 9be3adf6e..7cc2cfd32 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-cookbook.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-cookbook.adoc
@@ -180,7 +180,7 @@ As an exercise, choose some other Oracle JET components from the Oracle JET Cook
 
 Congratulations! You have now learned how to use the Oracle JET Cookbook.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Oracle%20JET%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -188,8 +188,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-crud.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-crud.adoc
index 7a8dae071..2518fd8dc 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-crud.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-crud.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 
 In this exercise you set up an Oracle JET application and explore its default content.
 
-1. Follow the steps described in link:ojet-settingup.html[+Setting Up an Oracle JET Application+].
+1. Follow the steps described in xref:ojet-settingup.adoc[+Setting Up an Oracle JET Application+].
 
 
 [start=2]
@@ -208,7 +208,7 @@ image::images/navdrawer_5.png[]
 
 Congratulations! You have now learned how to create and load modules into your Oracle JET applications.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Oracle%20JET%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -216,8 +216,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-databinding.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-databinding.adoc
index 45e7dd94f..8f92a37c7 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-databinding.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-databinding.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 
 In this section, you copy/paste Oracle JET components into your JET applications.
 
-1. As described in link:https://netbeans.org/kb/docs/webclient/ojet-cookbook.html[+Using the Oracle JET Cookbook+], you can copy/paste Oracle JET components from the Oracle JET Cookbook into your Oracle JET application. At this stage, you should have the link:http://www.oracle.com/webfolder/technetwork/jet/jetCookbook.html?component=barChart&demo=default[+Bar Chart+] component in your application, as shown below:
+1. As described in xref:ojet-cookbook.adoc[+Using the Oracle JET Cookbook+], you can copy/paste Oracle JET components from the Oracle JET Cookbook into your Oracle JET application. At this stage, you should have the link:http://www.oracle.com/webfolder/technetwork/jet/jetCookbook.html?component=barChart&demo=default[+Bar Chart+] component in your application, as shown below:
 
 image::images/cookbook-3.png[]
 
@@ -202,7 +202,7 @@ Work through the link:http://knockoutjs.com/examples/[+Live Examples+] and link:
 
 Congratulations! You have now learned the basics of using Knockout data bindings to connect components together.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20Data%20Bindings%20to%20Connect%20Components[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -210,8 +210,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20Data%20Bindings%2
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-flex.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-flex.adoc
index 3ce41bd38..bab08c35b 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-flex.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-flex.adoc
@@ -50,7 +50,7 @@ References:
 
 In this exercise you set up an Oracle JET application and explore its default content.
 
-1. Follow the steps described in link:ojet-settingup.html[+Setting Up an Oracle JET Application+].
+1. Follow the steps described in xref:ojet-settingup.adoc[+Setting Up an Oracle JET Application+].
 
 
 [start=2]
@@ -314,7 +314,7 @@ Also notice that the container below the one we've been working with is still ma
 
 Congratulations! You have now learned how to work with FlexBox in your Oracle JET applications.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20FlexBox[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -322,8 +322,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-gettingstarted.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-gettingstarted.adoc
index 443e7f1ab..de0503971 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-gettingstarted.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-gettingstarted.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE, the HTML5/JavaScript Bundle+] |8.2 
+|xref:../../../download/index.adoc[+NetBeans IDE, the HTML5/JavaScript Bundle+] |8.2 
 |===
 
 *Notes:*
@@ -307,7 +307,8 @@ You may need to reference properties across different JET modules. There are thr
 1. Use *$root* within an HTML file to access global variables from *main.js*. link:https://blogs.oracle.com/geertjan/entry/intermodular_communication_in_oracle_jet[+Details here.+]
 2. Use *ko.dataFor* within a JavaScript file to access global variables from *main.js*. link:https://blogs.oracle.com/geertjan/entry/intermodular_communication_in_oracle_jet1[+Details here.+]
 3. Use *knockout-postbox* to set up a loosely coupled publish/subscribe mechanism. link:https://blogs.oracle.com/geertjan/entry/intermodular_communication_in_oracle_jet2[+Details here.+]
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Oracle%20JET%20Applications[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -315,8 +316,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-intermodular.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-intermodular.adoc
index 2bd7c84b7..3bca16af5 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-intermodular.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-intermodular.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 
 In this exercise you set up an Oracle JET application.
 
-1. Follow the steps described in link:ojet-settingup.html[+Setting Up an Oracle JET Application+].
+1. Follow the steps described in xref:ojet-settingup.adoc[+Setting Up an Oracle JET Application+].
 
 
 [start=2]
@@ -269,7 +269,7 @@ Name: <span data-bind="text: name"></span>
 
 Congratulations! You have now learned different approaches for setting up communication between Oracle JET modules.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Oracle%20JET%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -277,8 +277,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-porting.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-porting.adoc
index 67ca00138..da5e64cff 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-porting.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-porting.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE, the HTML5/JavaScript Bundle+] |8.2 
+|xref:../../../download/index.adoc[+NetBeans IDE, the HTML5/JavaScript Bundle+] |8.2 
 |===
 
 *Notes:*
@@ -307,7 +307,8 @@ You may need to reference properties across different JET modules. There are thr
 1. Use *$root* within an HTML file to access global variables from *main.js*. link:https://blogs.oracle.com/geertjan/entry/intermodular_communication_in_oracle_jet[+Details here.+]
 2. Use *ko.dataFor* within a JavaScript file to access global variables from *main.js*. link:https://blogs.oracle.com/geertjan/entry/intermodular_communication_in_oracle_jet1[+Details here.+]
 3. Use *knockout-postbox* to set up a loosely coupled publish/subscribe mechanism. link:https://blogs.oracle.com/geertjan/entry/intermodular_communication_in_oracle_jet2[+Details here.+]
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Oracle%20JET%20Applications[+Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -315,8 +316,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-rest.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-rest.adoc
index b74934f1f..d244df04d 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-rest.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-rest.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 
 In this exercise you set up an Oracle JET application and explore its default content.
 
-1. Follow the steps described in link:ojet-settingup.html[+Setting Up an Oracle JET Application+].
+1. Follow the steps described in xref:ojet-settingup.adoc[+Setting Up an Oracle JET Application+].
 
 
 [start=2]
@@ -178,7 +178,7 @@ You should now see a table with data in your application.
 
 Congratulations! You have now learned how to get started with REST in your Oracle JET applications.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Oracle%20JET%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -186,8 +186,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-settingup.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-settingup.adoc
index 4d792dcb0..2fef7e15a 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-settingup.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-settingup.adoc
@@ -118,7 +118,7 @@ image::images/newhtml5project-9.png[]
 
 Congratulations, you have successfully set up an Oracle JET application. Repeat the steps above whenever you need to set up a new Oracle JET application.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Setting%20Up%20Oracle%20JET%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -126,8 +126,8 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Setting%20Up%20Oracle%20J
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-working.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-working.adoc
index 2f09f16cb..ea06c8df5 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/ojet-working.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/ojet-working.adoc
@@ -36,7 +36,7 @@ This document provides a step-by-step set of instructions guiding you through th
 
 In this exercise you set up an Oracle JET application and explore its default content.
 
-1. Follow the steps described in link:ojet-settingup.html[+Setting Up an Oracle JET Application+].
+1. Follow the steps described in xref:ojet-settingup.adoc[+Setting Up an Oracle JET Application+].
 
 
 [start=2]
@@ -208,16 +208,14 @@ image::images/navdrawer_5.png[]
 
 Congratulations! You have now learned how to create and load modules into your Oracle JET applications.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Oracle%20JET%20Applications[+Send Feedback on This Tutorial+]
-
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 [[seealso]]
 == See Also
 
-For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about support for Oracle JET and a variety of HTML5 applications in the IDE on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
 * link:http://www.oracle.com/webfolder/technetwork/jet/globalExamples.html[+"Learn" section on the Oracle JET site+]. A set of official Oracle JET learning resources.
-* link:html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
-* link:html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
+* xref:html5-editing-css.adoc[+Working with CSS Style Sheets in HTML5 Applications+]. A document that continues with the application that you created in this tutorial that demonstrates how to use some of the CSS wizards and windows in the IDE and how to use the Inspect mode in the Chrome browser to visually locate elements in your project sources.
+* xref:html5-js-support.adoc[+Debugging and Testing JavaScript in HTML5 Applications+]. A document that demonstrates how the IDE provides tools that can help you debug and test JavaScript files in the IDE.
diff --git a/netbeans.apache.org/src/content/kb/docs/webclient/section.adoc b/netbeans.apache.org/src/content/kb/docs/webclient/section.adoc
index a311b31d8..4221d13d6 100644
--- a/netbeans.apache.org/src/content/kb/docs/webclient/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/webclient/section.adoc
@@ -19,25 +19,25 @@
 
 .HTML5 Tutorials
 ************************************************
-- link:ojet-chatbot.html[Chatbot Integration with Oracle JET]
-- link:ojet-cca.html[Composite Component Architecture in Oracle JET]
-- link:ojet-crud.html[CRUD Application Development with Oracle JET]
-- link:ojet-flex.html[CSS3 Flexible Box and Oracle JET]
-- link:html5-js-support.html[Debugging and Testing JavaScript in an HTML5 Application]
-- link:cordova-gettingstarted.html[Getting Started with Cordova Applications]
-- link:html5-gettingstarted.html[Getting Started with HTML5 Applications]
-- link:ojet-gettingstarted.html[Getting Started with Oracle JET in NetBeans IDE]
-- link:index.html[HTML5 Tutorials]
-- link:ojet-rest.html[Interacting with RESTful Web Services in Oracle JET]
-- link:ojet-porting.html[Porting an Application to Oracle JET]
-- link:section.html[]
-- link:ojet-settingup.html[Setting Up an Oracle JET Application]
-- link:ojet-intermodular.html[Strategies for Intermodular Communication in Oracle JET]
-- link:ojet-databinding.html[Using Data Bindings to Connect Components]
-- link:ojet-cookbook.html[Using the Oracle JET Cookbook]
-- link:html5-knockout-screencast.html[Video of Using KnockoutJS in an HTML5 Application]
-- link:html5-editing-css.html[Working with CSS Style Sheets in an HTML5 Application]
-- link:ojet-working.html[Working with Oracle JET Applications]
+- xref:ojet-chatbot.adoc[Chatbot Integration with Oracle JET]
+- xref:ojet-cca.adoc[Composite Component Architecture in Oracle JET]
+- xref:ojet-crud.adoc[CRUD Application Development with Oracle JET]
+- xref:ojet-flex.adoc[CSS3 Flexible Box and Oracle JET]
+- xref:html5-js-support.adoc[Debugging and Testing JavaScript in an HTML5 Application]
+- xref:cordova-gettingstarted.adoc[Getting Started with Cordova Applications]
+- xref:html5-gettingstarted.adoc[Getting Started with HTML5 Applications]
+- xref:ojet-gettingstarted.adoc[Getting Started with Oracle JET in NetBeans IDE]
+- xref:index.adoc[HTML5 Tutorials]
+- xref:ojet-rest.adoc[Interacting with RESTful Web Services in Oracle JET]
+- xref:ojet-porting.adoc[Porting an Application to Oracle JET]
+- xref:section.adoc[]
+- xref:ojet-settingup.adoc[Setting Up an Oracle JET Application]
+- xref:ojet-intermodular.adoc[Strategies for Intermodular Communication in Oracle JET]
+- xref:ojet-databinding.adoc[Using Data Bindings to Connect Components]
+- xref:ojet-cookbook.adoc[Using the Oracle JET Cookbook]
+- xref:html5-knockout-screencast.adoc[Video of Using KnockoutJS in an HTML5 Application]
+- xref:html5-editing-css.adoc[Working with CSS Style Sheets in an HTML5 Application]
+- xref:ojet-working.adoc[Working with Oracle JET Applications]
 ************************************************
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/client.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/client.adoc
index dbd8d6c94..f48e8ad28 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/client.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/client.adoc
@@ -655,7 +655,7 @@ Now that you have completed your first web service client in the IDE, it is time
 * Rewrite the client so that the user can interact with the data returned from the web service.
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20JAX-WS%20Clients%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -663,10 +663,10 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20JAX-WS%20Clients%20in%20N
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:jax-ws.html[+Getting Started with JAX-WS Web Services+]
-* link:rest.html[+Getting Started with RESTful Web Services+]
-* link:wsit.html[+Advanced Web Service Interoperability+]
-* link:../../trails/web.html[+Web Services Learning Trail+]
+* xref:jax-ws.adoc[+Getting Started with JAX-WS Web Services+]
+* xref:rest.adoc[+Getting Started with RESTful Web Services+]
+* xref:wsit.adoc[+Advanced Web Service Interoperability+]
+* xref:../web.adoc[+Web Services Learning Trail+]
 
-To send comments and suggestions, receive support, and stay informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, receive support, and stay informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/flower-code-ws.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/flower-code-ws.adoc
index a47432564..12082d094 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/flower-code-ws.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/flower-code-ws.adoc
@@ -37,11 +37,11 @@ You can download a complete sample of the web service from the link:https://netb
 
 image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to the NetBeans IDE 7.2, 7.3, 7.4 and 8.0"]
 
-1. link:./flower_overview.html[+Overview+]
-2. link:flower_ws.html[+ Creating the Web Service+]
+1. xref:flower_overview.adoc[+Overview+]
+2. xref:flower_ws.adoc[+ Creating the Web Service+]
 3. => Coding and Testing the Web Service
-4. link:./flower_wsdl_schema.html[+ Modifying the Schema and WSDL Files to Pass Binary Data+]
-5. link:./flower_swing.html[+ Creating the Swing Client+]
+4. xref:flower_wsdl_schema.adoc[+ Modifying the Schema and WSDL Files to Pass Binary Data+]
+5. xref:flower_swing.adoc[+ Creating the Swing Client+]
 6. <<coding-ws,Coding the Web Service>>
 7. <<retrieve-jpeg-as-bytes,Get a JPEG File as an Array of Bytes>>
 8. <<read-bytes-as-image,Read an Array of Bytes as an Image>>
@@ -384,9 +384,9 @@ image::images/ws-tester-badschema.png[]
 
 == Next step:
 
-link:./flower_wsdl_schema.html[+ Modifying the Schema and WSDL Files to Pass Binary Data+]
+xref:flower_wsdl_schema.adoc[+ Modifying the Schema and WSDL Files to Pass Binary Data+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Flower%20Coding%20WS%20EE6[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/flower_overview.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/flower_overview.adoc
index b346a485f..7a0310db6 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/flower_overview.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/flower_overview.adoc
@@ -44,10 +44,10 @@ You can download a complete version of service and client applications from the
 image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to the NetBeans IDE 7.2, 7.3, 7.4 and 8.0"]
 
 1. => Overview
-2. link:./flower_ws.html[+ Creating the Web Service+]
-3. link:./flower-code-ws.html[+ Coding and Testing the Web Service+]
-4. link:./flower_wsdl_schema.html[+ Modifying the Schema and WSDL Files to Pass Binary Data+]
-5. link:./flower_swing.html[+ Creating the Swing Client+]
+2. xref:flower_ws.adoc[+ Creating the Web Service+]
+3. xref:flower-code-ws.adoc[+ Coding and Testing the Web Service+]
+4. xref:flower_wsdl_schema.adoc[+ Modifying the Schema and WSDL Files to Pass Binary Data+]
+5. xref:flower_swing.adoc[+ Creating the Swing Client+]
 
 
 == Software Needed for the Tutorial
@@ -81,9 +81,9 @@ image::images/running-client.png[title="JFrame showing all flower images passed
 
 == Next step:
 
-link:./flower_ws.html[+ Creating the Web Service+]
+xref:flower_ws.adoc[+ Creating the Web Service+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Flower%20Overview%20EE6[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -91,10 +91,10 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Flower%20Overview%20EE6[+
 
 For background information prior to using this tutorial, see the following resources:
 
-* link:./jax-ws.html[+Getting Started with JAX-WS Web Services+]
-* link:../../docs/websvc/client.html[+Developing Web Service Clients+]
-* link:../javaee/javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:./wsit.html[+Advanced Web Service Interoperability+]
+* xref:jax-ws.adoc[+Getting Started with JAX-WS Web Services+]
+* xref:client.adoc[+Developing Web Service Clients+]
+* xref:../javaee/javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:wsit.adoc[+Advanced Web Service Interoperability+]
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/flower_swing.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/flower_swing.adoc
index c61699332..e7a3ea6c4 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/flower_swing.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/flower_swing.adoc
@@ -37,10 +37,10 @@ You can download a complete version of the client from the link:https://netbeans
 
 image::images/netbeans-stamp-74-73-72.png[title="Content on this page applies to the NetBeans IDE 7.2, 7.3 and 7.4"]
 
-1. link:./flower_overview.html[+Overview+]
-2. link:./flower_ws.html[+Creating the Web Service+]
-3. link:./flower-code-ws.html[+Coding and Testing the Web Service+]
-4. link:./flower_wsdl_schema.html[+Modifying the Schema and WSDL Files to Pass Binary Data+]
+1. xref:flower_overview.adoc[+Overview+]
+2. xref:flower_ws.adoc[+Creating the Web Service+]
+3. xref:flower-code-ws.adoc[+Coding and Testing the Web Service+]
+4. xref:flower_wsdl_schema.adoc[+Modifying the Schema and WSDL Files to Pass Binary Data+]
 5. => Creating the Swing Client
 
 
@@ -597,7 +597,7 @@ The client application is now complete, with code that interacts with the web se
 
 ]]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Flower%20Swing%20Client%20EE6[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/flower_ws.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/flower_ws.adoc
index f5d169399..5e1c7b857 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/flower_ws.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/flower_ws.adoc
@@ -37,11 +37,11 @@ You can download a complete sample of the web service from the link:https://netb
 
 image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to the NetBeans IDE 7.2, 7.3, 7.4 and 8.0"]
 
-1. link:./flower_overview.html[+Overview+]
+1. xref:flower_overview.adoc[+Overview+]
 2. => Creating the Web Service
-3. link:flower-code-ws.html[+Coding and Testing the Web Service+]
-4. link:./flower_wsdl_schema.html[+ Modifying the Schema and WSDL Files to Pass Binary Data+]
-5. link:./flower_swing.html[+ Creating the Swing Client+]
+3. xref:flower-code-ws.adoc[+Coding and Testing the Web Service+]
+4. xref:flower_wsdl_schema.adoc[+ Modifying the Schema and WSDL Files to Pass Binary Data+]
+5. xref:flower_swing.adoc[+ Creating the Swing Client+]
 
 
 [start=1]
@@ -138,10 +138,10 @@ image::images/flower-service-full-design.png[]
 
 == Next step:
 
-link:./flower-code-ws.html[+Coding and Testing the Web Service+]
+xref:flower-code-ws.adoc[+Coding and Testing the Web Service+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Flower%20Creating%20WS%20EE6[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/flower_wsdl_schema.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/flower_wsdl_schema.adoc
index ca4381c22..da5c52894 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/flower_wsdl_schema.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/flower_wsdl_schema.adoc
@@ -39,11 +39,11 @@ You can download a complete sample of the web service from the link:https://netb
 
 image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to the NetBeans IDE 7.2, 7.3, 7.4 and 8.0"]
 
-1. link:./flower_overview.html[+Overview+]
-2. link:./flower_ws.html[+Creating the Web Service+]
-3. link:./flower-code-ws.html[+Coding and Testing the Web Service+]
+1. xref:flower_overview.adoc[+Overview+]
+2. xref:flower_ws.adoc[+Creating the Web Service+]
+3. xref:flower-code-ws.adoc[+Coding and Testing the Web Service+]
 4. => Modifying the Schema and WSDL Files to Pass Binary Data
-5. link:./flower_swing.html[+ Creating the Swing Client+]
+5. xref:flower_swing.adoc[+ Creating the Swing Client+]
 
 
 == Modifying the Schema File and WSDL Files to Pass Binary Data
@@ -136,9 +136,9 @@ Now that the Tester application has confirmed that images are correctly being re
 
 == Next Step:
 
-link:./flower_swing.html[+Creating the Swing Client+]
+xref:flower_swing.adoc[+Creating the Swing Client+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Flower%20WSDL%20EE6[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/index.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/index.adoc
index fe2ea86d1..6f9c556b4 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/index.adoc
@@ -26,20 +26,20 @@
 :toc-title:
 :description: Web Service Tutorials
 
-- link:wsit.html[Advanced Web Service Interoperability]
-- link:client.html[Developing JAX-WS Web Service Clients]
-- link:flower_ws.html[End-to-End Binary SOAP Attachment 2: Creating the Web Service]
-- link:flower-code-ws.html[End-to-End Binary SOAP Attachment part 3: Coding and Testing the Web Service]
-- link:jax-ws.html[Getting Started with JAX-WS Web Services]
-- link:rest.html[Getting Started with RESTful Web Services]
-- link:intro-ws.html[Introduction to Web Services]
-- link:pet-catalog-screencast.html[RESTful Web Services Pet Catalog - NetBeans IDE 6.5]
-- link:zillow.html[SaaS (Software as a Service): Zillow Tutorial]
-- link:section.html[]
-- link:flower_overview.html[Web Service Application Passing Binary Data, pt 1: Overview]
-- link:flower_wsdl_schema.html[Web Service Passing Binary Data, pt 4: Modifying the Schema and WSDL Files]
-- link:flower_swing.html[Web Service Passing Binary Data, pt 5: Creating the Swing Client]
-- link:index.html[Web Service Tutorials]
+- xref:wsit.adoc[Advanced Web Service Interoperability]
+- xref:client.adoc[Developing JAX-WS Web Service Clients]
+- xref:flower_ws.adoc[End-to-End Binary SOAP Attachment 2: Creating the Web Service]
+- xref:flower-code-ws.adoc[End-to-End Binary SOAP Attachment part 3: Coding and Testing the Web Service]
+- xref:jax-ws.adoc[Getting Started with JAX-WS Web Services]
+- xref:rest.adoc[Getting Started with RESTful Web Services]
+- xref:intro-ws.adoc[Introduction to Web Services]
+- xref:pet-catalog-screencast.adoc[RESTful Web Services Pet Catalog - NetBeans IDE 6.5]
+- xref:zillow.adoc[SaaS (Software as a Service): Zillow Tutorial]
+- xref:section.adoc[]
+- xref:flower_overview.adoc[Web Service Application Passing Binary Data, pt 1: Overview]
+- xref:flower_wsdl_schema.adoc[Web Service Passing Binary Data, pt 4: Modifying the Schema and WSDL Files]
+- xref:flower_swing.adoc[Web Service Passing Binary Data, pt 5: Creating the Swing Client]
+- xref:index.adoc[Web Service Tutorials]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/intro-ws.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/intro-ws.adoc
index 13c5baea7..228e54eaa 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/intro-ws.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/intro-ws.adoc
@@ -73,8 +73,8 @@ Tools to explore and test REST services:
 
 The following *knowledge base tutorials* involve creating and consuming REST services:
 
-* link:./rest.html[+Getting Started with RESTful Web Services+]
-* link:./zillow.html[+SaaS: Zillow+]
+* xref:rest.adoc[+Getting Started with RESTful Web Services+]
+* xref:zillow.adoc[+SaaS: Zillow+]
 
 ==  SOAP Web Services
 
@@ -102,10 +102,10 @@ Tools to explore and test SOAP services:
 
 The following *knowledge base tutorials* involve creating and consuming JAX-WS SOAP-based web services:
 
-* link:./jax-ws.html[Getting Started with JAX-WS Web Services]
-* link:./client.html[Developing JAX-WS Web Service Clients]
-* link:./flower_overview.html[Web Service Passing Binary Data] - a separate learning trail about using web services to pass binary data which are displayed in a client using Swing components
-* link:./wsit.html[Advanced Web Service Interoperability] (demonstrates WSIT)
+* xref:jax-ws.adoc[Getting Started with JAX-WS Web Services]
+* xref:client.adoc[Developing JAX-WS Web Service Clients]
+* xref:flower_overview.adoc[Web Service Passing Binary Data] - a separate learning trail about using web services to pass binary data which are displayed in a client using Swing components
+* xref:wsit.adoc[Advanced Web Service Interoperability] (demonstrates WSIT)
 
 == Conclusion & Comparison
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/jax-ws.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/jax-ws.adoc
index d8cf84ab4..0aeeb73b5 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/jax-ws.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/jax-ws.adoc
@@ -31,7 +31,7 @@
 
 link:http://www.jcp.org/en/jsr/detail?id=224[+Java API for XML Web Services (JAX-WS), JSR 224+], is an important part of the Java EE platform. A follow-up to the release of Java API for XML-based RPC 1.1(JAX-RPC), JAX-WS simplifies the task of developing web services using Java technology. It addresses some of the issues in JAX-RPC 1.1 by providing support for multiple protocols such as SOAP 1.1, SOAP 1.2, XML, and by providing a facility for supporting additional protocols along with HT [...]
 
-This document demonstrates the basics of using the IDE to develop a JAX-WS web service. After you create the web service, you write three different web service clients that use the web service over a network, which is called "consuming" a web service. The three clients are a Java class in a Java SE application, a servlet, and a JSP page in a web application. A more advanced tutorial focusing on clients is link:./client.html[+Developing JAX-WS Web Service Clients+].
+This document demonstrates the basics of using the IDE to develop a JAX-WS web service. After you create the web service, you write three different web service clients that use the web service over a network, which is called "consuming" a web service. The three clients are a Java class in a Java SE application, a servlet, and a JSP page in a web application. A more advanced tutorial focusing on clients is xref:client.adoc[+Developing JAX-WS Web Service Clients+].
 
 
 image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to the NetBeans IDE 7.2, 7.3, 7.4 and 8.0"]
@@ -112,7 +112,7 @@ You can either deploy your web service in a web container or in an EJB container
 [start=3]
 . Select your server and Java EE version and click Finish.
 
-*Note.* To use the Oracle WebLogic server, link:../web/jsf-jpa-weblogic.html#01[+register the server with the IDE+]. Also, if you are using the WebLogic server, watch the screencast on link:../javaee/weblogic-javaee-m1-screencast.html[+Deploying a Web Application to Oracle WebLogic+].
+*Note.* To use the Oracle WebLogic server, xref:../web/jsf-jpa-weblogic.adoc#01[+register the server with the IDE+]. Also, if you are using the WebLogic server, watch the screencast on xref:../javaee/weblogic-javaee-m1-screencast.adoc[+Deploying a Web Application to Oracle WebLogic+].
 
 
 === Creating a Web Service from a Java Class
@@ -235,7 +235,7 @@ A Maven Calculator Service and a Maven Calculator Client are available in Sample
 
 Now that you have deployed the web service, you need to create a client to make use of the web service's  ``add``  method. Here, you create three clients— a Java class in a Java SE application, a servlet, and a JSP page in a web application.
 
-*Note:* A more advanced tutorial focusing on clients is link:../../../kb/docs/websvc/client.html[+Developing JAX-WS Web Service Clients+].
+*Note:* A more advanced tutorial focusing on clients is xref:client.adoc[+Developing JAX-WS Web Service Clients+].
 
 
 === Client 1: Java Class in Java SE Application
@@ -445,7 +445,7 @@ image::images/jaxws-60-webclient.png[]
 
 In this section, you create a new web application and then consume the web service in the default JSP page that the Web Application wizard creates.
 
-*Note:* If you want to run a JSP web application client on Oracle WebLogic, see link:../web/jsf-jpa-weblogic.html[+Running a Java Server Faces 2.0 Application on WebLogic+].
+*Note:* If you want to run a JSP web application client on Oracle WebLogic, see xref:../web/jsf-jpa-weblogic.adoc[+Running a Java Server Faces 2.0 Application on WebLogic+].
 
 1. Choose File > New Project (Ctrl-Shift-N on Linux and Windows, ⌘-Shift-N on MacOS). Select Web Application from the Java Web category. Name the project  ``CalculatorWSJSPClient`` . Click Next and then click Finish.
 2. Expand the Web Pages node under the project node and delete  ``index.html`` .
@@ -511,7 +511,7 @@ The server starts, if it wasn't running already. The application is built and de
 image::images/jax-ws-project-jsp-result.png[]
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20JAX-WS%20Services%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -519,10 +519,10 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20JAX-WS%20Services%20in%20
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:./client.html[+Developing JAX-WS Web Service Clients+]
-* link:./rest.html[+Getting Started with RESTful Web Services+]
-* link:./wsit.html[+Advanced Web Service Interoperability+]
-* link:../../../kb/trails/web.html[+Web Services Learning Trail+]
+* xref:client.adoc[+Developing JAX-WS Web Service Clients+]
+* xref:rest.adoc[+Getting Started with RESTful Web Services+]
+* xref:wsit.adoc[+Advanced Web Service Interoperability+]
+* xref:../web.adoc[+Web Services Learning Trail+]
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/pet-catalog-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/pet-catalog-screencast.adoc
index ca8213e34..2061ba091 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/pet-catalog-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/pet-catalog-screencast.adoc
@@ -32,7 +32,7 @@
 |===
 |In this screencast, Carol Mcdonald shows how to build a Pet Catalog using RESTful Web Services, JAX-RS, dojo, MySQL and NetBeans IDE 6.5.
 
-This tutorial is part of the link:../intro-screencasts.html[+Guided Video Tour of NetBeans IDE 6.5+].
+This tutorial is part of the xref:../intro-screencasts.adoc[+Guided Video Tour of NetBeans IDE 6.5+].
 
 Author: Carol Mcdonald
 Time: 8:46 
@@ -42,7 +42,8 @@ link:http://bits.netbeans.org/media/restproject.swf[+Download+] [20 MB]
 == Related links
 
 * link:https://www.java.net/blogs/caroljmcdonald[+download sample projects from Carol's Blog+]
-* link:./rest.html[+Getting Started with RESTful Web Services+]
-link:/about/contact_form.html?to=3&subject=Feedback: NB6 web services pet catalog screencast[+Send Feedback on This Tutorial+]
+* xref:rest.adoc[+Getting Started with RESTful Web Services+]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  |     
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/rest.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/rest.adoc
index e2bc6ba7e..e5393f1b0 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/rest.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/rest.adoc
@@ -114,12 +114,12 @@ image::images/register-mysql-server.png[]
 
 [start=2]
 . 
-A dialog opens in which you type the configuration details of your MySQL server, including administrator user name and password. See "Configuring MySQL Server Properties" in link:../ide/install-and-configure-mysql-server.html[+Connecting to a MySQL Database+].
+A dialog opens in which you type the configuration details of your MySQL server, including administrator user name and password. See "Configuring MySQL Server Properties" in xref:../ide/install-and-configure-mysql-server.adoc[+Connecting to a MySQL Database+].
 
 image::images/basic-mysql-properties.png[]
 
 [start=3]
-. Start the MySQL server and connect to it. See "Starting the MySQL Server" in link:../ide/install-and-configure-mysql-server.html[+Connecting to a MySQL Database+].
+. Start the MySQL server and connect to it. See "Starting the MySQL Server" in xref:../ide/install-and-configure-mysql-server.adoc[+Connecting to a MySQL Database+].
 
 [start=4]
 . Right-click the MySQL server node and select Create Database. The Create MySQL Database dialog opens. 
@@ -260,7 +260,7 @@ There are 5 tabs in the Test Output section.
 
 Exit the browser and return to the IDE.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20REST%20Services%20in%20NetBeans%20IDE%20[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -269,9 +269,9 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
 * link:http://netbeans.dzone.com/nb-generate-simpler-rest[+NetBeans to Generate Simpler RESTful Web Services+]
-* link:../../trails/web.html[+Web Services Learning Trail+]
+* xref:../web.adoc[+Web Services Learning Trail+]
 * YouTube: link:http://www.youtube.com/watch?v=cDdfVMro99s[+RESTful Web Services, Building and Deploying (Part 1)+]
 * YouTube: link:http://www.youtube.com/watch?v=_c-CCVy4_Eo[+NetBeans RESTful Testing and Invoking RESTful Resources (Part 2)+]
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/section.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/section.adoc
index 708e67a38..ef13f70bb 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/section.adoc
@@ -19,20 +19,20 @@
 
 .Web Service Tutorials
 ************************************************
-- link:wsit.html[Advanced Web Service Interoperability]
-- link:client.html[Developing JAX-WS Web Service Clients]
-- link:flower_ws.html[End-to-End Binary SOAP Attachment 2: Creating the Web Service]
-- link:flower-code-ws.html[End-to-End Binary SOAP Attachment part 3: Coding and Testing the Web Service]
-- link:jax-ws.html[Getting Started with JAX-WS Web Services]
-- link:rest.html[Getting Started with RESTful Web Services]
-- link:intro-ws.html[Introduction to Web Services]
-- link:pet-catalog-screencast.html[RESTful Web Services Pet Catalog - NetBeans IDE 6.5]
-- link:zillow.html[SaaS (Software as a Service): Zillow Tutorial]
-- link:section.html[]
-- link:flower_overview.html[Web Service Application Passing Binary Data, pt 1: Overview]
-- link:flower_wsdl_schema.html[Web Service Passing Binary Data, pt 4: Modifying the Schema and WSDL Files]
-- link:flower_swing.html[Web Service Passing Binary Data, pt 5: Creating the Swing Client]
-- link:index.html[Web Service Tutorials]
+- xref:wsit.adoc[Advanced Web Service Interoperability]
+- xref:client.adoc[Developing JAX-WS Web Service Clients]
+- xref:flower_ws.adoc[End-to-End Binary SOAP Attachment 2: Creating the Web Service]
+- xref:flower-code-ws.adoc[End-to-End Binary SOAP Attachment part 3: Coding and Testing the Web Service]
+- xref:jax-ws.adoc[Getting Started with JAX-WS Web Services]
+- xref:rest.adoc[Getting Started with RESTful Web Services]
+- xref:intro-ws.adoc[Introduction to Web Services]
+- xref:pet-catalog-screencast.adoc[RESTful Web Services Pet Catalog - NetBeans IDE 6.5]
+- xref:zillow.adoc[SaaS (Software as a Service): Zillow Tutorial]
+- xref:section.adoc[]
+- xref:flower_overview.adoc[Web Service Application Passing Binary Data, pt 1: Overview]
+- xref:flower_wsdl_schema.adoc[Web Service Passing Binary Data, pt 4: Modifying the Schema and WSDL Files]
+- xref:flower_swing.adoc[Web Service Passing Binary Data, pt 5: Creating the Swing Client]
+- xref:index.adoc[Web Service Tutorials]
 ************************************************
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/wsit.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/wsit.adoc
index b442bc7ba..d9b2941a5 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/wsit.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/wsit.adoc
@@ -106,7 +106,7 @@ image::images/wsit-design.png[title="CalculatorWS service in Design GUI (Visual
 
 *Note:* In the Quality of Service section in the design tab of the service you can see that _no_ options are enabled. As a result, the Quality of Service components have not been applied to this particular web service. You will look at a web service where a Quality of Service component _is_ enabled when you create the secure web service.
 
-For a full tutorial on web services in the IDE, see link:jax-ws.html[+Getting Started with JAX-WS Web Services+].
+For a full tutorial on web services in the IDE, see xref:jax-ws.adoc[+Getting Started with JAX-WS Web Services+].
 
 
 === Deploying and Testing the Calculator Sample
@@ -256,7 +256,7 @@ image::images/wsit-browser-secure2.png[title="Secure web service client in brows
 
 If you get an error message that authentication failed due to an invalid user/password pair, there is either a problem with the default user created by the IDE or there are mismatched credentials set on the client. In this case, you need to create the user/password pair manually. For instructions, please see link:http://docs.oracle.com/cd/E19159-01/820-1072/6ncp48v3b/index.html[+Chapter 7 Using WSIT Security+] in link:http://docs.oracle.com/cd/E19159-01/820-1072/index.html[+The WSIT Tutorial+].
 
-link:/about/contact_form.html?to=3&subject=Feedback:WSIT%20Advanced%20Interoperability%20in%20NetBeans%20IDE%206.0[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -264,12 +264,12 @@ link:/about/contact_form.html?to=3&subject=Feedback:WSIT%20Advanced%20Interopera
 
 For more information about using NetBeans IDE to develop Web Services, see the following resources:
 
-* link:client.html[+Developing JAX-WS Web Service Clients+]
-* link:jax-ws.html[+Getting Started with JAX-WS Web Services+]
-* link:rest.html[+Getting Started with RESTful Web Services+]
-* link:flower_overview.html[+Web Service Application Passing Binary Data+]
-* link:../../74/websvc/jaxb.html[+Binding WSDL to Java with JAXB+]
-* link:../../trails/web.html[+Web Services Learning Trail+]
+* xref:client.adoc[+Developing JAX-WS Web Service Clients+]
+* xref:jax-ws.adoc[+Getting Started with JAX-WS Web Services+]
+* xref:rest.adoc[+Getting Started with RESTful Web Services+]
+* xref:flower_overview.adoc[+Web Service Application Passing Binary Data+]
+* xref:../../74/websvc/jaxb.adoc[+Binding WSDL to Java with JAXB+]
+* xref:../web.adoc[+Web Services Learning Trail+]
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/zillow.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/zillow.adoc
index ba755defb..5952dbead 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/zillow.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/zillow.adoc
@@ -250,7 +250,7 @@ Here are a few more ideas for you to explore:
 * Use a JSP page instead of JAXB Object to return the chart, as shown in this link:http://netbeans.dzone.com/news/consuming-zillow-web-services-[+NetBeans Zone article+].
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20SaaS%20Zillow[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -258,12 +258,12 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20SaaS%20Zillow[+Se
 
 For more information about using NetBeans IDE to develop RESTful web services, SaaS, and other Java EE applications, see the following resources:
 
-* link:./rest.html[+Getting Started with RESTful Web Sevices+]
+* xref:rest.adoc[+Getting Started with RESTful Web Sevices+]
 * link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Creating a Java Client for del.icio.us RESTful Web Services+], by Amit Kumar Saha
 * link:http://wiki.netbeans.org/RESTRemoting[+NetBeans Wiki: RESTful Web Service Client Stub+]
-* link:../../trails/web.html[+Web Services Learning Trail+]
+* xref:../web.adoc[+Web Services Learning Trail+]
 * YouTube: link:http://www.youtube.com/watch?v=cDdfVMro99s[+RESTful Web Services, Building and Deploying (Part 1)+]
 * YouTube: link:http://www.youtube.com/watch?v=_c-CCVy4_Eo[+NetBeans RESTful Testing and Invoking RESTful Resources (Part 2)+]
 
-To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee@netbeans.org mailing list+].
+To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/index.adoc b/netbeans.apache.org/src/content/kb/index.adoc
index 5d1deca55..64aed667b 100644
--- a/netbeans.apache.org/src/content/kb/index.adoc
+++ b/netbeans.apache.org/src/content/kb/index.adoc
@@ -32,47 +32,47 @@
 
 [.card]
 .icon:graduation-cap[]
-link:docs/cnd.html[C/C++ Application Learning Trail]
+xref:docs/cnd.adoc[C/C++ Application Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/java-se.html[General Java Development Learning Trail]
+xref:docs/java-se.adoc[General Java Development Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/intro-screencasts.html[Guided Video Tours of NetBeans IDE]
+xref:docs/intro-screencasts.adoc[Guided Video Tours of NetBeans IDE]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/tools.html[Integration with External Tools and Services]
+xref:docs/tools.adoc[Integration with External Tools and Services]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/java-ee.html[Java EE & Java Web Learning Trail]
+xref:docs/java-ee.adoc[Java EE & Java Web Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/matisse.html[Java GUI Applications Learning Trail]
+xref:docs/matisse.adoc[Java GUI Applications Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/mobility.html[Java ME Embedded and Java Card Application Technology Trail]
+xref:docs/mobility.adoc[Java ME Embedded and Java Card Application Technology Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/platform.html[NetBeans Platform Learning Trail]
+xref:docs/platform.adoc[NetBeans Platform Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/index.html[NetBeans Tutorials]
+xref:docs/index.adoc[NetBeans Tutorials]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/php.html[PHP and HTML5 Learning Trail]
+xref:docs/php.adoc[PHP and HTML5 Learning Trail]
 
 [.card]
 .icon:graduation-cap[]
-link:docs/web.html[Web Services Learning Trail]
+xref:docs/web.adoc[Web Services Learning Trail]
 
 ****
 
diff --git a/netbeans.apache.org/src/content/tutorials/index.adoc b/netbeans.apache.org/src/content/tutorials/index.adoc
index a452fd4d5..06ab02141 100644
--- a/netbeans.apache.org/src/content/tutorials/index.adoc
+++ b/netbeans.apache.org/src/content/tutorials/index.adoc
@@ -87,7 +87,7 @@
 - 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: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]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-ant.adoc b/netbeans.apache.org/src/content/tutorials/nbm-ant.adoc
index d3cc7e0f3..2e8377dc8 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-ant.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-ant.adoc
@@ -123,11 +123,11 @@ Read `harness/README` for a lot of tips, configuration data, and advice.
 
 The folder "myapp" is where you will create your application, on top of the NetBeans Platform, which is in the folder "nbrcp".
 
-NOTE:  Instead of using the Ant target above, you can simply download the ZIP files for `harness` and `platform`:
+//NOTE:  Instead of using the Ant target above, you can simply download the ZIP files for `harness` and `platform`:
 
-* platform:  link:https://netbeans.apache.org/download/index.html[http://netbeans.org/downloads/start.html?filename=zip/moduleclusters/netbeans-7.0-201104080000-ml-platform.zip&amp;pagelang=]
+//* platform:  xref:../download/index.adoc[http://netbeans.org/downloads/start.html?filename=zip/moduleclusters/netbeans-7.0-201104080000-ml-platform.zip&amp;pagelang=]
 
-* harness:  link:https://netbeans.apache.org/download/index.html[http://netbeans.org/downloads/start.html?filename=zip/moduleclusters/netbeans-7.0-201104080000-ml-harness.zip&amp;pagelang=]
+//* harness:  xref:../download/index.adoc[http://netbeans.org/downloads/start.html?filename=zip/moduleclusters/netbeans-7.0-201104080000-ml-harness.zip&amp;pagelang=]
 
 Now that you have the NetBeans Platform, you can start creating an application on top of it.
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-feedreader.adoc b/netbeans.apache.org/src/content/tutorials/nbm-feedreader.adoc
index 5f782cecd..a9c7a047d 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-feedreader.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-feedreader.adoc
@@ -37,7 +37,7 @@ To illustrate the end result, here you see the Feed Reader that you will create
 
 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.
+This is [.underline]#not# a beginner's tutorial. The assumption is that you are familiar with, and have used, NetBeans Platform idioms such as " xref:../wiki/index.adoc#_nodes_and_explorer[Node]" and " xref:../wiki/index.adoc#_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].
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-google.adoc b/netbeans.apache.org/src/content/tutorials/nbm-google.adoc
index 7bd882037..81dcf38a6 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-google.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-google.adoc
@@ -125,7 +125,7 @@ In order to create a Google toolbar, we will need to complete the following step
 
 In this section, you use the New Action wizard in NetBeans IDE to create a new Action. An Action is a piece of code invoked by the user to do something in the application. An Action can be invoked from a menu item, toolbar button, and keyboard shortcut in the application.
 
-NOTE:  As you will see, the New Action wizard creates a Java class with annotations. At compile-time, the annotations are converted into XML elements in a file contributed to the virtual filesystem of the application, which is how an Action is registered in the application. For more information relating to the creation and registration of Actions in the NetBeans Platform, see  link:https://netbeans.apache.org/wiki/index.asciidoc#_actions:_how_to_add_things_to_files.2c_folders.2c_menus.2c [...]
+NOTE:  As you will see, the New Action wizard creates a Java class with annotations. At compile-time, the annotations are converted into XML elements in a file contributed to the virtual filesystem of the application, which is how an Action is registered in the application. For more information relating to the creation and registration of Actions in the NetBeans Platform, see  xref:../wiki/index.adoc#_actions:_how_to_add_things_to_files.2c_folders.2c_menus.2c_toolbars_and_more[Actions: H [...]
 
 
 [start=1]
@@ -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]
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 ad3b1c2ea..c4911d607 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-java-hint.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-java-hint.adoc
@@ -44,7 +44,7 @@ For troubleshooting purposes, you are welcome to download the  link:http://web.a
 The best way to learn about the Java hint infrastructure is to read the sources of the Java hints that are part of the IDE. Start by identifying a hint that does something similar to what you would like to achieve, then check out the NetBeans sources, and read the source code of the related hint.
 
 [start=1]
-1. Use git to clone the NetBeans sources:  link:https://netbeans.apache.org/participate/submit-pr.html#_contributing_to_apache_netbeans_in_github[as explained here].
+1. Use git to clone the NetBeans sources:  xref:../participate/submit-pr.adoc#_contributing_to_apache_netbeans_in_github[as explained here].
 
 [start=2]
 1. In the NetBeans sources, browse to the "java.hints" folder (see link:https://github.com/apache/netbeans/tree/master/java/java.hints[the java.hints sources here]), expand it, and read the sources relevant to the hint you want to create.
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 0013b664d..65e74826a 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesuite.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-maven-modulesuite.adoc
@@ -318,7 +318,7 @@ image::images/maven-suite_72_pic08.png[title="screenshot"]
 
 
 [start=4]
-1. You are now going to listen to the global context, provided by the  link:https://netbeans.apache.org/wiki/index.asciidoc#_lookup[NetBeans Lookup], for Event objects. Right now, no Event objects will be present in the global context. However, in the next section, we will create a new module that will publish Event objects.
+1. You are now going to listen to the global context, provided by the  xref:../wiki/index.adoc#_lookup[NetBeans Lookup], for Event objects. Right now, no Event objects will be present in the global context. However, in the next section, we will create a new module that will publish Event objects.
 
 Click the Source tab and modify the class signature to implement  ``LookupListener`` :
 
@@ -436,7 +436,7 @@ jTextField1.setText("Event #" + obj.getIndex() + " created at " + obj.getDate())
 setDisplayName("MyEditor " + obj.getIndex());
 ----
 
-NOTE:  The  ``associateLookup(Lookups.singleton(obj));``  line in the constructor will add a new instance of  ``Event``  to the  ``Lookup``  of the  ``TopComponent`` . When the  ``TopComponent``  is selected, its  ``Lookup``  is passed into the global context. For more details, see  link:https://netbeans.apache.org/wiki/index.asciidoc#_lookup[NetBeans Lookup].
+NOTE:  The  ``associateLookup(Lookups.singleton(obj));``  line in the constructor will add a new instance of  ``Event``  to the  ``Lookup``  of the  ``TopComponent`` . When the  ``TopComponent``  is selected, its  ``Lookup``  is passed into the global context. For more details, see  xref:../wiki/index.adoc#_lookup[NetBeans Lookup].
 
 Make sure to import the correct  ``Event``  class, that is,  ``com.mycompany.mavenselectionsuite.Event`` .
 
@@ -481,7 +481,7 @@ xref:../community/mailing-lists.adoc[ Send Us Your Feedback]
 For more information about creating and developing on the NetBeans Platform, see the following resources.
 
 *  xref:../kb/docs/platform.adoc[NetBeans Platform Learning Trail]
-*  link:https://netbeans.apache.org/wiki/[NetBeans Developer FAQ]
+*  xref:../wiki/index.adoc[NetBeans Developer FAQ]
 *  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 08f4a2821..373e63b46 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-maven-quickstart.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-maven-quickstart.adoc
@@ -600,7 +600,7 @@ 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: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: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].
+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  xref:../wiki/index.adoc#_lookup[NetBeans Lookup] in the  xref:../wiki/index.adoc[NetBeans Developer Wiki].
 
 
 [source,java]
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 7ae21d81d..92bd1b5c3 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-1.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-1.adoc
@@ -62,7 +62,7 @@ NOTE:  If you haven't developed a NetBeans Platform application before, you are
 * * 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
+*  xref:../wiki/index.adoc[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
 
 
 == Creating the Application and Modules
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 d6fc3cefc..d549e6400 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-10.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-10.adoc
@@ -71,7 +71,7 @@ We now have our POV-Ray rendering application working exactly as we want. During
 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 * 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.
+* Explore the  xref:../wiki/index.adoc[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: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/]
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 71c82d72c..a1db479ef 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-povray-2.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-povray-2.adoc
@@ -43,7 +43,7 @@ A NetBeans project is a directory on disk; typically there is some signature, su
 
 The major requirement of identifying a folder as being a project is that the test fail quickly—the code that determines that a folder is _not_ a project must complete very quickly, because it is going to be called once for every folder visible in the file chooser that lets users open projects. We will stick with what works, and use a specific subdirectory name to identify our POV-Ray projects.
 
-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.
+Most Project types in NetBeans use link:https://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  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.
 
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 c557db55c..88e7d9946 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-propertyeditors-integration.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-propertyeditors-integration.adoc
@@ -293,9 +293,9 @@ Doing these things involves overriding two targets in our module project's build
 1. Open the build script by expanding the module project in the *Projects* tab in the IDE, and the *Important Files* node under it, and double clicking the *Build Script* node. This corresponds to the file `build.xml` in the `BeanLibraryModule` directory which is the root of our module project.
 
 [start=2]
-1. Add the code found in  link:listing3[Listing 3] to the build script, below the line `<import file="nbproject/build-impl.xml"/>`.
-
+1. Add the code found in  xref:nbm-propertyeditors-integration.adoc#listing3[Listing 3] to the build script, below the line `<import file="nbproject/build-impl.xml"/>`.
 
+[[listing3]]
 === [[Listing 3: Module Build Script Changes]] 
 
 
@@ -811,7 +811,7 @@ _Table 1: Component Variable Names and Types in ColorValueCustomEditor_
 1. Change the class signature of `ColorValueCustomEditor` to look like <<listing15,listing 15, implementing `ChangeListener` and `DocumentListener`>>.
 
 [start=8]
-1. Add the code in  link:listing16[listing 16] to `ColorValueCustomEditor` to implement the listener interfaces and handle events.
+1. Add the code in  xref:nbm-propertyeditors-integration.adoc#listing16[listing 16] to `ColorValueCustomEditor` to implement the listener interfaces and handle events.
 
 
 === [[Listing 14: ColorValueCustomEditor Constructor]] 
@@ -848,7 +848,7 @@ _Table 1: Component Variable Names and Types in ColorValueCustomEditor_
 final class ColorValueCustomEditor extends javax.swing.JPanel implements ChangeListener, DocumentListener {
 ----
 
-
+[[listing16]]
 === [[Listing 16: Listener Interface Implementation for ColorValueCustomEditor]] 
 
 
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 442bcb523..c13e4a4cb 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-server-plugin.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-server-plugin.adoc
@@ -75,7 +75,7 @@ Before you start writing the module, you have to make sure you have all of the n
 
 Before you begin, you need to install the following software on your computer:
 
-* NetBeans IDE 5.5 ( link:https://netbeans.apache.org/download/index.html[download]). Note that this tutorial was originally written for NetBeans IDE 5.0, but that version of this tutorial is no longer supported.
+* NetBeans IDE 5.5 ( xref:../download/index.adoc[download]). Note that this tutorial was originally written for NetBeans IDE 5.0, but that version of this tutorial is no longer supported.
 * Java Standard Development Kit (JDK™) version 1.4.2 ( link:https://www.oracle.com/technetwork/java/javase/downloads/index.html[download]) or 5.0 ( link:https://www.oracle.com/technetwork/java/javase/downloads/index.html[download])
 
 
@@ -1420,7 +1420,7 @@ Here are some j2eeserver API classes worth looking at:
 
 For more information about creating and developing NetBeans modules, see the following resources:
 
-*  link:https://netbeans.apache.org/tutorials.html[Tutorials]
+*  xref:index.adoc[Tutorials]
 
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API List (Current Development Version)]
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-test.adoc b/netbeans.apache.org/src/content/tutorials/nbm-test.adoc
index 425b3cfd8..4e0e46445 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-test.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-test.adoc
@@ -420,8 +420,8 @@ This concludes the NetBeans Platform Testing Tutorial. This document has describ
 *  link:http://forums.netbeans.org/topic10210.html[http://forums.netbeans.org/topic10210.html]
 *  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/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:../wiki/CodeCoverage.adoc[Code Coverage]
+*  xref:../wiki/CodeCoverage.adoc[Code Coverage]


---------------------------------------------------------------------
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