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/20 08:26:22 UTC

[netbeans-website] branch master updated: more xref

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 9b60f36b7 more xref
9b60f36b7 is described below

commit 9b60f36b7fa438c4ffc8ac85454ccd846fa56b53
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Thu Oct 20 10:26:16 2022 +0200

    more xref
---
 netbeans.apache.org/src/content/kb/docs/cnd.adoc   |  24 +--
 .../src/content/kb/docs/cnd/HowTos.adoc            |   2 +-
 .../content/kb/docs/cnd/beginning-jni-linux.adoc   |  19 +--
 .../src/content/kb/docs/cnd/c-unit-test.adoc       |  30 ++--
 .../src/content/kb/docs/cnd/cpp-vcs.adoc           |  17 ++-
 .../src/content/kb/docs/cnd/debugging.adoc         |  10 +-
 .../src/content/kb/docs/cnd/depchecking.adoc       |  14 +-
 .../kb/docs/cnd/development-environment.adoc       |  14 +-
 .../src/content/kb/docs/cnd/index.adoc             |  28 ++--
 .../content/kb/docs/cnd/navigating-editing.adoc    |  10 +-
 .../src/content/kb/docs/cnd/quickstart.adoc        |  22 +--
 .../src/content/kb/docs/cnd/remote-modes.adoc      |  12 +-
 .../content/kb/docs/cnd/remotedev-tutorial.adoc    |  36 ++---
 .../src/content/kb/docs/cnd/section.adoc           |  28 ++--
 .../src/content/kb/docs/cnd/toolchain.adoc         |  22 +--
 .../src/content/kb/docs/intro-screencasts.adoc     | 114 ++++++++++----
 .../src/content/kb/docs/java-ee.adoc               | 106 ++++++-------
 .../src/content/kb/docs/java-se.adoc               |  38 ++---
 .../content/kb/docs/java/jdk8-nb74-screencast.adoc |  24 +--
 .../src/content/kb/docs/javaee/cdi-events.adoc     |  26 ++--
 .../src/content/kb/docs/javaee/cdi-inject.adoc     |  14 +-
 .../src/content/kb/docs/javaee/cdi-intro.adoc      |  16 +-
 .../src/content/kb/docs/javaee/cdi-validate.adoc   |  14 +-
 .../kb/docs/javaee/ecommerce/conclusion.adoc       |   2 +-
 .../kb/docs/javaee/ecommerce/entity-session.adoc   |   2 +-
 .../content/kb/docs/javaee/ecommerce/intro.adoc    |   2 +-
 .../content/kb/docs/javaee/ecommerce/language.adoc |   2 +-
 .../kb/docs/javaee/ecommerce/manage-sessions.adoc  |   2 +-
 .../javaee/ecommerce/page-views-controller.adoc    |   2 +-
 .../content/kb/docs/javaee/ecommerce/security.adoc |   2 +-
 .../kb/docs/javaee/ecommerce/transaction.adoc      |   2 +-
 .../src/content/kb/docs/javaee/entappclient.adoc   |   8 +-
 .../src/content/kb/docs/javaee/index.adoc          |  48 +++---
 .../content/kb/docs/javaee/javaee-entapp-ejb.adoc  |  14 +-
 .../kb/docs/javaee/javaee-entapp-junit.adoc        |  16 +-
 .../javaee-gettingstarted-js-screencast.adoc       |  30 ++--
 .../javaee/javaee-gettingstarted-screencast.adoc   |   8 +-
 .../kb/docs/javaee/javaee-gettingstarted.adoc      |  14 +-
 .../src/content/kb/docs/javaee/javaee-intro.adoc   |  10 +-
 .../kb/docs/javaee/maven-entapp-testing.adoc       |  10 +-
 .../src/content/kb/docs/javaee/maven-entapp.adoc   |  12 +-
 .../kb/docs/javaee/maven-osgiservice-cdi.adoc      |   4 +-
 .../docs/javaee/maven-primefaces-screencast.adoc   |   8 +-
 .../docs/javaee/maven-websocketapi-screencast.adoc |  10 +-
 .../content/kb/docs/javaee/maven-websocketapi.adoc |  12 +-
 .../content/kb/docs/javaee/profiler-javaee.adoc    |  10 +-
 .../src/content/kb/docs/javaee/section.adoc        |  46 +++---
 .../src/content/kb/docs/javaee/secure-ejb.adoc     |  12 +-
 .../docs/javaee/weblogic-javaee-m1-screencast.adoc |   2 +-
 .../src/content/kb/docs/matisse.adoc               |  32 ++--
 .../src/content/kb/docs/mobility.adoc              |  10 +-
 netbeans.apache.org/src/content/kb/docs/php.adoc   | 168 ++++++++++-----------
 .../src/content/kb/docs/php/ajax-quickstart.adoc   |   6 +-
 .../docs/php/configure-php-environment-mac-os.adoc |   2 +-
 .../docs/php/configure-php-environment-ubuntu.adoc |   6 +-
 .../php/configure-php-environment-windows.adoc     |   4 +-
 .../src/content/kb/docs/php/debugging.adoc         |   6 +-
 .../src/content/kb/docs/php/editor-screencast.adoc |   8 +-
 .../src/content/kb/docs/php/flickr-screencast.adoc |   7 +-
 .../src/content/kb/docs/php/index.adoc             |  44 +++---
 .../php/namespace-code-completion-screencast.adoc  |   6 +-
 .../content/kb/docs/php/php-editor-screencast.adoc |   4 +-
 .../kb/docs/php/php-variables-screencast.adoc      |   2 +-
 .../src/content/kb/docs/php/phpunit.adoc           |   2 +-
 .../kb/docs/php/project-config-screencast.adoc     |   4 +-
 .../src/content/kb/docs/php/project-setup.adoc     |  18 +--
 .../src/content/kb/docs/php/quickstart.adoc        |  10 +-
 .../docs/php/remote-hosting-and-ftp-account.adoc   |   4 +-
 .../src/content/kb/docs/php/section.adoc           |  74 ++++-----
 .../src/content/kb/docs/php/wish-list-lesson1.adoc |  15 +-
 .../src/content/kb/docs/php/wish-list-lesson2.adoc |   8 +-
 .../src/content/kb/docs/php/wish-list-lesson3.adoc |  10 +-
 .../src/content/kb/docs/php/wish-list-lesson4.adoc |   6 +-
 .../src/content/kb/docs/php/wish-list-lesson5.adoc |  10 +-
 .../src/content/kb/docs/php/wish-list-lesson6.adoc |   8 +-
 .../src/content/kb/docs/php/wish-list-lesson7.adoc |   6 +-
 .../src/content/kb/docs/php/wish-list-lesson8.adoc |   6 +-
 .../src/content/kb/docs/php/wish-list-lesson9.adoc |   8 +-
 .../kb/docs/php/wish-list-oracle-lesson1.adoc      |  10 +-
 .../kb/docs/php/wish-list-tutorial-main-page.adoc  |  26 ++--
 .../src/content/kb/docs/section.adoc               |  28 ++--
 netbeans.apache.org/src/content/kb/docs/tools.adoc |  32 ++--
 netbeans.apache.org/src/content/kb/docs/web.adoc   |  22 +--
 .../src/content/kb/docs/web/ajax-quickstart.adoc   |  12 +-
 .../src/content/kb/docs/web/applets.adoc           |   7 +-
 .../kb/docs/web/framework-adding-support.adoc      |  16 +-
 .../src/content/kb/docs/web/grails-quickstart.adoc |   7 +-
 .../src/content/kb/docs/web/hibernate-webapp.adoc  |  24 ++-
 .../kb/docs/web/html5-cordova-screencast.adoc      |  20 +--
 .../content/kb/docs/web/html5-css-screencast.adoc  |  25 +--
 .../docs/web/html5-gettingstarted-screencast.adoc  |  20 +--
 .../kb/docs/web/html5-javascript-screencast.adoc   |  20 +--
 .../src/content/kb/docs/web/index.adoc             |  48 +++---
 .../src/content/kb/docs/web/js-toolkits-dojo.adoc  |  16 +-
 .../content/kb/docs/web/js-toolkits-jquery.adoc    |   6 +-
 .../src/content/kb/docs/web/jsf-jpa-weblogic.adoc  |  19 ++-
 .../src/content/kb/docs/web/jsf20-crud.adoc        |  68 ++++-----
 .../src/content/kb/docs/web/jsf20-intro.adoc       |  27 ++--
 .../src/content/kb/docs/web/jsf20-support.adoc     |  14 +-
 .../src/content/kb/docs/web/mysql-webapp.adoc      |  19 ++-
 .../src/content/kb/docs/web/oracle-cloud.adoc      |  20 +--
 .../kb/docs/web/quickstart-webapps-spring.adoc     |  10 +-
 .../kb/docs/web/quickstart-webapps-struts.adoc     |  11 +-
 .../kb/docs/web/quickstart-webapps-wicket.adoc     |  13 +-
 .../content/kb/docs/web/quickstart-webapps.adoc    |   9 +-
 .../src/content/kb/docs/web/section.adoc           |  48 +++---
 .../src/content/kb/docs/web/security-webapps.adoc  |  14 +-
 107 files changed, 1037 insertions(+), 998 deletions(-)

diff --git a/netbeans.apache.org/src/content/kb/docs/cnd.adoc b/netbeans.apache.org/src/content/kb/docs/cnd.adoc
index eca648b56..70875ea2a 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd.adoc
@@ -41,26 +41,26 @@ When you install the NetBeans IDE with C/C++ support, the IDE includes project t
 
 === Creating C and C++ Projects
 
-* link:../docs/cnd/quickstart.html[+C/C++ Projects Quick Start Tutorial+]
-* link:../docs/cnd/development-environment.html[+Defining Your C/C++ Project's Development Environment+]
-* link:../docs/cnd/beginning-jni-linux.html[+Beginning JNI with NetBeans IDE and C/C++ Plugin on Linux+]
+* xref:cnd/quickstart.adoc[+C/C++ Projects Quick Start Tutorial+]
+* xref:cnd/development-environment.adoc[+Defining Your C/C++ Project's Development Environment+]
+* xref:cnd/beginning-jni-linux.adoc[+Beginning JNI with NetBeans IDE and C/C++ Plugin on Linux+]
 
 === Developing C and C++ Projects
 
-* link:../docs/cnd/navigating-editing.html[+Editing and Navigating C/C++ Source Files Tutorial+]
-* link:../docs/cnd/debugging.html[+Debugging C/C++ Projects Tutorial+]
-* link:../docs/cnd/remote-modes.html[+Modes of C/C++ Remote Development+]
-* link:../docs/cnd/remotedev-tutorial.html[+C/C++ Remote Development Tutorial+]
-* link:../docs/cnd/c-unit-test.html[+Adding Unit Tests to a C/C++ Project+]
+* xref:cnd/navigating-editing.adoc[+Editing and Navigating C/C++ Source Files Tutorial+]
+* xref:cnd/debugging.adoc[+Debugging C/C++ Projects Tutorial+]
+* xref:cnd/remote-modes.adoc[+Modes of C/C++ Remote Development+]
+* xref:cnd/remotedev-tutorial.adoc[+C/C++ Remote Development Tutorial+]
+* xref:cnd/c-unit-test.adoc[+Adding Unit Tests to a C/C++ Project+]
 
 == Tutorials and Articles
 
 === C and C++ Project How-tos
 
-* link:../docs/cnd/HowTos.html[+C/C++ Application How-Tos+]
-* link:../docs/cnd/depchecking.html[+Make Dependency Checking+]
-* link:../docs/cnd/toolchain.html[+Using the C/C++ Tool Collection Descriptor+]
-* link:../docs/cnd/cpp-vcs.html[+Storing NetBeans C/C++ Projects Under VCS+]
+* xref:cnd/HowTos.adoc[+C/C++ Application How-Tos+]
+* xref:cnd/depchecking.adoc[+Make Dependency Checking+]
+* xref:cnd/toolchain.adoc[+Using the C/C++ Tool Collection Descriptor+]
+* xref:cnd/cpp-vcs.adoc[+Storing NetBeans C/C++ Projects Under VCS+]
 
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/HowTos.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/HowTos.adoc
index 9e36b0817..60b711f84 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/HowTos.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/HowTos.adoc
@@ -105,4 +105,4 @@ You can also right-click the item and select Navigate > Go to Declaration/Defini
 
 A namespace can be defined in different files of the project. To navigate between different namespace definitions, use the Classes window (Ctrl-9). Right-click the namespace you are interested in and choose All Declarations. You will see a list of all definitions sorted by file names.
 
-link:mailto:users@cnd.netbeans.org?subject=subject=Feedback:%20C/C++%20Application%20How-Tos%20-%20NetBeans%20IDE%208.0[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
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 389177a10..6c7f29ed5 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
@@ -42,14 +42,14 @@ The tutorial is specific to Linux.
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[+version 7.4 or 8.0 with NetBeans C/C++ plugin+] 
+|NetBeans IDE |link:https://netbeans.org/downloads/index.html[version 7.4 or 8.0 with NetBeans C/C{pp} plugin] 
 
-|Java Developer Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+version 7 or 8+] 
+|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++/Fortran+] 
+|C and C++ compilers,  ``make`` ,  ``gdb``  |link:../../../community/releases/80/cpp-setup-instructions.html[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++/Fortran+] for information on downloading and installing the required software.
+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.
 
 
 == Setting Up Your Environment for the Tutorial
@@ -332,11 +332,12 @@ In this exercise you made some final configuration steps and ran the application
 
 == Next Steps
 
-If you want to check your work against a working example, you can link:https://netbeans.org/projects/samples/downloads/download/Samples%252FCPlusPlus%252FJNIDemo.zip[+ download a zip file containing the source code+] from netbeans.org.
+If you want to check your work against a working example, you can link:https://netbeans.org/projects/samples/downloads/download/Samples%252FCPlusPlus%252FJNIDemo.zip[download a zip file containing the source code] from netbeans.org.
 
 You can use the following documents to get more information:
 
-* link:quickstart.html[+ C/C++ Projects Quick Start Tutorial+]
-* link:http://docs.oracle.com/javase/7/docs/technotes/guides/jni/[+JNI Specification+]
-* link:http://en.wikipedia.org/wiki/Java_Native_Interface[+Java Native Interface+]
-link:https://netbeans.org/about/contact_form.html?to=7&subject=Feedback:%20Beginning%20JNI%20with%20NetBeans%20IDE%20and%20C/C++%20Plugin%20on%20Linux[+Send Feedback on This Tutorial+]
+* xref:quickstart.adoc[C/C{pp} Projects Quick Start Tutorial]
+* link:http://docs.oracle.com/javase/7/docs/technotes/guides/jni/[JNI Specification]
+* link:http://en.wikipedia.org/wiki/Java_Native_Interface[Java Native Interface]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This 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 e9091bb77..0f5117851 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
@@ -40,15 +40,15 @@ March 2014_ [Revision number: V8.0-1]
 |===
 |Software |Version Required 
 
-|NetBeans IDE (including C/C++/Fortran support) |link:https://netbeans.org/downloads/index.html[+version 7.4 or 8.0 with NetBeans C/C++ plugin+] 
+|NetBeans IDE (including C/C++/Fortran support) |link:https://netbeans.org/downloads/index.html[version 7.4 or 8.0 with NetBeans C/C{pp} plugin] 
 
-|Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Version 7 or 8+] 
+|Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[Version 7 or 8] 
 
-|CUnit 2.1 test framework |link:http://sourceforge.net/projects/cunit/[+C Unit Testing Framework project on sourceforge.+] 
+|CUnit 2.1 test framework |link:http://sourceforge.net/projects/cunit/[C Unit Testing Framework project on sourceforge.] 
 |===
 
 
-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++/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]
 for information about downloading and installing the required NetBeans software.
 
 
@@ -71,9 +71,9 @@ This tutorial uses the CUnit test framework and NetBeans C Simple Tests on Ubunt
 
 == Install the CUnit Testing Framework
 
-To follow this tutorial, you must install CUnit on your system first. See more information about the CUnit framework at the link:http://sourceforge.net/projects/cunit/[+C Unit Testing Framework project on sourceforge.+]
+To follow this tutorial, you must install CUnit on your system first. See more information about the CUnit framework at the link:http://sourceforge.net/projects/cunit/[C Unit Testing Framework project on sourceforge.]
 
-The CUnit documentation is included in the CUnit download, or you can view it at link:http://cunit.sourceforge.net/doc/index.html[+http://cunit.sourceforge.net/doc/index.html+].
+The CUnit documentation is included in the CUnit download, or you can view it at link:http://cunit.sourceforge.net/doc/index.html[http://cunit.sourceforge.net/doc/index.html].
 
 See the appropriate section for installation instructions for your platform:
 
@@ -91,7 +91,7 @@ On Mac OS, or on Linux if the libcunitl* packages are not available, you can dow
 
 The instructions below assume you downloaded the file CUnit-2.1-2-src.tar.bz2 into the directory /tmp. If your download file has a different name be sure to specify your actual CUnit download file and the actual directory where you saved it.
 
-1. Download the CUnit-2.1-2-src.tar.bz2 source from the link:http://sourceforge.net/projects/cunit/files[+CUnit files page+] and save to temporary directory such as /tmp for example.
+1. Download the CUnit-2.1-2-src.tar.bz2 source from the link:http://sourceforge.net/projects/cunit/files[CUnit files page] and save to temporary directory such as /tmp for example.
 2. In a terminal window, unpack the  ``CUnit-2.1-2-src.tar.bz2``  file as follows:
 
 [source,shell]
@@ -120,7 +120,7 @@ When the 'make install' finishes, the CUnit test framework is ready to use in th
 [[solaris]]
 === How to Install CUnit on Oracle Solaris
 
-You must build CUnit with the link:http://en.wikipedia.org/wiki/GNU_build_system[+GNU build system+] before you can use CUnit tests. On Oracle Solaris 11 systems the GNU build system is not usually installed by default. You can get the GNU build system components from the Oracle Solaris 11 package repository with the following commands:
+You must build CUnit with the link:http://en.wikipedia.org/wiki/GNU_build_system[GNU build system] before you can use CUnit tests. On Oracle Solaris 11 systems the GNU build system is not usually installed by default. You can get the GNU build system components from the Oracle Solaris 11 package repository with the following commands:
 
 
 [source,java]
@@ -136,7 +136,7 @@ pkg install pkg://solaris/developer/build/automake-110
 
 The instructions below assume you downloaded the file CUnit-2.1-2-src.tar.bz2 into the directory /tmp. If your download file has a different name be sure to specify your actual CUnit download file and the actual directory where you saved it.
 
-1. Download the CUnit-2.1-2-src.tar.bz2 source from the link:http://sourceforge.net/projects/cunit/files[+CUnit files page+] and save to temporary directory such as /tmp for example.
+1. Download the CUnit-2.1-2-src.tar.bz2 source from the link:http://sourceforge.net/projects/cunit/files[CUnit files page] and save to temporary directory such as /tmp for example.
 2. In a terminal window, unpack the  ``CUnit-2.1-2-src.tar.bz2``  file as follows:
 
 [source,shell]
@@ -166,7 +166,7 @@ When the 'make install' finishes, the CUnit test framework is ready to use in th
 
 These instructions assume you downloaded the file CUnit-2.1-2-src.tar.bz2 into the directory C:/distr. If your download file has a different name be sure to specify your actual CUnit download file and the actual directory where you saved it.
 
-1. Download the CUnit-2.1-2-src.tar.bz2 source from the link:http://sourceforge.net/projects/cunit/files[+CUnit files page+] and save to temporary directory such as the C:/distr example.
+1. Download the CUnit-2.1-2-src.tar.bz2 source from the link:http://sourceforge.net/projects/cunit/files[CUnit files page] and save to temporary directory such as the C:/distr example.
 2. Start the MinGW shell application in Windows by choosing Start > All Programs > MinGW > MinGW Shell.
 3. In the MinGW Shell window, unpack the  ``CUnit-2.1-2-src.tar.bz2``  file as follows:
 
@@ -250,7 +250,7 @@ $
 ----
 
 [start=8]
-. If you use Java 7 update 21, 25, or 40 you must perform the following workaround due to link:https://netbeans.org/bugzilla/show_bug.cgi?id=236867[+issue 236867+] in order to get CUnit and this tutorial to work.
+. If you use Java 7 update 21, 25, or 40 you must perform the following workaround due to link:https://netbeans.org/bugzilla/show_bug.cgi?id=236867[issue 236867] in order to get CUnit and this tutorial to work.
 
 1. Go to Tools > Options > C/C++ > Build Tools and select the MinGW tool collection.
 2. Change the Make Command entry to make.exe without a complete path.
@@ -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++/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 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.
 
 
 == Create the Project for the Tutorial
@@ -459,7 +459,7 @@ image::images/c-unit-test-fail-annotation.png[]
 
 == Debug My CUnit Test
 
-You can debug tests using the same techniques you use to debug your project source files, as described in the link:https://netbeans.org/kb/docs/cnd/debugging.html[+Debugging C/C++ Projects Tutorial+].
+You can debug tests using the same techniques you use to debug your project source files, as described in the xref:debugging.adoc[Debugging C/C{pp} Projects Tutorial].
 
 1. In the Projects window, right-click the My CUnit Test folder and select Step Into Test.
 
@@ -687,8 +687,8 @@ make[1]: Leaving directory `/home/tester/NetBeansProjects/CppApplication_1'
 
 == Adding Support for Other Test Frameworks
 
-You can add support for your favorite C/C++ test framework by creating a NetBeans module. See the NetBeans developer's link:http://wiki.netbeans.org/CND69UnitTestsPluginTutotial[+C/C++ Unit Test Plugin Tutorial+] on the NetBeans wiki.
+You can add support for your favorite C/C++ test framework by creating a NetBeans module. See the NetBeans developer's link:http://wiki.netbeans.org/CND69UnitTestsPluginTutotial[C/C{pp} Unit Test Plugin Tutorial] on the NetBeans wiki.
 
-link:mailto:users@cnd.netbeans.org?subject=Feedback:%20Adding%20Unit%20Tests%20to%20a%20C/C++%20Project%20-%20NetBeans%20IDE%207.4%20Tutorial[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
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 7d3c90f4c..f291f0141 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
@@ -42,13 +42,13 @@ Starting with NetBeans IDE 7.3 storing NetBeans C/C++ projects (mostly projects
 |===
 |Software |Version Required 
 
-|NetBeans IDE (including C/C++ support) |link:https://netbeans.org/downloads/index.html[+version 7.3 or more recent with NetBeans C/C++ plugin+] 
+|NetBeans IDE (including C/C++ support) |link:https://netbeans.org/downloads/index.html[version 7.3 or more recent with NetBeans C/C{pp} plugin] 
 
-|Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Version 6, 7, or 8 +] 
+|Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[Version 6, 7, or 8 ] 
 |===
 
 
-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++/Fortran+] documents for information about downloading and installing the required software.
+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.
 
 
 == VCS Controlled Project Issues Resolved in NetBeans IDE
@@ -112,8 +112,9 @@ In managed projects ("C/C++ Application", "C/C++ Dynamic Library", or "C/C++ Sta
 
 == More Information about C/C++/Fortran Support
 
-* Please visit the link:https://netbeans.org/kb/trails/cnd.html[+C/C++ Learning Trail+] for more information about using the C/C++ features of the NetBeans IDE.
-* Join the link:http://forums.netbeans.org/cnd-users.html[+NetBeans C/C++ User Forum+] to take part in discussions related to C/C++ development using the NetBeans IDE or ask for help.
-* You can file a bug or suggest an enhancement to link:https://netbeans.org/bugzilla/enter_bug.cgi?component=cnd[+Bugzilla+] (netbeans.org registration is required).
-* For information on using popular version control packages with NetBeans IDE, see " link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG234[+Versioning Applications with Version Control+]" in _Developing Applications with NetBeans IDE_.
-link:mailto:users@cnd.netbeans.org?subject=subject=Feedback:%20Storing%20NetBeans%20C/++%20Projects%20Under%20Version%20Control%20System[+Send Feedback on This Tutorial+]
+* Please visit the xref:../cnd.adoc[C/C{pp} Learning Trail] for more information about using the C/C++ features of the NetBeans IDE.
+* Join the link:http://forums.netbeans.org/cnd-users.html[NetBeans C/C{pp} User Forum] to take part in discussions related to C/C++ development using the NetBeans IDE or ask for help.
+* You can file a bug or suggest an enhancement to link:https://netbeans.org/bugzilla/enter_bug.cgi?component=cnd[Bugzilla] (netbeans.org registration is required).
+* For information on using popular version control packages with NetBeans IDE, see " link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG234[Versioning Applications with Version Control]" in _Developing Applications with NetBeans IDE_.
+
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
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 b2933d7fa..ef8b6df95 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/debugging.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/debugging.adoc
@@ -42,12 +42,12 @@ The following short tutorial takes you through some of the features for debuggin
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[+version 7.4 or 8.0 with NetBeans C/C++ plugin module+] 
+|NetBeans IDE |link:https://netbeans.org/downloads/index.html[version 7.4 or 8.0 with NetBeans C/C{pp} plugin module] 
 
-|Java Developer Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+version 7 or 8+] 
+|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++/Fortran+] for information on downloading and installing the required software.
+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.
 
 
 == Creating the Sample Project
@@ -188,6 +188,6 @@ image::images/disassembly.png[]
 
 == See Also
 
-Please see the link:https://netbeans.org/kb/trails/cnd.html[+C/C++ Learning Trail+] for more articles about developing with C/C++/Fortran in NetBeans IDE.
+Please see the xref:../cnd.adoc[C/C{pp} Learning Trail] for more articles about developing with C/C++/Fortran in NetBeans IDE.
 
-link:mailto:users@cnd.netbeans.org?subject=Feedback:%20Debugging%20C/C++%20Projects%20-%20NetBeans%20IDE%207.4%20Tutorial[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
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 3230ab0c3..f345f48e7 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/depchecking.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/depchecking.adoc
@@ -46,13 +46,13 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software |Version Required 
 
-|NetBeans IDE (including C/C++ support) |link:https://netbeans.org/downloads/index.html[+version 7.3, 7.4, or 8.0 with NetBeans C/C++ plugin+] 
+|NetBeans IDE (including C/C++ support) |link:https://netbeans.org/downloads/index.html[version 7.3, 7.4, or 8.0 with NetBeans C/C{pp} plugin] 
 
-|Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+version 7 or 8+] 
+|Java Development 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++/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]
 for information about downloading and installing the required software.
 
 
@@ -167,12 +167,12 @@ The rule  ``.dep.inc: .depcheck-impl``  is added to prevent build failure when
 
 == References
 
-1. link:http://en.wikipedia.org/wiki/Make_%28software%29[+Wikipedia article about  ``make`` +]
-2. link:http://make.paulandlesley.org/autodep.html[+Advanced Auto-Dependency Generation+]
+1. link:http://en.wikipedia.org/wiki/Make_%28software%29[Wikipedia article about  ``make`` ]
+2. link:http://make.paulandlesley.org/autodep.html[Advanced Auto-Dependency Generation]
 
 
 == See Also
 
-Please see the link:https://netbeans.org/kb/trails/cnd.html[+C/C++ Learning Trail+] for more articles about developing with C/C++/Fortran in NetBeans IDE.
+Please see the xref:../cnd.adoc[C/C{pp} Learning Trail] for more articles about developing with C/C++/Fortran in NetBeans IDE.
 
-link:mailto:users@cnd.netbeans.org?subject=Feedback:%20Make%20Dependency%20Checking%20-%20NetBeans%20IDE%208.0%20Tutorial[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
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 cbaf9abea..07e0da565 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
@@ -45,18 +45,18 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[+version 7.3 or more recent with NetBeans C/C++ plugin+] 
+|NetBeans IDE |link:https://netbeans.org/downloads/index.html[version 7.3 or more recent with NetBeans C/C{pp} plugin] 
 
-|Java Developer Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+version 6, 7, or 8+] 
+|Java Developer Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[version 6, 7, or 8] 
 |===
 
 
-See the link:../../../community/releases/80/install.html[+NetBeans IDE Installation Instructions+] for information on downloading and installing the required software.
+See the link:../../../community/releases/80/install.html[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++/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 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.
 
 
 == Specifying the Build Host
@@ -69,7 +69,7 @@ You can define remote build hosts in several ways:
 * Right-click a project, select Set Build Host > Manage Hosts, then click Add in the Build Host Manager dialog box.
 * Using the Options window: Choose Tools > Options > C/C++ > Build Tools and click the Edit button next to the Build Host list.
 
-See the link:./remotedev-tutorial.html[+C/C++ Remote Development Tutorial+] for more information.
+See the xref:remotedev-tutorial.adoc[C/C{pp} Remote Development Tutorial] for more information.
 
 
 == Using the Tool Collection List
@@ -135,6 +135,6 @@ The next time you build the project, the selected tool collection will be used.
 
 == See Also
 
-Please see the link:https://netbeans.org/kb/trails/cnd.html[+C/C++ Learning Trail+] for more articles about developing with C/C++/Fortran in NetBeans IDE.
+Please see the xref:../cnd.adoc[C/C{pp} Learning Trail] for more articles about developing with C/C++/Fortran in NetBeans IDE.
 
-link:mailto:users@cnd.netbeans.org?subject=Feedback:%20Defining%20Your%20C/C++%20Project's%20Development%20Environment%20-%20NetBeans%20IDE%207.3%20Tutorial[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/index.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/index.adoc
index fe34b5845..7963b4f75 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/index.adoc
@@ -26,20 +26,20 @@
 :toc-title:
 :description: C and C++ Tutorials
 
-- link:c-unit-test.html[Adding Unit Tests to a C Project - NetBeans IDE Tutorial]
-- link:beginning-jni-linux.html[Beginning JNI with NetBeans IDE and C/C++ Plugin on Linux]
-- link:HowTos.html[C/C++ Application How-Tos for Code Assistance]
-- link:quickstart.html[C/C++ Projects Quick Start Tutorial]
-- link:remotedev-tutorial.html[C/C++ Remote Development - NetBeans IDE Tutorial]
-- link:index.html[C and C++ Tutorials]
-- link:debugging.html[Debugging C/C++ Projects Tutorial]
-- link:development-environment.html[Defining Your C/C++ Project&#39;s Development Environment]
-- link:navigating-editing.html[Editing and Navigating C/C++ Source Files - NetBeans IDE Tutorial]
-- link:depchecking.html[Make Dependency Checking]
-- link:remote-modes.html[Modes of C/C++ Remote Development in the IDE]
-- link:section.html[]
-- link:cpp-vcs.html[Storing NetBeans C/C++ Projects Under Version Control Systems]
-- link:toolchain.html[Using the C/C++ Tool Collection Descriptor - NetBeans IDE Tutorial]
+- xref:c-unit-test.adoc[Adding Unit Tests to a C Project - NetBeans IDE Tutorial]
+- xref:beginning-jni-linux.adoc[Beginning JNI with NetBeans IDE and C/C++ Plugin on Linux]
+- xref:HowTos.adoc[C/C{pp} Application How-Tos for Code Assistance]
+- xref:quickstart.adoc[C/C{pp} Projects Quick Start Tutorial]
+- xref:remotedev-tutorial.adoc[C/C{pp} Remote Development - NetBeans IDE Tutorial]
+- xref:index.adoc[C and C++ Tutorials]
+- xref:debugging.adoc[Debugging C/C++ Projects Tutorial]
+- xref:development-environment.adoc[Defining Your C/C++ Project&#39;s Development Environment]
+- xref:navigating-editing.adoc[Editing and Navigating C/C++ Source Files - NetBeans IDE Tutorial]
+- xref:depchecking.adoc[Make Dependency Checking]
+- xref:remote-modes.adoc[Modes of C/C++ Remote Development in the IDE]
+- xref:section.adoc[]
+- xref:cpp-vcs.adoc[Storing NetBeans C/C++ Projects Under Version Control Systems]
+- xref:toolchain.adoc[Using the C/C++ Tool Collection Descriptor - NetBeans IDE Tutorial]
 
 
 
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 e4d8d2989..560fe4787 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
@@ -42,13 +42,13 @@ The following short tutorial takes you through some of the features for navigati
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[+ version 7.4 or 8.0 with NetBeans C/C++ plugin+] 
+|NetBeans IDE |link:https://netbeans.org/downloads/index.html[ version 7.4 or 8.0 with NetBeans C/C{pp} plugin] 
 
-|Java Developer Kit (JDK) |link:http://java.sun.com/javase/downloads/index.jsp[+version 7 or 8+] 
+|Java Developer Kit (JDK) |link:http://java.sun.com/javase/downloads/index.jsp[version 7 or 8] 
 |===
 
 
-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++/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 about downloading and installing the required software.
 
 *Sample Projects*
@@ -386,6 +386,6 @@ image::images/type_hierarchy.png[]
 
 === [[Next Steps]] 
 
-See link:debugging.html[+Debugging C/C++ Projects+] for a tutorial on using some of the features for debugging a C or C++ project in NetBeans IDE.
+See xref:debugging.adoc[Debugging C/C{pp} Projects] for a tutorial on using some of the features for debugging a C or C++ project in NetBeans IDE.
 
-link:mailto:users@cnd.netbeans.org?subject=Feedback:%20Editing%20and%20Navigating%20C/C++%20Source%20Files%20-%20NetBeans%20IDE%207.3%20Tutorial[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
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 a0951b86b..a2554bcc6 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/quickstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/quickstart.adoc
@@ -46,15 +46,15 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[+ version 7.2 or more recent with NetBeans C/C++ plugin+] 
+|NetBeans IDE |link:https://netbeans.org/downloads/index.html[ version 7.2 or more recent with NetBeans C/C{pp} plugin] 
 
-|Java Developer Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+version 6, 7, or 8+] 
+|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++/Fortran+] 
+|C and C++ compilers,  ``make`` ,  ``gdb``  |link:../../../community/releases/80/cpp-setup-instructions.html[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++/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]
 for information about downloading and installing the required software.
 
 *Sample Projects*
@@ -66,7 +66,7 @@ If you want to just play with some sample projects provided in the IDE, choose F
 
 NetBeans C/C++ support lets you create C and C++ Application and Library projects with generated makefiles, as well as C and C++ projects with existing sources.
 
-You can build, run, and debug your project on the local host (the system from which you started the IDE) or on a remote host running a UNIX® operating system. For information on specifying the tool collection for your project and on defining and using remote hosts, see link:development-environment.html[+Defining Your C/C++ Project's Development Environment+].
+You can build, run, and debug your project on the local host (the system from which you started the IDE) or on a remote host running a UNIX® operating system. For information on specifying the tool collection for your project and on defining and using remote hosts, see xref:development-environment.adoc[Defining Your C/C{pp} Project's Development Environment].
 
 With a C/C++ Application, Dynamic Library, or Static Library project, the IDE controls all aspects of how your application is built, run, and debugged. You specify project settings when creating the project and in the Project Properties dialog box. The IDE generates a makefile in which all of your settings are stored.
 
@@ -243,15 +243,15 @@ In this exercise, you download and install the sources for the open source Loki
 
 === Creating a Project With Existing Sources
 
-1. If you are running the IDE on Windows, install the Pthreads library from link:http://sourceware.org/pthreads-win32[+  ``http://sourceware.org/pthreads-win32`` +].
+1. If you are running the IDE on Windows, install the Pthreads library from link:http://sourceware.org/pthreads-win32[http://sourceware.org/pthreads-win32].
 
-For convenience, you can use this link:ftp://sourceware.org/pub/pthreads-win32/pthreads-2005-03-08.exe[+direct link+] to the pthreads-2005-03-08.exe installer.
+For convenience, you can use this link:ftp://sourceware.org/pub/pthreads-win32/pthreads-2005-03-08.exe[direct link] to the pthreads-2005-03-08.exe installer.
 
 Extract the pthreads library in your Windows user directory.
 
 
 [start=2]
-. Download the  ``loki-0.1.7``  library from link:http://sourceforge.net/projects/loki-lib[+  ``http://sourceforge.net/projects/loki-lib`` +].
+. Download the  ``loki-0.1.7``  library from link:http://sourceforge.net/projects/loki-lib[http://sourceforge.net/projects/loki-lib].
 
 [start=3]
 . Uncompress  ``loki-0.1.7``  in a directory of your choice.
@@ -313,8 +313,8 @@ To rebuild the project:
 
 == [[Next Steps]] 
 
-See link:navigating-editing.html[+Editing and Navigating C/C++ Source Files+] for a tutorial on using the advanced navigation and editing features in NetBeans IDE to view and modify your source code.
+See xref:navigating-editing.adoc[Editing and Navigating C/C{pp} Source Files] for a tutorial on using the advanced navigation and editing features in NetBeans IDE to view and modify your source code.
 
-See the link:https://netbeans.org/kb/trails/cnd.html[+C/C++ Learning Trail+] for more articles about developing with C/C++/Fortran in NetBeans IDE.
+See the xref:../cnd.adoc[C/C{pp} Learning Trail] for more articles about developing with C/C++/Fortran in NetBeans IDE.
 
-link:mailto:users@cnd.netbeans.org?subject=Feedback:%20C/C++%20Projects%20Quick%20Start%20-%20NetBeans%20IDE%207.4%20Tutorial[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/remote-modes.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/remote-modes.adoc
index e79082781..b40e428f6 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/remote-modes.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/remote-modes.adoc
@@ -175,7 +175,7 @@ In this environment, the benefits of using full remote mode are:
 
 The remote development mode that you use is determined by the way you configure a remote build host, but also by the way you access the project in the IDE.
 
-For each mode, you must first configure a remote build host, as described in the link:./remotedev-tutorial.html[+C/C++ Remote Development tutorial+] and in the IDE help.
+For each mode, you must first configure a remote build host, as described in the xref:remotedev-tutorial.adoc[C/C{pp} Remote Development tutorial] and in the IDE help.
 
 You can select simple mode or mixed mode for your remote host in the IDE using the Host Properties dialog box to specify how project files should be accessed when you use the host.
 
@@ -260,7 +260,7 @@ You can browse to the file on the remote file system.
 
 To provide fast access to remote files, the IDE uses a disk cache on the local system. The cache is located in `_userdir_/var/cache/remote-files` where `_userdir_` is unique to the user and its location varies by the platform where you are running the IDE.
 
-See a description of the `_userdir_` and locations for each platform at link:http://wiki.netbeans.org/FaqWhatIsUserdir[+http://wiki.netbeans.org/FaqWhatIsUserdir+].
+See a description of the `_userdir_` and locations for each platform at xref:../../../wiki/FaqWhatIsUserdir.adoc[FaqWhatIsUserdir].
 
 When using remote development in simple and shared modes, only system headers will be accessed through the local cache so there is no security risk.
 
@@ -277,11 +277,9 @@ See the following locations for more information:
 
 * The Help menu in the IDE provides access to extensive information about using the IDE.
 
-* The link:./remotedev-tutorial.html[+C/C++ Remote Development tutorial+] tells how to do simple remote development step-by-step
+* The xref:remotedev-tutorial.adoc[C/C{pp} Remote Development tutorial] tells how to do simple remote development step-by-step
 
-* The link:https://netbeans.org/kb/trails/cnd.html[+C/C++ Learning Trail+] provides several articles and tutorials for developing in C/C++ in the IDE.
-
-
-link:/about/contact_form.html?to=3&subject=Feedback:%20C/C++%20Remote%20Development%20Modes%20-%20NetBeans%20IDE%20Article[+Send Us Your Feedback+]link:mailto:users@cnd.netbeans.org?subject=Feedback:%20C/C++%20Remote%20Development%20Modes%20-%20NetBeans%20IDE%20Article[+Send Feedback on This Article+]
+* The xref:../cnd.adoc[C/C{pp} Learning Trail] provides several articles and tutorials for developing in C/C++ in the IDE.
 
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
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 aca462988..121b6e212 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
@@ -41,13 +41,13 @@ This document describes how to use remote development features of the NetBeans I
 |===
 |Software |Version Required 
 
-|NetBeans IDE (including C/C++ support) |link:https://netbeans.org/downloads/index.html[+version 7.3, 7.4, or 8.0 with NetBeans C/C++ plugin+] 
+|NetBeans IDE (including C/C++ support) |link:https://netbeans.org/downloads/index.html[version 7.3, 7.4, or 8.0 with NetBeans C/C{pp} plugin] 
 
-|Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Version 7 or 8+] 
+|Java Development 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++/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]
 for information about downloading and installing the required software.
 
 
@@ -62,7 +62,7 @@ Have you ever wanted to develop a Solaris or Linux application from your laptop
 
 When you do remote development, you run the NetBeans IDE on your client system and you can create projects, edit files, and use code assistance features the same way as you do for local projects. But when you build, run, or debug your project, the process runs on the remote Solaris or Linux server with output and input transferred to the client system. Ideally, you shouldn't see any difference in workflow between doing local and remote development once you've set up the remote build host.
 
-The IDE supports different modes of remote development, which are described in link:./remote-modes.html[+C/C++ Remote Development Modes+]. You can determine how you want to develop on the remote host.
+The IDE supports different modes of remote development, which are described in xref:remote-modes.adoc[C/C{pp} Remote Development Modes]. You can determine how you want to develop on the remote host.
 
 
 === Requirements for Remote Development
@@ -96,7 +96,7 @@ The IDE must be able to find a supported tool collection on the remote host: GNU
 
 For correct operation of editor features like code completion and semantic highlighting, the Classes window, and others, your project has to be used in the correct environment, which means system includes, macro definitions, platform, etc. All of this information is gathered from the remote server and stored locally on your client system, so that when you edit locally the code assistance will work even when the project is set up to use a remote build host.
 
-
+[system]
 == Setting Up the System
 
 Your remote Linux or Solaris server must allow communication through the SSH protocol from the client where you are running the IDE. If you want to use file sharing instead of allowing the IDE to copy files to the remote server, the file sharing must be set up in the network for both systems.
@@ -104,7 +104,7 @@ Your remote Linux or Solaris server must allow communication through the SSH pro
 
 === SSH protocol
 
-The SSH server is usually included in Linux and Solaris operating systems, and is run by default in most cases. If not, you can find information about installing and managing SSH at link:http://en.wikipedia.org/wiki/Secure_Shell[+http://en.wikipedia.org/wiki/Secure_Shell+]
+The SSH server is usually included in Linux and Solaris operating systems, and is run by default in most cases. If not, you can find information about installing and managing SSH at link:http://en.wikipedia.org/wiki/Secure_Shell[http://en.wikipedia.org/wiki/Secure_Shell]
 
 The IDE provides its own ssh client, so you do not need to install the ssh client on your local machine.
 
@@ -125,13 +125,13 @@ For Windows to UNIX® configuration there are two major ways of sharing sources:
 
 ==== Organizing Sources Using Samba or SMB
 
-A Samba server (open source version of SMB) allows a Windows user to map shared NFS folders as Windows network drives. The Samba package, or its equivalent SMB or CIFS, is included in most distributions of Linux and Solaris operating systems. If Samba is not included in your distribution, you can download it from link:http://www.samba.org/[+www.samba.org+].
+A Samba server (open source version of SMB) allows a Windows user to map shared NFS folders as Windows network drives. The Samba package, or its equivalent SMB or CIFS, is included in most distributions of Linux and Solaris operating systems. If Samba is not included in your distribution, you can download it from link:http://www.samba.org/[www.samba.org].
 
 If you have privileged access on your server, you can set up Samba yourself following the instructions at the following links. Otherwise you have to contact your system administrator.
 
-* Oracle Solaris 11: link:https://blogs.oracle.com/paulie/entry/cifs_sharing_on_solaris_11[+https://blogs.oracle.com/paulie/entry/cifs_sharing_on_solaris_11+] for brief information. See link:http://docs.oracle.com/cd/E26502_01/html/E29004/smboverview.html[+Managing SMB File Sharing and Windows Interoperability in Oracle Solaris 11.1+] for full information.
-* Oracle Solaris 10: link:http://blogs.oracle.com/timthomas/entry/enabling_and_configuring_samba_as[+http://blogs.oracle.com/timthomas/entry/enabling_and_configuring_samba_as+]
-* Linux: link:http://www.linux.com/articles/58593[+http://www.linux.com/articles/58593+]
+* Oracle Solaris 11: link:https://blogs.oracle.com/paulie/entry/cifs_sharing_on_solaris_11[https://blogs.oracle.com/paulie/entry/cifs_sharing_on_solaris_11] for brief information. See link:http://docs.oracle.com/cd/E26502_01/html/E29004/smboverview.html[Managing SMB File Sharing and Windows Interoperability in Oracle Solaris 11.1] for full information.
+* Oracle Solaris 10: link:http://blogs.oracle.com/timthomas/entry/enabling_and_configuring_samba_as[http://blogs.oracle.com/timthomas/entry/enabling_and_configuring_samba_as]
+* Linux: link:http://www.linux.com/articles/58593[http://www.linux.com/articles/58593]
 
 After starting Samba you can map your UNIX server's folders the same way as Windows folders.
 
@@ -139,9 +139,9 @@ After starting Samba you can map your UNIX server's folders the same way as Wind
 ==== Windows Services For UNIX (SFU)
 
 Another option is Windows Services For UNIX, a set of utilities provided by Microsoft to access NFS filesystems from Windows. 
-You can download them from link:http://www.microsoft.com/downloads/details.aspx?FamilyID=896c9688-601b-44f1-81a4-02878ff11778&displaylang=en[+Microsoft Download Center+] and read documentation at link:http://technet.microsoft.com/en-us/library/bb496506.aspx[+Windows Services for Unix page+].
+You can download them from link:http://www.microsoft.com/downloads/details.aspx?FamilyID=896c9688-601b-44f1-81a4-02878ff11778&displaylang=en[Microsoft Download Center] and read documentation at link:http://technet.microsoft.com/en-us/library/bb496506.aspx[Windows Services for Unix page].
 
-The SFU package is not available for Windows Vista or Windows 7 users. Windows Vista and Windows 7 Enterprise and Ultimate Editions include the Services for Unix components, renamed to the Subsystem for UNIX-based applications (SUA), and Client for NFS v3. For more information, see link:http://en.wikipedia.org/wiki/Microsoft_Windows_Services_for_UNIX#Subsystem_for_UNIX-based_Applications_.28SUA.29[+http://en.wikipedia.org/wiki/Microsoft_Windows_Services_for_UNIX+]
+The SFU package is not available for Windows Vista or Windows 7 users. Windows Vista and Windows 7 Enterprise and Ultimate Editions include the Services for Unix components, renamed to the Subsystem for UNIX-based applications (SUA), and Client for NFS v3. For more information, see link:http://en.wikipedia.org/wiki/Microsoft_Windows_Services_for_UNIX#Subsystem_for_UNIX-based_Applications_.28SUA.29[http://en.wikipedia.org/wiki/Microsoft_Windows_Services_for_UNIX]
 
 
 ==== Mac OS X configuration
@@ -158,7 +158,7 @@ smb://_DNSname/sharename_
 smb://_IPaddress/sharename_
 ----
 
-You are prompted to enter the username and password for the shared folder. See link:http://support.apple.com/kb/ht1568[+How to Connect to Windows File Sharing (SMB)+] in the Apple knowledge base for more information.
+You are prompted to enter the username and password for the shared folder. See link:http://support.apple.com/kb/ht1568[How to Connect to Windows File Sharing (SMB)] in the Apple knowledge base for more information.
 
 To connect to an NFS server, type the server name and path to the NFS shared folder in one of these forms:
 
@@ -168,7 +168,7 @@ To connect to an NFS server, type the server name and path to the NFS shared fol
 nfs://_IPaddress/path/to/share_`
 ----
 
-For more information, see link:http://support.apple.com/kb/TA22243[+Using the Finder to Mount NFS Exports+] in the Apple knowledge base.
+For more information, see link:http://support.apple.com/kb/TA22243[Using the Finder to Mount NFS Exports] in the Apple knowledge base.
 
 You are not prompted for your username and password, but authorization is checked against your Mac UID. The UID is a unique integer assigned to your username in Unix-like operating systems such as Mac OS X, Solaris, and Linux. To use NFS, the Mac UID must be the same as the UID of your account on the server.
 
@@ -326,7 +326,7 @@ image::images/remotedev-set-remote-host-menu.png[]
 * You can change the properties of a remote build host after initial setup, by right-clicking the host in the Services window and selecting Properties.
 * If you are using a remote host to build and run an application with a graphical UI, you can select Enable X11 Forwarding in the hosts properties to that the UI can be seen on your local system while it runs on the remote host.
 * If building your project remotely compiles libraries or generates other files in addition to the main build product, the IDE prompts you to download the files to the local system. You can select which changed files to download.
-* You can work on projects in full remote mode where the project and the tools are on the remote host. See the IDE's integrated help or the article link:./remote-modes.html[+C/C++ Remote Development Modes+] for more information.
+* You can work on projects in full remote mode where the project and the tools are on the remote host. See the IDE's integrated help or the article xref:remote-modes.adoc[C/C{pp} Remote Development Modes] for more information.
 * You can access the remote host and tools information from the IDE's Tools menu as well as the Services window. Select Tools > Options > C/C++ > Build Tools and click the Edit button next to the Build Host list.
 * When using file sharing for project files, you can map the local and remote paths to the shared folder through the Path Mapping feature. You can set the mapping by doing one of the following:
 * In the Services window, open C/C++ Build Hosts, right-click the hostname and select Path Mapper.
@@ -339,10 +339,10 @@ See the following locations for more information:
 
 * The Help menu in the IDE provides access to extensive information about using the IDE.
 
-* The link:./remote-modes.html[+C/C++ Remote Development Modes article+] describes different ways to use remote development
+* The xref:remote-modes.adoc[C/C{pp} Remote Development Modes article] describes different ways to use remote development
 
-* The link:https://netbeans.org/kb/trails/cnd.html[+C/C++ Learning Trail+] provides several articles and tutorials for developing in C/C++ in the IDE.
+* The xref:../cnd.adoc[C/C{pp} Learning Trail] provides several articles and tutorials for developing in C/C++ in the IDE.
 
-link:mailto:users@cnd.netbeans.org?subject=Feedback:%20C/C++%20Remote%20Development%20-%20NetBeans%20IDE%208.0%20Tutorial[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd/section.adoc b/netbeans.apache.org/src/content/kb/docs/cnd/section.adoc
index 2585039da..09a17c11d 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/section.adoc
@@ -19,20 +19,20 @@
 
 .C and C++ Tutorials
 ************************************************
-- link:c-unit-test.html[Adding Unit Tests to a C Project - NetBeans IDE Tutorial]
-- link:beginning-jni-linux.html[Beginning JNI with NetBeans IDE and C/C++ Plugin on Linux]
-- link:HowTos.html[C/C++ Application How-Tos for Code Assistance]
-- link:quickstart.html[C/C++ Projects Quick Start Tutorial]
-- link:remotedev-tutorial.html[C/C++ Remote Development - NetBeans IDE Tutorial]
-- link:index.html[C and C++ Tutorials]
-- link:debugging.html[Debugging C/C++ Projects Tutorial]
-- link:development-environment.html[Defining Your C/C++ Project&#39;s Development Environment]
-- link:navigating-editing.html[Editing and Navigating C/C++ Source Files - NetBeans IDE Tutorial]
-- link:depchecking.html[Make Dependency Checking]
-- link:remote-modes.html[Modes of C/C++ Remote Development in the IDE]
-- link:section.html[]
-- link:cpp-vcs.html[Storing NetBeans C/C++ Projects Under Version Control Systems]
-- link:toolchain.html[Using the C/C++ Tool Collection Descriptor - NetBeans IDE Tutorial]
+- xref:c-unit-test.adoc[Adding Unit Tests to a C Project - NetBeans IDE Tutorial]
+- xref:beginning-jni-linux.adoc[Beginning JNI with NetBeans IDE and C/C{pp} Plugin on Linux]
+- xref:HowTos.adoc[C/C{pp} Application How-Tos for Code Assistance]
+- xref:quickstart.adoc[C/C{pp} Projects Quick Start Tutorial]
+- xref:remotedev-tutorial.adoc[C/C{pp} Remote Development - NetBeans IDE Tutorial]
+- xref:index.adoc[C and C++ Tutorials]
+- xref:debugging.adoc[Debugging C/C++ Projects Tutorial]
+- xref:development-environment.adoc[Defining Your C/C++ Project&#39;s Development Environment]
+- xref:navigating-editing.adoc[Editing and Navigating C/C++ Source Files - NetBeans IDE Tutorial]
+- xref:depchecking.adoc[Make Dependency Checking]
+- xref:remote-modes.adoc[Modes of C/C++ Remote Development in the IDE]
+- xref:section.adoc[]
+- xref:cpp-vcs.adoc[Storing NetBeans C/C++ Projects Under Version Control Systems]
+- xref:toolchain.adoc[Using the C/C++ Tool Collection Descriptor - NetBeans IDE Tutorial]
 ************************************************
 
 
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 d7ff3cd0a..f2e1d06ea 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/toolchain.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/toolchain.adoc
@@ -41,13 +41,13 @@ image::images/netbeans-stamp.png[title="Content on this page applies to the NetB
 |===
 |Software |Version Required 
 
-|NetBeans IDE (including C/C++ support) |link:https://netbeans.org/downloads/index.html[+Version 8.0+] 
+|NetBeans IDE (including C/C++ support) |link:https://netbeans.org/downloads/index.html[Version 8.0] 
 
-|Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Version 7 or 8+] 
+|Java Development 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++/Fortran+] for information about downloading and installing the required software.
+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.
 
 
 == Introduction
@@ -73,13 +73,13 @@ This article tells you how to create duplicates of the tool descriptors in your
 
 Some plugins for tool collections have been contributed by users in the NetBeans community:
 
-* link:http://plugins.netbeans.org/plugin/36176/cuda-plugin[+Cuda+]
-* link:http://plugins.netbeans.org/plugin/27033/msp430-toolchain[+TI msp430 microcontroller toolchain+]
-* link:http://plugins.netbeans.org/plugin/42519/[+Visual Studio+]
+* link:http://plugins.netbeans.org/plugin/36176/cuda-plugin[Cuda]
+* link:http://plugins.netbeans.org/plugin/27033/msp430-toolchain[TI msp430 microcontroller toolchain]
+* link:http://plugins.netbeans.org/plugin/42519/[Visual Studio]
 
 Note that these plugins are not officially supported but are referenced here in case you find them helpful in creating your own plugins.
 
-Windows users might also be interested in an article from a user in the NetBeans community: link:http://minghuasweblog.wordpress.com/2012/09/27/netbeans-setup-and-gnu-cross-toolchain-configuration-for-arm-developmen/[+NetBeans Setup and GNU Cross-Toolchain Configuration for ARM Development+].
+Windows users might also be interested in an article from a user in the NetBeans community: link:http://minghuasweblog.wordpress.com/2012/09/27/netbeans-setup-and-gnu-cross-toolchain-configuration-for-arm-developmen/[NetBeans Setup and GNU Cross-Toolchain Configuration for ARM Development].
 
 
 == Editing Tool Collection Descriptors
@@ -158,7 +158,7 @@ The descriptors in this directory take precedence over the official versions in
 
 This section shows how to create a tool collection that is based on the GNU tool collection with some changes to compiler flags for debugging. The example shows steps for creating a new NetBeans module that contains a new tool collection to enable you to share the tool collection or use it in other instances of the IDE.
 
-For general information about creating NetBeans modules, see link:https://netbeans.apache.org/tutorials/nbm-google.html[+NetBeans Plugin Quick Start+].
+For general information about creating NetBeans modules, see xref:../../../tutorials/nbm-google.adoc[NetBeans Plugin Quick Start].
 
 
 *To create a custom tool collection:*
@@ -380,7 +380,7 @@ If you want to use the new module for the GNU_tuned tool collection in your regu
 
 This is a description of most important tags in the tool collection xml file.
 
-For the scheme of all supported tags and attributes of toolchain xml files, you can search for the file  ``toolchaindefinition.xsd``  in the link:http://hg.netbeans.org/cnd-main[+NetBeans IDE source tree +] .
+For the scheme of all supported tags and attributes of toolchain xml files, you can search for the file  ``toolchaindefinition.xsd``  in the link:http://hg.netbeans.org/cnd-main[NetBeans IDE source tree ] .
 
 
 ==== Tool collection definition tags
@@ -575,8 +575,8 @@ The GNU compiler handler works well enough for any GNU compiler, but if you want
 
 == See Also
 
-Please see the link:https://netbeans.org/kb/trails/cnd.html[+C/C++ Learning Trail+] for more articles about developing with C/C++/Fortran in NetBeans IDE.
+Please see the xref:../cnd.adoc[C/C{pp} Learning Trail] for more articles about developing with C/C++/Fortran in NetBeans IDE.
 
-link:mailto:users@cnd.netbeans.org?subject=Feedback:Using%20the%20C/C++%20Tool%20Collection%20Descriptors%20-%20NetBeans%20IDE%208.0%20Tutorial[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Us Your Feedback]
 
 
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 ed3e85e04..578968995 100644
--- a/netbeans.apache.org/src/content/kb/docs/intro-screencasts.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/intro-screencasts.adoc
@@ -38,7 +38,7 @@ Tour the screencasts below to discover the new and noteworthy features of NetBea
 |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. 
 
-Watch the link:ide/overview-screencast.html[+*NetBeans IDE 8.0 Overview Video*+] to find out what's new and noteworthy in this latest release.
+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.
  
 |===
 
@@ -91,89 +91,141 @@ This screencast demonstrates installation and usage of link:http://www.oracle.co
 
 == NetBeans IDE 7.4 Screencasts
 
-|===
-|image::images/jdk8-lambda.png[role="left", link="java/jdk8-nb74-screencast.html"] 
+[cols="1a,1a"]
+|============================================================
+|
+
+[cols="1,1",grid="none",frame="none"]
+!================================
+a!image::images/jdk8-lambda.png[link="java/jdk8-nb74-screencast.html"] 
+//role="left",
 
 Time: 3:44
-link:http://bits.netbeans.org/media/jdk8-gettingstarted.mp4[+*Download*+] [30 MB]
+//link:http://bits.netbeans.org/media/jdk8-gettingstarted.mp4[+*Download*+] [30 MB]
 
- |link:java/jdk8-nb74-screencast.html[+ *JDK 8 in NetBeans IDE*+]
+!
+xref:java/jdk8-nb74-screencast.adoc[JDK 8 in NetBeans IDE]
 
 This screencast demonstrates how to set up NetBeans IDE 7.4 to use JDK 8, together with how to use JDK 8 profile support and lambda expressions.
 
- |  |image::images/html5-javaee.png[role="left", link="javaee/javaee-gettingstarted-js-screencast.html"] 
+!================================
+
+|
+[cols="1,1",grid=none,frame=none]
+!================================
+a!image::images/html5-javaee.png[link="javaee/javaee-gettingstarted-js-screencast.html"] 
+//role="left", 
 
 Time: 5:10
-link:http://bits.netbeans.org/media/html5-gettingstarted-javaee-screencast.mp4[+*Download*+] [41 MB]
+//link:http://bits.netbeans.org/media/html5-gettingstarted-javaee-screencast.mp4[+*Download*+] [41 MB]
 
- |link:javaee/javaee-gettingstarted-js-screencast.html[+ JavaScript Client Development in Java EE+]
+! 
+xref:javaee/javaee-gettingstarted-js-screencast.adoc[JavaScript Client Development in Java EE]
 
 This screencast shows that you can expose RESTful web service endpoints via a wizard that lets you create JavaScript Backbone.js clients in Java EE applications in NetBeans IDE 7.4.
 
- 
+!================================
 
-|image::images/html5-cordova.png[role="left", link="web/html5-cordova-screencast.html"] 
+| 
+[cols="1,1",grid=none,frame=none]
+!================================
+a!image::images/html5-cordova.png[link="web/html5-cordova-screencast.html"] 
+//ole="left", 
 
 Time: 5:08
-link:http://bits.netbeans.org/media/html5-gettingstarted-cordova-final-screencast.mp4[+*Download*+] [36 MB]
+//link:http://bits.netbeans.org/media/html5-gettingstarted-cordova-final-screencast.mp4[+*Download*+] [36 MB]
 
- |link:web/html5-cordova-screencast.html[+ *Getting Started with Cordova in NetBeans IDE*+]
+!
+xref:web/html5-cordova-screencast.adoc[Getting Started with Cordova in NetBeans IDE]
 
 This screencast demonstrates how to create HTML5 applications, that is, how to create applications that use HTML, JavaScript, and CSS, and deploy them as native Android or iOS applications via Cordova.
 
- |  |image::images/javaee-primefaces.png[role="left", link="javaee/javaee-gettingstarted-pf-screencast.html"] 
+!================================
+
+| 
+[cols="1,1",grid=none,frame=none]
+!================================
+a!image::images/javaee-primefaces.png[link="javaee/javaee-gettingstarted-pf-screencast.html"] 
+//role="left", 
 
 Time: 5:05
-link:http://bits.netbeans.org/media/javaee-html5-primefaces.mp4[+*Download*+] [63 MB]
+//link:http://bits.netbeans.org/media/javaee-html5-primefaces.mp4[+*Download*+] [63 MB]
 
- |link:javaee/javaee-gettingstarted-pf-screencast.html[+ Java EE Development with PrimeFaces+]
+!
+xref:javaee/javaee-gettingstarted-pf-screencast.adoc[Java EE Development with PrimeFaces]
 
 This screencast shows how easily PrimeFaces applications can be created with Maven and Java EE in NetBeans IDE 7.4.
 
- 
+!================================
 
-|image::images/javagui-javafx.png[role="left", link="java/nb_fx_screencast.html"] 
+|
+[cols="1,1",grid=none,frame=none]
+!================================
+a!image::images/javagui-javafx.png[link="java/nb_fx_screencast.html"] 
+//role="left", 
 
 Time: 7:04
-link:http://bits.netbeans.org/media/netbeans_fx.mp4[+*Download*+] [19 MB]
+//link:http://bits.netbeans.org/media/netbeans_fx.mp4[+*Download*+] [19 MB]
 
- |link:java/nb_fx_screencast.html[+ *JavaFX Support in NetBeans IDE*+]
+!
+xref:java/nb_fx_screencast.adoc[JavaFX Support in NetBeans IDE]
 
 This screencast demonstrates JavaFX-related features that are implemented in NetBeans IDE 7.4, including the JavaFX runtime classpath, the alignment of JavaFX and Java SE projects and the JavaFX Maven project template.
 
- |  |image::images/javame-thumb.png[role="left", link="javame/nb_mesdk_screencast.html"] 
+!================================
+
+|
+[cols="1,1",grid=none,frame=none]
+!================================
+a!image::images/javame-thumb.png[link="javame/nb_mesdk_screencast.html"] 
+//role="left", 
 
 Time: 4:22
-link:http://bits.netbeans.org/media/nb_mesdk.mp4[+*Download*+] [6 MB]
+//link:http://bits.netbeans.org/media/nb_mesdk.mp4[+*Download*+] [6 MB]
 
- |link:javame/nb_mesdk_screencast.html[+ Setting up NetBeans IDE for Mobile Development on Windows+]
+!
+xref:javame/nb_mesdk_screencast.adoc[Setting up NetBeans IDE for Mobile Development on Windows]
 
 This screencast demonstrates the support for the Java ME SDK in NetBeans IDE. This screencast shows how to activate JavaME plugins and register the Java ME SDK in NetBeans IDE.
 
+!================================
  
-
-|image::images/git-thumb.png[role="left", link="ide/github_nb_screencast.html"] 
+|
+[cols="1,1",grid=none,frame=none]
+!================================
+a!image::images/git-thumb.png[link="ide/github_nb_screencast.html"] 
+//role="left", 
 
 Time: 5:52
-link:http://bits.netbeans.org/media/github_nb.mp4[+*Download*+] [11 MB]
+//link:http://bits.netbeans.org/media/github_nb.mp4[+*Download*+] [11 MB]
 
- |link:ide/github_nb_screencast.html[+ Setting up a GitHub Repository Using NetBeans IDE+]
+!
+xref:ide/github_nb_screencast.adoc[Setting up a GitHub Repository Using NetBeans IDE]
 
 This screencast demonstrates how to set up a Git repository in NetBeans IDE and put it up to GitHub using the IDE's support for the Git versioning system.
 
- |  |image::images/clone_thumb.png[role="left", link="ide/git_nb_ssh_screencast.html"] 
+!================================
+
+|
+[cols="1,1",grid=none,frame=none]
+!================================
+a!image::images/clone_thumb.png[link="ide/git_nb_ssh_screencast.html"] 
+//role="left", 
 
 Time: 3:25
-link:http://bits.netbeans.org/media/git_nb_ssh.mp4[+*Download*+] [6 MB]
+//link:http://bits.netbeans.org/media/git_nb_ssh.mp4[+*Download*+] [6 MB]
 
- |link:ide/git_nb_ssh_screencast.html[+ Cloning a Git Repository Using NetBeans IDE+]
+!
+xref:ide/git_nb_ssh_screencast.adoc[Cloning a Git Repository Using NetBeans IDE]
 
 This screencast demonstrates how to get a Git project by cloning an existing Git repository from a remote server via the SSH protocol.
 
- 
-|===
+!================================
 
+ 
+|============================================================
 
+//video::mzzAUEFS4vs_8k[youtube,title="Cloning a Git Repository Using NetBeans IDE"]
 
 == More NetBeans IDE Screencasts
 
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 7fc2a1cdf..badba1947 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-ee.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-ee.adoc
@@ -50,89 +50,89 @@ JavaScript is an object-oriented scripting language primarily used in client-sid
 
 == Getting Started
 
-* link:../docs/web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:../docs/javaee/javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../docs/javaee/javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../docs/web/jsf20-intro.html[+Introduction to JavaServer Faces 2.x+]
-* link:../docs/web/ajax-quickstart.html[+Introduction to Ajax+]
+* xref:web/quickstart-webapps.adoc[+Introduction to Developing Web Applications+]
+* xref:javaee/javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:javaee/javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:web/jsf20-intro.adoc[+Introduction to JavaServer Faces 2.x+]
+* xref:web/ajax-quickstart.adoc[+Introduction to Ajax+]
 
 == Tutorials and Articles
 
 === NetBeans E-commerce Tutorial
 
-* link:../docs/javaee/ecommerce/intro.html[+Introduction+]
-* link:../docs/javaee/ecommerce/design.html[+Designing the Application+]
-* link:../docs/javaee/ecommerce/setup-dev-environ.html[+Setting up the Development Environment+]
-* link:../docs/javaee/ecommerce/data-model.html[+Designing the Data Model+]
-* link:../docs/javaee/ecommerce/page-views-controller.html[+Preparing the Page Views and Controller Servlet+]
-* link:../docs/javaee/ecommerce/connect-db.html[+Connecting the Application to the Database+]
-* link:../docs/javaee/ecommerce/entity-session.html[+Adding Entity Classes and Session Beans+]
-* link:../docs/javaee/ecommerce/manage-sessions.html[+Managing Sessions+]
-* link:../docs/javaee/ecommerce/transaction.html[+Integrating Transactional Business Logic+]
-* link:../docs/javaee/ecommerce/language.html[+Adding Language Support+]
-* link:../docs/javaee/ecommerce/security.html[+Securing the Application+]
-* link:../docs/javaee/ecommerce/test-profile.html[+Testing and Profiling+]
-* link:../docs/javaee/ecommerce/conclusion.html[+Conclusion+]
+* xref:javaee/ecommerce/intro.adoc[+Introduction+]
+* xref:javaee/ecommerce/design.adoc[+Designing the Application+]
+* xref:javaee/ecommerce/setup-dev-environ.adoc[+Setting up the Development Environment+]
+* xref:javaee/ecommerce/data-model.adoc[+Designing the Data Model+]
+* xref:javaee/ecommerce/page-views-controller.adoc[+Preparing the Page Views and Controller Servlet+]
+* xref:javaee/ecommerce/connect-db.adoc[+Connecting the Application to the Database+]
+* xref:javaee/ecommerce/entity-session.adoc[+Adding Entity Classes and Session Beans+]
+* xref:javaee/ecommerce/manage-sessions.adoc[+Managing Sessions+]
+* xref:javaee/ecommerce/transaction.adoc[+Integrating Transactional Business Logic+]
+* xref:javaee/ecommerce/language.adoc[+Adding Language Support+]
+* xref:javaee/ecommerce/security.adoc[+Securing the Application+]
+* xref:javaee/ecommerce/test-profile.adoc[+Testing and Profiling+]
+* xref:javaee/ecommerce/conclusion.adoc[+Conclusion+]
 
 === Contexts and Dependency Injection
 
-* link:../docs/javaee/cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.x+]
-* link:../docs/javaee/cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
-* link:../docs/javaee/cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
-* link:../docs/javaee/cdi-events.html[+Working with Events in CDI+]
-* link:../docs/javaee/maven-osgiservice-cdi.html[+Using CDI to Inject OSGi Bundles as Services +]
+* xref:javaee/cdi-intro.adoc[+Getting Started with Contexts and Dependency Injection and JSF 2.x+]
+* xref:javaee/cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+]
+* xref:javaee/cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+]
+* xref:javaee/cdi-events.adoc[+Working with Events in CDI+]
+* xref:javaee/maven-osgiservice-cdi.adoc[+Using CDI to Inject OSGi Bundles as Services +]
 
 === Developing Java Web Applications
 
-* link:../docs/javaee/maven-websocketapi.html[+Using the WebSocket API in a Web Application+]
-* link:../docs/web/jsf-jpa-weblogic.html[+Developing an Enterprise Application for Oracle WebLogic Server+]
-* link:../docs/web/mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+]
-* link:../docs/web/jsf20-crud.html[+Generating a JavaServer Faces 2.0 CRUD Application from a Database+]
-* link:../docs/web/applets.html[+Integrating an Applet in a Web Application+]
-* link:../docs/web/security-webapps.html[+Securing a Web Application+]
-* link:../docs/java/profile-loadgenerator.html[+Using a Load Generator in NetBeans IDE+]
+* xref:javaee/maven-websocketapi.adoc[+Using the WebSocket API in a Web Application+]
+* xref:web/jsf-jpa-weblogic.adoc[+Developing an Enterprise Application for Oracle WebLogic Server+]
+* xref:web/mysql-webapp.adoc[+Creating a Simple Web Application Using a MySQL Database+]
+* xref:web/jsf20-crud.adoc[+Generating a JavaServer Faces 2.0 CRUD Application from a Database+]
+* xref:web/applets.adoc[+Integrating an Applet in a Web Application+]
+* xref:web/security-webapps.adoc[+Securing a Web Application+]
+* xref:java/profile-loadgenerator.adoc[+Using a Load Generator in NetBeans IDE+]
 
 === Cloud Support
 
-* link:../docs/web/oracle-cloud.html[+Running Web Applications on Oracle Cloud+]
+* 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+]
 
 === EJB Technology and Java Persistence
 
-* link:../docs/javaee/javaee-entapp-junit.html[+Using the Embedded EJB Container to Test Enterprise Applications+]
-* link:../docs/javaee/javaee-entapp-ejb.html[+Creating an Enterprise Application with EJB 3.1+]
-* link:../docs/javaee/maven-entapp.html[+Creating an Enterprise Application Using Maven+]
-* link:../docs/javaee/maven-entapp-testing.html[+Testing a Maven Enterprise Application+]
-* link:../docs/javaee/entappclient.html[+Creating and Running an Application Client on the GlassFish Server+]
-* link:../docs/javaee/secure-ejb.html[+Building Secure Enterprise Beans+]
-* link:../docs/javaee/profiler-javaee.html[+Profiling an Enterprise Application+]
+* xref:javaee/javaee-entapp-junit.adoc[+Using the Embedded EJB Container to Test Enterprise Applications+]
+* xref:javaee/javaee-entapp-ejb.adoc[+Creating an Enterprise Application with EJB 3.1+]
+* xref:javaee/maven-entapp.adoc[+Creating an Enterprise Application Using Maven+]
+* xref:javaee/maven-entapp-testing.adoc[+Testing a Maven Enterprise Application+]
+* 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+]
 
 === Web Frameworks
 
-* link:../docs/web/jsf20-intro.html[+Introduction to JavaServer Faces 2.x+]
-* link:../docs/web/jsf20-support.html[+JSF 2.x Support+]
+* 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+]
-* link:../docs/web/quickstart-webapps-spring.html[+Spring Web MVC+]
-* link:../docs/web/quickstart-webapps-struts.html[+Struts+]
-* link:../docs/web/grails-quickstart.html[+Grails+]
-* link:../docs/web/quickstart-webapps-wicket.html[+Wicket+]
-* link:../docs/web/framework-adding-support.html[+Adding Support For A Web Framework+]
+* xref:web/quickstart-webapps-spring.adoc[+Spring Web MVC+]
+* xref:web/quickstart-webapps-struts.adoc[+Struts+]
+* xref:web/grails-quickstart.adoc[+Grails+]
+* xref:web/quickstart-webapps-wicket.adoc[+Wicket+]
+* xref:web/framework-adding-support.adoc[+Adding Support For A Web Framework+]
 
 === JavaScript and Ajax Development
 
-* link:../docs/web/ajax-quickstart.html[+Introduction to Ajax+]
-* link:../docs/web/js-toolkits-jquery.html[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]
-* link:../docs/web/js-toolkits-dojo.html[+Connecting a Dojo Tree to an ArrayList using JSON+]
+* xref:web/ajax-quickstart.adoc[+Introduction to Ajax+]
+* xref:web/js-toolkits-jquery.adoc[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]
+* xref:web/js-toolkits-dojo.adoc[+Connecting a Dojo Tree to an ArrayList using JSON+]
 
 == Screencasts
 
-* link:../docs/javaee/maven-primefaces-screencast.html[+PrimeFaces Development with Maven+]
-* link:../docs/javaee/javaee-gettingstarted-js-screencast.html[+JavaScript Client Development in Java EE+]
-* link:../docs/javaee/javaee-gettingstarted-pf-screencast.html[+Java EE Development with PrimeFaces+]
-* link:../docs/javaee/weblogic-javaee-m1-screencast.html[+Video of Deploying a Web Application to the Oracle WebLogic Server+]
-* link:../docs/javaee/javaee-gettingstarted-screencast.html[+Video of Getting Started with Java EE 6 Applications+]
+* xref:javaee/maven-primefaces-screencast.adoc[+PrimeFaces Development with Maven+]
+* xref:javaee/javaee-gettingstarted-js-screencast.adoc[+JavaScript Client Development in Java EE+]
+* xref:javaee/javaee-gettingstarted-pf-screencast.adoc[+Java EE Development with PrimeFaces+]
+* xref:javaee/weblogic-javaee-m1-screencast.adoc[+Video of Deploying a Web Application to the Oracle WebLogic Server+]
+* xref:javaee/javaee-gettingstarted-screencast.adoc[+Video of Getting Started with Java EE 6 Applications+]
 * YouTube: link:http://www.youtube.com/watch?v=0hHkV04JPxo[+WebLogic Server 12c - 5 Mins with GlassFish Descriptor Support+]
 * YouTube: link:https://www.youtube.com/watch?v=_PDIxHyaWy4[+Get Started with PrimeFaces Development +]
 * YouTube: link:http://www.youtube.com/watch?v=Uvt1byURZrw[+Unlocking the Java EE6 Platform+]
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 398e527b0..cfabdb480 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-se.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-se.adoc
@@ -39,50 +39,50 @@ In addition to being a platform for multi-platform desktop applications, the Jav
 
 == Getting Started 
 
-- link:../docs/java/quickstart.html[+Java Quick Start Tutorial+]
-- link:../docs/java/editor-codereference.html[+Code Assistance in the NetBeans IDE Java Editor: A Reference Guide to NetBeans IDE+]
+- xref:java/quickstart.adoc[+Java Quick Start Tutorial+]
+- xref:java/editor-codereference.adoc[+Code Assistance in the NetBeans IDE Java Editor: A Reference Guide to NetBeans IDE+]
 - link:http://docs.oracle.com/cd/E50453_01/doc.80/e50452/toc.htm[+Developing Applications with NetBeans IDE 8.0+] (link:http://docs.oracle.com/cd/E50453_01/doc.80/e50452.pdf[+PDF+])
 
 == Tutorials and Articles
 
 === Developing Java Applications
 
-- link:../docs/java/javase-embedded.html[+Using Oracle Java SE Embedded Support in NetBeans IDE+]
-- link:../docs/java/javase-jdk8.html[+Overview of JDK 8 Support in NetBeans IDE+]
-- link:../docs/java/javase-jdk7.html[+Overview of JDK 7 Support in NetBeans IDE+]
-- link:../docs/java/javase-deploy.html[+Packaging and Distributing Java Desktop Applications+]
-- link:../docs/java/javase-intro.html[+Developing General Java Applications+]
-- link:../docs/java/code-inspect.html[+Static Code Analysis in the NetBeans IDE Java Editor+]
-- link:../docs/java/editor-inspect-transform.html[+Refactoring with Inspect and Transform in the NetBeans IDE Java Editor+]
+- xref:java/javase-embedded.adoc[+Using Oracle Java SE Embedded Support in NetBeans IDE+]
+- xref:java/javase-jdk8.adoc[+Overview of JDK 8 Support in NetBeans IDE+]
+- xref:java/javase-jdk7.adoc[+Overview of JDK 7 Support in NetBeans IDE+]
+- xref:java/javase-deploy.adoc[+Packaging and Distributing Java Desktop Applications+]
+- xref:java/javase-intro.adoc[+Developing General Java Applications+]
+- xref:java/code-inspect.adoc[+Static Code Analysis in the NetBeans IDE Java Editor+]
+- xref:java/editor-inspect-transform.adoc[+Refactoring with Inspect and Transform in the NetBeans IDE Java Editor+]
 - link:https://netbeans.org/projects/usersguide/downloads/download/shortcuts-80.pdf[+Keyboard Shortcuts Card+]
 
 === Building, Debugging, and Testing
 
-- link:../docs/java/debug-visual.html[+Using the Visual Debugger+]
-- link:../docs/java/junit-intro.html[+Writing JUnit Tests+]
-- link:../docs/java/debug-multithreaded.html[+Debugging Multithreaded Applications+]
+- xref:java/debug-visual.adoc[+Using the Visual Debugger+]
+- xref:java/junit-intro.adoc[+Writing JUnit Tests+]
+- xref:java/debug-multithreaded.adoc[+Debugging Multithreaded Applications+]
 
 === Maven
 
 - link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices+]
-- link:../docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+]
+- xref:java/maven-hib-java-se.adoc[+Creating a Maven Swing Application Using Hibernate+]
 
 === Profiling Source Code
 
-- link:../docs/java/profiler-intro.html[+Introduction to Profiling Java Applications+]
-- link:../docs/java/profiler-profilingpoints.html[+Using Profiling Points+]
+- 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+]
 
 === Scripting Languages
 
-- link:../docs/java/groovy-quickstart.html[+Introduction to Groovy+]
+- xref:java/groovy-quickstart.adoc[+Introduction to Groovy+]
 
 === JMX Monitoring and Management
 
-- link:../docs/java/jmx-getstart.html[+Getting Started with Java Management Extensions (JMX) Monitoring+]
-- link:../docs/java/jmx-tutorial.html[+Adding JMX Instrumentation to a Java Application+]
-- link:../docs/java/jmx-manager-tutorial.html[+Developing a JMX Manager and Connecting to a Remote JMX Agent+]
+- xref:java/jmx-getstart.adoc[+Getting Started with Java Management Extensions (JMX) Monitoring+]
+- xref:java/jmx-tutorial.adoc[+Adding JMX Instrumentation to a Java Application+]
+- xref:java/jmx-manager-tutorial.adoc[+Developing a JMX Manager and Connecting to a Remote JMX Agent+]
 
 === Community-Contributed Docs
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jdk8-nb74-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/jdk8-nb74-screencast.adoc
index 12b24d18d..3d853edba 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jdk8-nb74-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jdk8-nb74-screencast.adoc
@@ -29,23 +29,27 @@
 :description: Video of JDK 8 Support in NetBeans IDE 7.4 - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Video of JDK 8 Support in NetBeans IDE 7.4
 
-|===
-|This screencast shows how to get started with JDK 8 in NetBeans IDE and how to use JDK 8 profiles and lambda expressions.
+//|===
+//|
 
-link:http://bits.netbeans.org/media/jdk8-gettingstarted.mp4[+Download / Watch full size+] (30 MB)
+This screencast shows how to get started with JDK 8 in NetBeans IDE and how to use JDK 8 profiles and lambda expressions.
 
+//link:http://bits.netbeans.org/media/jdk8-gettingstarted.mp4[+Download / Watch full size+] (30 MB)
+
+
+video::OXw5M_tD7B8[youtube,title="JDK 8 Support in NetBeans IDE"]
  
 
-|
-link:/about/contact_form.html?to=3&subject=Feedback: Getting Started with JDK 8 Support in NetBeans IDE 7.4[+Send Feedback on This Tutorial+] 
-|===
+//|
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial] 
+//|===
 
 
 == 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+]
-* 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+]
+* link:http://openjdk.java.net/projects/jdk8/[JDK 8 Project Page]
+* xref:javase-jdk8.adoc[Overview of JDK 8 Support in NetBeans IDE]
+* xref:index.adoc[NetBeans Feature Pages: Java]
+* 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/javaee/cdi-events.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/cdi-events.adoc
index 43db758c6..c8327c467 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
@@ -34,13 +34,13 @@ _Contributed by Andy Gibson_
 
 == Contexts and Dependency Injection
 
-1. link:cdi-intro.html[+Getting Started with CDI and JSF 2.0+]
+1. xref:cdi-intro.adoc[+Getting Started with CDI and JSF 2.0+]
 
 
-. link:cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
+. xref:cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+]
 
 
-. link:cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
+. xref:cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+]
 
 
 . *Working with Events in CDI*
@@ -79,9 +79,9 @@ To complete this tutorial, you need the following software and resources.
 [[event]]
 == Utilizing Events
 
-In the previous tutorial, link:cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+], we had an application that obtained a list of items, validated them and took a specific action when an invalid item was found. Let's say in the future we want to expand our system to handle all sorts of things happening when we find an invalid item. This could range from an email being sent, changes made to other data such as an order being canceled, or storing a list of rejections  [...]
+In the previous tutorial, xref:cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+], we had an application that obtained a list of items, validated them and took a specific action when an invalid item was found. Let's say in the future we want to expand our system to handle all sorts of things happening when we find an invalid item. This could range from an email being sent, changes made to other data such as an order being canceled, or storing a list of rejections  [...]
 
-Using the application we've been building from the previous tutorials in the series, we don't require many changes to implement this. We can just provide another implementation of `ItemErrorHandler` (created in link:cdi-validate.html[+the previous tutorial+]), which raises an event each time it handles an item. We'll name this class `EventItemHandler`, inject it into the `ItemProcessor`, and use a `Notify` qualifier to select it for injection.
+Using the application we've been building from the previous tutorials in the series, we don't require many changes to implement this. We can just provide another implementation of `ItemErrorHandler` (created in xref:cdi-validate.adoc[+the previous tutorial+]), which raises an event each time it handles an item. We'll name this class `EventItemHandler`, inject it into the `ItemProcessor`, and use a `Notify` qualifier to select it for injection.
 
 image::images/cdi-diagram-events.png[title="Use CDI injection to loosely couple classes in your application"]
 
@@ -120,7 +120,7 @@ image::images/event-javadoc.png[title="Press Ctrl-Space to view Javadoc document
 
 
 
-. Create a qualifier named `Notify`. (Qualifiers were discussed in link:cdi-inject.html[+Working with Injection and Qualifiers in CDI+].)
+. Create a qualifier named `Notify`. (Qualifiers were discussed in xref:cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+].)
 
 
 . Click the New File ( image:images/new-file-btn.png[] ) button or press Ctrl-N (⌘-N on Mac) to open the File wizard.
@@ -197,7 +197,7 @@ public class ItemProcessor {
 
 image::images/output-window.png[title="View the GlassFish server log displayed in Output window"] 
 
-Currently though, we don't have anything observing the event. We can fix this by creating an _observer_ method using the `@Observes` annotation. This is the only thing needed to observe an event. To demonstrate, we can modify the `FileErrorReporter` (created in the link:cdi-validate.html[+previous tutorial+]) to respond to fired events by adding an observer method that calls its `handleItem()` method.
+Currently though, we don't have anything observing the event. We can fix this by creating an _observer_ method using the `@Observes` annotation. This is the only thing needed to observe an event. To demonstrate, we can modify the `FileErrorReporter` (created in the xref:cdi-validate.adoc[+previous tutorial+]) to respond to fired events by adding an observer method that calls its `handleItem()` method.
 
 
 . To make our `FileErrorReporter` respond to the event, add the following method to the class.
@@ -221,7 +221,7 @@ public class FileErrorReporter implements ItemErrorHandler {
 
 image::images/output-window2.png[title="View the GlassFish server log displayed in Output window"] 
 
-You see that the events are fired on the invalid objects as they were previously, but now the item information is being saved when each event is fired. You can also note that the lifecycle events are being observed, since a `FileErrorReporter` bean is created and closed for each fired event. (See link:cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+] for a discussion of lifecycle annotations, e.g., `@PostConstruct` and `@PreDestroy`.)
+You see that the events are fired on the invalid objects as they were previously, but now the item information is being saved when each event is fired. You can also note that the lifecycle events are being observed, since a `FileErrorReporter` bean is created and closed for each fired event. (See xref:cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+] for a discussion of lifecycle annotations, e.g., `@PostConstruct` and `@PreDestroy`.)
 
 As shown in the above steps, the `@Observes` annotation provides an easy way to observe an event.
 
@@ -285,11 +285,11 @@ For more information about CDI and Java EE, see the following resources.
 
 === NetBeans Resources
 
-* link:cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
-* link:cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
-* link:cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../web/jsf20-intro.html[+Introduction to JavaServer Faces 2.0+]
+* xref:cdi-intro.adoc[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
+* xref:cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+]
+* xref:cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../web/jsf20-intro.adoc[+Introduction to JavaServer Faces 2.0+]
 
 
 === External Resources
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 f3d0a9cdc..820b2266a 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
@@ -34,7 +34,7 @@ _Contributed by Andy Gibson_
 
 == Contexts and Dependency Injection
 
-1. link:cdi-intro.html[+Getting Started with CDI and JSF 2.0+]
+1. xref:cdi-intro.adoc[+Getting Started with CDI and JSF 2.0+]
 2. *Working with Injection and Qualifiers in CDI*
 * <<inject,Injection: the 'I' in CDI>>
 * <<qualifier,Working with Qualifiers>>
@@ -42,10 +42,10 @@ _Contributed by Andy Gibson_
 * <<seealso,See Also>>
 
 
-. link:cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
+. xref:cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+]
 
 
-. link:cdi-events.html[+Working with Events in CDI+]
+. xref:cdi-events.adoc[+Working with Events in CDI+]
 
 Contexts and Dependency Injection (CDI), specified by link:http://jcp.org/en/jsr/detail?id=299[+JSR-299+], is an integral part of Java EE 6 and provides an architecture that allows Java EE components such as servlets, enterprise beans, and JavaBeans to exist within the lifecycle of an application with well-defined scopes. In addition, CDI services allow Java EE components such as EJB session beans and JavaServer Faces (JSF) managed beans to be injected and to interact in a loosely couple [...]
 
@@ -79,7 +79,7 @@ To complete this tutorial, you need the following software and resources.
 [[inject]]
 == Injection: the 'I' in CDI
 
-CDI is an API for injecting contexts and dependencies. In Seam and Spring, dependencies work mostly by naming beans and binding them to their injection points by their names. If you are following this tutorial after having completed link:cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.0+], you have so far only referenced a managed bean by name from the JSF page when we defined the name for the bean using the `@Named` annotation. The primary role of the `@ [...]
+CDI is an API for injecting contexts and dependencies. In Seam and Spring, dependencies work mostly by naming beans and binding them to their injection points by their names. If you are following this tutorial after having completed xref:cdi-intro.adoc[+Getting Started with Contexts and Dependency Injection and JSF 2.0+], you have so far only referenced a managed bean by name from the JSF page when we defined the name for the bean using the `@Named` annotation. The primary role of the `@ [...]
 
 In the following example, you create an `ItemProcessor` that takes a list of items from a class that implements the `ItemDao` interface. You take advantage of CDI's `@Inject` annotation to demonstrate how it is possible to _inject_ a bean into another class. The following diagram depicts the scenario you construct in this exercise.
 
@@ -637,12 +637,12 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Working%20with%20Injectio
 
 Continue to the next installment of this series on Contexts and Dependency Injection:
 
-* link:cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
+* xref:cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+]
 
 For more information about CDI and Java EE, see the following resources.
 
-* link:cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
+* xref:cdi-intro.adoc[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * link:http://blogs.oracle.com/enterprisetechtips/entry/using_cdi_and_dependency_injection[+Enterprise Tech Tip: Using CDI and Dependency Injection for Java in a JSF 2.0 Application+]
 * link:http://download.oracle.com/javaee/6/tutorial/doc/gjbnr.html[+The Java EE 6 Tutorial, Part V: Contexts and Dependency Injection for the Java EE Platform+]
 * link:http://jcp.org/en/jsr/detail?id=299[+JSR 299: Specification for Contexts and Dependency Injection+]
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 d89e97854..a4cc7a115 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
@@ -40,13 +40,13 @@ _Contributed by Andy Gibson_
 * <<seealso,See Also>>
 
 
-. link:cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
+. xref:cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+]
 
 
-. link:cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
+. xref:cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+]
 
 
-. link:cdi-events.html[+Working with Events in CDI+]
+. xref:cdi-events.adoc[+Working with Events in CDI+]
 
 Contexts and Dependency Injection (CDI), specified by link:http://jcp.org/en/jsr/detail?id=299[+JSR-299+], is an integral part of Java EE 6 and provides an architecture that allows Java EE components such as servlets, enterprise beans, and JavaBeans to exist within the lifecycle of an application with well-defined scopes. In addition, CDI services allow Java EE components such as EJB session beans and JavaServer Faces (JSF) managed beans to be injected and to interact in a loosely couple [...]
 
@@ -246,15 +246,15 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%
 
 The next installment of this series focuses on CDI injection, and provides a closer look at using CDI for managing dependencies in a Java EE environment.
 
-* link:cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
+* xref:cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+]
 
 For more information about CDI and JSF 2.0, see the following resources.
 
 
 === Contexts and Dependency Injection
 
-* link:cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
-* link:cdi-events.html[+Working with Events in CDI+]
+* xref:cdi-validate.adoc[+Applying @Alternative Beans and Lifecycle Annotations+]
+* xref:cdi-events.adoc[+Working with Events in CDI+]
 * link:http://blogs.oracle.com/enterprisetechtips/entry/using_cdi_and_dependency_injection[+Enterprise Tech Tip: Using CDI and Dependency Injection for Java in a JSF 2.0 Application+]
 * link:http://docs.oracle.com/javaee/7/tutorial/doc/cdi-basic.htm[+The Java EE 6 Tutorial: Introduction to Contexts and Dependency Injection for Java EE+]
 * link:http://jcp.org/en/jsr/detail?id=299[+JSR 299: Specification for Contexts and Dependency Injection+]
@@ -262,8 +262,8 @@ For more information about CDI and JSF 2.0, see the following resources.
 
 === JavaServer Faces 2.0
 
-* link:../web/jsf20-intro.html[+Introduction to JavaServer Faces 2.x+]
-* link:../web/jsf20-crud.html[+Generating a JavaServer Faces 2.x CRUD Application from a Database+]
+* 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+]
 * 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+]
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 cdb77ffd1..79cf403ed 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
@@ -33,15 +33,15 @@ _Contributed by Andy Gibson_
 
 == Contexts and Dependency Injection
 
-1. link:cdi-intro.html[+Getting Started with CDI and JSF 2.0+]
-2. link:cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
+1. xref:cdi-intro.adoc[+Getting Started with CDI and JSF 2.0+]
+2. xref:cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+]
 3. *Applying @Alternative Beans and Lifecycle Annotations*
 * <<alternative,Handling Multiple Deployments>>
 * <<lifecycle,Applying Lifecycle Annotations to Managed Beans>>
 * <<seealso,See Also>>
 
 
-. link:cdi-events.html[+Working with Events in CDI+]
+. xref:cdi-events.adoc[+Working with Events in CDI+]
 
 Contexts and Dependency Injection (CDI), specified by link:http://jcp.org/en/jsr/detail?id=299[+JSR-299+], is an integral part of Java EE 6 and provides an architecture that allows Java EE components such as servlets, enterprise beans, and JavaBeans to exist within the lifecycle of an application with well-defined scopes. In addition, CDI services allow Java EE components such as EJB session beans and JavaServer Faces (JSF) managed beans to be injected and to interact in a loosely couple [...]
 
@@ -446,13 +446,13 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20CDI%20Injection%2
 
 Different application deployments might use different rules for handling invalid items, such as rejecting an item, sending notifications to individuals, flagging them, or just listing them in an output file. In addition, we may want to do a combination of these (e.g., reject an order, send an email to a sales representative, and list the order in a file). One great way to handle this kind of multi-faceted problem is by using _events_. CDI events are the subject of the final installment o [...]
 
-* link:cdi-events.html[+Working with Events in CDI+]
+* xref:cdi-events.adoc[+Working with Events in CDI+]
 
 For more information about CDI and Java EE, see the following resources.
 
-* link:cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
-* link:cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
+* xref:cdi-intro.adoc[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
+* xref:cdi-inject.adoc[+Working with Injection and Qualifiers in CDI+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * link:http://blogs.oracle.com/enterprisetechtips/entry/using_cdi_and_dependency_injection[+Enterprise Tech Tip: Using CDI and Dependency Injection for Java in a JSF 2.0 Application+]
 * link:http://download.oracle.com/javaee/6/tutorial/doc/gjbnr.html[+The Java EE 6 Tutorial, Part V: Contexts and Dependency Injection for the Java EE Platform+]
 * link:http://jcp.org/en/jsr/detail?id=299[+JSR 299: Specification for Contexts and Dependency Injection+]
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 65578cdd8..7fa94950f 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
@@ -296,7 +296,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 image::images/logo.png[] 
 
-The NetBeans E-commerce Tutorial and sample application were conceived of and written by Troy Giunipero. The application began as a project arising out of Sun's link:http://research.sun.com/SEED/[+SEED program+], and was developed from January 2009 to November 2010. The tutorial was prepared as part of ongoing efforts to provide documentation for the IDE's link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+].
+The NetBeans E-commerce Tutorial and sample application were conceived of and written by Troy Giunipero. The application began as a project arising out of Sun's link:http://research.sun.com/SEED/[+SEED program+], and was developed from January 2009 to November 2010. The tutorial was prepared as part of ongoing efforts to provide documentation for the IDE's xref:../../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+].
 
 
 
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 3e49bc94d..3f26568ce 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
@@ -725,7 +725,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 
 === NetBeans Resources
 
-* link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 * xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
 * xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * xref:../secure-ejb.adoc[+Building Secure Enterprise Beans in Java EE+]
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 7ad6f8f69..e02707888 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
@@ -306,7 +306,7 @@ The IDE provides many link:../../../../features/web/index.html[+features for web
 * *Profiling and Debugging Tools:* With NetBeans IDE link:../../../../features/java/profiler.html[+profiler+], you get real time insight into memory usage and potential performance bottlenecks. Furthermore, you can instrument specific parts of code to avoid performance degradation during profiling. The link:http://profiler.netbeans.org/docs/help/6.0/heapwalker.html[+HeapWalker+] tool helps you evaluate Java heap contents and find memory leaks.
 * *Customizable Projects:* Through the NetBeans IDE build process, which relies on industry standards such as link:https://ant.apache.org/[+Apache Ant+], link:http://www.gnu.org/software/make/[+make+], link:http://maven.apache.org/[+Maven+], and link:http://rake.rubyforge.org/[+rake+] - rather than a proprietary build process - you can easily customize projects and add functionality. You can build, run, and deploy projects to servers outside of the IDE.
 * *Collaboration Tools:* The IDE provides built-in support for version control systems such as CVS, Subversion, and Mercurial.
-* *Extensive Documentation:* There's a wealth of tips and instructions contained in the IDE's built-in help set. Simply press F1 (fn-F1 on Mac) on a component in the IDE to invoke the help set. Also, the IDE's link:../../../index.html[+official knowledge base+] provides hundreds of online tutorials, articles and link:../../../../community/media.html[+screencasts+] that are continuously being updated.
+* *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.
 
 For a more extensive list of reasons why you should consider choosing NetBeans, see link:../../../../switch/why.html[+NetBeans IDE Connects Developers+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/language.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/language.adoc
index ce3510008..0b649751d 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/language.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/language.adoc
@@ -1071,7 +1071,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 * xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
 * xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
-* link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 
 === External Resources
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 d949e56a2..62149f5ca 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
@@ -1068,7 +1068,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 * 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+]
-* link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 
 === GlassFish Resources
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 ef8a1179f..aea0232bb 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
@@ -1034,7 +1034,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 * xref:../../web/mysql-webapp.adoc[+Creating a Simple Web Application Using a MySQL Database+]
 * link:../../../../community/media.html[+Video Tutorials and Demos for NetBeans IDE+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
-* link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 
 === NetBeans Books
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 b3e2ee84f..e61ba83eb 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
@@ -892,7 +892,7 @@ image::images/http-404.png[title="The browser address bar indicates that a secur
 * xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
 * xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
-* link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 
 === External Resources
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 4b639ece2..210bc8445 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
@@ -994,7 +994,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: NetBeans E-commerce Tutoria
 * xref:../javaee-intro.adoc[+Introduction to Java EE Technology+]
 * xref:../javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts &amp; Code Templates Card+]
-* link:../../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 
 === External Resources
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 6e3e117c1..f0d7aeeed 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/entappclient.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/entappclient.adoc
@@ -246,11 +246,11 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20an%20Applicati
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 You can find more information about using EJB Enterprise Beans in the link:http://download.oracle.com/javaee/6/tutorial/doc/[+Java EE 6 Tutorial+].
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/index.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/index.adoc
index 54c544c40..0fb4cfc96 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/index.adoc
@@ -26,30 +26,30 @@
 :toc-title:
 :description: JavaEE Tutorials
 
-- link:cdi-validate.html[Applying @Alternative Beans and Lifecycle Annotations]
-- link:secure-ejb.html[Building Secure Enterprise Beans in Java EE]
-- link:entappclient.html[Creating and Running an Application Client on the GlassFish Server]
-- link:maven-entapp.html[Creating an Enterprise Application Using Maven]
-- link:javaee-entapp-ejb.html[Creating an Enterprise Application with EJB 3.1]
-- link:cdi-intro.html[Getting Started with Contexts and Dependency Injection and JSF 2.x]
-- link:javaee-gettingstarted.html[Getting Started with Java EE Applications]
-- link:javaee-intro.html[Introduction to Support for Java EE Technology in NetBeans IDE]
-- link:index.html[JavaEE Tutorials]
-- link:profiler-javaee.html[Profiling an Enterprise Application in NetBeans IDE]
-- link:section.html[]
-- link:maven-entapp-testing.html[Testing a Maven Enterprise Application]
-- link:maven-osgiservice-cdi.html[Using CDI to Inject OSGi Bundles as Services in NetBeans IDE]
-- link:jpa-eclipselink-screencast.html[Using JPA Support with EclipseLink]
-- link:javaee-entapp-junit.html[Using the Embedded EJB Container to Test Enterprise Applications]
-- link:maven-websocketapi.html[Using the WebSocket API in a Web Application]
-- link:weblogic-javaee-m1-screencast.html[Video of Deploying a Web Application to the Oracle WebLogic Server]
-- link:javaee-gettingstarted-screencast.html[Video of Getting Started with Java EE Applications]
-- link:javaee-gettingstarted-js-screencast.html[Video of Getting Started with JavaScript Client Development in Java EE Applications]
-- link:javaee-gettingstarted-pf-screencast.html[Video of Getting Started with PrimeFaces Development in Java EE Applications]
-- link:maven-primefaces-screencast.html[Video of PrimeFaces Development with NetBeans IDE]
-- link:maven-websocketapi-screencast.html[Video of Using the WebSocket API in a Web Application]
-- link:cdi-events.html[Working with Events in CDI]
-- link:cdi-inject.html[Working with Injection and Qualifiers in CDI]
+- xref:cdi-validate.adoc[Applying @Alternative Beans and Lifecycle Annotations]
+- xref:secure-ejb.adoc[Building Secure Enterprise Beans in Java EE]
+- xref:entappclient.adoc[Creating and Running an Application Client on the GlassFish Server]
+- xref:maven-entapp.adoc[Creating an Enterprise Application Using Maven]
+- xref:javaee-entapp-ejb.adoc[Creating an Enterprise Application with EJB 3.1]
+- xref:cdi-intro.adoc[Getting Started with Contexts and Dependency Injection and JSF 2.x]
+- xref:javaee-gettingstarted.adoc[Getting Started with Java EE Applications]
+- 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]
+- 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]
+- xref:javaee-entapp-junit.adoc[Using the Embedded EJB Container to Test Enterprise Applications]
+- xref:maven-websocketapi.adoc[Using the WebSocket API in a Web Application]
+- xref:weblogic-javaee-m1-screencast.adoc[Video of Deploying a Web Application to the Oracle WebLogic Server]
+- xref:javaee-gettingstarted-screencast.adoc[Video of Getting Started with Java EE Applications]
+- xref:javaee-gettingstarted-js-screencast.adocl[Video of Getting Started with JavaScript Client Development in Java EE Applications]
+- xref:javaee-gettingstarted-pf-screencast.adoc[Video of Getting Started with PrimeFaces Development in Java EE Applications]
+- xref:maven-primefaces-screencast.adoc[Video of PrimeFaces Development with NetBeans IDE]
+- xref:maven-websocketapi-screencast.adoc[Video of Using the WebSocket API in a Web Application]
+- xref:cdi-events.adoc[Working with Events in CDI]
+- xref:cdi-inject.adoc[Working with Injection and Qualifiers in CDI]
 
 
 
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 00ce76c5a..62b8b95f2 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
@@ -36,7 +36,7 @@ The application contains an EJB module and a web module. The EJB module contains
 
 Before starting this tutorial you may want to familiarize yourself with the following document.
 
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
 
 *Tutorial Exercises*
 
@@ -676,7 +676,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+].
 
 
 == Troubleshooting
@@ -723,12 +723,12 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20an%20Enterpris
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../web/quickstart-webapps.adoc[+Introduction to Developing Web Applications+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 You can find more information about using enterprise beans in the link:http://docs.oracle.com/javaee/7/tutorial/doc/ejb-intro.htm[+Java EE 7 Tutorial+].
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
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 769f883a2..271c4e5d6 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
@@ -68,8 +68,8 @@ This document assumes you have some basic knowledge of, or programming experienc
 
 Before starting this tutorial you may want to familiarize yourself with the following documents.
 
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../java/junit-intro.html[+Writing JUnit Tests in NetBeans IDE+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../java/junit-intro.adoc[+Writing JUnit Tests in NetBeans IDE+]
 * link:http://download.oracle.com/docs/cd/E19798-01/821-1754/gjlde/index.html[+Using the EJB 3.1 Embeddable API with Embedded GlassFish Server+]
 
 You can download link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252FWebAppJUnit.zip[+a zip archive of the finished project+].
@@ -602,7 +602,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+].
 
 
 link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20the%20Embedded%20EJB%20Container[+Send Feedback on This Tutorial+]
@@ -613,12 +613,12 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20the%20Embedded%20
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../web/quickstart-webapps.adoc[+Introduction to Developing Web Applications+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 You can find more information about using EJB 3.1 Enterprise Beans in the link:http://download.oracle.com/javaee/6/tutorial/doc/[+Java EE 6 Tutorial+].
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
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 0997482de..fd8fed84e 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
@@ -29,28 +29,30 @@
 :description: Video of Getting Started with JavaScript Client Development in Java EE Applications - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Video of Getting Started with JavaScript Client Development in Java EE Applications
 
-|===
-|This screencast demonstrates the creation of Backbone.js web front-ends in Java EE applications.
+//|===
+//|
 
-link:http://bits.netbeans.org/media/html5-gettingstarted-javaee-screencast.mp4[+Download / Watch full size+] (41 MB)
+This screencast demonstrates the creation of Backbone.js web front-ends in Java EE applications.
+
+//link:http://bits.netbeans.org/media/html5-gettingstarted-javaee-screencast.mp4[+Download / Watch full size+] (41 MB)
 
  
 
-|For more about working with HTML5 applications in NetBeans IDE, watch the following screencasts.
+For more about working with HTML5 applications in NetBeans IDE, watch the following screencasts.
 
-* link:../web/html5-gettingstarted-screencast.html[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
-* link:../web/html5-css-screencast.html[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
-* link:../web/html5-javascript-screencast.html[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
+* xref:../web/html5-gettingstarted-screencast.adoc[HTML5 - Part 1: Getting Started with HTML5 Applications]
+* 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]
 
-link:/about/contact_form.html?to=3&subject=Feedback: Getting Started with JavaScript Client Development in Java EE Applications[+Send Feedback on This Tutorial+]
+xref:../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
-|===
+//|===
 
 
 == Related links
 
-* link:../webclient/html5-gettingstarted.html[+Getting Started with HTML5 Applications +]
-* link:../webclient/html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]
-* link:../webclient/html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]
-* link:http://wiki.netbeans.org/HTML5[+HTML5 Support in NetBeans IDE wiki page+]
-* link:../../trails/php.html[+PHP and HTML5 Learning Trail+]
+* 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:../php.adoc[PHP and HTML5 Learning Trail]
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 646eeb13d..f4fef68ad 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
@@ -45,7 +45,7 @@ link:/about/contact_form.html?to=3&subject=Feedback: Getting Started with Java E
 
 == Related links
 
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications in NetBeans IDE+]
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../web/jsf20-support.html[+JSF 2.0 Support in NetBeans IDE 6.8+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications in NetBeans IDE+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../web/jsf20-support.adoc[+JSF 2.0 Support in NetBeans IDE 6.8+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
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 54b8840e8..8bf03a94c 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
@@ -104,7 +104,7 @@ In this section you will create an entity class and a session facade for the ent
 
 The session facade for the entity class in this application is a stateless session bean. The Enterprise JavaBean (EJB) 3.1 architecture introduced as part of the Java EE 6 specification enables you to create session beans without the business interfaces that were required in EJB 3.0. The Java EE 6 specification also allows you to package EJB components directly in a WAR archive. This simplifies development of smaller web applications by eliminating the need to create separate EJB modules [...]
 
-For more about using EJB 3.1 in the IDE, see the tutorial link:javaee-entapp-ejb.html[+Creating an Enterprise Application with EJB 3.1+].
+For more about using EJB 3.1 in the IDE, see the tutorial xref:javaee-entapp-ejb.adoc[+Creating an Enterprise Application with EJB 3.1+].
 
 For more details about entity classes, see the chapter link:http://docs.oracle.com/javaee/7/tutorial/doc/persistence-intro.htm[+Introduction to the Java Persistence API+] in the link:http://download.oracle.com/javaee/7/tutorial/doc/[+Java EE 7 Tutorial+].
 
@@ -207,7 +207,7 @@ The IDE also generates methods in  ``AbstractFacade.java``  to create, edit, rem
 
 In this section you will create the presentation layer for the application using JavaServer Faces (JSF) 2.x and a managed backing bean that is used by the JSF pages. The JSF 2.x specification adds support for Facelets as the preferred view technology for JSF-based applications. Starting with JSF 2.x, you can also use the  ``@ManagedBean``  annotation in your source code to declare a class a managed bean. You are no longer required to add entries in the  ``faces-config.xml``  file to decl [...]
 
-For more about IDE support for the JavaServer Faces 2.x specification, see link:../web/jsf20-support.html[+JSF 2.x Support in NetBeans IDE+].
+For more about IDE support for the JavaServer Faces 2.x specification, see xref:../web/jsf20-support.adoc[+JSF 2.x Support in NetBeans IDE+].
 
 For more about the JavaServer Faces 2.x specification, see the link:http://docs.oracle.com/javaee/7/tutorial/doc/jsf-intro.htm[+JavaServer Faces Technology+] chapter in the Java EE 7 Tutorial.
 
@@ -444,7 +444,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+].
 
 
 link:/about/contact_form.html?to=3&subject=Feedback:%20Getting%20Started%20with%20Java%20EE%206%20Applications[+Send Feedback on This Tutorial+]
@@ -455,11 +455,11 @@ 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:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../web/jsf20-support.html[+JSF 2.x Support in NetBeans IDE+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../web/jsf20-support.adoc[+JSF 2.x Support in NetBeans IDE+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 You can find more information about using Java EE technologies to develop applications in the link:http://download.oracle.com/javaee/7/tutorial/doc/[+Java EE 7 Tutorial+].
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
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 538834023..102a1204c 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
@@ -121,7 +121,7 @@ The Java Persistence API has the following key features:
 * *Detached entities.* Because entity beans are POJOs, they can be serialized and sent across the network to a different address space and used in a persistence-unaware environment. As a result, you no longer need to use data transfer objects (DTOs).
 * *EntityManager API.* Application programmers now use a standard EntityManager API to perform `Create Read Update Delete` (CRUD) operations that involve entities.
 
-The IDE provides tools to work with the new Java Persistence API. You can generate entity classes automatically from a database, or code entity classes by hand. The IDE also provides templates and graphic editors for creating and maintaining persistence units. See link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+] for more information on using the Java Persistence API.
+The IDE provides tools to work with the new Java Persistence API. You can generate entity classes automatically from a database, or code entity classes by hand. The IDE also provides templates and graphic editors for creating and maintaining persistence units. See xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+] for more information on using the Java Persistence API.
 
 
 == Web Services
@@ -162,9 +162,9 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Intro%20to%20Java%20EE%20
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../websvc/jax-ws.html[+Getting Started with JAX-WS Web Services+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../websvc/jax-ws.adoc[+Getting Started with JAX-WS Web Services+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
-To send comments and suggestions, get support, and keep informed on 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 on 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/javaee/maven-entapp-testing.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/maven-entapp-testing.adoc
index ad327c30d..8f63e90ca 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
@@ -473,12 +473,12 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20an%20Enterpris
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:maven-entapp.html[+Creating an Enterprise Application Using Maven+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:maven-entapp.adoc[+Creating an Enterprise Application Using Maven+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 You can find more information about using Enterprise Beans in the link:http://download.oracle.com/javaee/6/tutorial/doc/[+Java EE 6 Tutorial+].
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
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 d1e5d17c5..c1162f117 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
@@ -726,7 +726,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 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:  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+]
@@ -737,12 +737,12 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20an%20Enterpris
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:maven-entapp-testing.html[+Testing a Maven Enterprise Application+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:maven-entapp-testing.adoc[+Testing a Maven Enterprise Application+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 You can find more information about using Enterprise Beans in the link:http://download.oracle.com/javaee/7/tutorial/doc/[+Java EE 7 Tutorial+].
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
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 f54633e51..a654d1216 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
@@ -894,7 +894,7 @@ For more information about using NetBeans IDE and Maven to develop OSGi bundles,
 * link:http://wiki.netbeans.org/OSGiAndNetBeans[+OSGi And NetBeans at wiki.netbeans.org+]
 * link:http://wiki.netbeans.org/MavenBestPractices[+Best Practices for Apache Maven in NetBeans IDE+]
 * link:https://blogs.oracle.com/arungupta/entry/totd_125_creating_an_osgi[+TOTD #125: Creating an OSGi bundles using NetBeans and deploying in GlassFish+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
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 45d3a7595..d5ba38517 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
@@ -47,7 +47,7 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20PrimeFaces%2
 
 == Related links
 
-* Demo: link:javaee-gettingstarted-screencast.html[+Getting Started with Java EE Applications+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail +]
+* Demo: xref:javaee-gettingstarted-screencast.adoc[+Getting Started with Java EE Applications+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail +]
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 e34eb804d..7a70662de 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
@@ -41,7 +41,7 @@ link:http://bits.netbeans.org/media/websocketapi-screencast.mp4[+Download / Watc
 
 |For the steps for creating this application in NetBeans IDE, see the following tutorial.
 
-* link:maven-websocketapi.html[+Using the WebSocket API in a Web Application+]
+* 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+]
  
@@ -50,7 +50,7 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Using%20the%
 
 == Related links
 
-* Demo: link:javaee-gettingstarted-screencast.html[+Getting Started with Java EE Applications+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail +]
+* Demo: xref:javaee-gettingstarted-screencast.adoc[+Getting Started with Java EE Applications+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail +]
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 8697a6a48..f42393e34 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
@@ -37,7 +37,7 @@ The application contains a WebSocket endpoint and decoder and encoder interfaces
 
 NOTE:  This tutorial is based on the link:https://blogs.oracle.com/arungupta/entry/collaborative_whiteboard_using_websocket_in[+ Collaborative Whiteboard using WebSocket in GlassFish 4 - Text/JSON and Binary/ArrayBuffer Data Transfer (TOTD #189) +] blog post and other blog entries which can be found on link:http://blog.arungupta.me/[+Arun Gupta's blog+]. Be sure to visit the blog and see many other excellent entries on working with the WebSocket API and GlassFish 4.
 
-You can also watch the link:maven-websocketapi-screencast.html[+Video of Using the WebSocket API in a Web Application+].
+You can also watch the xref:maven-websocketapi-screencast.adoc[+Video of Using the WebSocket API in a Web Application+].
 
 *Tutorial Exercises*
 
@@ -949,12 +949,12 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20the%20WebSocket%2
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* Demo: link:maven-websocketapi-screencast.html[+Using the WebSocket API in a Web Application+]
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* Demo: xref:maven-websocketapi-screencast.adoc[+Using the WebSocket API in a Web Application+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 You can find more information about using Java EE in the link:http://download.oracle.com/javaee/6/tutorial/doc/[+Java EE Tutorial+].
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
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 b1b473829..e5a805067 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
@@ -55,8 +55,8 @@ 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 link:../java/profiler-intro.html[+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 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+]
 * 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.
 ====
 
@@ -144,7 +144,7 @@ NOTE:  Select JDK 1.7 or JDK 1.8 if you are prompted to select a Java platform f
 
 . Click Run.
 
-NOTE:  If you have not used the profiler before you might be prompted to calibrate the profiler before you can click Run. For more on calibrating the profiler, see the section on link:../java/profiler-intro.html#calibrate[+Using the Profiler for the First Time+] in the link:../java/profiler-intro.html[+Introduction to Profiling Java Applications in NetBeans IDE+].
+NOTE:  If you have not used the profiler before you might be prompted to calibrate the profiler before you can click Run. For more on calibrating the profiler, see the section on xref:../java/profiler-intro.adoc#calibrate[+Using the Profiler for the First Time+] in the xref:../java/profiler-intro.adoc[+Introduction to Profiling Java Applications in NetBeans IDE+].
 
 When you click Run, the IDE builds the application, starts the server in profile mode and then deploys the application to the server. The IDE then attaches to the application and starts retrieving data.
 
@@ -175,7 +175,7 @@ You can choose to instrument all the methods in the application or limit the ins
 * In addition to the Java core classes, an enterprise application will typically invoke a number of methods in classes in the target server. For this reason it is important to choose a filter to limit the sources that are instrumented. It is recommended that you use the *Profile only project classes* filter when profiling enterprise applications.
 * Profiling results are collected as soon as the profiling session is started. If you are using the Advanced method and you do not specify any profiling root methods, some interesting data is available immediately after server startup, specifically the web application's listeners and filters initialization. If you specify some profiling root methods you probably will not get this data, depending on the root methods that you select.
 * Usually you are not interested in data about listeners or filters, so you can click Reset Collected Results to clear that data. The first usable data will be collected after some code is invoked as a result of some action in the web browser, typically displaying a JSP page that uses JavaBeans and/or custom tags or processing servlet's  ``doGet`` / ``doPost``  method. You should note that the data collected when the application starts up the first time often only represents the startup  [...]
-* If a JSP page is being displayed for the first time, it is compiled to the servlet internally by the server, which affects the call tree and the methods timing. Also, the behavior of servlets and other application code can be slightly different during the first run than it is in a real production environment, where the application is running constantly. To obtain profiling data that better represents real application performance, you should generate some workload on the profiled code b [...]
+* If a JSP page is being displayed for the first time, it is compiled to the servlet internally by the server, which affects the call tree and the methods timing. Also, the behavior of servlets and other application code can be slightly different during the first run than it is in a real production environment, where the application is running constantly. To obtain profiling data that better represents real application performance, you should generate some workload on the profiled code b [...]
 
 NOTE:  If you are profiling web applications on the GlassFish application server on a Windows machine, starting the server for profiling may fail if the NetBeans IDE is installed in a path that contains spaces (such as the default installation to  ``C:\Program Files\netbeans-7.4`` ). The workaround is to install/copy your NetBeans IDE installation directory to a location that does not contain spaces in the path (such as  ``C:\netbeans-7.4`` ).
 
@@ -423,7 +423,7 @@ For related documentation, see the following resources:
 * link:http://wiki.netbeans.org/wiki/view/NetBeansUserFAQ#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+]
-* link:../java/profiler-screencast.html[+Screencast: Profiling Points, Drill Down Graph, Heap Walker+]
+* 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+]
 * link:http://profiler.netbeans.org/index.html[+profiler.netbeans.org+]
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 beffde9d3..ff3afb4be 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/section.adoc
@@ -19,30 +19,30 @@
 
 .JavaEE Tutorials
 ************************************************
-- link:cdi-validate.html[Applying @Alternative Beans and Lifecycle Annotations]
-- link:secure-ejb.html[Building Secure Enterprise Beans in Java EE]
-- link:entappclient.html[Creating and Running an Application Client on the GlassFish Server]
-- link:maven-entapp.html[Creating an Enterprise Application Using Maven]
-- link:javaee-entapp-ejb.html[Creating an Enterprise Application with EJB 3.1]
-- link:cdi-intro.html[Getting Started with Contexts and Dependency Injection and JSF 2.x]
-- link:javaee-gettingstarted.html[Getting Started with Java EE Applications]
-- link:javaee-intro.html[Introduction to Support for Java EE Technology in NetBeans IDE]
-- link:index.html[JavaEE Tutorials]
-- link:profiler-javaee.html[Profiling an Enterprise Application in NetBeans IDE]
+- xref:cdi-validate.adoc[Applying @Alternative Beans and Lifecycle Annotations]
+- xref:secure-ejb.adoc[Building Secure Enterprise Beans in Java EE]
+- xref:entappclient.adoc[Creating and Running an Application Client on the GlassFish Server]
+- xref:maven-entapp.adoc[Creating an Enterprise Application Using Maven]
+- xref:javaee-entapp-ejb.adoc[Creating an Enterprise Application with EJB 3.1]
+- xref:cdi-intro.adoc[Getting Started with Contexts and Dependency Injection and JSF 2.x]
+- xref:javaee-gettingstarted.adoc[Getting Started with Java EE Applications]
+- 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[]
-- link:maven-entapp-testing.html[Testing a Maven Enterprise Application]
-- link:maven-osgiservice-cdi.html[Using CDI to Inject OSGi Bundles as Services in NetBeans IDE]
-- link:jpa-eclipselink-screencast.html[Using JPA Support with EclipseLink]
-- link:javaee-entapp-junit.html[Using the Embedded EJB Container to Test Enterprise Applications]
-- link:maven-websocketapi.html[Using the WebSocket API in a Web Application]
-- link:weblogic-javaee-m1-screencast.html[Video of Deploying a Web Application to the Oracle WebLogic Server]
-- link:javaee-gettingstarted-screencast.html[Video of Getting Started with Java EE Applications]
-- link:javaee-gettingstarted-js-screencast.html[Video of Getting Started with JavaScript Client Development in Java EE Applications]
-- link:javaee-gettingstarted-pf-screencast.html[Video of Getting Started with PrimeFaces Development in Java EE Applications]
-- link:maven-primefaces-screencast.html[Video of PrimeFaces Development with NetBeans IDE]
-- link:maven-websocketapi-screencast.html[Video of Using the WebSocket API in a Web Application]
-- link:cdi-events.html[Working with Events in CDI]
-- link:cdi-inject.html[Working with Injection and Qualifiers in CDI]
+- 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]
+- xref:javaee-entapp-junit.adoc[Using the Embedded EJB Container to Test Enterprise Applications]
+- xref:maven-websocketapi.adoc[Using the WebSocket API in a Web Application]
+- xref:weblogic-javaee-m1-screencast.adoc[Video of Deploying a Web Application to the Oracle WebLogic Server]
+- xref:javaee-gettingstarted-screencast.adoc[Video of Getting Started with Java EE Applications]
+- xref:javaee-gettingstarted-js-screencast.adocl[Video of Getting Started with JavaScript Client Development in Java EE Applications]
+- xref:javaee-gettingstarted-pf-screencast.adoc[Video of Getting Started with PrimeFaces Development in Java EE Applications]
+- xref:maven-primefaces-screencast.adoc[Video of PrimeFaces Development with NetBeans IDE]
+- xref:maven-websocketapi-screencast.adoc[Video of Using the WebSocket API in a Web Application]
+- xref:cdi-events.adoc[Working with Events in CDI]
+- xref:cdi-inject.adoc[Working with Injection and Qualifiers in CDI]
 ************************************************
 
 
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 72a0e06c1..3ab9dc7e4 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
@@ -35,7 +35,7 @@ One area that has become greatly simplified through the use of annotations is th
 
 Using annotations, building secure enterprise beans is now much easier. Instead of configuring enterprise bean security in the  ``ejb-jar.xml``  deployment descriptor you can use security annotations to configure authorization directly in the source code. Java EE 5 enterprise applications do not require  ``ejb-jar.xml``  or  ``application.xml`` .
 
-For an overview of some of the features of the Java EE specification, see link:javaee-intro.html[+Introduction to Java EE Technology+]. For more information about annotation specifications, see link:http://jcp.org/en/jsr/detail?id=250[+ JSR 250: Common Annotations for the Java Platform+].
+For an overview of some of the features of the Java EE specification, see xref:javaee-intro.adoc[+Introduction to Java EE Technology+]. For more information about annotation specifications, see link:http://jcp.org/en/jsr/detail?id=250[+ JSR 250: Common Annotations for the Java Platform+].
 
 
 *To follow this tutorial, you need the following software and resources.*
@@ -316,7 +316,7 @@ public static void main(String[] args) {
 }
 ----
 
-For more on applications clients, see link:entappclient.html[+Creating and Running an Application Client on the GlassFish Server+].
+For more on applications clients, see xref:entappclient.adoc[+Creating and Running an Application Client on the GlassFish Server+].
 
 
 == Running the Application
@@ -357,9 +357,9 @@ For more information about using annotations and deployment descriptors to secur
 
 For more information about using NetBeans IDE to develop Java EE applications, see the following resources:
 
-* link:javaee-intro.html[+Introduction to Java EE Technology+]
-* link:javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:javaee-intro.adoc[+Introduction to Java EE Technology+]
+* xref:javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, link:../../../community/lists/top.html[+join the nbj2ee mailing list+].
+To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee mailing list+].
 
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 6ade33e48..97bdc4976 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
@@ -48,4 +48,4 @@ link:/about/contact_form.html?to=3&subject=Feedback:  Deploying a Java EE Applic
 
 == Related links
 
-* link:../web/jsf-jpa-weblogic.html[+Running a JavaServer Faces 2.0 Web Application on Oracle WebLogic Server+]
+* xref:../web/jsf-jpa-weblogic.adoc[+Running a JavaServer Faces 2.0 Web Application on Oracle WebLogic Server+]
diff --git a/netbeans.apache.org/src/content/kb/docs/matisse.adoc b/netbeans.apache.org/src/content/kb/docs/matisse.adoc
index ad0b6a4b5..c8adc85a5 100644
--- a/netbeans.apache.org/src/content/kb/docs/matisse.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/matisse.adoc
@@ -103,33 +103,33 @@ link:http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceS
 
 === Getting Started with Swing
 
-* link:../docs/java/native_pkg.html[+Native Packaging in NetBeans IDE+]
-* link:../docs/java/gui-functionality.html[+Introduction to Java GUI Building+]
-* link:../docs/java/quickstart-gui.html[+Designing a Swing GUI in NetBeans IDE+]
-* link:../docs/java/quickstart-gui-legend.html[+NetBeans IDE GUI Builder Visual Feedback Legend+]
-* link:../docs/java/gui-image-display.html[+Handling Images in a GUI Application+]
-* link:../docs/java/gui-filechooser.html[+Adding a FileChooser to a GUI Application+]
-* link:../docs/java/gbcustomizer-basic.html[+Designing a Basic Java Form Using the GridBag Customizer+]
-* link:../docs/java/gbcustomizer-advanced.html[+Designing an Advanced Java Form Using the GridBag Customizer+]
-* link:../docs/java/gui-gaps.html[+Gap Editing Support in the NetBeans GUI Builder+]
-* link:../docs/java/debug-visual.html[+Using the Visual Debugger+]
+* xref:java/native_pkg.adoc[+Native Packaging in NetBeans IDE+]
+* xref:java/gui-functionality.adoc[+Introduction to Java GUI Building+]
+* xref:java/quickstart-gui.adoc[+Designing a Swing GUI in NetBeans IDE+]
+* xref:java/quickstart-gui-legend.adoc[+NetBeans IDE GUI Builder Visual Feedback Legend+]
+* xref:java/gui-image-display.adoc[+Handling Images in a GUI Application+]
+* xref:java/gui-filechooser.adoc[+Adding a FileChooser to a GUI Application+]
+* xref:java/gbcustomizer-basic.adoc[+Designing a Basic Java Form Using the GridBag Customizer+]
+* xref:java/gbcustomizer-advanced.adoc[+Designing an Advanced Java Form Using the GridBag Customizer+]
+* xref:java/gui-gaps.adoc[+Gap Editing Support in the NetBeans GUI Builder+]
+* xref:java/debug-visual.adoc[+Using the Visual Debugger+]
 
 === Java Persistence and Beans Binding
 
-* link:../docs/java/gui-binding.html[+Binding Beans and Data in a Java Application+]
-* link:../docs/java/hibernate-java-se.html[+Using Hibernate in a Java Swing Application+]
-* link:../docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+]
+* xref:java/gui-binding.adoc[+Binding Beans and Data in a Java Application+]
+* xref:java/hibernate-java-se.adoc[+Using Hibernate in a Java Swing Application+]
+* xref:java/maven-hib-java-se.adoc[+Creating a Maven Swing Application Using Hibernate+]
 
 === Internationalization
 
-* link:../docs/java/gui-automatic-i18n.html[+Internationalizing a GUI Form+]
+* xref:java/gui-automatic-i18n.adoc[+Internationalizing a GUI Form+]
 
 == Screencasts
 
 * link:http://www.youtube.com/watch?v=ddJpDi5SWFc[+JavaFX Graphics Tips and Tricks+]
 * link:https://blogs.oracle.com/geertjan/entry/thanks_javafx_wysiwyg_html_editor[+Thanks JavaFX: WYSIWYG HTML Editor for NetBeans IDE +]
-* link:../docs/java/nb_fx_screencast.html[+Demo: JavaFX Support in NetBeans IDE+]
-* link:../docs/java/gui-builder-screencast.html[+Designing a Swing GUI in NetBeans IDE+]
+* xref:java/nb_fx_screencast.adoc[+Demo: JavaFX Support in NetBeans IDE+]
+* xref:java/gui-builder-screencast.adoc[+Designing a Swing GUI in NetBeans IDE+]
 
 == Community-Contributed Docs
 
diff --git a/netbeans.apache.org/src/content/kb/docs/mobility.adoc b/netbeans.apache.org/src/content/kb/docs/mobility.adoc
index b93f4299e..07f0e6df3 100644
--- a/netbeans.apache.org/src/content/kb/docs/mobility.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/mobility.adoc
@@ -36,20 +36,20 @@ Most mobile applications use the Java Micro Edition (Java ME) platform, which wa
 
 == Getting Started
 
-* link:../docs/javame/imp-ng.html[+Creating, Debugging, and Profiling a Mobile Embedded Application+]
-* link:../docs/javame/java-card.html[+NetBeans Java Card Development Quick Start Guide+]
+* xref:javame/imp-ng.adoc[+Creating, Debugging, and Profiling a Mobile Embedded Application+]
+* xref:javame/java-card.adoc[+NetBeans Java Card Development Quick Start Guide+]
 
 == Tutorials and Articles
 
 === Developing Java Card Applications
 
-* link:../docs/javame/javacard.html[+Java Card Quick Start Article+]
+* xref:javame/javacard.adoc[+Java Card Quick Start Article+]
 * link:http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html[+Deploying Servlets on Smart Cards: Portable Web Servers with Java Card 3.0+]
 
 == Screencasts
 
-* link:../docs/javame/nb_me8_screencast.html[+Demo: NetBeans IDE Support for Java ME 8+]
-* link:../docs/javame/nb_me_plugins_screencast.html[+Demo: Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE+]
+* xref:javame/nb_me8_screencast.adoc[+Demo: NetBeans IDE Support for Java ME 8+]
+* xref:javame/nb_me_plugins_screencast.adoc[+Demo: Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE+]
 * YouTube: link:http://youtu.be/_1PPSt2AwpM[+ Introduction into Java Micro Edition (ME) 8+] (_by Terrence Bar_)
 
 == Community-Contributed Docs
diff --git a/netbeans.apache.org/src/content/kb/docs/php.adoc b/netbeans.apache.org/src/content/kb/docs/php.adoc
index fdca504eb..33ba718b2 100644
--- a/netbeans.apache.org/src/content/kb/docs/php.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php.adoc
@@ -29,142 +29,142 @@
 :description: PHP and HTML5 Learning Trail - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, PHP and HTML5 Learning Trail
 
-Below are some resources using the NetBeans IDE to develop PHP applications and HTML5 applications. NetBeans IDE support for these technologies is rapidly evolving. Please see the link:http://blogs.oracle.com/netbeansphp/[+NetBeans for PHP blog+] and link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans WebClient blog+] for the latest information.
+Below are some resources using the NetBeans IDE to develop PHP applications and HTML5 applications. NetBeans IDE support for these technologies is rapidly evolving. Please see the link:http://blogs.oracle.com/netbeansphp/[NetBeans for PHP blog] and link:https://blogs.oracle.com/netbeanswebclient/[NetBeans WebClient blog] for the latest information.
 
 == Getting Started 
 
-* link:../docs/webclient/html5-gettingstarted.html[+Getting Started with HTML5 Applications+]
-* link:../docs/php/quickstart.html[+NetBeans IDE PHP Quick Start Tutorial+]
-* link:../docs/php/project-setup.html[+Setting Up a PHP Project+]
-* link:../../kb/docs/php/ajax-quickstart.html[+Introduction to Ajax in PHP Applications+]
-* link:../docs/webclient/ojet-gettingstarted.html[+Getting Started with Oracle JET Applications+]
-* link:../docs/webclient/cordova-gettingstarted.html[+Getting Started with Cordova Applications+]
+* xref:../docs/webclient/html5-gettingstarted.adoc[Getting Started with HTML5 Applications]
+* xref:../docs/php/quickstart.adoc[NetBeans IDE PHP Quick Start Tutorial]
+* xref:../docs/php/project-setup.adoc[Setting Up a PHP Project]
+* xref:php/ajax-quickstart.adoc[Introduction to Ajax in PHP Applications]
+* xref:../docs/webclient/ojet-gettingstarted.adoc[Getting Started with Oracle JET Applications]
+* xref:../docs/webclient/cordova-gettingstarted.adoc[Getting Started with Cordova Applications]
 
 == Tutorials and Articles
 
 === Basic Oracle JET Development
 
-* link:../docs/webclient/ojet-settingup.html[+Setting Up an Oracle JET Application+]
-* link:../docs/webclient/ojet-working.html[+Working with Oracle JET Applications+]
-* link:../docs/webclient/ojet-cookbook.html[+Using the Oracle JET Cookbook+]
-* link:../docs/webclient/ojet-databinding.html[+Using Data Bindings to Connect Components+]
-* link:../docs/webclient/ojet-porting.html[+Porting an Application to Oracle JET+]
-* link:../docs/webclient/ojet-gettingstarted.html[+Getting Started with Oracle JET in NetBeans IDE+]
+* xref:../docs/webclient/ojet-settingup.adoc[Setting Up an Oracle JET Application]
+* xref:../docs/webclient/ojet-working.adoc[Working with Oracle JET Applications]
+* xref:../docs/webclient/ojet-cookbook.adoc[Using the Oracle JET Cookbook]
+* xref:../docs/webclient/ojet-databinding.adoc[Using Data Bindings to Connect Components]
+* xref:../docs/webclient/ojet-porting.adoc[Porting an Application to Oracle JET]
+* xref:../docs/webclient/ojet-gettingstarted.adoc[Getting Started with Oracle JET in NetBeans IDE]
 
 === Common Scenarios for Oracle JET Development
 
-* link:../docs/webclient/ojet-intermodular.html[+Strategies for Intermodular Communication+]
-* link:../docs/webclient/ojet-crud.html[+CRUD Application Development+]
-* link:../docs/webclient/ojet-rest.html[+Interacting with RESTful Web Services+]
-* link:../docs/webclient/ojet-cca.html[+Composite Component Architecture+]
+* xref:../docs/webclient/ojet-intermodular.adoc[Strategies for Intermodular Communication]
+* xref:../docs/webclient/ojet-crud.adoc[CRUD Application Development]
+* xref:../docs/webclient/ojet-rest.adoc[Interacting with RESTful Web Services]
+* xref:../docs/webclient/ojet-cca.adoc[Composite Component Architecture]
 * Oracle JET Mobile Development
 * Error Handling and Validation
-* link:../docs/webclient/ojet-flex.html[+CSS3 Flexible Box+]
+* xref:../docs/webclient/ojet-flex.adoc[CSS3 Flexible Box]
 * Theming
 * Internationalization
 
 === HTML5 and JavaScript Project Development
 
-* link:../docs/webclient/html5-editing-css.html[+Working with CSS Stylesheets in HTML5 Applications+]
-* link:../docs/webclient/html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]
-* link:http://wiki.netbeans.org/HTML5[+HTML5 Support in NetBeans IDE wiki page+]
-* link:../docs/web/js-toolkits-jquery.html[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]
-* link:../docs/web/js-toolkits-dojo.html[+Connecting a Dojo Tree to an ArrayList using JSON+]
-* link:https://blogs.oracle.com/geertjan/entry/html5_front_end_for_an[+HTML5 Front End for an Existing Java EE Application+] (Geertjan's blog)
+* xref:../docs/webclient/html5-editing-css.adoc[Working with CSS Stylesheets in HTML5 Applications]
+* xref:../docs/webclient/html5-js-support.adoc[Debugging and Testing JavaScript in HTML5 Applications]
+* link:http://wiki.netbeans.org/HTML5[HTML5 Support in NetBeans IDE wiki page]
+* xref:../docs/web/js-toolkits-jquery.adoc[Using jQuery to Enhance the Appearance and Usability of a Web Page]
+* xref:../docs/web/js-toolkits-dojo.adoc[Connecting a Dojo Tree to an ArrayList using JSON]
+* link:https://blogs.oracle.com/geertjan/entry/html5_front_end_for_an[HTML5 Front End for an Existing Java EE Application] (Geertjan's blog)
 
 === Configuring Your Environment for PHP Development
 
-* link:../docs/php/configure-php-environment-windows.html[+Configuring the Environment in Windows+]
-* link:../docs/ide/install-and-configure-mysql-server.html[+Configuring the MySQL Database Server in Windows+]
-* link:../docs/php/configure-php-environment-ubuntu.html[+Configuring the Environment in Linux Ubuntu Distribution+]
-* link:../docs/php/configure-php-environment-mac-os.html[+Configuring the Environment in Mac OS X+]
-* link:http://wiki.netbeans.org/HowToConfigureXDebug[+How To Configure XDebug (Wiki)+]
+* xref:../docs/php/configure-php-environment-windows.adoc[Configuring the Environment in Windows]
+* xref:../docs/ide/install-and-configure-mysql-server.adoc[Configuring the MySQL Database Server in Windows]
+* xref:../docs/php/configure-php-environment-ubuntu.adoc[Configuring the Environment in Linux Ubuntu Distribution]
+* xref:../docs/php/configure-php-environment-mac-os.adoc[Configuring the Environment in Mac OS X]
+* link:http://wiki.netbeans.org/HowToConfigureXDebug[How To Configure XDebug (Wiki)]
 
 === Testing and Debugging
 
-* link:../../kb/docs/php/debugging.html[+Debugging PHP Source Code in the NetBeans IDE+]
-* link:../docs/php/phpunit.html[+Testing with PHPUnit and Selenium+]
-* link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[+NetBeans for PHP Blog: Path Mapping for Remote Debugging+]
+* xref:../../kb/docs/php/debugging.adoc[Debugging PHP Source Code in the NetBeans IDE]
+* xref:../docs/php/phpunit.adoc[Testing with PHPUnit and Selenium]
+* link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[NetBeans for PHP Blog: Path Mapping for Remote Debugging]
 
 === Frameworks
 
-* link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[+Developing a Zend Framework Application With Oracle Database 11g and NetBeans IDE+]
-* link:http://www.tiplite.com/cakephp-support-in-netbeans/[+TipLite blog: CakePHP Support in NetBeans+]
-* link:http://blogs.oracle.com/netbeansphp/entry/using_zend_framework_with_netbeans[+NetBeans for PHP Blog: Using Zend Framework with NetBeans IDE+]
-* link:http://www.mybelovedphp.com/2009/01/27/netbeans-revisited-code-completion-for-code-igniter-ii/[+My Beloved PHP blog: Netbeans revisited: Code Completion for Code-igniter II+]
-* link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[+My Beloved PHP blog: Netbeans: Code Completion for the Kohana Framework+]
+* link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[Developing a Zend Framework Application With Oracle Database 11g and NetBeans IDE]
+* link:http://www.tiplite.com/cakephp-support-in-netbeans/[TipLite blog: CakePHP Support in NetBeans]
+* link:http://blogs.oracle.com/netbeansphp/entry/using_zend_framework_with_netbeans[NetBeans for PHP Blog: Using Zend Framework with NetBeans IDE]
+* link:http://www.mybelovedphp.com/2009/01/27/netbeans-revisited-code-completion-for-code-igniter-ii/[My Beloved PHP blog: Netbeans revisited: Code Completion for Code-igniter II]
+* link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[My Beloved PHP blog: Netbeans: Code Completion for the Kohana Framework]
 * See also: Symfony and Zend framework support documents in the Screencasts and Community Contributions sections.
 
 == General PHP Tutorials
 
-* link:../docs/php/code-templates.html[+Code Templates in NetBeans IDE for PHP+]
-* link:../docs/php/remote-hosting-and-ftp-account.html[+Deploying a PHP Application on a Remote Web Server+]
+* xref:../docs/php/code-templates.adoc[Code Templates in NetBeans IDE for PHP]
+* xref:../docs/php/remote-hosting-and-ftp-account.adoc[Deploying a PHP Application on a Remote Web Server]
 
 === Creating a Database Driven Application With PHP
 
-* link:../docs/php/wish-list-tutorial-main-page.html[+Main Page: Creating a Database Driven Application With PHP+]
-* link:../docs/php/wish-list-lesson1.html[+1a: Creating a MySQL Database+]
-* link:../docs/php/wish-list-oracle-lesson1.html[+1b: Creating Oracle Database Tables+]
-* link:../docs/php/wish-list-lesson2.html[+Part 2: Designing the Application. Reading from the Database+]
-* link:../docs/php/wish-list-lesson3.html[+Part 3: Creating a New Application User+]
-* link:../docs/php/wish-list-lesson4.html[+Part 4: Optimizing the Code+]
-* link:../docs/php/wish-list-lesson5.html[+Part 5: Adding Security. Implementing Application User Logon+]
-* link:../docs/php/wish-list-lesson6.html[+Part 6: Adding a New Wish to the Database+]
-* link:../docs/php/wish-list-lesson7.html[+Part 7: Updating and Deleting Entries In the Database+]
-* link:../docs/php/wish-list-lesson8.html[+Part 8: Making the Application Look Better Using CSS+]
-* link:../docs/php/wish-list-lesson9.html[+Part 9: Deploying the Application on a Remote Web Server+]
+* xref:../docs/php/wish-list-tutorial-main-page.adoc[Main Page: Creating a Database Driven Application With PHP]
+* xref:../docs/php/wish-list-lesson1.adoc[1a: Creating a MySQL Database]
+* xref:../docs/php/wish-list-oracle-lesson1.adoc[1b: Creating Oracle Database Tables]
+* xref:../docs/php/wish-list-lesson2.adoc[Part 2: Designing the Application. Reading from the Database]
+* xref:../docs/php/wish-list-lesson3.adoc[Part 3: Creating a New Application User]
+* xref:../docs/php/wish-list-lesson4.adoc[Part 4: Optimizing the Code]
+* xref:../docs/php/wish-list-lesson5.adoc[Part 5: Adding Security. Implementing Application User Logon]
+* xref:../docs/php/wish-list-lesson6.adoc[Part 6: Adding a New Wish to the Database]
+* xref:../docs/php/wish-list-lesson7.adoc[Part 7: Updating and Deleting Entries In the Database]
+* xref:../docs/php/wish-list-lesson8.adoc[Part 8: Making the Application Look Better Using CSS]
+* xref:../docs/php/wish-list-lesson9.adoc[Part 9: Deploying the Application on a Remote Web Server]
 
 == Screencasts
 
-* (YouTube) link:https://www.youtube.com/watch?v=gIEBo2AUDkA[+Backbone.js Meets Java EE in Maven +]
-* link:../docs/web/html5-cordova-screencast.html[+Getting Started with Cordova in NetBeans IDE+]
-* link:../docs/webclient/html5-knockout-screencast.html[+Using KnockoutJS in an HTML5 Application+]
-* link:../docs/web/html5-gettingstarted-screencast.html[+Getting Started with HTML5 Applications+]
-* link:../docs/web/html5-css-screencast.html[+Working with CSS Stylesheets in HTML5 Applications+]
-* link:../docs/web/html5-javascript-screencast.html[+Testing and Debugging JavaScript in HTML5 Applications+]
-* (YouTube) link:http://www.youtube.com/watch?v=edw0js0hdEo[+HTML5, JavaScript &amp; CSS3 in NetBeans IDE +]
-* (YouTube) link:http://www.youtube.com/watch?v=loSrdwuxgSI#![+From Database to HTML5 Backbone.js in 5 Minutes+]
-* link:../docs/php/screencast-php54.html[+Editing PHP 5.4 with NetBeans IDE+]
-* link:../docs/php/screencast-doctrine2.html[+Doctrine 2 Framework Support in NetBeans IDE for PHP+]
-* link:../docs/php/screencast-continuous-builds.html[+Support for PHP on Continuous Build Servers+]
-* link:../docs/php/screencast-apigen.html[+Generating PHP Documentation With NetBeans IDE+] (Now uses ApiGen instead of PHPDocumentor.)
-* link:../docs/php/screencast-smarty.html[+Smarty Framework Support in NetBeans IDE for PHP+]
-* link:../docs/php/screencast-rename-refactoring.html[+Rename Refactoring and Other Editor Improvements in NetBeans IDE 7.0 for PHP+]
-* link:../docs/php/zend-framework-screencast.html[+Screencast: Zend Framework Support in NetBeans IDE +]
-* link:../docs/php/namespace-code-completion-screencast.html[+PHP Namespace Code Completion+]
-* link:../docs/php/flickr-screencast.html[+Building a PHP Demo in Flickr+]
-* link:../docs/php/php-variables-screencast.html[+Declaring Variables in Comments and Related Code Completion Features+]
+* (YouTube) link:https://www.youtube.com/watch?v=gIEBo2AUDkA[Backbone.js Meets Java EE in Maven ]
+* xref:../docs/web/html5-cordova-screencast.adoc[Getting Started with Cordova in NetBeans IDE]
+* xref:../docs/webclient/html5-knockout-screencast.adoc[Using KnockoutJS in an HTML5 Application]
+* xref:../docs/web/html5-gettingstarted-screencast.adoc[Getting Started with HTML5 Applications]
+* xref:../docs/web/html5-css-screencast.adoc[Working with CSS Stylesheets in HTML5 Applications]
+* xref:../docs/web/html5-javascript-screencast.adoc[Testing and Debugging JavaScript in HTML5 Applications]
+* (YouTube) link:http://www.youtube.com/watch?v=edw0js0hdEo[HTML5, JavaScript &amp; CSS3 in NetBeans IDE ]
+* (YouTube) link:http://www.youtube.com/watch?v=loSrdwuxgSI#![From Database to HTML5 Backbone.js in 5 Minutes]
+* xref:../docs/php/screencast-php54.adoc[Editing PHP 5.4 with NetBeans IDE]
+* xref:../docs/php/screencast-doctrine2.adoc[Doctrine 2 Framework Support in NetBeans IDE for PHP]
+* xref:../docs/php/screencast-continuous-builds.adoc[Support for PHP on Continuous Build Servers]
+* xref:../docs/php/screencast-apigen.adoc[Generating PHP Documentation With NetBeans IDE] (Now uses ApiGen instead of PHPDocumentor.)
+* xref:../docs/php/screencast-smarty.adoc[Smarty Framework Support in NetBeans IDE for PHP]
+* xref:../docs/php/screencast-rename-refactoring.adoc[Rename Refactoring and Other Editor Improvements in NetBeans IDE 7.0 for PHP]
+* xref:../docs/php/zend-framework-screencast.adoc[Screencast: Zend Framework Support in NetBeans IDE ]
+* xref:../docs/php/namespace-code-completion-screencast.adoc[PHP Namespace Code Completion]
+* xref:../docs/php/flickr-screencast.adoc[Building a PHP Demo in Flickr]
+* xref:../docs/php/php-variables-screencast.adoc[Declaring Variables in Comments and Related Code Completion Features]
 
 == Community-Contributed Docs
 
-* link:http://netbeans.dzone.com/php-project-api-generator[+DZone: APIGen Plugin: PHP Project API Generator+]
-* link:http://wiki.netbeans.org/NB68symfony[+Symfony on Windows in NetBeans 6.8+]
-* link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[+Configuring a NetBeans IDE Project for WordPress+]
+* link:http://netbeans.dzone.com/php-project-api-generator[DZone: APIGen Plugin: PHP Project API Generator]
+* link:http://wiki.netbeans.org/NB68symfony[Symfony on Windows in NetBeans 6.8]
+* link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[Configuring a NetBeans IDE Project for WordPress]
 
 == Other Resources
 
 === _Developing Applications with NetBeans IDE_ User's Guide
 
-* link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1532[+Developing PHP Applications+]
-* link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1525[+Developing HTML5 Applications+]
+* link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1532[Developing PHP Applications]
+* link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1525[Developing HTML5 Applications]
 
 === Online Magazine Articles
 
-* link:http://netbeans.dzone.com/news/generate-constructor-getters-a[+NetBeans Zone: Generate Constructor, Getters and Setters in NetBeans PHP IDE+]
-* link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[+NetBeans Zone: NetBeans Project-Specific PHP Interpreter+]
-* link:http://jaxenter.com/from-database-to-restful-web-service-to-html5-in-10-minutes-46064.html[+Jax Magazine: From database to RESTful web service to HTML5 in 10 minutes+]
+* link:http://netbeans.dzone.com/news/generate-constructor-getters-a[NetBeans Zone: Generate Constructor, Getters and Setters in NetBeans PHP IDE]
+* link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[NetBeans Zone: NetBeans Project-Specific PHP Interpreter]
+* link:http://jaxenter.com/from-database-to-restful-web-service-to-html5-in-10-minutes-46064.html[Jax Magazine: From database to RESTful web service to HTML5 in 10 minutes]
 
 === The IDE, Databases, and Versioning
 
-* link:../docs/ide/oracle-db.html[+Connecting to Oracle Database+]
-* link:../../features/ide/index.html[+Base IDE Features+]
-* link:../articles/mysql.html[+MySQL and the NetBeans IDE+]
-* link:../docs/ide/mysql.html[+Connecting to a MySQL Database+]
-* link:../../features/ide/collaboration.html[+Version Control and Developer Collaboration+]
-* link:http://nbdrupalsupport.dev.java.net/[+NetBeans IDE Support for Drupal 6.x+]
+* xref:../docs/ide/oracle-db.adoc[Connecting to Oracle Database]
+* xref:../../features/ide/index.adoc[Base IDE Features]
+* xref:../articles/mysql.adoc[MySQL and the NetBeans IDE]
+* xref:../docs/ide/mysql.adoc[Connecting to a MySQL Database]
+* xref:../../features/ide/collaboration.adoc[Version Control and Developer Collaboration]
+* link:http://nbdrupalsupport.dev.java.net/[NetBeans IDE Support for Drupal 6.x]
 
 === Weblogs
 
-* link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[+NetBeans for PHP blog+]
-* link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans Web Client blog+]
+* link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[NetBeans for PHP blog]
+* link:https://blogs.oracle.com/netbeanswebclient/[NetBeans Web Client blog]
 
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 3ad63ae4a..78b5ef446 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
@@ -43,7 +43,7 @@ Ajax stands for Asynchronous JavaScript and XML. In essence, Ajax is an efficien
 |link:http://httpd.apache.org/download.cgi[+Apache web server+] |2.2 
 |===
 
-NOTE: PHP development environment is often configured using an *AMP package, depending on your operating system. This includes the PHP engine and Apache web server. For instructions on configuring your environment, see the link:../../trails/php.html[+PHP Learning Trail+].
+NOTE: PHP development environment is often configured using an *AMP package, depending on your operating system. This includes the PHP engine and Apache web server. For instructions on configuring your environment, see the xref:../php.adoc[+PHP Learning Trail+].
 
 NOTE: This tutorial assumes that you have a working knowledge of the various technologies it employs (i.e., HTML, CSS, JavaScript, and PHP). It attempts to provide an overview of the functionality provided by the code, but _does not_ explain how the code works on a line-to-line basis.
 
@@ -120,7 +120,7 @@ In the IDE's editor, add an `echo` statement to the index page:
 
 . In the Projects window, right-click on the project node and choose Run. The IDE opens your default browser and displays the Hello World message you just created in `index.php`. 
 
-NOTE: If you have difficulty setting up your project or establishing communication between the IDE, the server and browser, see link:project-setup.html[+Setting Up a PHP Project+] for a more thorough description. The link:../../trails/php.html[+PHP Learning Trail+] can provide more information on configuring your environment.
+NOTE: If you have difficulty setting up your project or establishing communication between the IDE, the server and browser, see xref:project-setup.adoc[+Setting Up a PHP Project+] for a more thorough description. The xref:../php.adoc[+PHP Learning Trail+] can provide more information on configuring your environment.
 
 
 [[html]]
@@ -385,7 +385,7 @@ and a `callback()` function <<callback,must later be defined>>. The HTTP interac
 [[serverside]]
 == Programming the Server-Side
 
-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 [...]
+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.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-mac-os.adoc b/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-mac-os.adoc
index ea64e3ed8..497ab2c60 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-mac-os.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-mac-os.adoc
@@ -114,7 +114,7 @@ image::images/new-php-project.png[role="left", link="images/new-php-project.png"
 
 --
 
-The IDE remembers this location for future projects. For further instructions on creating PHP projects in NetBeans IDE, see link:project-setup.html[+Setting Up a PHP Project+].
+The IDE remembers this location for future projects. For further instructions on creating PHP projects in NetBeans IDE, see xref:project-setup.adoc[+Setting Up a PHP Project+].
 
 == Enabling Xdebug with MAMP
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-ubuntu.adoc b/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-ubuntu.adoc
index 58a0f2eba..5d2815f46 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-ubuntu.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-ubuntu.adoc
@@ -51,7 +51,7 @@ To follow this tutorial, you need the following software and resources.
 |A PHP debugger (optional) |XDebug 2.0 or later 
 |===
 
-Typically, development and debugging is performed on a local web server, while the production environment is located on a remote web server. Setting up a remote web server is described in link:./remote-hosting-and-ftp-account.html[+ Deploying a PHP Application on a Remote Web Server Using the NetBeans IDE+]. This tutorial has you set up a local web server. PHP support can be added to a number of local web servers (IIS, Xitami, and so on), but most commonly link:http://httpd.apache.org/do [...]
+Typically, development and debugging is performed on a local web server, while the production environment is located on a remote web server. Setting up a remote web server is described in xref:remote-hosting-and-ftp-account.adoc[+ Deploying a PHP Application on a Remote Web Server Using the NetBeans IDE+]. This tutorial has you set up a local web server. PHP support can be added to a number of local web servers (IIS, Xitami, and so on), but most commonly link:http://httpd.apache.org/down [...]
 
 === Installing the Software
 
@@ -95,7 +95,7 @@ The individual packages to install are the following:
 
 After you set up your PHP web stack, check that it is installed correctly and that your Apache server recognizes your PHP engine.
 
-To check that Apache and PHP are installed and running, open NetBeans IDE and link:./project-setup.html[+create a PHP project+]. In the  ``index.php``  file, enter the PHP method  ``phpinfo()`` . Run the file. The standard PHP information page should display. 
+To check that Apache and PHP are installed and running, open NetBeans IDE and xref:project-setup.adoc[+create a PHP project+]. In the  ``index.php``  file, enter the PHP method  ``phpinfo()`` . Run the file. The standard PHP information page should display. 
 
 image::images/ubuntu-phpinfo.png[]
 
@@ -242,7 +242,7 @@ Query OK, 0 rows affected (0.00 sec)
 
 === Installing and Enabling the XDebug Debugger
 
-The following steps are required only if you want to use XDebug, which is optional for PHP development. XDebug is an extension to PHP. NetBeans IDE uses it automatically when it is configured correctly for your PHP web stack. For more information on XDebug and NetBeans IDE, see link:./debugging.html[+Debugging PHP Source Code in the NetBeans IDE+]. Also see the link:http://wiki.netbeans.org/HowToConfigureXDebug[+NetBeans wiki page on XDebug+].
+The following steps are required only if you want to use XDebug, which is optional for PHP development. XDebug is an extension to PHP. NetBeans IDE uses it automatically when it is configured correctly for your PHP web stack. For more information on XDebug and NetBeans IDE, see xref:debugging.adoc[+Debugging PHP Source Code in the NetBeans IDE+]. Also see the link:http://wiki.netbeans.org/HowToConfigureXDebug[+NetBeans wiki page on XDebug+].
 
 [[xdebug-package]]
 ==== Installing the XDebug Package (Ubuntu 8.05 and later)
diff --git a/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-windows.adoc b/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-windows.adoc
index 7085cb9a9..4effc4509 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-windows.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/configure-php-environment-windows.adoc
@@ -51,7 +51,7 @@ Included in XAMPP Windows.
  
 |===
 
-Typically, development and debugging is performed on a local web server, while the production environment is located on a remote web server. Setting up a remote web server is described in link:./remote-hosting-and-ftp-account.html[+ Deploying a PHP Application on a Remote Web Server Using the NetBeans IDE+]. This tutorial has you set up a local web server. PHP support can be added to a number of local web servers (IIS, Xitami, and so on), but most commonly link:http://httpd.apache.org/do [...]
+Typically, development and debugging is performed on a local web server, while the production environment is located on a remote web server. Setting up a remote web server is described in xref:remote-hosting-and-ftp-account.adoc[+ Deploying a PHP Application on a Remote Web Server Using the NetBeans IDE+]. This tutorial has you set up a local web server. PHP support can be added to a number of local web servers (IIS, Xitami, and so on), but most commonly link:http://httpd.apache.org/down [...]
 
 === Required Software
 
@@ -258,7 +258,7 @@ If the page does not open:
 
 ==== MySQL Database Server
 
-Find detailed information on link:../ide/install-and-configure-mysql-server.html[+installing and configuring the MySQL+] database server.
+Find detailed information on xref:../ide/install-and-configure-mysql-server.adoc[+installing and configuring the MySQL+] database server.
 
 ==== XDebug
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/debugging.adoc b/netbeans.apache.org/src/content/kb/docs/php/debugging.adoc
index 7b568174b..87e5e09a4 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/debugging.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/debugging.adoc
@@ -45,7 +45,7 @@
 
 == Getting Ready
 
-To successfully debug PHP applications in the NetBeans IDE for PHP, you need to have the PHP engine, the Apache local web server, and the XDebug debugger link:../../trails/php.html#configuration[+installed and configured for PHP development+]. If you have difficulties getting XDebug to work, see the link:http://wiki.netbeans.org/HowToConfigureXDebug[+NetBeans wiki on XDebug+] and/or ask the community at users@php.netbeans.org.
+To successfully debug PHP applications in the NetBeans IDE for PHP, you need to have the PHP engine, the Apache local web server, and the XDebug debugger xref:../php.adoc#configuration[+installed and configured for PHP development+]. If you have difficulties getting XDebug to work, see the link:http://wiki.netbeans.org/HowToConfigureXDebug[+NetBeans wiki on XDebug+] and/or ask the community at users@php.netbeans.org.
 
 
 == How PHP Debugging with XDebug Works in NetBeans IDE
@@ -289,7 +289,7 @@ The sample in this section illustrates the basic debugger functions, including s
 * Project type - PHP application
 * Sources location - the default  ``htdocs``  folder location
 * Run configuration - Local Web Site
-Find more details about setting up a PHP project in the document link:project-setup.html[+Setting Up a PHP Project+].
+Find more details about setting up a PHP project in the document xref:project-setup.adoc[+Setting Up a PHP Project+].
 
 
 . To enable the use of hotkeys during the session, position the cursor on the project node and choose Set as Main Project from the popup menu.
@@ -467,7 +467,7 @@ You can debug code that contains both PHP and HTML blocks. In the example from t
  </form>
 ----
 
-Find more information about link:wish-list-lesson2.html#htmlForm[+HTML input forms+].
+Find more information about xref:wish-list-lesson2.adoc#htmlForm[+HTML input forms+].
 
 
 
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 334dba1d9..92bf74ddc 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
@@ -38,10 +38,12 @@ link:http://bits.netbeans.org/media/NetBeans65PHP_demo_part_II.flv[+Download+] [
 
 *Related links*
 
-* link:../../../kb/docs/php/project-config-screencast.html[+Demo of PHP support in NetBeans 6.5 - Part I: Projects and Configuration+]
+* 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+]
-* link:../../../kb/trails/php.html[+The PHP Learning Trail+]
+* 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: PetrP's 6.5 PHP Editor 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/flickr-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/php/flickr-screencast.adoc
index d44cb0e0d..3ebe9cc7a 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/flickr-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/flickr-screencast.adoc
@@ -32,7 +32,7 @@
 |===
 |Justin Bolter shows off the new PHP features of NetBeans IDE 6.9-7.0 by walking through building a simple application to access Flickr. You will then see how to turn your Flickr images into a simple slideshow using JavaScript and CSS.
 
-This tutorial is part of the link:../intro-screencasts.html[+Guided Video Tour of NetBeans IDE 6.9-7.0+].
+This tutorial is part of the xref:../intro-screencasts.adoc[+Guided Video Tour of NetBeans IDE 6.9-7.0+].
 
 Author: Justin Bolter
 Time: 14:00 
@@ -41,11 +41,12 @@ link:http://bits.netbeans.org/media/NB65-flickrPHP-Screencast.flv[+Download+] [7
 
 *Related links*
 
-* link:https://netbeans.org/kb/trails/php.html[+The PHP Learning Trail+]
+* xref:../php.adoc[+The PHP Learning Trail+]
 * link:http://blogs.oracle.com/netbeansphp/[+NetBeans for PHP Weblog+]
 * link:http://phpflickr.com/[+PHPFlickr+]
 * link:http://jquery.com/[+jQuery+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20PHP+Flickr%20in%20NB6.5%20screencast[+Send Us Your Feedback+]
+xref:../../../community/mailing-lists.adoc[+Send Feedback on This Tutorial+]
+
  |   
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/php/index.adoc b/netbeans.apache.org/src/content/kb/docs/php/index.adoc
index 9060a1154..a98b78ed1 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/index.adoc
@@ -30,36 +30,36 @@ Below are resources for using NetBeans IDE to develop PHP applications and HTML5
 
 == Getting Started
 
-- link:../webclient/html5-gettingstarted.html[Getting Started with HTML5 Applications]
-- link:quickstart.html[Getting Started with PHP Applications]
+- xref:../webclient/html5-gettingstarted.adoc[Getting Started with HTML5 Applications]
+- xref:quickstart.adoc[Getting Started with PHP Applications]
 
 [[configuration]]
 == Configuration
 
-- link:configure-php-environment-mac-os.html[Configuring PHP, Apache, MySQL, and Xdebug for PHP development in MAC OS X]
-- link:configure-php-environment-windows.html[Configuring PHP Development Environment in Windows]
-- link:configure-php-environment-ubuntu.html[Configuring the PHP Development Environment in Linux Ubuntu]
+- xref:configure-php-environment-mac-os.adoc[Configuring PHP, Apache, MySQL, and Xdebug for PHP development in MAC OS X]
+- xref:configure-php-environment-windows.adoc[Configuring PHP Development Environment in Windows]
+- xref:configure-php-environment-ubuntu.adoc[Configuring the PHP Development Environment in Linux Ubuntu]
 
 == Tutorials and Articles
 
-- link:project-setup.html[Setting Up a PHP Project]
-- link:code-templates.html[Code Templates in NetBeans IDE for PHP]
-- link:ajax-quickstart.html[Introduction to Ajax for PHP Web Applications]
-- link:phpunit.html[Testing with PHPUnit and Selenium]
-- link:debugging.html[Debugging PHP Source Code in the NetBeans IDE]
-- link:remote-hosting-and-ftp-account.html[Deploying a PHP Application on a Remote Web Server Using the NetBeans IDE]
+- xref:project-setup.adoc[Setting Up a PHP Project]
+- xref:code-templates.adoc[Code Templates in NetBeans IDE for PHP]
+- xref:ajax-quickstart.adoc[Introduction to Ajax for PHP Web Applications]
+- xref:phpunit.adoc[Testing with PHPUnit and Selenium]
+- xref:debugging.adoc[Debugging PHP Source Code in the NetBeans IDE]
+- xref:remote-hosting-and-ftp-account.adoc[Deploying a PHP Application on a Remote Web Server Using the NetBeans IDE]
 
 == Creating a Database Driven Application With PHP
 
-- link:wish-list-tutorial-main-page.html[Main Page: Creating a Database Driven Application With PHP]
-- link:wish-list-lesson1.html[Lesson 1a: Creating a MySQL Database]
-- link:wish-list-oracle-lesson1.html[Lesson 1b: Creating Oracle Database Tables]
-- link:wish-list-lesson2.html[Lesson 2: Designing the Application. Reading from the Database]
-- link:wish-list-lesson3.html[Lesson 3: Creating a New Application User]
-- link:wish-list-lesson4.html[Lesson 4: Optimizing the Code]
-- link:wish-list-lesson5.html[Lesson 5: Adding Security. Implementing Application User Logon]
-- link:wish-list-lesson6.html[Lesson 6: Adding a New Wish to the Database]
-- link:wish-list-lesson7.html[Lesson 7: Updating and Deleting Entries In the Database]
-- link:wish-list-lesson8.html[Lesson 8: Making the Application Look Better Using CSS]
-- link:wish-list-lesson9.html[Lesson 9: Deploying the Application on a Remote Web Server]
+- xref:wish-list-tutorial-main-page.adoc[Main Page: Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson1.adoc[Lesson 1a: Creating a MySQL Database]
+- xref:wish-list-oracle-lesson1.adoc[Lesson 1b: Creating Oracle Database Tables]
+- xref:wish-list-lesson2.adoc[Lesson 2: Designing the Application. Reading from the Database]
+- xref:wish-list-lesson3.adoc[Lesson 3: Creating a New Application User]
+- xref:wish-list-lesson4.adoc[Lesson 4: Optimizing the Code]
+- xref:wish-list-lesson5.adoc[Lesson 5: Adding Security. Implementing Application User Logon]
+- xref:wish-list-lesson6.adoc[Lesson 6: Adding a New Wish to the Database]
+- xref:wish-list-lesson7.adoc[Lesson 7: Updating and Deleting Entries In the Database]
+- xref:wish-list-lesson8.adoc[Lesson 8: Making the Application Look Better Using CSS]
+- xref:wish-list-lesson9.adoc[Lesson 9: Deploying the Application on a Remote Web Server]
 
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 9e22274a5..423f78637 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
@@ -42,8 +42,10 @@ link:http://bits.netbeans.org/media/php-namespaces.flv[+Download+] [27.4 MB]
 == Related links
 
 * link:../../../features/php/index.html[+NetBeans IDE for PHP+]
-* link:../../../kb/trails/php.html[+The PHP Learning Trail+]
+* 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: Namespace cc 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/php-editor-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/php/php-editor-screencast.adoc
index 6df1488b5..74708c399 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
@@ -39,9 +39,9 @@ link:https://netbeans.org/files/documents/4/2028/php_demo.zip[+Download+] ( 6.35
 
 *Related links*
 
-* link:../../../kb/docs/php/editor-screencast.html[+Petr's NetBeans IDE 6.9-7.0 PHP Editor Screencast+]
+* xref:editor-screencast.adoc[+Petr's NetBeans IDE 6.9-7.0 PHP Editor Screencast+]
 * link:../../../features/php/index.html[+NetBeans IDE for PHP+]
-* link:../../../kb/trails/php.html[+The PHP Learning Trail+]
+* 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+]
  |
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 812a3707b..b71379552 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
@@ -40,7 +40,7 @@ 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+]
-* link:../../../kb/trails/php.html[+The PHP Learning Trail+]
+* 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+]
  |   
diff --git a/netbeans.apache.org/src/content/kb/docs/php/phpunit.adoc b/netbeans.apache.org/src/content/kb/docs/php/phpunit.adoc
index 429839856..961281da3 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/phpunit.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/phpunit.adoc
@@ -357,6 +357,6 @@ image::images/selenium-test-in-project.png[]
 Here are a few more ideas for you to explore:
 
 * Add a second class to Calculator.php, such as a  ``Calculator2``  class that multiplies $a and $b. Delete and regenerate the tests.
-* If you try the multi-part link:./wish-list-tutorial-main-page.html[+Creating a CRUD Application tutorial+], create a Selenium test for the final project.
+* If you try the multi-part xref:wish-list-tutorial-main-page.adoc[+Creating a CRUD Application tutorial+], create a Selenium test for the final project.
 
 
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 229a0cc54..2e34b071b 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
@@ -39,9 +39,9 @@ link:http://bits.netbeans.org/media/NetBeans65PHP_demo_part_I.flv[+Download+] [1
 
 == Related links
 
-* link:../../../kb/docs/php/editor-screencast.html[+Demo of PHP support in NetBeans 6.5 - Part II: Editor Features +]
+* 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+]
-* link:../../../kb/trails/php.html[+The PHP Learning Trail+]
+* 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+]
  |   
diff --git a/netbeans.apache.org/src/content/kb/docs/php/project-setup.adoc b/netbeans.apache.org/src/content/kb/docs/php/project-setup.adoc
index 256016132..e49d67052 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/project-setup.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/project-setup.adoc
@@ -50,7 +50,7 @@ To follow this tutorial, you need the following software and resources.
 
 == Getting Ready
 
-Before creating a PHP project, you need to download and install the link:https://netbeans.org/downloads/index.html[+NetBeans IDE for PHP+] and link:../../trails/php.html#configuration[+prepare your environment+] for PHP development.
+Before creating a PHP project, you need to download and install the link:https://netbeans.org/downloads/index.html[+NetBeans IDE for PHP+] and xref:../php.adoc#configuration[+prepare your environment+] for PHP development.
 
 To set up a PHP project:
 
@@ -75,7 +75,7 @@ Depending on your needs, you can create a completely new PHP project <<projectNo
 2. In the Project Name text field, enter the name of the project.
 3. In the Sources Folder field, specify the subfolder of your document root where you want to store your source files.
 
-The document root is the folder where the local web server looks for files to open in the browser. The document root is specified in the web server link:../../trails/php.html#configuration[+configuration file+]. After installation, the New Project wizard locates the document root and by default specifies the following path:  ``<Document Root>\<New PHP Project>`` .
+The document root is the folder where the local web server looks for files to open in the browser. The document root is specified in the web server xref:../php.adoc#configuration[+configuration file+]. After installation, the New Project wizard locates the document root and by default specifies the following path:  ``<Document Root>\<New PHP Project>`` .
 
 A copy of the source files must be kept in a subfolder of the document root. However, you can have your Sources Folder in a different location than the document root and copy source files from this location to the document root. See <<copy-sources,Specifying the Run Configuration>>.
 
@@ -113,11 +113,11 @@ image::images/new-php-project-with-ssources.png[]
 2. In the Project Name text field, enter the name of the project.
 3. In the Sources Folder field, specify the subfolder of your _local_ document root where you want to store your source files.
 
-The document root is the folder where the local web server looks for files to open in the browser. The document root is specified in the web server link:../../trails/php.html#configuration[+configuration file+]. After installation, the New Project wizard locates the document root and by default specifies the following path:  ``<Document Root>\<New PHP Project>`` . Note that it is useful to be able to test the project on a local server.
+The document root is the folder where the local web server looks for files to open in the browser. The document root is specified in the web server xref:../php.adoc#configuration[+configuration file+]. After installation, the New Project wizard locates the document root and by default specifies the following path:  ``<Document Root>\<New PHP Project>`` . Note that it is useful to be able to test the project on a local server.
 
 
 . If you want to store NetBeans metadata in a different location than your source files, select "Put NetBeans metadata into a separate directory." For example, you might want to store your sources in your document root but the NetBeans metadata in your NetBeansProjects directory.
-. Click Next. The Remote Connection panel opens. The tutorial link:remote-hosting-and-ftp-account.html[+Deploying a PHP Application to a Remote Web Server+] describes how to set up remote connections.
+. Click Next. The Remote Connection panel opens. The tutorial xref:remote-hosting-and-ftp-account.adoc[+Deploying a PHP Application to a Remote Web Server+] describes how to set up remote connections.
 
 
 == Specifying the Default Run Configuration of the New Project
@@ -131,9 +131,9 @@ A run configuration is a stored setting for running a PHP project. You can defin
 
 When you create a new PHP project, you create the project's default run configuration. To set the default run configuration for your project, choose the relevant option from the Run As dropdown list on the Run Configuration panel. The following options are available:
 
-* <<localServer,Local Web Site>>. To use this run configuration, you need the link:../../trails/php.html#configuration[+Apache http server installed+] and running.
-* link:remote-hosting-and-ftp-account.html[+Remote Web Site (FTP/SFTP) (Separate tutorial)+]. To use this configuration, you need a link:remote-hosting-and-ftp-account.html#registerHostingAccount[+hosting account+] on a remote server and an link:remote-hosting-and-ftp-account.html#createFTPAccount[+FTP account+] on this server.
-* <<scriptCommandLine,Script>>. This run configuration does not require that a web server be installed and running. You only need a link:../../trails/php.html#configuration[+PHP engine+].
+* <<localServer,Local Web Site>>. To use this run configuration, you need the xref:../php.adoc#configuration[+Apache http server installed+] and running.
+* xref:remote-hosting-and-ftp-account.adoc[+Remote Web Site (FTP/SFTP) (Separate tutorial)+]. To use this configuration, you need a xref:remote-hosting-and-ftp-account.adoc#registerHostingAccount[+hosting account+] on a remote server and an xref:remote-hosting-and-ftp-account.adoc#createFTPAccount[+FTP account+] on this server.
+* <<scriptCommandLine,Script>>. This run configuration does not require that a web server be installed and running. You only need a xref:../php.adoc#configuration[+PHP engine+].
 
 The process for creating additional run configurations, or editing the default run configuration, is described in <<runConfiguration,Customizing the Project Setup: Run Configuration>>. It is almost identical to the process for creating the default run configuration, except that you use the Properties dialog of the existing project instead of the new project wizard.
 
@@ -153,7 +153,7 @@ image::images/run-configuration-local-server-project-with-existing-sources.png[]
 . If you are creating the project from existing sources, you can choose which source file to use as the index file.
 . To store the project's source files in a different directory than the NetBeans IDE project, select "Copy files from Sources Folder to another location". _If you are creating a project from existing sources, this is a required step, unless the existing sources were already in the web folder of your Apache server._
 The field by default specifies the following path: `` <Document Root>\<New PHP Project>`` . Use the Browse button to specify a different path, if necessary.
-The document root is the folder where the web server looks for files to open in the browser. The document root is specified in the web server link:../../trails/php.html#configuration[+configuration file+]. 
+The document root is the folder where the web server looks for files to open in the browser. The document root is specified in the web server xref:../php.adoc#configuration[+configuration file+]. 
 The wizard detects the Apache installation type, either a component or within a package, and provides the path to the default location of the  ``htdocs``  folder for the current installation type. Therefore, if you accepted the default settings during the installation of the Apache server or the AMP package, choose the path from the dropdown list.
 
 . Click Finish. The IDE creates your PHP project.
@@ -161,7 +161,7 @@ The wizard detects the Apache installation type, either a component or within a
 
 === Remote Web Site
 
-See the tutorial link:remote-hosting-and-ftp-account.html[+Deploying a PHP Application to a Remote Web Server+].
+See the tutorial xref:remote-hosting-and-ftp-account.adoc[+Deploying a PHP Application to a Remote Web Server+].
 
 
 === Script
diff --git a/netbeans.apache.org/src/content/kb/docs/php/quickstart.adoc b/netbeans.apache.org/src/content/kb/docs/php/quickstart.adoc
index 55ec848bd..acd16ffc3 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/quickstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/quickstart.adoc
@@ -53,9 +53,9 @@ You can install the PHP engine, web server and database separately or use AMP (A
 
 The following documents contain instructions for one or two ways to set up a PHP web stack on your operating system. These instructions are not definitive. The web stack consists of third-party software, your environment may differ, and you might prefer a different AMP package or another way to set up PHP. You might need to supplement our instructions with your own investigations.
 
-* link:configure-php-environment-windows.html[+Configuring PHP Development Environment in Windows+]
-* link:configure-php-environment-ubuntu.html[+Configuring PHP Development Environment in the Ubuntu Linux Distribution+]
-* link:configure-php-environment-mac-os.html[+Configuring PHP Development Environment in Mac Operating System (Mac OS X)+]
+* xref:configure-php-environment-windows.adoc[+Configuring PHP Development Environment in Windows+]
+* xref:configure-php-environment-ubuntu.adoc[+Configuring PHP Development Environment in the Ubuntu Linux Distribution+]
+* xref:configure-php-environment-mac-os.adoc[+Configuring PHP Development Environment in Mac Operating System (Mac OS X)+]
 
 == Setting up a PHP Project in the NetBeans IDE for PHP
 
@@ -71,7 +71,7 @@ image::images/new-project-name-location.png[title="Name and Location panel of Ne
 
 
 . In the Project Name text field, enter  ``NewPHPProject`` .
-. In the Sources Folder field, browse for your PHP document root and create a subfolder there called  ``NewPHPProject`` . The document root is the folder where the web server looks for files to open in the browser. The document root is specified in the web server link:index.html#configuration[+configuration file+]. For example, on Xampp, the document root is XAMPP_HOME/htdocs.
+. In the Sources Folder field, browse for your PHP document root and create a subfolder there called  ``NewPHPProject`` . The document root is the folder where the web server looks for files to open in the browser. The document root is specified in the web server xref:index.adoc#configuration[+configuration file+]. For example, on Xampp, the document root is XAMPP_HOME/htdocs.
 . Leave all other fields with their default values. Click Next. The Run Configuration window opens. 
 
 image::images/new-project-run-config.png[]
@@ -81,7 +81,7 @@ image::images/new-project-run-config.png[]
 . Leave the Project URL at default.
 . Click Finish. The IDE creates the project.
 
-Learn more about link:project-setup.html[+Setting up a PHP project in NetBeans+].
+Learn more about xref:project-setup.adoc[+Setting up a PHP project in NetBeans+].
 
 == Running Your First PHP Project
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/remote-hosting-and-ftp-account.adoc b/netbeans.apache.org/src/content/kb/docs/php/remote-hosting-and-ftp-account.adoc
index 2fe45599f..69df38467 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/remote-hosting-and-ftp-account.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/remote-hosting-and-ftp-account.adoc
@@ -31,7 +31,7 @@
 
 Normally, a real-life PHP application is run on a remote server. Remote applications are accessed either through a version control system or through File Transfer Protocol (FTP).
 
-NOTE: NetBeans provides basic support for FTP/SFTP, sufficient for a lone developer to work on a simple project. If you are working on a complex project or with multiple developers, you should use a version control system. NetBeans IDE supports a number of version control systems. See our link:../ide/subversion.html[+Subversion+] and link:../ide/git.html[+Git+] tutorials, for example. If you must use FTP/SFTP with a complex project, consider using the IDE in combination with a full-featu [...]
+NOTE: NetBeans provides basic support for FTP/SFTP, sufficient for a lone developer to work on a simple project. If you are working on a complex project or with multiple developers, you should use a version control system. NetBeans IDE supports a number of version control systems. See our xref:../ide/subversion.adoc[+Subversion+] and xref:../ide/git.adoc[+Git+] tutorials, for example. If you must use FTP/SFTP with a complex project, consider using the IDE in combination with a full-featu [...]
 
 *JDK 7 + Windows 7/Vista:* Windows 7 and Windows Vista firewall blocks some FTP operations that are launched by JDK 7. See link:http://forums.netbeans.org/post-115176.html#113923[+NetBeans forum+] for workaround.
 
@@ -60,7 +60,7 @@ If you have a hosting account on a remote Web server and an FTP account to trans
 
 To enable running a PHP application on a remote web server, you need to set up a run configuration that contains an FTP connection profile.
 
-If you already have a project with a default run configuration and you want to add a new remote run configuration, link:project-setup.html#managingProjectSetup[+customize your project+]:
+If you already have a project with a default run configuration and you want to add a new remote run configuration, xref:project-setup.adoc#managingProjectSetup[+customize your project+]:
 
 1. Click the right mouse button on the project node and choose Properties from the popup menu. The Project Properties panel opens.
 2. From the Categories list, choose Run Configuration. The Run Configurations panel opens.
diff --git a/netbeans.apache.org/src/content/kb/docs/php/section.adoc b/netbeans.apache.org/src/content/kb/docs/php/section.adoc
index 7bf380e6d..2003341d8 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/section.adoc
@@ -19,43 +19,43 @@
 
 .PHP Tutorials
 ************************************************
-- link:flickr-screencast.html[Building a Flickr Slideshow with PHP]
-- link:code-templates.html[Code Templates in NetBeans IDE for PHP]
-- link:configure-php-environment-mac-os.html[Configuring PHP, Apache, MySQL, and Xdebug for PHP development in MAC OS X]
-- link:configure-php-environment-windows.html[Configuring PHP Development Environment in Windows]
-- link:configure-php-environment-ubuntu.html[Configuring the PHP Development Environment in Linux Ubuntu]
-- link:wish-list-tutorial-main-page.html[Creating a Database Driven Application With NetBeans IDE PHP Editor]
-- link:wish-list-lesson1.html[Creating a Database Driven Application With PHP]
-- link:wish-list-lesson2.html[Creating a Database Driven Application With PHP]
-- link:wish-list-lesson3.html[Creating a Database Driven Application With PHP]
-- link:wish-list-lesson4.html[Creating a Database Driven Application With PHP]
-- link:wish-list-lesson5.html[Creating a Database Driven Application With PHP]
-- link:wish-list-lesson6.html[Creating a Database Driven Application With PHP]
-- link:wish-list-lesson7.html[Creating a Database Driven Application With PHP]
-- link:wish-list-lesson8.html[Creating a Database Driven Application With PHP]
-- link:wish-list-lesson9.html[Creating a Database Driven Application With PHP]
-- link:wish-list-oracle-lesson1.html[Creating a Database Driven Application With PHP]
-- link:debugging.html[Debugging PHP Source Code in the NetBeans IDE]
-- link:php-variables-screencast.html[Declaring Variables in Comments and Associated Code Completion Features in NetBeans PHP Editor 6.7]
-- link:project-config-screencast.html[Demo of PHP support in NetBeans 6.5 - Part I: Projects and Configuration]
-- link:editor-screencast.html[Demo of PHP support in NetBeans 6.5 - Part II: Editor Features]
-- link:remote-hosting-and-ftp-account.html[Deploying a PHP Application on a Remote Web Server Using the NetBeans IDE]
-- link:screencast-doctrine2.html[Doctrine 2 Support in NetBeans IDE for PHP]
-- link:screencast-php54.html[Editing PHP 5.4 with NetBeans IDE for PHP]
-- link:screencast-apigen.html[Generating PHP Documentation With NetBeans IDE]
-- link:screencast-phpdoc.html[Generating PHP Documentation With NetBeans IDE]
-- link:ajax-quickstart.html[Introduction to Ajax for PHP Web Applications]
-- link:quickstart.html[NetBeans IDE PHP Quick Start Tutorial]
-- link:namespace-code-completion-screencast.html[PHP Namespace Support in NetBeans IDE]
-- link:index.html[PHP Tutorials]
-- link:screencast-rename-refactoring.html[Rename Refactoring and Other Editor Improvements in NetBeans IDE 7.0 for PHP]
-- link:section.html[]
-- link:project-setup.html[Setting Up a PHP Project]
-- link:screencast-smarty.html[Smarty Support in NetBeans IDE for PHP]
-- link:screencast-continuous-builds.html[Support for PHP on Continuous Build Servers]
-- link:phpunit.html[Testing with PHPUnit and Selenium]
-- link:php-editor-screencast.html[The PHP Editor in NetBeans IDE 6.9-7.0 (Preview)]
-- link:zend-framework-screencast.html[Zend Framework Support in NetBeans IDE for PHP]
+- xref:flickr-screencast.adoc[Building a Flickr Slideshow with PHP]
+- xref:code-templates.adoc[Code Templates in NetBeans IDE for PHP]
+- xref:configure-php-environment-mac-os.adoc[Configuring PHP, Apache, MySQL, and Xdebug for PHP development in MAC OS X]
+- xref:configure-php-environment-windows.adoc[Configuring PHP Development Environment in Windows]
+- xref:configure-php-environment-ubuntu.adoc[Configuring the PHP Development Environment in Linux Ubuntu]
+- xref:wish-list-tutorial-main-page.adoc[Creating a Database Driven Application With NetBeans IDE PHP Editor]
+- xref:wish-list-lesson1.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson2.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson3.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson4.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson5.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson6.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson7.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson8.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-lesson9.adoc[Creating a Database Driven Application With PHP]
+- xref:wish-list-oracle-lesson1.adoc[Creating a Database Driven Application With PHP]
+- xref:debugging.adoc[Debugging PHP Source Code in the NetBeans IDE]
+- xref:php-variables-screencast.adoc[Declaring Variables in Comments and Associated Code Completion Features in NetBeans PHP Editor 6.7]
+- xref:project-config-screencast.adoc[Demo of PHP support in NetBeans 6.5 - Part I: Projects and Configuration]
+- xref:editor-screencast.adoc[Demo of PHP support in NetBeans 6.5 - Part II: Editor Features]
+- xref:remote-hosting-and-ftp-account.adoc[Deploying a PHP Application on a Remote Web Server Using the NetBeans IDE]
+- xref:screencast-doctrine2.adoc[Doctrine 2 Support in NetBeans IDE for PHP]
+- xref:screencast-php54.adoc[Editing PHP 5.4 with NetBeans IDE for PHP]
+- xref:screencast-apigen.adoc[Generating PHP Documentation With NetBeans IDE]
+- xref:screencast-phpdoc.adoc[Generating PHP Documentation With NetBeans IDE]
+- xref:ajax-quickstart.adoc[Introduction to Ajax for PHP Web Applications]
+- xref:quickstart.adoc[NetBeans IDE PHP Quick Start Tutorial]
+- xref:namespace-code-completion-screencast.adoc[PHP Namespace Support in NetBeans IDE]
+- xre:index.adoc[PHP Tutorials]
+- xref:screencast-rename-refactoring.adoc[Rename Refactoring and Other Editor Improvements in NetBeans IDE 7.0 for PHP]
+- xref:section.adoc[]
+- xref:project-setup.adoc[Setting Up a PHP Project]
+- xref:screencast-smarty.adoc[Smarty Support in NetBeans IDE for PHP]
+- xref:screencast-continuous-builds.adoc[Support for PHP on Continuous Build Servers]
+- xref:phpunit.adoc[Testing with PHPUnit and Selenium]
+- xref:php-editor-screencast.adoc[The PHP Editor in NetBeans IDE 6.9-7.0 (Preview)]
+- xref:zend-framework-screencast.adoc[Zend Framework Support in NetBeans IDE for PHP]
 ************************************************
 
 
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 9913665e7..b954c1233 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
@@ -32,7 +32,7 @@
 == Lesson 1a: Creating a MySQL Database
 
 This lesson describes the last preliminary step in developing the Wish List application, that of creating a sample database with test data. To complete the steps in this tutorial, you will need a database in which to store data of wishers. With the NetBeans IDE you can perform all these activities through the IDE interface. 
-Before starting, see the tutorial requirements described in link:wish-list-tutorial-main-page.html[+Creating a CRUD Application with PHP - Main page+].
+Before starting, see the tutorial requirements described in xref:wish-list-tutorial-main-page.adoc[+Creating a CRUD Application with PHP - Main page+].
 
 The current document is a part of the Creating a CRUD Application in the NetBeans IDE for PHP tutorial.
 
@@ -41,7 +41,7 @@ The current document is a part of the Creating a CRUD Application in the NetBean
 [[register-mysql]]
 == Registering a MySQL Server
 
-If you do not have a MySQL database server registered in the IDE, or you want general information about using MySQL with NetBeans IDE, see link:../ide/mysql.html[+Connecting to a MySQL Database+].
+If you do not have a MySQL database server registered in the IDE, or you want general information about using MySQL with NetBeans IDE, see xref:../ide/mysql.adoc[+Connecting to a MySQL Database+].
 
 
 == Creating the Database User
@@ -263,15 +263,12 @@ Note: You can download a set of SQL commands for creating the MySQL wishlist dat
 
 == Next Step
 
-link:wish-list-lesson2.html[+Next Lesson >>+]
+xref:wish-list-lesson2.adoc[+Next Lesson >>+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
 
+xref:../../../community/mailing-lists.adoc[+Send Feedback on This Tutorial+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20PHP%20Wish%20List%20CRUD%201:%20Create%20MySQL%20Database[+Send Us Your Feedback+]
 
-
-To send comments and suggestions, get support, and keep informed on the latest developments on the NetBeans IDE PHP development features, link:../../../community/lists/top.html[+join the users@php.netbeans.org mailing list+].
-
-link:../../trails/php.html[+Back to the PHP Learning Trail+]
+xref:../php.adoc[+Back to the PHP Learning Trail+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson2.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson2.adoc
index cc28c68bc..d70f31a29 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson2.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson2.adoc
@@ -41,7 +41,7 @@ The current document is a part of the Creating a Database-Driven Application in
 
 == Creating a PHP Project
 
-Select File > New Project (Ctrl-Shift-N on Windows and Linux, ⌘-Shift-N on MacOS). Create a new PHP project named "wishlist". When you create a PHP project, it contains the index file  ``index.php``  by default. For information on creating and configuring a PHP project, see link:project-setup.html[+Setting Up a PHP Project+].
+Select File > New Project (Ctrl-Shift-N on Windows and Linux, ⌘-Shift-N on MacOS). Create a new PHP project named "wishlist". When you create a PHP project, it contains the index file  ``index.php``  by default. For information on creating and configuring a PHP project, see xref:project-setup.adoc[+Setting Up a PHP Project+].
 
 
 == Defining a Page Flow Diagram
@@ -447,8 +447,8 @@ Oracle Database users: Click link:https://netbeans.org/projects/www/downloads/do
 
 == Next Step
 
-link:wish-list-lesson1.html[+<< Previous lesson+]
+xref:wish-list-lesson1.adoc[+<< Previous lesson+]
 
-link:wish-list-lesson3.html[+Next lesson >>+]
+xref:wish-list-lesson3.adoc[+Next lesson >>+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial Main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial Main page+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson3.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson3.adoc
index e56c57688..6f736a4d5 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson3.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson3.adoc
@@ -71,7 +71,7 @@ Where:
 
 == Creating New PHP Web Pages
 
-Create two new PHP web pages in your project's Source Files, as link:wish-list-lesson2.html#createNewFile[+described+] in Lesson 2.
+Create two new PHP web pages in your project's Source Files, as xref:wish-list-lesson2.adoc#createNewFile[+described+] in Lesson 2.
 
 *  `createNewWisher.php` 
 *  `editWishList.php` 
@@ -96,7 +96,7 @@ Type or paste the following HTML block into  `createNewWisher.php` , beneath the
 </html>
 ----
 
-NOTE: The  `password`  type is a special type of a text field where characters are replaced with asterisks. The code presents an link:wish-list-lesson3.html#htmlForm[+HTML form+] for a user to enter the name and password of the new wisher in the text fields. When the user clicks the "Register" button, the entered data is transferred for validation to the same page,  `createNewWisher.php` .
+NOTE: The  `password`  type is a special type of a text field where characters are replaced with asterisks. The code presents an xref:wish-list-lesson3.adoc#htmlForm[+HTML form+] for a user to enter the name and password of the new wisher in the text fields. When the user clicks the "Register" button, the entered data is transferred for validation to the same page,  `createNewWisher.php` .
 
 NOTE: You can ignore warnings from the HTML validator.
 
@@ -517,8 +517,8 @@ Oracle Database users: Click link:https://netbeans.org/projects/www/downloads/do
 
 == Next Steps
 
-link:wish-list-lesson2.html[+<< Previous lesson+]
+xref:wish-list-lesson2.adoc[+<< Previous lesson+]
 
-link:wish-list-lesson4.html[+Next lesson >>+]
+xref:wish-list-lesson4.adoc[+Next lesson >>+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson4.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson4.adoc
index 3b5837345..134eb03d6 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson4.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson4.adoc
@@ -671,8 +671,8 @@ Oracle Database users: Click link:https://netbeans.org/projects/www/downloads/do
 
 == Next Steps
 
-link:wish-list-lesson3.html[+<< Previous lesson+]
+xref:wish-list-lesson3.adoc[+<< Previous lesson+]
 
-link:wish-list-lesson5.html[+Next lesson >>+]
+xref:wish-list-lesson5.adoc[+Next lesson >>+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson5.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson5.adoc
index 577126820..41b2e9fc2 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson5.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson5.adoc
@@ -55,7 +55,7 @@ Oracle Database users: Click link:https://netbeans.org/projects/www/downloads/do
 [[_saving_the_wisher_s_id_in_the_session_upon_creation]]
 == Saving the Wisher's ID in the Session Upon Creation
 
-A link:http://us2.php.net/manual/en/ref.session.php[+Session+] is persistent storage for transferring information from one page to another without using an link:wish-list-lesson5.html#_html_form_for_logon_on_index_php[+HTML input form+]. This functionality is supported through the predefined PHP array  `$_SESSION` .
+A link:http://us2.php.net/manual/en/ref.session.php[+Session+] is persistent storage for transferring information from one page to another without using an xref:wish-list-lesson5.adoc#_html_form_for_logon_on_index_php[+HTML input form+]. This functionality is supported through the predefined PHP array  `$_SESSION` .
 
 For the sake of security, after a new wisher is created he should be logged on automatically without filling in a form. Therefore you need to modify the  `createNewWisher.php`  file to implement the following functionality:
 
@@ -162,7 +162,7 @@ In the  `index.php`  file, enter the following code before the closing  `</body>
 
 *Note:* You can ignore warnings from the HTML validator.
 
-The code presents an link:wish-list-lesson3.html#htmlForm[+HTML form+] that enables entering the name and password of the user in the text fields. When the user clicks Edit My Wish List, the data is transferred to the same page, index.php.
+The code presents an xref:wish-list-lesson3.adoc#htmlForm[+HTML form+] that enables entering the name and password of the user in the text fields. When the user clicks Edit My Wish List, the data is transferred to the same page, index.php.
 
 [[_logon_validation]]
 === Logon Validation
@@ -298,8 +298,8 @@ Oracle Database users: Click link:https://netbeans.org/projects/www/downloads/do
 [[_next_steps]]
 == Next Steps
 
-link:wish-list-lesson4.html[+<< Previous lesson+]
+xref:wish-list-lesson4.adoc[+<< Previous lesson+]
 
-link:wish-list-lesson6.html[+Next lesson >>+]
+xref:wish-list-lesson6.adoc[+Next lesson >>+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson6.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson6.adoc
index ffc32a85a..7fdfd8a2f 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson6.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson6.adoc
@@ -39,7 +39,7 @@ To implement this functionality, you edit the  `editWishList.php`  file and crea
 
 image::images/page-flow-diagram-l6.png[]
 
-The current document is a part of the link:wish-list-tutorial-main-page.html[+Creating a CRUD Application in the NetBeans IDE for PHP+] tutorial.
+The current document is a part of the xref:wish-list-tutorial-main-page.adoc[+Creating a CRUD Application in the NetBeans IDE for PHP+] tutorial.
 
 
 [[_application_source_code_from_the_previous_lesson]]
@@ -473,8 +473,8 @@ Oracle Database users: Click link:https://netbeans.org/projects/www/downloads/do
 [[_next_steps]]
 == Next Steps
 
-link:wish-list-lesson5.html[+<< Previous lesson+]
+xref:wish-list-lesson5.adoc[+<< Previous lesson+]
 
-link:wish-list-lesson7.html[+Next lesson >>+]
+xref:wish-list-lesson7.adoc[+Next lesson >>+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson7.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson7.adoc
index de8559f5a..96bc8be92 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson7.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson7.adoc
@@ -604,9 +604,9 @@ Oracle Database users: Click link:https://netbeans.org/projects/www/downloads/do
 
 == Next Steps
 
-link:wish-list-lesson6.html[+<< Previous lesson+] 
+xref:wish-list-lesson6.adoc[+<< Previous lesson+] 
 
-link:wish-list-lesson8.html[+Next lesson >>+] 
+xref:wish-list-lesson8.adoc[+Next lesson >>+] 
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson8.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson8.adoc
index c3da08a1a..851c8d1ef 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson8.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson8.adoc
@@ -242,8 +242,8 @@ The NetBeans IDE team would like to thank Ozan Hazer for contributing the CSS an
 
 == Next Steps
 
-link:wish-list-lesson7.html[+<< Previous lesson+]
+xref:wish-list-lesson7.adoc[+<< Previous lesson+]
 
-link:wish-list-lesson9.html[+Next lesson >>+]
+xref:wish-list-lesson9.adoc[+Next lesson >>+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson9.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson9.adoc
index 10020bba6..f05f4cc88 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson9.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson9.adoc
@@ -106,9 +106,9 @@ Because the CRUD application uses a database you will also need to deploy the  `
 
 * <<previousLessonSourceCode,Download the source files>> that correspond to the state of the application after the previous lesson is completed. Extract the files.
 * Save the source files in the  `htdocs`  folder.
-* Create a link:project-setup.html#importSources[+PHP project with existing sources+]:
+* Create a xref:project-setup.adoc#importSources[+PHP project with existing sources+]:
 ** Specify the location of the downloaded sources in the Source folder
-** Choose the link:project-setup.html#remiteWebSite[+Remote Web Site+] run configuration and configure the FTP connection
+** Choose the xref:project-setup.adoc#remiteWebSite[+Remote Web Site+] run configuration and configure the FTP connection
 * Complete the project creation.
 
 
@@ -141,6 +141,6 @@ private $dbHost = "localhost";
 
 == Next Steps
 
-- link:wish-list-lesson8.html[+<< Previous lesson+]
-- link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+- xref:wish-list-lesson8.adoc[+<< Previous lesson+]
+- xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-oracle-lesson1.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-oracle-lesson1.adoc
index 398ec46d2..db491a36c 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-oracle-lesson1.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-oracle-lesson1.adoc
@@ -31,7 +31,7 @@
 
 
 This lesson describes the last preliminary step in developing the Wish List application, that of creating a sample database with test data. To complete the steps in this tutorial, you will need a database in which to store data of wishers. With the NetBeans IDE you can perform all these activities through the IDE interface. 
-Before starting, see the tutorial requirements described in link:wish-list-tutorial-main-page.html[+Creating a CRUD Application with PHP - Main page+].
+Before starting, see the tutorial requirements described in xref:wish-list-tutorial-main-page.adoc[+Creating a CRUD Application with PHP - Main page+].
 
 The current document is a part of the Creating a CRUD Application in the NetBeans IDE for PHP tutorial.
 
@@ -41,7 +41,7 @@ The current document is a part of the Creating a CRUD Application in the NetBean
 
 In this procedure you first create a user and then create tables as that user.
 
-You can create a user either by using Oracle's tools, or by connecting NetBeans IDE to the database and using the IDE's SQL editor. NetBeans 7.0, currently available only as beta or development builds, provides improved connection to Oracle databases. To learn how to connect NetBeans IDE to Oracle Database and to create a user in that database, see the link:../ide/oracle-db.html[+Connecting to an Oracle Database+] tutorial.
+You can create a user either by using Oracle's tools, or by connecting NetBeans IDE to the database and using the IDE's SQL editor. NetBeans 7.0, currently available only as beta or development builds, provides improved connection to Oracle databases. To learn how to connect NetBeans IDE to Oracle Database and to create a user in that database, see the xref:../ide/oracle-db.adoc[+Connecting to an Oracle Database+] tutorial.
 
 Using the tool of your choice, create the following user:
 
@@ -105,7 +105,7 @@ The tables are related through the wisher's ID. All the fields are mandatory exc
 
 1. Log into the database as the user you have created.
 
-If you are connecting through NetBeans IDE, create a connection with the new user's name and password. Be certain to select the schema with the same name as the user. (See the link:../ide/oracle-db.html#connect[+Establishing a Connection to Oracle DB+] section of the Connecting to an Oracle Database tutorial.)
+If you are connecting through NetBeans IDE, create a connection with the new user's name and password. Be certain to select the schema with the same name as the user. (See the xref:../ide/oracle-db.adoc#connect[+Establishing a Connection to Oracle DB+] section of the Connecting to an Oracle Database tutorial.)
 
 
 
@@ -235,6 +235,6 @@ Note: You can download a set of SQL commands for creating the Oracle Database ta
 
 == Next Step
 
-link:wish-list-lesson2.html[+Next Lesson >>+]
+xref:wish-list-lesson2.adoc[+Next Lesson >>+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
+xref:wish-list-tutorial-main-page.adoc[+Back to the Tutorial main page+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-tutorial-main-page.adoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-tutorial-main-page.adoc
index bfb9789f0..d1d1284b2 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-tutorial-main-page.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-tutorial-main-page.adoc
@@ -38,16 +38,16 @@
 
 . Creating the Database
 
-.. link:wish-list-lesson1.html[+Creating a MySQL Database+]
-.. link:wish-list-oracle-lesson1.html[+Creating Oracle Database Tables+]
-.. link:wish-list-lesson2.html[+Designing the Application. Reading from the Database+]
-. link:wish-list-lesson3.html[+ Creating a New Application User +]
-. link:wish-list-lesson4.html[+Optimizing the Code+]
-. link:wish-list-lesson5.html[+Adding Security. Implementing Application User Logon+]
-. link:wish-list-lesson6.html[+Adding a New Wish to the Database+]
-. link:wish-list-lesson7.html[+Updating and Deleting Entries in the Database+]
-. link:wish-list-lesson8.html[+Making the Application Look Better Using the CSS Technology+]
-. link:wish-list-lesson9.html[+Deploying the Application on a Remote Web Server+]
+.. xref:wish-list-lesson1.adoc[+Creating a MySQL Database+]
+.. xref:wish-list-oracle-lesson1.adoc[+Creating Oracle Database Tables+]
+.. xref:wish-list-lesson2.adoc[+Designing the Application. Reading from the Database+]
+. xref:wish-list-lesson3.adoc[+ Creating a New Application User +]
+. xref:wish-list-lesson4.adoc[+Optimizing the Code+]
+. xref:wish-list-lesson5.adoc[+Adding Security. Implementing Application User Logon+]
+. xref:wish-list-lesson6.adoc[+Adding a New Wish to the Database+]
+. xref:wish-list-lesson7.adoc[+Updating and Deleting Entries in the Database+]
+. xref:wish-list-lesson8.adoc[+Making the Application Look Better Using the CSS Technology+]
+. xref:wish-list-lesson9.adoc[+Deploying the Application on a Remote Web Server+]
 
 In this tutorial, you use the PHP features in the Apache NetBeans to create and run a simple web application. The example shows how to create a wish list. After you create and deploy the application, it enables you to share information on wish lists with your friends, such as lists for wedding, birthday, or holiday gifts. The information is stored in the database that you create in Lesson 1.
 
@@ -79,13 +79,13 @@ Code is provided for both users of the MySQL database and users of Oracle Databa
 |A database server |MySQL, OracleXE, or Oracle11g 
 |===
 
-For details on installing and configuring the required software, see the document that describes link:../../trails/php.html#configuration[+preparing the environment for PHP development+] in your operating system.
+For details on installing and configuring the required software, see the document that describes xref:../php.adoc#configuration[+preparing the environment for PHP development+] in your operating system.
 
 
 == Next Step:
 
-link:wish-list-lesson1.html[+Creating a MySQL Database+]
+xref:wish-list-lesson1.adoc[+Creating a MySQL Database+]
 
 or
 
-link:wish-list-oracle-lesson1.html[+Creating Oracle Database Tables+]
+xref:wish-list-oracle-lesson1.adoc[+Creating Oracle Database Tables+]
diff --git a/netbeans.apache.org/src/content/kb/docs/section.adoc b/netbeans.apache.org/src/content/kb/docs/section.adoc
index 13835fc55..c52cac86a 100644
--- a/netbeans.apache.org/src/content/kb/docs/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/section.adoc
@@ -19,20 +19,20 @@
 
 .NetBeans Tutorials
 ************************************************
-- link:cnd.html[C/C++ Application Learning Trail]
-- link:java-se.html[General Java Development Learning Trail]
-- link:intro-screencasts.html[Guided Video Tours of NetBeans IDE]
-- link:tools.html[Integration with External Tools and Services]
-- link:java-ee.html[Java EE &amp;amp; Java Web Learning Trail]
-- link:matisse.html[Java GUI Applications Learning Trail]
-- link:mobility.html[Java ME Embedded and Java Card Application Technology Trail]
-- link:platform.html[NetBeans Platform Learning Trail]
-- link:index.html[NetBeans Tutorials]
-- link:php_fr.html[Parcours d&#39;Apprentissage PHP]
-- link:php.html[PHP and HTML5 Learning Trail]
-- link:screencasts.html[]
-- link:section.html[]
-- link:web.html[Web Services Learning Trail]
+- xref:cnd.adoc[C/C{pp} Application Learning Trail]
+- xref:java-se.adoc[General Java Development Learning Trail]
+- xref:intro-screencasts.adoc[Guided Video Tours of NetBeans IDE]
+- xref:tools.adoc[Integration with External Tools and Services]
+- xref:java-ee.adoc[Java EE &amp;amp; Java Web Learning Trail]
+- xref:matisse.adoc[Java GUI Applications Learning Trail]
+- xref:mobility.adoc[Java ME Embedded and Java Card Application Technology Trail]
+- xref:platform.adoc[NetBeans Platform Learning Trail]
+- xref:index.adoc[NetBeans Tutorials]
+- xref:php_fr.adoc[Parcours d&#39;Apprentissage PHP]
+- xref:php.adoc[PHP and HTML5 Learning Trail]
+- xref:screencasts.adoc[]
+- xref:section.adoc[]
+- xref:web.adoc[Web Services Learning Trail]
 ************************************************
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/tools.adoc b/netbeans.apache.org/src/content/kb/docs/tools.adoc
index 2849ff9ee..22f228359 100644
--- a/netbeans.apache.org/src/content/kb/docs/tools.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/tools.adoc
@@ -35,38 +35,38 @@ To facilitate development of various types of applications, the NetBeans IDE pro
 
 === Databases
 
-* link:../docs/ide/oracle-db.html[+Connecting to Oracle Database from NetBeans IDE+]
-* link:../docs/ide/java-db.html[+Working with the Java DB (Derby) Database+]
-* link:../docs/ide/mysql.html[+Connecting to a MySQL Database+]
-* link:../docs/web/mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+]
-* link:../docs/ide/install-and-configure-mysql-server.html[+Setting Up the MySQL Database Server in the Windows Operating System+]
+* xref:ide/oracle-db.adoc[+Connecting to Oracle Database from NetBeans IDE+]
+* xref:ide/java-db.adoc[+Working with the Java DB (Derby) Database+]
+* 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/install-and-configure-mysql-server.adoc[+Setting Up the MySQL Database Server in the Windows Operating System+]
 
 === Maven
 
-* link:../docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+]
+* xref:java/maven-hib-java-se.adoc[+Creating a Maven Swing Application Using Hibernate+]
 * link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices+]
 
 === Source Code Management
 
-* link:../docs/ide/mercurial-queues.html[+Using Mercurial Queues Support in NetBeans IDE+]
-* link:../docs/ide/git.html[+Using Git Support in NetBeans IDE+]
-* link:../docs/ide/mercurial.html[+Using Mercurial Support in Netbeans IDE+]
-* link:../docs/ide/subversion.html[+Using Subversion Support in Netbeans IDE+]
-* link:../docs/ide/cvs.html[+Using CVS Support in Netbeans IDE+]
-* link:../docs/ide/clearcase.html[+Using ClearCase Support in Netbeans IDE+]
+* xref:ide/mercurial-queues.adoc[+Using Mercurial Queues Support in NetBeans IDE+]
+* xref:ide/git.adoc[+Using Git Support in NetBeans IDE+]
+* xref:ide/mercurial.adoc[+Using Mercurial Support in Netbeans IDE+]
+* xref:ide/subversion.adoc[+Using Subversion Support in Netbeans IDE+]
+* xref:ide/cvs.adoc[+Using CVS Support in Netbeans IDE+]
+* xref:ide/clearcase.adoc[+Using ClearCase Support in Netbeans IDE+]
 
 === Collaborative Development
 
-* link:../docs/ide/team-servers.html[+Working With a Team Server in NetBeans IDE+]
+* xref:ide/team-servers.adoc[+Working With a Team Server in NetBeans IDE+]
 
 === Optimization
 
-* link:../docs/java/profile-loadgenerator.html[+Using a Load Generator in NetBeans IDE+]
+* xref:java/profile-loadgenerator.adoc[+Using a Load Generator in NetBeans IDE+]
 
 == Screencasts
 
-* link:../docs/ide/github_nb_screencast.html[+Demo: Setting Up a GitHub Repository Using NetBeans IDE+]
-* link:../docs/ide/git_nb_ssh_screencast.html[+Demo: Cloning a Git Repository Using NetBeans IDE+]
+* xref:ide/github_nb_screencast.adoc[+Demo: Setting Up a GitHub Repository Using NetBeans IDE+]
+* xref:ide/git_nb_ssh_screencast.adoc[+Demo: Cloning a Git Repository Using NetBeans IDE+]
 * YouTube: link:http://www.youtube.com/watch?v=mQS-CViDHBU[+FindBugs in NetBeans IDE+] (_by Geertjan Wielenga_)
 
 == Community-Contributed Docs
diff --git a/netbeans.apache.org/src/content/kb/docs/web.adoc b/netbeans.apache.org/src/content/kb/docs/web.adoc
index ac0c78295..9c7881e46 100644
--- a/netbeans.apache.org/src/content/kb/docs/web.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web.adoc
@@ -39,31 +39,31 @@ This page provides links to some of the NetBeans documents and resources that ca
 
 == Getting Started 
 
-* link:../docs/websvc/intro-ws.html[+Introduction to Web Services +]
+* xref:websvc/intro-ws.adoc[+Introduction to Web Services +]
 
 == Tutorials and Articles
 
 === SOAP Web Services
 
-* link:../docs/websvc/jax-ws.html[+Getting Started with JAX-WS Web Services+]
-* link:../docs/websvc/client.html[+Developing JAX-WS Web Service Clients+]
+* xref:websvc/jax-ws.adoc[+Getting Started with JAX-WS Web Services+]
+* xref:websvc/client.adoc[+Developing JAX-WS Web Service Clients+]
 * Passing Binary Data in SOAP: A five-part tutorial
-** link:../docs/websvc/flower_overview.html[+Part 1: Overview+]
-** link:../docs/websvc/flower_ws.html[+Part 2: Creating the Web Service+]
-** link:../docs/websvc/flower-code-ws.html[+Part 3: Coding and Testing the Web Service+]
-** link:../docs/websvc/flower_wsdl_schema.html[+Part 4: Modifying the Schema and WSDL Files+]
-** link:../docs/websvc/flower_swing.html[+Part 5: Creating the Swing Client+]
+** xref:websvc/flower_overview.adoc[+Part 1: Overview+]
+** xref:websvc/flower_ws.adoc[+Part 2: Creating the Web Service+]
+** xref:websvc/flower-code-ws.adoc[+Part 3: Coding and Testing the Web Service+]
+** xref:websvc/flower_wsdl_schema.adoc[+Part 4: Modifying the Schema and WSDL Files+]
+** xref:websvc/flower_swing.adoc[+Part 5: Creating the Swing Client+]
 
 === RESTful Web Services
 
-* link:../docs/websvc/rest.html[+Getting Started with RESTful Web Services+]
+* xref:websvc/rest.adoc[+Getting Started with RESTful Web Services+]
 * link:http://netbeans.dzone.com/nb-generate-simpler-rest[+DZone: NetBeans IDE to Generate Simpler RESTful Web Services+]
 * link:http://netbeans.dzone.com/nb-smugmug-client[+DZone: SmugMug Client in Java with NetBeans IDE+]
 * link:http://netbeans.dzone.com/articles/how-to-combine-rest-and-ejb-31[+DZone: How to Combine REST Services with EJB 3.1+]
 
 === Software as a Service (SaaS)
 
-* link:../docs/websvc/zillow.html[+SaaS: Zillow+]
+* xref:websvc/zillow.adoc[+SaaS: Zillow+]
 
 == Community-Contributed Docs
 
@@ -76,7 +76,7 @@ This page provides links to some of the NetBeans documents and resources that ca
 
 == Screencasts
 
-* link:../docs/websvc/pet-catalog-screencast.html[+RESTful Web Services Pet Catalog - NetBeans IDE 6.5+]
+* xref:websvc/pet-catalog-screencast.adoc[+RESTful Web Services Pet Catalog - NetBeans IDE 6.5+]
 * java.net: link:http://download.java.net/javaee5/screencasts/metro-nb6/[+Secure and Reliable Web Services using Metro/GlassFish+]
 * YouTube: link:http://youtube.com/watch?v=K8OtFD6RLMM[+SOCRADES: Demonstration of Web Services on Sun SPOT Devices+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/web/ajax-quickstart.adoc b/netbeans.apache.org/src/content/kb/docs/web/ajax-quickstart.adoc
index 6f482e578..906586a5e 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/ajax-quickstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/ajax-quickstart.adoc
@@ -40,7 +40,7 @@ Ajax stands for Asynchronous JavaScript and XML. In essence, Ajax is an efficien
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE, Java EE bundle+] | 
+|xref:../../../download/index.adoc[+NetBeans IDE, Java EE bundle+] | 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] | 8
 
@@ -1181,14 +1181,14 @@ image::images/xml-data.png[title="HTTP Server monitor displays in the IDE"]
 
 This concludes the Introduction to Ajax. Hopefully by now you realize that Ajax is simply exchanging information over HTTP in the background, and updating that page dynamically based on the results.
 
-You may note that the application you built has numerous shortcomings, for example nothing happens when a composer name is selected from the auto-complete box! You are welcome to link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaScript%252FMyAjaxApp.zip[+download the solution project+] to see how this can be implemented using JSP technology. Furthermore, you might want to investigate server-side validation that prevents a user from requesting a name that does  [...]
+You may note that the application you built has numerous shortcomings, for example nothing happens when a composer name is selected from the auto-complete box! You are welcome to link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaScript%252FMyAjaxApp.zip[+download the solution project+] to see how this can be implemented using JSP technology. Furthermore, you might want to investigate server-side validation that prevents a user from requesting a name that does  [...]
 
 [[seeAlso]]
 == See Also
 
-For more information about Ajax and Java technology on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about Ajax and Java technology on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
-* link:../../docs/web/js-toolkits-jquery.html[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]. Demonstrates how to integrate jQuery core and UI libraries into a NetBeans project.
-* link:../../docs/web/js-toolkits-dojo.html[+Connecting a Dojo Tree to an ArrayList using JSON+]. Based on a JavaOne Hands-On Lab, this document shows how to implement a Dojo Tree widget into a web page and enable the server-side to respond to Tree requests in JSON format.
+* xref:js-toolkits-jquery.adoc[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]. Demonstrates how to integrate jQuery core and UI libraries into a NetBeans project.
+* xref:js-toolkits-dojo.adoc[+Connecting a Dojo Tree to an ArrayList using JSON+]. Based on a JavaOne Hands-On Lab, this document shows how to implement a Dojo Tree widget into a web page and enable the server-side to respond to Tree requests in JSON format.
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG2272[+Creating JavaScript Files+] in _Developing Applications with NetBeans IDE_.
-* link:quickstart-webapps-wicket.html[+Introduction to the Wicket Web Framework+]. An introduction to creating reusable components and applying them to a web application using the Wicket framework.
+* xref:quickstart-webapps-wicket.adoc[+Introduction to the Wicket Web Framework+]. An introduction to creating reusable components and applying them to a web application using the Wicket framework.
diff --git a/netbeans.apache.org/src/content/kb/docs/web/applets.adoc b/netbeans.apache.org/src/content/kb/docs/web/applets.adoc
index 21e372ded..0dfc4592d 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/applets.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/applets.adoc
@@ -42,7 +42,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java Version 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java Version 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 
@@ -121,7 +121,7 @@ The IDE creates the applet source file in the specified package. The applet sour
                     
 ----
 
-Alternatively, if you are designing an Applet Form instead, use the link:../java/quickstart-gui.html[+Designing a Swing GUI in NetBeans IDE+] document to create something like the following:
+Alternatively, if you are designing an Applet Form instead, use the xref:../java/quickstart-gui.adoc[+Designing a Swing GUI in NetBeans IDE+] document to create something like the following:
 
 image::images/movie-magic-quiz-design.png[]
 
@@ -229,6 +229,5 @@ For applet forms, you should see something similar to the following:
 image::images/movie-magic-quiz-html.png[]
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Introduction%20to%20Developing%20Applets[+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/web/framework-adding-support.adoc b/netbeans.apache.org/src/content/kb/docs/web/framework-adding-support.adoc
index d3acf51d3..2dbbcdc75 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/framework-adding-support.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/framework-adding-support.adoc
@@ -35,7 +35,7 @@ The easiest way to add support for a particular web framework is by installing a
 
 In this tutorial you will add support for the Apache Struts 2 framework by downloading a plugin from the NetBeans Plugin Portal and installing the plugin using the Plugins manager.
 
-*Note: *The IDE bundles support for the link:../../docs/web/jsf20-support.html[+JavaServer Faces 2.x+] and link:../../docs/web/quickstart-webapps-struts.html[+Struts 1.3.10+] and link:../../docs/web/quickstart-webapps-spring.html[+Spring 3.x and 4.x+] frameworks. The specific version of the bundled framework depends upon the version of the IDE.
+*Note: *The IDE bundles support for the xref:jsf20-support.adoc[+JavaServer Faces 2.x+] and xref:quickstart-webapps-struts.adoc[+Struts 1.3.10+] and xref:quickstart-webapps-spring.adoc[+Spring 3.x and 4.x+] frameworks. The specific version of the bundled framework depends upon the version of the IDE.
 
 
 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"]
@@ -46,7 +46,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE, Java EE bundle+] |7.2, 7.3, 7.4, 8.0 
+|xref:../../../download/index.adoc[+NetBeans IDE, Java EE bundle+] |7.2, 7.3, 7.4, 8.0 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 |===
@@ -236,9 +236,9 @@ For example, if you want to specify the ICEfaces component suite you can select
 *Notes.* The libraries for JSF components are not included with the IDE. To use a component suite you need to download the required libraries and then create a NetBeans library that you can then add to the project classpath in the Project Properties window.
 
 
-
 . Click OK to confirm your selection and close the Project Properties window. The framework-specific artifacts and libraries are added to your project, which you can examine in the Projects window.
-link:/about/contact_form.html?to=3&subject=Feedback:%20Adding%20Web%20Framework%20Support[+ Send Feedback on This Tutorial+]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 
@@ -246,10 +246,10 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Adding%20Web%20Framework%
 
 This document described how to add support for a web framework in NetBeans IDE. It demonstrated how to install framework support plugins by downloading manually as well as via an update center in the IDE's Plugin Manager. It also showed how to add an IDE-supported framework to both a new web application project and an existing project.
 
-This tutorial focused on adding the Struts2 framework. If you would like to explore the other features offered by this framework, see link:../../docs/web/quickstart-webapps-struts.html[+Introduction to the Struts Web Framework+].
+This tutorial focused on adding the Struts2 framework. If you would like to explore the other features offered by this framework, see xref:quickstart-webapps-struts.adoc[+Introduction to the Struts Web Framework+].
 
 For more information about using other web frameworks in NetBeans IDE, see the following resources:
 
-* link:../../docs/web/quickstart-webapps-spring.html[+Introduction to the Spring Web Framework+]
-* link:../../docs/web/quickstart-webapps-struts.html[+Introduction to the Struts Web Framework+]
-* link:../../docs/web/quickstart-webapps-wicket.html[+Introduction to the Wicket Web Framework+]
+* xref:quickstart-webapps-spring.adoc[Introduction to the Spring Web Framework]
+* xref:quickstart-webapps-struts.adoc[Introduction to the Struts Web Framework]
+* xref:quickstart-webapps-wicket.adoc[Introduction to the Wicket Web Framework]
diff --git a/netbeans.apache.org/src/content/kb/docs/web/grails-quickstart.adoc b/netbeans.apache.org/src/content/kb/docs/web/grails-quickstart.adoc
index 9a58e95c7..34a77d456 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/grails-quickstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/grails-quickstart.adoc
@@ -40,7 +40,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |version 7.2 Java or above 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |version 7.2 Java or above 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 
 
@@ -158,13 +158,12 @@ image::images/grails-65-17.png[]
 
 image::images/grails-65-18.png[]
 
-link:/about/contact_form.html?to=3&subject=Feedback: NetBeans IDE 6.5 Grails Quick Start Guide[+Send Feedback on This Tutorial+]
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 == See Also
 
 This concludes the introduction to Grails in NetBeans IDE. You now know how to create a basic application in the Grails framework using the IDE.
 
-For more information about Grails and Groovy technology on link:https://netbeans.org/[+netbeans.org+], see link:../java/groovy-quickstart.html[+Introduction to Groovy+].
+For more information about Grails and Groovy technology on xref:../../../index.adoc[+netbeans.org+], see xref:../java/groovy-quickstart.adoc[+Introduction to Groovy+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/web/hibernate-webapp.adoc b/netbeans.apache.org/src/content/kb/docs/web/hibernate-webapp.adoc
index 77ae27cbf..a3cf4e369 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/hibernate-webapp.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/hibernate-webapp.adoc
@@ -36,8 +36,8 @@ Hibernate is framework that provides tools for object relational mapping (ORM).
 Before starting this tutorial you may want to familiarize yourself with the following documents.
 
 * Hibernate documentation at link:http://www.hibernate.org/[+hibernate.org+]
-* link:quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:jsf20-intro.html[+Introduction to JavaServer Faces 2.x+]
+* xref:quickstart-webapps.adoc[+Introduction to Developing Web Applications+]
+* xref:jsf20-intro.adoc[+Introduction to JavaServer Faces 2.x+]
 
 
 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"]
@@ -48,7 +48,7 @@ image::images/netbeans-stamp-74-73-72.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.1, 7.2, 7.3, 7.4, Java EE version 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.1, 7.2, 7.3, 7.4, Java EE version 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |Version 6 or 7 
 
@@ -68,7 +68,7 @@ This tutorial uses a MySQL database called  ``sakila`` , a free sample MySQL dat
 
 To create the sakila database you can download and install the Sakila Sample Database plugin using the Plugins manager. After you install the plugin 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 by expanding the Databases node in the Services window, right-clicking the MySQL Server node and choosing Start.
@@ -665,7 +665,7 @@ You can use the code completion in the editor to help you type your code.
 
 In this exercise you will create two web pages for displaying the data. You will modify the  ``index.xhtml``  generated by the IDE to add a table that displays the films in the database. You will then create  ``browse.xhtml``  to display a film's details when you click the "View" link in the table. You will also create a JSF template page that is used by  ``index.xhtml``  and  ``browse.xhtml`` .
 
-For more about using JSF 2.0 and Facelets templates, see link:jsf20-intro.html[+Introduction to JavaServer Faces 2.0+]
+For more about using JSF 2.0 and Facelets templates, see xref:jsf20-intro.adoc[+Introduction to JavaServer Faces 2.0+]
 
 
 === Creating  ``template.xhtml`` 
@@ -980,12 +980,12 @@ 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.
 
-*Notes.* 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+].
+*Notes.* 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+].
 
 
 === Troubleshooting
 
-Most of the problems that occur with the tutorial application are due to communication difficulties between the GlassFish Server Open Source Edition and the MySQL database server. If your application does not display correctly, or if you are receiving a server error, you might want to look at the link:mysql-webapp.html#troubleshoot[+Troubleshooting+] section of the link:mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+] tutorial or the link:../ide/mysql.html[+C [...]
+Most of the problems that occur with the tutorial application are due to communication difficulties between the GlassFish Server Open Source Edition and the MySQL database server. If your application does not display correctly, or if you are receiving a server error, you might want to look at the xref:mysql-webapp.adoc#troubleshoot[+Troubleshooting+] section of the xref:mysql-webapp.adoc[+Creating a Simple Web Application Using a MySQL Database+] tutorial or the xref:../ide/mysql.adoc[+C [...]
 
 If you download and run the solution project you might see the following error in the Output window if it is the first time that you have deployed an application that uses the MySQL database.
 
@@ -1033,12 +1033,10 @@ Alternatively, when you use the IDE to create an application that uses the MySQL
 
 After you create and deploy a web application that uses the MySQL database, if you navigate to the `domain1/lib` directory of your local GlassFish installation you will see that directory contains the JDBC driver file.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Using%20Hibernate%20in%20a%20Web%20Application[+Send Feedback on This Tutorial+]
-
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 == See Also
 
-* link:jsf20-support.html[+JSF 2.x Support in NetBeans IDE+]
-* link:jsf20-intro.html[+Introduction to JavaServer Faces 2.x+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:jsf20-support.adoc[+JSF 2.x Support in NetBeans IDE+]
+* xref:jsf20-intro.adoc[+Introduction to JavaServer Faces 2.x+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/web/html5-cordova-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/web/html5-cordova-screencast.adoc
index 50333ae67..e3aec9d68 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/html5-cordova-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/html5-cordova-screencast.adoc
@@ -38,20 +38,20 @@ link:http://bits.netbeans.org/media/html5-gettingstarted-cordova-final-screencas
 
 |For more about working with HTML5 applications in NetBeans IDE, watch the following screencasts.
 
-* link:html5-gettingstarted-screencast.html[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
-* link:html5-css-screencast.html[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
-* link:html5-javascript-screencast.html[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
+* xref:html5-gettingstarted-screencast.adoc[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
+* xref:html5-css-screencast.adoc[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
+* xref:html5-javascript-screencast.adoc[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Getting%20Started%20with%20Cordova%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
 |===
 
 
 == Related links
 
-* link:../webclient/cordova-gettingstarted.html[+Getting Started with Creating a Cordova Application+]
-* link:../webclient/html5-gettingstarted.html[+Getting Started with HTML5 Applications +]
-* link:../webclient/html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]
-* link:../webclient/html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]
-* link:http://wiki.netbeans.org/HTML5[+HTML5 Support in NetBeans IDE wiki page+]
-* link:../../trails/php.html[+PHP and HTML5 Learning Trail+]
+* xref:../webclient/cordova-gettingstarted.adoc[+Getting Started with Creating a Cordova Application+]
+* 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+]
+* 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/web/html5-css-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/web/html5-css-screencast.adoc
index 12444ee4c..56a829b2a 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/html5-css-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/html5-css-screencast.adoc
@@ -41,23 +41,24 @@ link:http://bits.netbeans.org/media/html5-css-screencast.mp4[+Download / Watch f
 
 |For more about working with HTML5 applications in NetBeans IDE, watch the following screencasts.
 
-* link:html5-gettingstarted-screencast.html[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
-* link:html5-css-screencast.html[+ HTML5 - Part 2: Working with CSS in HTML5 Applications+]
+* xref:html5-gettingstarted-screencast.adoc[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
+* xref:html5-css-screencast.adoc[+ HTML5 - Part 2: Working with CSS in HTML5 Applications+]
+
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Working%20with%20CSS%20Stylesheets%20in%20HTML5%20Applications[+Send Feedback on This Tutorial+]
  
 |===
 
 
 == Related links
 
-* Demo:link:html5-gettingstarted-screencast.html[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
-* Demo:link:html5-javascript-screencast.html[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
-* link:../webclient/html5-gettingstarted.html[+Getting Started with HTML5 Applications +]
-* link:../webclient/html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]
-* link:../webclient/html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]
-* link:http://wiki.netbeans.org/HTML5[+HTML5 Support in NetBeans IDE wiki page+]
-* link:../../trails/php.html[+PHP and HTML5 Learning Trail+]
+* Demo:xref:html5-gettingstarted-screencast.adoc[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
+* Demo:xref:html5-javascript-screencast.adoc[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
+* 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+]
+* xref:../../../wiki/HTML5.adoc[+HTML5 Support in NetBeans IDE wiki page+]
+* xref:../php.adoc[+PHP and HTML5 Learning Trail+]
 
-* link:http://wiki.netbeans.org/HTML5[+HTML5 Support in NetBeans IDE wiki page+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../../../wiki/HTML5.adoc[+HTML5 Support in NetBeans IDE wiki page+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/web/html5-gettingstarted-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/web/html5-gettingstarted-screencast.adoc
index fa0b4f01c..36767d250 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/html5-gettingstarted-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/html5-gettingstarted-screencast.adoc
@@ -41,20 +41,20 @@ link:http://bits.netbeans.org/media/html5-gettingstarted-final-screencast.mp4[+D
 
 |For more about working with HTML5 applications in NetBeans IDE, watch the following screencasts.
 
-* link:html5-css-screencast.html[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
-* link:html5-javascript-screencast.html[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
+* xref:html5-css-screencast.adoc[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
+* xref:html5-javascript-screencast.adoc[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Getting%20Started%20with%20HTML5%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
 |===
 
 
 == Related links
 
-* Demo:link:html5-css-screencast.html[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
-* Demo:link:html5-javascript-screencast.html[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
-* link:../webclient/html5-gettingstarted.html[+Getting Started with HTML5 Applications +]
-* link:../webclient/html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]
-* link:../webclient/html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]
-* link:http://wiki.netbeans.org/HTML5[+HTML5 Support in NetBeans IDE wiki page+]
-* link:../../trails/php.html[+PHP and HTML5 Learning Trail+]
+* Demo:xref:html5-css-screencast.adoc[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
+* Demo:xref:html5-javascript-screencast.adoc[+ HTML5 - Part 3: Testing and Debugging JavaScript in HTML5 Applications+]
+* 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+]
+* 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/web/html5-javascript-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/web/html5-javascript-screencast.adoc
index 1c3123d46..07255b32a 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/html5-javascript-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/html5-javascript-screencast.adoc
@@ -41,20 +41,20 @@ link:http://bits.netbeans.org/media/html5-jsdebug-screencast.mp4[+Download / Wat
 
 |For more about working with HTML5 applications in NetBeans IDE, watch the following screencasts.
 
-* link:html5-gettingstarted-screencast.html[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
-* link:html5-css-screencast.html[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
+* xref:html5-gettingstarted-screencast.adoc[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
+* xref:html5-css-screencast.adoc[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Video%20of%20Testing%20and%20Debugging%20JavaScript%20in%20HTML5%20Applications[+Send Feedback on This Tutorial+]
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
  
 |===
 
 
 == Related links
 
-* Demo:link:html5-gettingstarted-screencast.html[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
-* Demo:link:html5-css-screencast.html[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
-* link:../webclient/html5-gettingstarted.html[+Getting Started with HTML5 Applications +]
-* link:../webclient/html5-editing-css.html[+Working with CSS Style Sheets in HTML5 Applications+]
-* link:../webclient/html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]
-* link:http://wiki.netbeans.org/HTML5[+HTML5 Support in NetBeans IDE wiki page+]
-* link:../../trails/php.html[+PHP and HTML5 Learning Trail+]
+* Demo:xref:html5-gettingstarted-screencast.adoc[+ HTML5 - Part 1: Getting Started with HTML5 Applications+]
+* Demo:xref:html5-css-screencast.adoc[+ HTML5 - Part 2: Working with CSS Style Sheets in HTML5 Applications+]
+* 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+]
+* 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/web/index.adoc b/netbeans.apache.org/src/content/kb/docs/web/index.adoc
index 0c05ae1bd..24463cab8 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/index.adoc
@@ -26,30 +26,30 @@
 :toc-title:
 :description: Web Technologies Tutorials
 
-- link:framework-adding-support.html[Adding Support For A Web Framework]
-- link:js-toolkits-dojo.html[Connecting a Dojo Tree to an ArrayList using JSON]
-- link:mysql-webapp.html[Creating a Simple Web Application Using a MySQL Database]
-- link:jsf-jpa-weblogic.html[Developing an Enterprise Application for Oracle WebLogic Server]
-- link:jsf20-crud.html[Generating a JavaServer Faces 2.x CRUD Application from a Database]
-- link:html5-cordova-screencast.html[HTML5 - Getting Started with Cordova Development]
-- link:html5-gettingstarted-screencast.html[HTML5 - Part 1: Video of Getting Started with HTML5 Applications]
-- link:html5-css-screencast.html[HTML5 - Part 2: Video of Working with CSS Style Sheets in HTML5 Applications]
-- link:html5-javascript-screencast.html[HTML5 - Part 3: Video of Testing and Debugging JavaScript in HTML5 Applications]
-- link:applets.html[Integrating an Applet in a Web Application]
-- link:ajax-quickstart.html[Introduction to Ajax for Java Web Applications]
-- link:quickstart-webapps.html[Introduction to Developing Web Applications]
-- link:jsf20-intro.html[Introduction to JavaServer Faces 2.x]
-- link:quickstart-webapps-spring.html[Introduction to Spring Web MVC]
-- link:grails-quickstart.html[Introduction to the Grails Web Framework]
-- link:quickstart-webapps-struts.html[Introduction to the Struts Web Framework]
-- link:quickstart-webapps-wicket.html[Introduction to the Wicket Web Framework]
-- link:jsf20-support.html[JSF 2.x Support in NetBeans IDE]
-- link:oracle-cloud.html[Running Web Applications on Oracle Cloud]
-- link:section.html[]
-- link:security-webapps.html[Securing a Web Application in NetBeans IDE]
-- link:hibernate-webapp.html[Using Hibernate in a Web Application]
-- link:js-toolkits-jquery.html[Using jQuery to Enhance the Appearance and Usability of a Web Page]
-- link:index.html[Web Technologies Tutorials]
+- xref:framework-adding-support.adoc[Adding Support For A Web Framework]
+- xref:js-toolkits-dojo.adoc[Connecting a Dojo Tree to an ArrayList using JSON]
+- xref:mysql-webapp.adoc[Creating a Simple Web Application Using a MySQL Database]
+- xref:jsf-jpa-weblogic.adoc[Developing an Enterprise Application for Oracle WebLogic Server]
+- xref:jsf20-crud.adoc[Generating a JavaServer Faces 2.x CRUD Application from a Database]
+- xref:html5-cordova-screencast.adoc[HTML5 - Getting Started with Cordova Development]
+- xref:html5-gettingstarted-screencast.adoc[HTML5 - Part 1: Video of Getting Started with HTML5 Applications]
+- xref:html5-css-screencast.adoc[HTML5 - Part 2: Video of Working with CSS Style Sheets in HTML5 Applications]
+- xref:html5-javascript-screencast.adoc[HTML5 - Part 3: Video of Testing and Debugging JavaScript in HTML5 Applications]
+- xref:applets.adoc[Integrating an Applet in a Web Application]
+- xref:ajax-quickstart.adoc[Introduction to Ajax for Java Web Applications]
+- xref:quickstart-webapps.adoc[Introduction to Developing Web Applications]
+- xref:jsf20-intro.adoc[Introduction to JavaServer Faces 2.x]
+- xref:quickstart-webapps-spring.adocl[Introduction to Spring Web MVC]
+- xref:grails-quickstart.adoc[Introduction to the Grails Web Framework]
+- xref:quickstart-webapps-struts.adoc[Introduction to the Struts Web Framework]
+- xref:quickstart-webapps-wicket.adoc[Introduction to the Wicket Web Framework]
+- xref:jsf20-support.adoc[JSF 2.x Support in NetBeans IDE]
+- xref:oracle-cloud.adoc[Running Web Applications on Oracle Cloud]
+- xref:section.adoc[]
+- xref:security-webapps.adoc[Securing a Web Application in NetBeans IDE]
+- xref:hibernate-webapp.adoc[Using Hibernate in a Web Application]
+- xref:js-toolkits-jquery.adoc[Using jQuery to Enhance the Appearance and Usability of a Web Page]
+- xref:index.adoc[Web Technologies Tutorials]
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/web/js-toolkits-dojo.adoc b/netbeans.apache.org/src/content/kb/docs/web/js-toolkits-dojo.adoc
index 9db0e6425..f939bd4b1 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/js-toolkits-dojo.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/js-toolkits-dojo.adoc
@@ -42,7 +42,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |7 or 8 
 
@@ -404,9 +404,9 @@ image::images/debugger-breakpoint.png[title="Use the Java Debugger to step throu
 
 For more information on the Java Debugger, see the following screencasts:
 
-* link:../java/debug-stepinto-screencast.html[+Visual Step Into Action in NetBeans Debugger+]
-* link:../java/debug-deadlock-screencast.html[+Deadlock Detection Using the NetBeans Debugger+]
-* link:../java/debug-evaluator-screencast.html[+Using the Code Snippet Evaluator in the NetBeans Debugger+]
+* xref:../java/debug-stepinto-screencast.adoc[+Visual Step Into Action in NetBeans Debugger+]
+* xref:../java/debug-deadlock-screencast.adoc[+Deadlock Detection Using the NetBeans Debugger+]
+* xref:../java/debug-evaluator-screencast.adoc[+Using the Code Snippet Evaluator in the NetBeans Debugger+]
 
 
 Within this step, you've compiled third-party sources from link:http://json.org[+http://json.org+] and added them as a JAR file to the `DojoTreeSample` project. You then added import statements to classes from the JAR file in the `Tribe` and `TribeDataManager` classes. Finally, you examined some of the methods contained in `TribeDataManager` which are used to convert the ArrayList data into a JSON string.
@@ -483,8 +483,8 @@ import dojo.org.json.JSONObject;
 . To run the project, select the `DojoTreeSample` project node in the Projects window, then click the Run Project ( image:images/run-project-btn.png[] ) button in the IDE's toolbar. 
 
 The browser opens to display the welcome page (`dojoDemo.html`), and you can see that the Dojo Tree widget is displaying data from the ArrayList properly, as in the <<final,screenshot above>>.
-link:/about/contact_form.html?to=3&subject=Feedback:%20Connecting%20a%20Dojo%20Tree%20to%20an%20ArrayList[+Send Us Your Feedback+]
 
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 == See Also
@@ -495,8 +495,8 @@ For more information about Dojo, refer to the official documentation:
 * Online API Reference: link:http://api.dojotoolkit.org/[+http://api.dojotoolkit.org/+]
 * Dojo Demo: link:http://demos.dojotoolkit.org/demos/[+http://demos.dojotoolkit.org/demos/+]
 
-For more information about JavaScript and JavaScript toolkit features on link:https://netbeans.org/[+netbeans.org+], see the following resources:
+For more information about JavaScript and JavaScript toolkit features on xref:../../../index.adoc[+netbeans.org+], see the following resources:
 
-* link:js-toolkits-jquery.html[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]. An introduction to jQuery is provided, and steps are given showing how to apply jQuery's accordion widget to HTML markup in a web page.
-* link:ajax-quickstart.html[+Introduction to Ajax (Java)+]. Describes how to build a simple application using servlet technology while teaching the underlying process flow of an Ajax request.
+* xref:js-toolkits-jquery.adoc[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]. An introduction to jQuery is provided, and steps are given showing how to apply jQuery's accordion widget to HTML markup in a web page.
+* xref:ajax-quickstart.adoc[+Introduction to Ajax (Java)+]. Describes how to build a simple application using servlet technology while teaching the underlying process flow of an Ajax request.
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG2272[+Creating JavaScript Files+] in _Developing Applications with NetBeans IDE_.
diff --git a/netbeans.apache.org/src/content/kb/docs/web/js-toolkits-jquery.adoc b/netbeans.apache.org/src/content/kb/docs/web/js-toolkits-jquery.adoc
index 21144cc85..edf9291fc 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/js-toolkits-jquery.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/js-toolkits-jquery.adoc
@@ -33,7 +33,7 @@ link:http://jquery.com/[+jQuery+] is a light-weight JavaScript library that allo
 
 This tutorial demonstrates how to get started using jQuery in NetBeans projects, and take advantage of the IDE when working in any front-end project involving HTML, CSS, and JavaScript files. Primarily, you'll be shown how to invoke code completion on functions, and use the integrated API support. You'll also be introduced to key jQuery concepts, including the `$(document).ready` function call, the use of CSS-selector-like jQuery objects, and the chaining together of jQuery effects and b [...]
 
-For an example of how to use jQuery in an HTML5 application, see the link:../webclient/html5-gettingstarted.html[+Getting Started with HTML5 Applications+] tutorial.
+For an example of how to use jQuery in an HTML5 application, see the xref:../webclient/html5-gettingstarted.adoc[+Getting Started with HTML5 Applications+] tutorial.
 
 To complete this tutorial, you will need the following resources.
 
@@ -53,7 +53,7 @@ NOTE: If you need to compare your project with a working solution, you can link:
 
 NOTE: If you plan to work in a Java project, you should consider configuring a server for your development environment. The GlassFish server is included with the IDE's Java download, and is configured to run from NetBeans by default.
 
-NOTE: If you plan to work in a PHP project, you'll need to download PHP and configure your environment. For more information, see the link:../../trails/php.html[+PHP Learning Trail+].
+NOTE: If you plan to work in a PHP project, you'll need to download PHP and configure your environment. For more information, see the xref:../php.adoc[+PHP Learning Trail+].
 
 [[settingup]]
 == Setting Up a NetBeans Project
@@ -69,7 +69,7 @@ If you want to work in a Java Web project, select the *Java Web* category, then
 
 . In Step 3, for purposes of this tutorial, accept default settings provided in the wizard. 
 
-*Note:* If you are creating a PHP project for the first time and need help, see Configuring Your Environment for PHP Development in the link:../../trails/php.html[+PHP Learning Trail+].
+*Note:* If you are creating a PHP project for the first time and need help, see Configuring Your Environment for PHP Development in the xref:../php.adoc[+PHP Learning Trail+].
 
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/web/jsf-jpa-weblogic.adoc b/netbeans.apache.org/src/content/kb/docs/web/jsf-jpa-weblogic.adoc
index 2298217e3..55ab43016 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/jsf-jpa-weblogic.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/jsf-jpa-weblogic.adoc
@@ -40,7 +40,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:/downloads/[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |Version 6 or 7 
 
@@ -51,7 +51,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 
 *Notes.*
 
-* This project uses the * ``sample`` * database that is available for either the MySQL or JavaDB database servers. For details on using a MySQL database server with the IDE and creating a database connection, see the link:../ide/mysql.html[+Connecting to a MySQL Database+] tutorial. Alternatively, you can use the database connection for the JavaDB  ``sample``  database that is registered with the IDE by default if you install the GlassFish server during the IDE installation.
+* This project uses the * ``sample`` * database that is available for either the MySQL or JavaDB database servers. For details on using a MySQL database server with the IDE and creating a database connection, see the xref:../ide/mysql.adoc[+Connecting to a MySQL Database+] tutorial. Alternatively, you can use the database connection for the JavaDB  ``sample``  database that is registered with the IDE by default if you install the GlassFish server during the IDE installation.
 
 
 == Registering the Oracle WebLogic Server
@@ -274,7 +274,7 @@ After you create the application, when you view the  ``weblogic.xml``  descripto
 
 === Creating the Database Connection
 
-This tutorial uses a database that is named *sample* and running on the MySQL database server. In this exercise you will use the IDE to create the database and populate the database tables. You will then open a database connection to the database. The IDE will use the database connection details to create the persistence unit for the application. For more details about using a MySQL database server with the IDE, see the link:../ide/mysql.html[+Connecting to a MySQL Database+] tutorial
+This tutorial uses a database that is named *sample* and running on the MySQL database server. In this exercise you will use the IDE to create the database and populate the database tables. You will then open a database connection to the database. The IDE will use the database connection details to create the persistence unit for the application. For more details about using a MySQL database server with the IDE, see the xref:../ide/mysql.adoc[+Connecting to a MySQL Database+] tutorial
 
 *Note.* Alternatively, if you installed the GlassFish server when you installed the IDE, you can use the database connection to the sample database on the JavaDB database server that was registered automatically during the IDE installation.
 
@@ -303,7 +303,7 @@ The IDE uses the database connection to connect to the database and retrieve the
 
 If you do not have a MySQL database installed, you can use the  ``sample``  database running on JavaDB. If the  ``sample``  database does not exist, you can right-click the MySQL (or JavaDB) node and choose Create Database.
 
-For more details see link:../ide/mysql.html[+Connecting to a MySQL Database+] tutorial.
+For more details see xref:../ide/mysql.adoc[+Connecting to a MySQL Database+] tutorial.
 
  
 
@@ -417,15 +417,14 @@ image::images/weblogic-services-window2.png[title="WebLogic Server applications
 
 For more information about deploying applications, see link:http://download.oracle.com/docs/cd/E12840_01/wls/docs103/deployment/index.html[+Deploying Applications to WebLogic Server +]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Developing%20an%20Enterprise%20Application%20on%20Oracle%20WebLogic[+Send Feedback on This Tutorial+]
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 == See Also
 
 For more information about using NetBeans IDE to develop web applications using Java Persistence and JavaServer Faces, see the following resources:
 
-* link:../javaee/weblogic-javaee-m1-screencast.html[+Video of Deploying a Web Application to the Oracle WebLogic Server+]
-* link:jsf20-intro.html[+Introduction to JavaServer Faces 2.0+]
-* link:../../docs/javaee/ecommerce/intro.html[+The NetBeans E-commerce Tutorial+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../javaee/weblogic-javaee-m1-screencast.adoc[+Video of Deploying a Web Application to the Oracle WebLogic Server+]
+* xref:jsf20-intro.adoc[+Introduction to JavaServer Faces 2.0+]
+* xref:../javaee/ecommerce/intro.adoc[+The NetBeans E-commerce Tutorial+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web 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 795834b0a..d4ca683df 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
@@ -42,21 +42,21 @@ To complete this tutorial, you need the following software and resources.
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+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)+] |7 or 8 
+|link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[Java Development Kit (JDK)] |7 or 8 
 
-|link:http://glassfish.dev.java.net/[+GlassFish Server Open Source Edition+] |3.x, 4.x 
+|link:http://glassfish.dev.java.net/[GlassFish Server Open Source Edition] |3.x, 4.x 
 
-|link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fmysql-consult.zip[+mysql-consult.zip+] (MySQL) 
+|link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fmysql-consult.zip[mysql-consult.zip] (MySQL) 
 _or_
-link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fjavadb-consult.zip[+javadb-consult.zip+] (JavaDB) |n/a 
+link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fjavadb-consult.zip[javadb-consult.zip] (JavaDB) |n/a 
 |===
 
 *Notes:*
 
 * The NetBeans IDE Java EE bundle also includes the GlassFish server, a Java EE-compliant server, which you require for this tutorial.
-* For the solution project to this tutorial, download link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252FConsultingAgencyJSF20.zip[+ConsultingAgencyJSF20.zip+].
+* For the solution project to this tutorial, download link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252FConsultingAgencyJSF20.zip[ConsultingAgencyJSF20.zip].
 
 
 
@@ -69,13 +69,13 @@ The `consult` database was designed to demonstrate the scope of IDE support for
 
 *Notes:*
 
-* This tutorial uses the MySQL database server but you can also complete the tutorial using the JavaDB database server. To create the database in JavaDB, download and extract the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fjavadb-consult.zip[+javadb-consult.zip+] archive. The archive contains SQL scripts for creating, dropping, and populating the `consult` database.
-* 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 JavaDB, see the link:../ide/java-db.html[+Working with the Java DB (Derby) Database+] tutorial.
+* This tutorial uses the MySQL database server but you can also complete the tutorial using the JavaDB database server. To create the database in JavaDB, download and extract the link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fjavadb-consult.zip[javadb-consult.zip] archive. The archive contains SQL scripts for creating, dropping, and populating the `consult` database.
+* For more information on configuring the IDE to work with MySQL, see the xref:../ide/mysql.adoc[Connecting to a MySQL Database] tutorial.
+* For more information on configuring the IDE to work with JavaDB, see the xref:../ide/java-db.adoc[Working with the Java DB (Derby) Database] tutorial.
 
 *MySQL with GlassFish Combination:*
 
-If you are using MySQL, and are using GlassFish v3 or Open Source Edition 3.0.1, you must ensure that your database is password-protected. (For more information, see GlassFish link:https://java.net/jira/browse/GLASSFISH-12221[+Issue 12221+].) If you are using the default MySQL `root` account with an empty password, you can set the password from a command-line prompt. 
+If you are using MySQL, and are using GlassFish v3 or Open Source Edition 3.0.1, you must ensure that your database is password-protected. (For more information, see GlassFish link:https://java.net/jira/browse/GLASSFISH-12221[Issue 12221].) If you are using the default MySQL `root` account with an empty password, you can set the password from a command-line prompt. 
 
 For example, to set your password to `_nbuser_`, in a command-line prompt enter the following commands.
 
@@ -99,15 +99,15 @@ shell> /usr/local/mysql/bin/mysql -u root
 
 For more information, see the offical MySQL Reference Manual:
 
-* link:http://dev.mysql.com/doc/refman/5.1/en/default-privileges.html[+Securing the Initial MySQL Accounts+]
-* link:http://dev.mysql.com/doc/refman/5.1/en/invoking-programs.html[+4.2.1. Invoking MySQL Programs+]
-* link:http://dev.mysql.com/doc/refman/5.1/en/setting-environment-variables.html[+4.2.4. Setting Environment Variables+]
+* link:http://dev.mysql.com/doc/refman/5.1/en/default-privileges.html[Securing the Initial MySQL Accounts]
+* link:http://dev.mysql.com/doc/refman/5.1/en/invoking-programs.html[4.2.1. Invoking MySQL Programs]
+* link:http://dev.mysql.com/doc/refman/5.1/en/setting-environment-variables.html[4.2.4. Setting Environment Variables]
 
 
 
 Perform the following steps to create a database and connect to it from the IDE.
 
-1. Download link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fmysql-consult.zip[+mysql-consult.zip+] and extract the archive to your local system. When you extract the archive you will see the SQL scripts for creating and populating the database. The archive also has scripts for dropping tables.
+1. Download link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252Fmysql-consult.zip[mysql-consult.zip] and extract the archive to your local system. When you extract the archive you will see the SQL scripts for creating and populating the database. The archive also has scripts for dropping tables.
 2. In the Services window, expand the Databases node, right-click the MySQL node and choose Start Server.
 3. Right-click the MySQL Server node and choose Create Database.
 4. Type *consult* as the Database Name in the Create MySQL Database dialog. Click OK. A new node appears under the Databases node (`jdbc:mysql://localhost:3306/consult [root on Default schema]`).
@@ -395,7 +395,7 @@ The database currently doesn't contain any sample data. You can add data manuall
 
 You can click the index link to return to the links listed in the welcome page. The links provide you with a view of the data held in each database table and trigger the `List.xhtml` file for each entity folder to display. As is later demonstrated, after you add data to the tables, other links will display for each entry enabling you to view (`View.xhtml`), edit (`Edit.xhmtl`), and destroy data for a single table record.
 
-*Note.* If the application fails to deploy, see the <<troubleshooting,troubleshooting section>> below. (Also see the troubleshooting section of link:mysql-webapp.html#troubleshoot[+Creating a Simple Web Application Using a MySQL Database+].)
+*Note.* If the application fails to deploy, see the <<troubleshooting,troubleshooting section>> below. (Also see the troubleshooting section of xref:mysql-webapp.adoc#troubleshoot[Creating a Simple Web Application Using a MySQL Database].)
 
 
 [[populateDB]]
@@ -443,7 +443,7 @@ image::images/view-data-table-small.png[role="left", link="images/view-data-tabl
 
 Double-click inside table cells to perform inline modifications to data. Click the Commit Records ( image:images/commit-records-icon.png[] ) icon to commit changes to the database.
 
-The graphical view provides much more functionality. See link:../../docs/ide/database-improvements-screencast.html[+Database Support in NetBeans IDE+] for more information.
+The graphical view provides much more functionality. See xref:../ide/database-improvements-screencast.adoc[Database Support in NetBeans IDE] for more information.
 
 
 
@@ -474,7 +474,7 @@ Click OK (or press Enter).
 
 image::images/doc-popup.png[title="Press Ctrl-Space to invoke a documentation popup on Facelets tags"]
 
-You can press Ctrl-Space on JSF tags and their attributes to invoke a documentation pop-up. The documentation you see is taken from the descriptions provided in the official link:http://javaserverfaces.java.net/nonav/docs/2.1/vdldocs/facelets/index.html[+JSF Tag Library Documentation+].
+You can press Ctrl-Space on JSF tags and their attributes to invoke a documentation pop-up. The documentation you see is taken from the descriptions provided in the official link:http://javaserverfaces.java.net/nonav/docs/2.1/vdldocs/facelets/index.html[JSF Tag Library Documentation].
 
 
 
@@ -810,38 +810,36 @@ image::images/gf-services-jdbc-resources.png[title="JDBC Resources displayed in
 
 For more tips on troubleshooting problems when using MySQL and the IDE, see the following documents:
 
-* link:../ide/mysql.html[+Connecting to a MySQL Database+] tutorial.
-* The troubleshooting section of link:mysql-webapp.html#troubleshoot[+Creating a Simple Web Application Using a MySQL Database+]
-link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20a%20JSF%202.0%20CRUD%20Application[+Send Feedback on This Tutorial+]
-
+* xref:../ide/mysql.adoc[Connecting to a MySQL Database] tutorial.
+* The troubleshooting section of xref:mysql-webapp.adoc#troubleshoot[Creating a Simple Web Application Using a MySQL Database]
 
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 [[seealso]]
 == See Also
 
 For more information about JSF 2.x, see the following resources.
 
-
 === NetBeans Articles and Tutorials
 
-* link:jsf20-intro.html[+Introduction to JavaServer Faces 2.x in NetBeans IDE+]
-* link:jsf20-support.html[+JSF 2.x Support in NetBeans IDE+]
-* link:../../samples/scrum-toys.html[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
-* link:../javaee/javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* 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:../javaee/javaee-gettingstarted.adoc[Getting Started with Java EE Applications]
+* xref:../java-ee.adoc[Java EE &amp; Java Web Learning Trail]
 
 
 === External Resources
 
-* link:http://www.oracle.com/technetwork/java/javaee/javaserverfaces-139869.html[+JavaServer Faces Technology+] (Official homepage)
-* link:http://jcp.org/aboutJava/communityprocess/final/jsr314/index.html[+JSR 314 Specification for JavaServer Faces 2.0+]
-* link:http://docs.oracle.com/javaee/7/tutorial/doc/jsf-intro.htm[+JavaServer Faces Technology+] chapter in the Java EE 7 Tutorial
-* link:http://javaserverfaces.dev.java.net/[+GlassFish Project Mojarra+] (Official reference implementation for JSF 2.x)
-* link:http://forums.oracle.com/forums/forum.jspa?forumID=982[+OTN Discussion Forums : JavaServer Faces+]
-* link:http://www.jsfcentral.com/[+JSF Central+]
+* link:http://www.oracle.com/technetwork/java/javaee/javaserverfaces-139869.html[JavaServer Faces Technology] (Official homepage)
+* link:http://jcp.org/aboutJava/communityprocess/final/jsr314/index.html[JSR 314 Specification for JavaServer Faces 2.0]
+* link:http://docs.oracle.com/javaee/7/tutorial/doc/jsf-intro.htm[JavaServer Faces Technology] chapter in the Java EE 7 Tutorial
+* link:http://javaserverfaces.dev.java.net/[GlassFish Project Mojarra] (Official reference implementation for JSF 2.x)
+* link:http://forums.oracle.com/forums/forum.jspa?forumID=982[OTN Discussion Forums : JavaServer Faces]
+* link:http://www.jsfcentral.com/[JSF Central]
 
 
 === Blogs
 
-* link:http://www.java.net/blogs/edburns/[+Ed Burns+]
-* link:http://www.java.net/blogs/driscoll/[+Jim Driscoll+]
+* link:http://www.java.net/blogs/edburns/[Ed Burns]
+* link:http://www.java.net/blogs/driscoll/[Jim Driscoll]
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 8963e2091..3862d3202 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
@@ -45,7 +45,7 @@ This tutorial demonstrates how you can apply JSF 2.x support to a web applicatio
 * wire the managed bean to the application's web pages, and
 * convert the web pages into Facelets template files.
 
-The NetBeans IDE has provided long-standing support for JavaServer Faces. Starting with the release of JSF 2.0 and Java EE 6, NetBeans IDE has provided support for JSF 2.0 and JSF 2.1. For more information, see link:jsf20-support.html[+JSF 2.x Support in NetBeans IDE+].
+The NetBeans IDE has provided long-standing support for JavaServer Faces. Starting with the release of JSF 2.0 and Java EE 6, NetBeans IDE has provided support for JSF 2.0 and JSF 2.1. For more information, see xref:jsf20-support.adoc[+JSF 2.x Support in NetBeans IDE+].
 
 
 To complete this tutorial, you need the following software and resources.
@@ -53,7 +53,7 @@ To complete this tutorial, you need the following software and resources.
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+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)+] |7 or 8 
 
@@ -74,7 +74,7 @@ To complete this tutorial, you need the following software and resources.
 
 Begin by opening the <<requiredSoftware,`jsfDemo` web application project>> in the IDE. Once you have the project opened in the IDE, you can add framework support to it using the project's Properties window.
 
-The IDE also allows you to create new projects with JSF 2.x support. For more information, see link:jsf20-support.html#creatingSupport[+Creating a New Project with JSF 2.x Support+].
+The IDE also allows you to create new projects with JSF 2.x support. For more information, see xref:jsf20-support.adoc#creatingSupport[+Creating a New Project with JSF 2.x Support+].
 
 1. Click the Open Project ( image:images/open-project-btn.png[] ) button in the IDE's main toolbar, or press Ctrl-Shift-O (⌘-Shift-O on Mac).
 2. In the Open Project dialog, navigate to the location on your computer where you stored the unzipped tutorial project. Select it, then click Open Project to open it in the IDE.
@@ -154,7 +154,7 @@ The Faces servlet is registered with the project, and the `index.xhtml` welcome
 
 You can locate the JSF libraries by expanding the project's Libraries node in the Projects window. If you are using the default libraries included with GlassFish Server 3.1.2 or GlassFish Server 4 this is the `javax.faces.jar` that is visible under the GlassFish Server node. (If you are using an older version of GlassFish you will see the `jsf-api.jar` and `jsf-impl.jar` libraries instead of `javax.faces.jar`.)
 
-The IDE's JSF 2.x support primarily includes numerous JSF-specific wizards, and special functionality provided by the Facelets editor. You explore these functional capabilities in the following steps. For more information, see link:jsf20-support.html[+JSF 2.x Support in NetBeans IDE+].
+The IDE's JSF 2.x support primarily includes numerous JSF-specific wizards, and special functionality provided by the Facelets editor. You explore these functional capabilities in the following steps. For more information, see xref:jsf20-support.adoc[+JSF 2.x Support in NetBeans IDE+].
 
 
 [[managedBean]]
@@ -164,7 +164,7 @@ You can use JSF's managed beans to process user data and retain it between reque
 
 A POJO is essentially a Java class that contains a public, no argument constructor and conforms to the link:http://download.oracle.com/javase/tutorial/javabeans/[+JavaBeans+] naming conventions for its properties.
 
-Looking at the <<staticPage,static page>> produced from running the project, you need a mechanism that determines whether a user-entered number matches the one currently selected, and returns a view that is appropriate for this outcome. Use the IDE's link:jsf20-support.html#managedBean[+Managed Bean wizard+] to create a managed bean for this purpose. The Facelets pages that you create in the next section will need to access the number that the user types in, and the generated response. T [...]
+Looking at the <<staticPage,static page>> produced from running the project, you need a mechanism that determines whether a user-entered number matches the one currently selected, and returns a view that is appropriate for this outcome. Use the IDE's xref:jsf20-support.adoc#managedBean[+Managed Bean wizard+] to create a managed bean for this purpose. The Facelets pages that you create in the next section will need to access the number that the user types in, and the generated response. T [...]
 
 * <<usingManagedBean,Using the Managed Bean Wizard>>
 * <<creatingConstructor,Creating a Constructor>>
@@ -560,7 +560,7 @@ After uncommenting the JSF HTML form component, the editor indicates that the `<
 
 . To declare these components, use the IDE's code completion to add the tag library namespace to the page's `<html>` tag.
 
-Use the editor's code completion support to add required JSF namespaces to the file. When selecting a JSF or Facelets tag through code completion, the required namespace is automatically added to the document's root element. For more information, see link:jsf20-support.html#facelets[+JSF 2.x Support in NetBeans IDE+].
+Use the editor's code completion support to add required JSF namespaces to the file. When selecting a JSF or Facelets tag through code completion, the required namespace is automatically added to the document's root element. For more information, see xref:jsf20-support.adoc#facelets[+JSF 2.x Support in NetBeans IDE+].
 
 Place your cursor on any of the undeclared tags and press Ctrl-Space. Code completion suggestions and documentation support displays.
 
@@ -690,9 +690,9 @@ Although you may not have realized it, the `index.xhtml` and `response.xhtml` fi
 
 The purpose of this section is to familiarize you with Facelets templating. For projects containing many views, it is often advantageous to apply a template file that defines the structure and appearance for multiple views. When servicing requests, the application inserts dynamically prepared content into the template file and sends the result back to the client. Although this project only contains two views (the welcome page and the response page), it is easy to see that they contain a  [...]
 
-The IDE provides a link:jsf20-support.html#faceletsTemplate[+Facelets Template wizard+] for creating Facelets templates, and a Facelets Template Client wizard for creating files that rely on a template. This section makes use of these wizards.
+The IDE provides a xref:jsf20-support.adoc#faceletsTemplate[+Facelets Template wizard+] for creating Facelets templates, and a Facelets Template Client wizard for creating files that rely on a template. This section makes use of these wizards.
 
-*Note:* The IDE also provides a JSF Page wizard that enables you to create individual Facelets pages for your project. For more information, see link:jsf20-support.html#jsfPage[+JSF 2.x Support in NetBeans IDE+].
+*Note:* The IDE also provides a JSF Page wizard that enables you to create individual Facelets pages for your project. For more information, see xref:jsf20-support.adoc#jsfPage[+JSF 2.x Support in NetBeans IDE+].
 
 * <<templateFile,Creating the Facelets Template File>>
 * <<templateClient,Creating Template Client Files>>
@@ -963,8 +963,7 @@ image::images/welcome-files.png[title="Change the Welcome Files entry in the dep
 
 Using the Facelets template and template client files, the application behaves in exactly the same way as it did previously. By factoring out duplicated code in the application's welcome and response pages, you succeeded in reducing the size of the application and eliminated the possibility of writing more duplicate code, should more pages be added at a later point. This can make development more efficient and easier to maintain when working in large projects.
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Introduction%20to%20JSF%202.0[+Send Feedback on This Tutorial+]
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 [[seealso]]
@@ -975,11 +974,11 @@ For more information about JSF 2.x, see the following resources.
 
 === NetBeans Articles and Tutorials
 
-* link:jsf20-support.html[+JSF 2.x Support in NetBeans IDE+]
-* link:jsf20-crud.html[+Generating a JavaServer Faces 2.x CRUD Application from a Database+]
+* 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+]
-* link:../javaee/javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../javaee/javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 
 === External Resources
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 f631dd902..968e52400 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
@@ -33,7 +33,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 
 NetBeans IDE provides numerous features that enable built-in support for JavaServer Faces (JSF) 2.0 and 2.1. The IDE's JSF 2.x support builds upon its previous support for JavaServer Faces, and includes versatile editor enhancements for Facelets pages, various facilities for working with entity classes, and a suite of JSF wizards for common development tasks, such as creating JSF managed beans, Facelets templates and composite components.
 
-The following topics demonstrate the JSF 2.x features that are at your disposal when working in the NetBeans IDE. To try out the new JSF features, link:https://netbeans.org/downloads/index.html[+download the Java bundle of the NetBeans IDE+], which includes Java Web and EE technologies. The download bundle also includes the GlassFish Server Open Source Edition, which is the reference implementation of the Java EE 6 platform specification (JSR 316).
+The following topics demonstrate the JSF 2.x features that are at your disposal when working in the NetBeans IDE. To try out the new JSF features, xref:../../../download/index.adoc[+download the Java bundle of the NetBeans IDE+], which includes Java Web and EE technologies. The download bundle also includes the GlassFish Server Open Source Edition, which is the reference implementation of the Java EE 6 platform specification (JSR 316).
 
 [[support]]
 == JSF 2.x Support for Projects
@@ -315,7 +315,7 @@ Use the Facelets Template Client wizard to generate a page that references a Fac
 
 image::images/new-template-client.png[title="Create a Client for a Facelets template using the Facelets Template Client wizard"]
 
-For more details on using Facelets templates and clients, see the section on link:jsf20-intro.html#template[+Applying a Facelets Template+] in the link:jsf20-intro.html[+Introduction to JavaServer Faces 2.x in NetBeans IDE+].
+For more details on using Facelets templates and clients, see the section on xref:jsf20-intro.adoc#template[+Applying a Facelets Template+] in the xref:jsf20-intro.adoc[+Introduction to JavaServer Faces 2.x in NetBeans IDE+].
 
 
 
@@ -508,8 +508,8 @@ The Palette provides you with five JSF-related components:
 </f:view>
 ----
 * *JSF Data Table from Entity: *Invokes a dialog enabling you to associate data from an entity class to fields contained in a JSF data table. See <<dataTable,Creating a JSF Data Table for Entity Data>>.
-link:/about/contact_form.html?to=3&subject=Feedback:%20JSF%202.x%20Support%20in%20NetBeans%20IDE[+Send Feedback on This Tutorial+]
 
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 [[seealso]]
@@ -520,11 +520,11 @@ For more information about JSF 2.x, see the following resources.
 
 === NetBeans Articles and Tutorials
 
-* link:jsf20-intro.html[+Introduction to JavaServer Faces 2.x in NetBeans IDE+]
-* link:jsf20-crud.html[+Generating a JavaServer Faces 2.x CRUD Application from a Database+]
+* 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+]
-* link:../javaee/javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../javaee/javaee-gettingstarted.adoc[+Getting Started with Java EE Applications+]
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
 
 
 === External Resources
diff --git a/netbeans.apache.org/src/content/kb/docs/web/mysql-webapp.adoc b/netbeans.apache.org/src/content/kb/docs/web/mysql-webapp.adoc
index e3a8753bd..a555b4bdd 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/mysql-webapp.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/mysql-webapp.adoc
@@ -35,7 +35,7 @@ This document describes how to create a simple web application that connects to
 
 link:http://www.mysql.com[+MySQL+] is a popular open source database management system 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.
 
-This tutorial is a continuation from the link:../ide/mysql.html[+Connecting to a MySQL Database+] tutorial and assumes that you have already created a MySQL database named `MyNewDatabase`, which you have registered a connection for in the NetBeans IDE. The table data used in that tutorial is contained in link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJava%2520Web%252Fifpwafcad.sql[+ifpwafcad.sql+] and is also required for this tutorial. This SQL file creates tw [...]
+This tutorial is a continuation from the xref:../ide/mysql.adoc[+Connecting to a MySQL Database+] tutorial and assumes that you have already created a MySQL database named `MyNewDatabase`, which you have registered a connection for in the NetBeans IDE. The table data used in that tutorial is contained in link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJava%2520Web%252Fifpwafcad.sql[+ifpwafcad.sql+] and is also required for this tutorial. This SQL file creates tw [...]
 
 
 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"]
@@ -46,7 +46,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+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 
 
@@ -70,7 +70,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 
 Simple web applications can be designed using a _two-tier architecture_, in which a client communicates directly with a server. In this tutorial, a Java web application communicates directly with a MySQL database using the Java Database Connectivity API. Essentially, it is the link:http://dev.mysql.com/downloads/connector/j/[+MySQL Connector/J JDBC Driver+] that enables communication between the Java code understood by the application server (the GlassFish server), and any content in SQL [...]
 
-The application you build in this tutorial involves the creation of two JSP pages. In each of these pages you use HTML and CSS to implement a simple interface, and apply JSTL technology to perform the logic that directly queries the database and inserts the retrieved data into the two pages. The two database tables, `Subject` and `Counselor`, are contained in the MySQL database, `MyNewDatabase`, which you create by completing the link:../ide/mysql.html[+Connecting to a MySQL Database+] t [...]
+The application you build in this tutorial involves the creation of two JSP pages. In each of these pages you use HTML and CSS to implement a simple interface, and apply JSTL technology to perform the logic that directly queries the database and inserts the retrieved data into the two pages. The two database tables, `Subject` and `Counselor`, are contained in the MySQL database, `MyNewDatabase`, which you create by completing the xref:../ide/mysql.adoc[+Connecting to a MySQL Database+] t [...]
 
  image::images/ifpwafcad-structure.png[title="Sample structure of a two-tier web application"]
 
@@ -108,7 +108,7 @@ The New Project wizard allows you to create an empty web application in a standa
 
 . In the Server and Settings panel, specify the GlassFish server as server which will be used to run the application.
 
-*Note. *The GlassFish server displays in the Server drop-down field if you installed the Java version of the link:https://netbeans.org/downloads/index.html[+NetBeans IDE+]. Because the GlassFish server is included in the download, it is automatically registered with the IDE. If you want to use a different server for this project, click the Add button located next to the Server drop-down field, and register a different server with the IDE. However, working with servers other than the Glas [...]
+*Note. *The GlassFish server displays in the Server drop-down field if you installed the Java version of the xref:../../../download/index.adoc[+NetBeans IDE+]. Because the GlassFish server is included in the download, it is automatically registered with the IDE. If you want to use a different server for this project, click the Add button located next to the Server drop-down field, and register a different server with the IDE. However, working with servers other than the GlassFish server  [...]
 
 
 
@@ -383,7 +383,7 @@ The most efficient way to implement communication between the server and databas
 
 After preparing the data source and connection pool for the server, you then need to instruct the application to use the data source. This is typically done by creating an entry in the application's `web.xml` deployment descriptor. Finally, you need to ensure that the database driver (MySQL Connector/J JDBC Driver) is accessible to the server.
 
-*Important: * From this point forward, you need you ensure that you have a MySQL database instance named `MyNewDatabase` set up that contains sample data provided in link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJava%2520Web%252Fifpwafcad.sql[+ifpwafcad.sql+]. This SQL file creates two tables, `Subject` and `Counselor`, then populates them with sample data. If you have not already done this, or if you need help with this task, see link:../../docs/ide/mysql.htm [...]
+*Important: * From this point forward, you need you ensure that you have a MySQL database instance named `MyNewDatabase` set up that contains sample data provided in link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJava%2520Web%252Fifpwafcad.sql[+ifpwafcad.sql+]. This SQL file creates two tables, `Subject` and `Counselor`, then populates them with sample data. If you have not already done this, or if you need help with this task, see xref:../ide/mysql.adoc[+Conne [...]
 
 Also, your database needs to be password-protected to create a data source and work with the GlassFish server in this tutorial. If you are using the default MySQL `root` account with an empty password, you can set the password from a command-line prompt. 
 
@@ -924,8 +924,7 @@ image::images/ping-succeeded.png[title="Test your connection pool by clicking Pi
 . If the ping fails, click the Additional Properties tab and ensure that the listed property values are correctly set.
 
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20Web%20App%20MySQL[+Send Us Your Feedback+]
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 [[seealso]]
@@ -934,9 +933,9 @@ link:/about/contact_form.html?to=3&subject=Feedback:%20Creating%20Web%20App%20My
 For more information about Java web development, see the following resources.
 
 * *NetBeans Articles and Tutorials*
-* link:../ide/mysql.html[+Connecting to a MySQL Database in NetBeans IDE+]. Covers the basics of working with a MySQL database in the IDE.
-* link:jsf20-intro.html[+Introduction to JavaServer Faces 2.x+]. An introductory tutorial describing how to use the JSF framework in a Java web project.
-* link:quickstart-webapps-spring.html[+Introduction to the Spring Framework+]. An introductory tutorial describing how to create an MVC web application using the Spring Framework.
+* xref:../ide/mysql.adoc[+Connecting to a MySQL Database in NetBeans IDE+]. Covers the basics of working with a MySQL database in the IDE.
+* xref:jsf20-intro.adoc[+Introduction to JavaServer Faces 2.x+]. An introductory tutorial describing how to use the JSF framework in a Java web project.
+* xref:quickstart-webapps-spring.adocl[+Introduction to the Spring Framework+]. An introductory tutorial describing how to create an MVC web application using the Spring Framework.
 * *Java Database Connectivity (JDBC)*
 * link:http://docs.oracle.com/javase/tutorial/jdbc/overview/index.html[+JDBC Overview+]
 * link:http://download.oracle.com/javase/6/docs/technotes/guides/jdbc/getstart/GettingStartedTOC.fm.html[+Getting Started with the JDBC API+]
diff --git a/netbeans.apache.org/src/content/kb/docs/web/oracle-cloud.adoc b/netbeans.apache.org/src/content/kb/docs/web/oracle-cloud.adoc
index fffac89bc..55779117a 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/oracle-cloud.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/oracle-cloud.adoc
@@ -31,7 +31,7 @@
 
 The Oracle Cloud is an enterprise cloud for business. The Oracle Cloud offers self-service business applications delivered on an integrated development and deployment platform with tools to rapidly extend and create new services. For more information about Oracle Cloud, see the link:https://cloud.oracle.com[+Oracle Cloud homepage+].
 
-This document shows you how to register the Oracle Cloud with NetBeans IDE and some of the Oracle Cloud features that are supported in the IDE. This document discusses some of the advantages and disadvantages of working completely on the Cloud versus working with a local server and then deploying to the Cloud. At the end you create a simple web application, following the instructions in link:quickstart-webapps.html[+Introduction to Web Applications+], and run it on Oracle Cloud.
+This document shows you how to register the Oracle Cloud with NetBeans IDE and some of the Oracle Cloud features that are supported in the IDE. This document discusses some of the advantages and disadvantages of working completely on the Cloud versus working with a local server and then deploying to the Cloud. At the end you create a simple web application, following the instructions in xref:quickstart-webapps.adoc[+Introduction to Web Applications+], and run it on Oracle Cloud.
 
 You might also want to look at the link:https://blogs.oracle.com/javatraining/entry/oracle_cloud_development_with_netbeans[+Oracle Cloud Development with NetBeans and Eclipse (OEPE)+] series of tutorials on the Java Training Beat blog.
 
@@ -44,7 +44,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.3, 7.4, 8.0, Java EE Version 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.3, 7.4, 8.0, Java EE Version 
 
 |Oracle Cloud plugin |available from NetBeans Update Center via NetBeans Plugins manager 
 
@@ -187,9 +187,9 @@ image::images/run-properties.png[]
 
 == Creating a Web Application
 
-Go to link:quickstart-webapps.html[+Introduction to Developing Web Applications+] and complete that tutorial. Develop the web application on a local Oracle WebLogic server. After the application is complete, change the server to Oracle Cloud Remote and run the application.
+Go to xref:quickstart-webapps.adoc[+Introduction to Developing Web Applications+] and complete that tutorial. Develop the web application on a local Oracle WebLogic server. After the application is complete, change the server to Oracle Cloud Remote and run the application.
 
-*Note.* You need to install Oracle WebLogic Server locally and register the server with the IDE. See link:https://netbeans.org/kb/docs/javaee/weblogic-javaee-m1-screencast.html[+Video of Deploying a Web Application to Oracle WebLogic Server+] for more information.
+*Note.* You need to install Oracle WebLogic Server locally and register the server with the IDE. See xref:../javaee/weblogic-javaee-m1-screencast.adoc[+Video of Deploying a Web Application to Oracle WebLogic Server+] for more information.
 
 Before you deploy the application to the Oracle Cloud Remote server, open the Output window (Window > Output > Output or Ctrl-4). Note the Oracle Cloud Remote Deployment tab in the output window. This tab shows you the progress of the deployment.
 
@@ -203,11 +203,11 @@ NetBeans IDE and Oracle Cloud can be used in use cases where you have an Oracle
 
 *Important: *The Oracle Cloud Remote WebLogic server does not support JPA 2.0. If your on-premises WebLogic server is JPA 2.0-enabled, either disable JPA 2.0 or use a JPA 1.0 persistence provider for CRUD applications.
 
-*Note: *This document gives only brief directions for creating entity classes and JSF pages. For a more detailed treatment, see link:jsf20crud.html[+Generating a JavaServer Faces 2.0 CRUD Application from a Database+].
+*Note: *This document gives only brief directions for creating entity classes and JSF pages. For a more detailed treatment, see xref:jsf20-crud.adoc[+Generating a JavaServer Faces 2.0 CRUD Application from a Database+].
 
 *To create a CRUD Application with JSF:*
 
-1. Enable the sample HR schema on your OracleXE database server and register the schema in NetBeans IDE. For details, see link:../ide/oracle-db.html[+Connecting to Oracle Database from NetBeans IDE+].
+1. Enable the sample HR schema on your OracleXE database server and register the schema in NetBeans IDE. For details, see xref:../ide/oracle-db.adoc[+Connecting to Oracle Database from NetBeans IDE+].
 
 Use the HR username and password when you register the HR schema with NetBeans IDE.
 
@@ -330,11 +330,7 @@ When a web application's server is set to Oracle Cloud Remote, the Oracle Cloud
 
 image::images/whitelist-properties.png[]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Running%20Web%20Apps%20on%20Oracle%20Cloud[+Send Us Your Feedback+]
-
- 
-
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 == See Also
 
@@ -345,4 +341,4 @@ For information about Oracle Cloud services, see the following resources:
 
 For related information about developing web applications in NetBeans IDE, see the following resources:
 
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:../java-ee.adoc[Java EE &amp; Java Web Learning Trail]
diff --git a/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-spring.adoc b/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-spring.adoc
index 9e15c957b..b4e6ba996 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-spring.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-spring.adoc
@@ -50,7 +50,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 
@@ -491,9 +491,7 @@ Enter your name in the text field and click enter. The `helloView` displays with
 
 image::images/hello-view.png[title="helloView is displayed in a browser"]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Introduction%20to%20Spring[+Send Us Your Feedback+]
-
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 [[seeAlso]]
 == See Also
@@ -506,5 +504,5 @@ Many of the Spring NetBeans Module capabilities can also be applied to non-web b
 
 For other related tutorials, see the following resources:
 
-* link:../../docs/web/framework-adding-support.html[+Adding Support for a Web Framework+]. A basic guide describing how to add support by installing a web framework plugin using the NetBeans Update Center.
-* link:jsf20-intro.html[+Introduction to JavaServer Faces 2.0+]. Demonstrates how to add JSF 2.0 support to an existing project, wire managed beans, and take advantage of Facelets templating.
+* xref:framework-adding-support.adoc[Adding Support for a Web Framework]. A basic guide describing how to add support by installing a web framework plugin using the NetBeans Update Center.
+* xref:jsf20-intro.adoc[Introduction to JavaServer Faces 2.0]. Demonstrates how to add JSF 2.0 support to an existing project, wire managed beans, and take advantage of Facelets templating.
diff --git a/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-struts.adoc b/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-struts.adoc
index e2fc7782f..1c561f59f 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-struts.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-struts.adoc
@@ -44,7 +44,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |7 or 8 
 
@@ -696,8 +696,7 @@ Try entering data that should pass validation. Upon clicking Login, you are pres
 
 image::images/success-page.png[title="Success page displays showing input data"]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Introduction%20to%20Struts[+Send Us Your Feedback+]
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 == See Also
@@ -706,6 +705,6 @@ This concludes the Introduction to the Struts Framework in NetBeans IDE. This do
 
 For related tutorials, see the following resources:
 
-* link:framework-adding-support.html[+Adding Support for a Web Framework+]. A general guide describing how to add web framework support to NetBeans IDE using the Plugin Manager.
-* link:quickstart-webapps-spring.html[+Introduction to the Spring Web Framework+]. Describes the basics of using NetBeans IDE to develop web applications using the Spring framework.
-* link:jsf20-intro.html[+Introduction to JavaServer Faces 2.0+]. A document describing how to wire a managed bean to web pages, and how to take advantage of Facelets templating. .
+* xref:framework-adding-support.adoc[+Adding Support for a Web Framework+]. A general guide describing how to add web framework support to NetBeans IDE using the Plugin Manager.
+* xref:quickstart-webapps-spring.adoc[+Introduction to the Spring Web Framework+]. Describes the basics of using NetBeans IDE to develop web applications using the Spring framework.
+* xref:jsf20-intro.adoc[+Introduction to JavaServer Faces 2.0+]. A document describing how to wire a managed bean to web pages, and how to take advantage of Facelets templating. .
diff --git a/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-wicket.adoc b/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-wicket.adoc
index 9e6703fc1..37d9d0cb0 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-wicket.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps-wicket.adoc
@@ -42,7 +42,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE 
 
 |Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+version 7+] or above 
 
@@ -61,7 +61,7 @@ version 7.x or above
 * *org-netbeans-modules-web-wicket.nbm.* Provides the Wicket-specific functionality that is used in this tutorial.
 * *org-netbeans-modules-wicket-templates.nbm.* Provides Wicket file-level templates for creating typical Wicket artifacts, such as pages and panels.
 * *org-netbeans-modules-wicket-library.nbm.* Provides the Wicket JARs, installs them in the IDE's Library Manager. Therefore, you do not need to download the Wicket distribution from the Wicket site, because the plugin provides everything you need.
-* To install the Wicket support plugin into the IDE, go to the Plugin Manager (Tools > Plugins from the main menu) and install the plugin under the Downloaded tab. For more detailed instructions on how to install a framework plugin into the IDE, see: link:framework-adding-support.html[+Adding Support For A Web Framework+].
+* To install the Wicket support plugin into the IDE, go to the Plugin Manager (Tools > Plugins from the main menu) and install the plugin under the Downloaded tab. For more detailed instructions on how to install a framework plugin into the IDE, see: xref:framework-adding-support.adoc[+Adding Support For A Web Framework+].
 * For more information on Wicket, see link:http://wicket.sourceforge.net/[+http://wicket.sourceforge.net/+]. For the development page for support for Wicket in NetBeans IDE, see link:http://java.net/projects/NbWicketSupport[+http://java.net/projects/NbWicketSupport+]. If you are familiar with Wicket, you are welcome to contribute code to the Wicket plugin for NetBeans IDE.
 
 
@@ -767,14 +767,13 @@ This is the end of the introduction to Wicket development in NetBeans IDE. You a
 
 image::images/samples.png[] 
 
-link:/about/contact_form.html?to=3&subject=Feedback: Introduction to the Wicket Framework in 7.2[+Send Us Your Feedback+]
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 == See Also
 
 For related or more advanced tutorials, see the following resources:
 
-* link:../../docs/web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:../../docs/web/quickstart-webapps-struts.html[+Introduction to the Struts Web Framework+]
-* link:quickstart-webapps-spring.html[+Introduction to the Spring Web Framework+]
+* xref:quickstart-webapps.adoc[Introduction to Developing Web Applications]
+* xref:quickstart-webapps-struts.adoc[Introduction to the Struts Web Framework]
+* xref:quickstart-webapps-spring.adoc[Introduction to the Spring Web Framework]
diff --git a/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps.adoc b/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps.adoc
index 8a3f326ec..6c94620fe 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/quickstart-webapps.adoc
@@ -40,7 +40,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE version 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java EE version 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 
@@ -336,8 +336,7 @@ _I've built and run the project but get "Hello, null!"_
 
 First, check the IDE's Output windows for both application and server, and the server log. Is the server running? Was the application deployed? If the server is running and the application was deployed, are you getting an  ``org.apache.jasper.JasperException: java.lang.NullPointerException?``  This usually means that a value in your code is not initialized correctly. In this tutorial, it means that you probably have a typo somewhere in a property name in your JSP files. Remember that pro [...]
 
-link:/about/contact_form.html?to=3&subject=Feedback:%20Introduction%20to%20Developing%20Web%20Applications[+Send Feedback on This Tutorial+]
-
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
 
 
 == See Also
@@ -346,5 +345,5 @@ This concludes the Introduction to Developing Web Applications tutorial. This do
 
 For related and more advanced information about developing web applications in NetBeans IDE, see the following resources:
 
-* link:quickstart-webapps-struts.html[+Introduction to the Struts Web Framework+]. Describes the basics of using NetBeans IDE to develop web applications using the Struts framework.
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:quickstart-webapps-struts.adoc[+Introduction to the Struts Web Framework+]. Describes the basics of using NetBeans IDE to develop web applications using the Struts framework.
+* xref:../java-ee.adoc[+Java EE &amp; Java Web Learning Trail+]
diff --git a/netbeans.apache.org/src/content/kb/docs/web/section.adoc b/netbeans.apache.org/src/content/kb/docs/web/section.adoc
index 373d0e319..11236294e 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/section.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/section.adoc
@@ -19,30 +19,30 @@
 
 .Web Technologies Tutorials
 ************************************************
-- link:framework-adding-support.html[Adding Support For A Web Framework]
-- link:js-toolkits-dojo.html[Connecting a Dojo Tree to an ArrayList using JSON]
-- link:mysql-webapp.html[Creating a Simple Web Application Using a MySQL Database]
-- link:jsf-jpa-weblogic.html[Developing an Enterprise Application for Oracle WebLogic Server]
-- link:jsf20-crud.html[Generating a JavaServer Faces 2.x CRUD Application from a Database]
-- link:html5-cordova-screencast.html[HTML5 - Getting Started with Cordova Development]
-- link:html5-gettingstarted-screencast.html[HTML5 - Part 1: Video of Getting Started with HTML5 Applications]
-- link:html5-css-screencast.html[HTML5 - Part 2: Video of Working with CSS Style Sheets in HTML5 Applications]
-- link:html5-javascript-screencast.html[HTML5 - Part 3: Video of Testing and Debugging JavaScript in HTML5 Applications]
-- link:applets.html[Integrating an Applet in a Web Application]
-- link:ajax-quickstart.html[Introduction to Ajax for Java Web Applications]
-- link:quickstart-webapps.html[Introduction to Developing Web Applications]
-- link:jsf20-intro.html[Introduction to JavaServer Faces 2.x]
-- link:quickstart-webapps-spring.html[Introduction to Spring Web MVC]
-- link:grails-quickstart.html[Introduction to the Grails Web Framework]
-- link:quickstart-webapps-struts.html[Introduction to the Struts Web Framework]
-- link:quickstart-webapps-wicket.html[Introduction to the Wicket Web Framework]
-- link:jsf20-support.html[JSF 2.x Support in NetBeans IDE]
-- link:oracle-cloud.html[Running Web Applications on Oracle Cloud]
-- link:section.html[]
-- link:security-webapps.html[Securing a Web Application in NetBeans IDE]
-- link:hibernate-webapp.html[Using Hibernate in a Web Application]
-- link:js-toolkits-jquery.html[Using jQuery to Enhance the Appearance and Usability of a Web Page]
-- link:index.html[Web Technologies Tutorials]
+- xref:framework-adding-support.adoc[Adding Support For A Web Framework]
+- xref:js-toolkits-dojo.adoc[Connecting a Dojo Tree to an ArrayList using JSON]
+- xref:mysql-webapp.adoc[Creating a Simple Web Application Using a MySQL Database]
+- xref:jsf-jpa-weblogic.adoc[Developing an Enterprise Application for Oracle WebLogic Server]
+- xref:jsf20-crud.adoc[Generating a JavaServer Faces 2.x CRUD Application from a Database]
+- xref:html5-cordova-screencast.adoc[HTML5 - Getting Started with Cordova Development]
+- xref:html5-gettingstarted-screencast.adoc[HTML5 - Part 1: Video of Getting Started with HTML5 Applications]
+- xref:html5-css-screencast.adoc[HTML5 - Part 2: Video of Working with CSS Style Sheets in HTML5 Applications]
+- xref:html5-javascript-screencast.adoc[HTML5 - Part 3: Video of Testing and Debugging JavaScript in HTML5 Applications]
+- xref:applets.adoc[Integrating an Applet in a Web Application]
+- xref:ajax-quickstart.adoc[Introduction to Ajax for Java Web Applications]
+- xref:quickstart-webapps.adoc[Introduction to Developing Web Applications]
+- xref:jsf20-intro.adoc[Introduction to JavaServer Faces 2.x]
+- xref:quickstart-webapps-spring.adocl[Introduction to Spring Web MVC]
+- xref:grails-quickstart.adoc[Introduction to the Grails Web Framework]
+- xref:quickstart-webapps-struts.adoc[Introduction to the Struts Web Framework]
+- xref:quickstart-webapps-wicket.adoc[Introduction to the Wicket Web Framework]
+- xref:jsf20-support.adoc[JSF 2.x Support in NetBeans IDE]
+- xref:oracle-cloud.adoc[Running Web Applications on Oracle Cloud]
+- xref:section.adoc[]
+- xref:security-webapps.adoc[Securing a Web Application in NetBeans IDE]
+- xref:hibernate-webapp.adoc[Using Hibernate in a Web Application]
+- xref:js-toolkits-jquery.adoc[Using jQuery to Enhance the Appearance and Usability of a Web Page]
+- xref:index.adoc[Web Technologies Tutorials]
 ************************************************
 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/web/security-webapps.adoc b/netbeans.apache.org/src/content/kb/docs/web/security-webapps.adoc
index 3a4438efd..d8a5f83d1 100644
--- a/netbeans.apache.org/src/content/kb/docs/web/security-webapps.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web/security-webapps.adoc
@@ -46,7 +46,7 @@ image::images/netbeans-stamp-80-74-73.png[title="Content on this page applies to
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java EE version 
+|xref:../../../download/index.adoc[+NetBeans IDE+] |Java EE version 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Developer Kit (JDK)+] |Version 7 or 8 
 
@@ -663,13 +663,9 @@ In this tutorial, you created a secure web application. You edited security sett
 
 == See Also
 
-* link:quickstart-webapps.html[+Introduction to Developing Web Applications+]
-* link:../../trails/java-ee.html[+Java EE &amp; Java Web Learning Trail+]
+* xref:quickstart-webapps.adoc[Introduction to Developing Web Applications]
+* xref:../java-ee.adoc[Java EE &amp; Java Web Learning Trail]
 
 
-|===
-|
-link:/about/contact_form.html?to=3&subject=Feedback: Securing a Web Application[+Send Feedback on This Tutorial+]
-
- 
-|===
+xref:../../../community/mailing-lists.adoc[Send Feedback on This Tutorial]
+ 
\ No newline at end of file


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