more xref, use link: instead of direct http
diff --git a/netbeans.apache.org/src/content/about/history.adoc b/netbeans.apache.org/src/content/about/history.adoc
index cf63819..6803d72 100644
--- a/netbeans.apache.org/src/content/about/history.adoc
+++ b/netbeans.apache.org/src/content/about/history.adoc
@@ -25,11 +25,12 @@
 :toc: left
 :toc-title:
 :icons: font
+include::../inc/database.adoc[]
 
 == The student project
 
 NetBeans started as a student project (originally called Xelfi) in the Czech
-Republic, in 1996. The goal was to write a link:https://en.wikipedia.org/wiki/Delphi_%28IDE%29[Delphi]-like Java IDE (Integrated
+Republic, in 1996. The goal was to write a link:{wikipedia}Delphi_%28IDE%29[Delphi]-like Java IDE (Integrated
 Development Environment) in Java. 
 
 Xelfi was the first Java IDE written in Java, with its first pre-releases in
@@ -171,7 +172,7 @@
 products into one IDE.
 
 In August, 2010, NetBeans 6.9.1 was released with link:https://www.osgi.org/[OSGi support],
-bundling the link:http://felix.apache.org/[Apache Felix OSGi container]. It also
+bundling the link:https://felix.apache.org/[Apache Felix OSGi container]. It also
 supported link:https://openjfx.io/[JavaFX 1.3.1], was Java EE 6 compliant and
 included support for PHP, Ruby, C and C++ and many other features.
 
@@ -186,7 +187,7 @@
 NetBeans 7 was released together with JDK 7, providing editor tools for working
 with new JDK 7 language constructs, together with support for JavaFX 2.0.
 
-NetBeans 7.1 introduced link:http://wiki.netbeans.org/Netigso[Netigso] from (Net and 
+NetBeans 7.1 introduced xref:../wiki/OSGiAndNetBeans.adoc[Netigso] from (Net and 
 a reversed OSGi). This was reused in Oracle's JDeveloper as well,
 with link:http://wiki.apidesign.org/wiki/JDeveloper[important performance enhancements].
 
@@ -209,7 +210,7 @@
 == The Apache Incubator era
 
 In 2016 Oracle donated the source code of NetBeans to the link:https://www.apache.org/[Apache Software Foundation],
-and started as a podling in the link:http://incubator.apache.org/[Apache Incubator Project].
+and started as a podling in the link:https://incubator.apache.org/[Apache Incubator Project].
 
 During approximately two years and a half many volunteers joined the podling, and work started to
 adapt the codebase to comply with the Apache Software Foundation Guidelines. 
diff --git a/netbeans.apache.org/src/content/about/oracle-transition.adoc b/netbeans.apache.org/src/content/about/oracle-transition.adoc
index 12924b8..817a5f1 100644
--- a/netbeans.apache.org/src/content/about/oracle-transition.adoc
+++ b/netbeans.apache.org/src/content/about/oracle-transition.adoc
@@ -36,7 +36,7 @@
 
 As of March the 6th, 2021, we'll be standing on our own feet, and all the Apache NetBeans Project source and convenience binaries will be hosted by the link:https://www.apache.org/dev/infrastructure.html[Apache Infra Team].
 
-This means that we won't be able to host any binaries that are not produced by the Apache Software Foundation, as stated in the link:https://infra.apache.org/release-distribution[ASF Infra Release Distribution Policy] and in the link:http://www.apache.org/legal/release-policy.html#policy[Apache Release Policy].
+This means that we won't be able to host any binaries that are not produced by the Apache Software Foundation, as stated in the link:https://infra.apache.org/release-distribution[ASF Infra Release Distribution Policy] and in the link:https://www.apache.org/legal/release-policy.html#policy[Apache Release Policy].
 
 == Oracle's binaries and artifacts
 
@@ -44,7 +44,7 @@
 
 === Maven repository
 
-Jaroslav Tulach is hosting a Maven repository with all previous Oracle binaries at https://netbeans.apidesign.org/maven2/. You can use this repository by adding the following to your `pom.xml`:
+Jaroslav Tulach is hosting a Maven repository with all previous Oracle binaries at link:https://netbeans.apidesign.org/maven2/[https://netbeans.apidesign.org/maven2/]. You can use this repository by adding the following to your `pom.xml`:
 
 [code, xml]
 ----
diff --git a/netbeans.apache.org/src/content/community/events.adoc b/netbeans.apache.org/src/content/community/events.adoc
index 65b6713..a49fabd 100644
--- a/netbeans.apache.org/src/content/community/events.adoc
+++ b/netbeans.apache.org/src/content/community/events.adoc
@@ -35,7 +35,7 @@
 
 *Note:* From an Apache point of view what's important (besides trademarks being respected) is that all organizations are treated fairly and that it's clear that they cannot "own" the event or project. We need to make sure we don't favor commercial entities or organizations over others is a strong requirement of the ASF's 501c(3) status, so we're very picky about that. And besides this legal requirement, it's what makes the ASF a unique place where companies which might compete in the market can collaborate in a fair way, due to our very neutral status.
 
-For publicizing NetBeans events, the Apache News posts at https://blogs.apache.org/foundation/ can mention those events, best is to contact press@apache.org for that. Apache has an Event Listing (https://events.apache.org/), that we'd also like to make use of.
+For publicizing NetBeans events, the Apache News posts at link:https://blogs.apache.org/foundation/[https://blogs.apache.org/foundation/] can mention those events, best is to contact press@apache.org for that. Apache has an Event Listing (link:https://events.apache.org/[https://events.apache.org/]), that we'd also like to make use of.
 
 == Past NetBeans related events
 - link:https://www.youtube.com/watch?v=ivPjmsSS8iU/[Dawscon 2021 - Everyday coding in NetBeans]
@@ -47,14 +47,14 @@
 The Apache Software Foundation provides different resources for events and conferences:
 
 - link:https://www.apache.org/foundation/marks/events[Apache Event Branding Policy Overview].
-- link:http://community.apache.org/speakers/slides.html[Apache related slides], see also more link:http://community.apache.org/speakers/index.html[Speaker Support Materials] 
+- link:https://community.apache.org/speakers/slides.html[Apache related slides], see also more link:https://community.apache.org/speakers/index.html[Speaker Support Materials] 
 and link:https://community.apache.org/speakers/[Speaker information], including an Apache press kit.
 - The link:https://www.youtube.com/user/TheApacheFoundation/[ASF YouTube Channel] can be used to upload videos.
-- You can list yourself as a link:http://community.apache.org/speakers/speakers.html[potential speaker].
-- link:http://community.apache.org/calendars/conferences.html[Events calendar].
-- link:https://www.apache.org/events/meetups.html[Upcoming Apache-Related meetups].
+- You can list yourself as a link:https://community.apache.org/speakers/speakers.html[potential speaker].
+- link:https://community.apache.org/calendars/conferences.html[Events calendar].
+- link:http://www.apache.org/events/meetups.html[Upcoming Apache-Related meetups].
 
-Be sure to also check the Apache Software Foundation link:http://community.apache.org/[Apache Community Development] page.
+Be sure to also check the Apache Software Foundation link:https://community.apache.org/[Apache Community Development] page.
 
 
 
diff --git a/netbeans.apache.org/src/content/community/nekobean.adoc b/netbeans.apache.org/src/content/community/nekobean.adoc
index b6bd17b..ac331b3 100644
--- a/netbeans.apache.org/src/content/community/nekobean.adoc
+++ b/netbeans.apache.org/src/content/community/nekobean.adoc
@@ -99,5 +99,5 @@
 * In the case of personal use, you can use images without credit if you use them without modifying and editing them. 
 (In this case, modifying and editing don't mean scaling them and modifying their backgrounds. i.e. You can scale them and modify their backgrounds.)
 
-If you use images without credit, please add the link of this page(https://netbeans.apache.org/community/nekobean.html) if possible.
+If you use images without credit, please add the link of this page(xref:nekobean.adoc[https://netbeans.apache.org/community/nekobean.html]) if possible.
 
diff --git a/netbeans.apache.org/src/content/community/nekobean_ja.adoc b/netbeans.apache.org/src/content/community/nekobean_ja.adoc
index b228a4b..298dbf9 100644
--- a/netbeans.apache.org/src/content/community/nekobean_ja.adoc
+++ b/netbeans.apache.org/src/content/community/nekobean_ja.adoc
@@ -99,5 +99,5 @@
 * 個人で使用する場合で、画像を変更・編集なしで使用する場合、 クレジット表示なしで使用することができます。
 (ここで言う変更、編集には画像の拡大・縮小・背景画像変更は含みません)
 
-クレジット表示をされない場合、余裕があればねこび〜んのページ (https://netbeans.apache.org/community/nekobean_ja.html) へのリンクを追加してください。
+クレジット表示をされない場合、余裕があればねこび〜んのページ (xref:nekobean_ja.adoc[https://netbeans.apache.org/community/nekobean_ja.html]) へのリンクを追加してください。
 
diff --git a/netbeans.apache.org/src/content/download/dev/index.adoc b/netbeans.apache.org/src/content/download/dev/index.adoc
index dd394e0..f469b9a 100644
--- a/netbeans.apache.org/src/content/download/dev/index.adoc
+++ b/netbeans.apache.org/src/content/download/dev/index.adoc
@@ -36,9 +36,9 @@
 
 You can of course build Apache NetBeans from source. To do so:
 
-. Clone the https://github.com/apache/netbeans GitHub repository.
+. Clone the link:https://github.com/apache/netbeans[https://github.com/apache/netbeans] GitHub repository.
 . Install an LTS release of the Java Development Kit.
-. Install Apache Ant 1.10 or greater (https://ant.apache.org/).
+. Install Apache Ant 1.10 or greater (link:https://ant.apache.org/[https://ant.apache.org/]).
 . Set JAVA_HOME and ANT_HOME appropriately or leave them undefined.
 
 Once you're all set, enter the `netbeans` directory:
@@ -50,7 +50,7 @@
   ** Extract that zip in a place of your choosing and run `netbeans/bin/netbeans` (or `netbeans/bin/netbeans.exe` on Windows).
   ** Type `ant tryme` to run the Apache NetBeans IDE directly from the build folder rather than the zip for development purposes.
 
-For details, go here: https://cwiki.apache.org/confluence/display/NETBEANS/Development+Environment
+For details, go here: link:https://cwiki.apache.org/confluence/display/NETBEANS/Development+Environment[https://cwiki.apache.org/confluence/display/NETBEANS/Development+Environment]
 
 Now that you have built Apache NetBeans from source you may want to xref:../../participate/submit-pr.adoc[submit a pull request].
 
@@ -58,12 +58,12 @@
 
 This is a list of Apache NetBeans repositories:
 
-- https://github.com/apache/netbeans The main source code repository.
-- https://github.com/apache/netbeans-l10n Translation bundle repository.
-- https://github.com/apache/netbeans-website This website's repository.
-- https://github.com/apache/netbeans-website-cleanup A repository used to clean up existing documentation from http://netbeans.org
-- https://github.com/apache/netbeans-tools Tools and facilities in support of the Apache NetBeans project.
-- Emilian Bold has converted the previous Mercurial repository (http://hg.netbeans.org) to git, for historical reference, and has kindly uploaded it to GitHub at https://github.com/emilianbold/netbeans-releases. Thanks, Emilian!
+- link:https://github.com/apache/netbeans[https://github.com/apache/netbeans] The main source code repository.
+- link:https://github.com/apache/netbeans-l10n[https://github.com/apache/netbeans-l10n] Translation bundle repository.
+- link:https://github.com/apache/netbeans-website[https://github.com/apache/netbeans-website] This website's repository.
+- link:https://github.com/apache/netbeans-website-cleanup[https://github.com/apache/netbeans-website-cleanup] A repository used to clean up existing documentation from pass:[http://netbeans.org]
+- link:https://github.com/apache/netbeans-tools[https://github.com/apache/netbeans-tools] Tools and facilities in support of the Apache NetBeans project.
+- Emilian Bold has converted the previous Mercurial repository (pass:[http://hg.netbeans.org]) to git, for historical reference, and has kindly uploaded it to GitHub at https://github.com/emilianbold/netbeans-releases. Thanks, Emilian!
 
 
 
diff --git a/netbeans.apache.org/src/content/download/nb100/index.adoc b/netbeans.apache.org/src/content/download/nb100/index.adoc
index bebc41a..768fa85 100644
--- a/netbeans.apache.org/src/content/download/nb100/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb100/index.adoc
@@ -83,10 +83,10 @@
 
 JDK 11 support has been enhanced in the following ways:
 
-- Integration with the link:https://hg.netbeans.org/main/nb-java-x[nb-javac] project, adding support for JDK 11.
+- Integration with the link:https://github.com/oracle/nb-javac[nb-javac] project, adding support for JDK 11.
 - Removed the CORBA modules.
-- Support for link:http://openjdk.java.net/jeps/309[JEP 309, Dynamic Class-File Constants].
-- Support for link:http://openjdk.java.net/jeps/323[JEP 323, Local-Variable Syntax for Lambda Parameters].
+- Support for link:https://openjdk.org/jeps/309[JEP 309, Dynamic Class-File Constants].
+- Support for link:https://openjdk.org/jeps/323[JEP 323, Local-Variable Syntax for Lambda Parameters].
 - Support for link:https://cwiki.apache.org/confluence/display/NETBEANS/LVTI+Support+for+Lamdba+Parameters+in+NetBeans+10[LVTI Support for Lamdba Parameters]
 
 image:convert-to-var.png[New Hint to convert variable type to 'var' for lambda parameters(JDK 11 and above)]
diff --git a/netbeans.apache.org/src/content/download/nb100/nb100.adoc b/netbeans.apache.org/src/content/download/nb100/nb100.adoc
index 19ef76b..072c775 100644
--- a/netbeans.apache.org/src/content/download/nb100/nb100.adoc
+++ b/netbeans.apache.org/src/content/download/nb100/nb100.adoc
@@ -67,7 +67,7 @@
 To build Apache NetBeans (incubating) 10.0 from source you need:
 
 . Oracle's Java 8 or Open JDK v8.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb110/index.adoc b/netbeans.apache.org/src/content/download/nb110/index.adoc
index 28e7e54..7beeb89 100644
--- a/netbeans.apache.org/src/content/download/nb110/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb110/index.adoc
@@ -136,7 +136,7 @@
 
 ==== JEP-325: Switch Expressions (Preview)
 
-We now have link:http://openjdk.java.net/jeps/325[JEP-325] support. In order to enable
+We now have link:https://openjdk.org/jeps/325[JEP-325] support. In order to enable
 JEP-325 (and other preview features) follow these instructions:
 
 1. Goto `Project > Properties`
diff --git a/netbeans.apache.org/src/content/download/nb110/nb110.adoc b/netbeans.apache.org/src/content/download/nb110/nb110.adoc
index 93203b6..15bf1d3 100644
--- a/netbeans.apache.org/src/content/download/nb110/nb110.adoc
+++ b/netbeans.apache.org/src/content/download/nb110/nb110.adoc
@@ -76,7 +76,7 @@
 To build Apache NetBeans (incubating) 11.0 from source you need:
 
 . Oracle's Java 8 or Open JDK v8.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb111/nb111.adoc b/netbeans.apache.org/src/content/download/nb111/nb111.adoc
index 27053a8..58bf07a 100644
--- a/netbeans.apache.org/src/content/download/nb111/nb111.adoc
+++ b/netbeans.apache.org/src/content/download/nb111/nb111.adoc
@@ -85,7 +85,7 @@
 To build Apache NetBeans 11.1 from source you need:
 
 . Oracle's Java 8 or OpenJDK v8.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb112/index.adoc b/netbeans.apache.org/src/content/download/nb112/index.adoc
index 9f845b7..9425747 100644
--- a/netbeans.apache.org/src/content/download/nb112/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb112/index.adoc
@@ -44,21 +44,21 @@
 
 The highlights of enhancements in the Java area are focused on support for JDK 13.
 
-- link:https://openjdk.java.net/jeps/354[JEP 354]: Switch Expressions (Preview Feature): 
+- link:https://openjdk.org/jeps/354[JEP 354]: Switch Expressions (Preview Feature): 
 
 [.feature]
 --
 image::jdk13-yield.png[role="left", link="jdk13-yield.png"]
 -- 
 
-- link:https://openjdk.java.net/jeps/355[JEP 355]: Text Blocks (Preview Feature)
+- link:https://openjdk.org/jeps/355[JEP 355]: Text Blocks (Preview Feature)
 
 [.feature]
 --
 image::jdk13-textblock.png[role="left", link="jdk13-textblock.png"]
 --  
 
-TIP: link:https://openjdk.java.net/jeps/12[JEP 12] provides for a preview language or VM feature, which "is a new feature of the Java SE Platform that is fully specified, fully implemented, and yet impermanent. It is available in a JDK feature release to provoke developer feedback based on real world use; this may lead to it becoming permanent in a future Java SE Platform".
+TIP: link:https://openjdk.org/jeps/12[JEP 12] provides for a preview language or VM feature, which "is a new feature of the Java SE Platform that is fully specified, fully implemented, and yet impermanent. It is available in a JDK feature release to provoke developer feedback based on real world use; this may lead to it becoming permanent in a future Java SE Platform".
 
 Preview features can only be used if the Java compiler's `--enable-preview` flag is set, as shown below for Maven. 
 
diff --git a/netbeans.apache.org/src/content/download/nb112/nb112.adoc b/netbeans.apache.org/src/content/download/nb112/nb112.adoc
index 8ce66c1..fda7824 100644
--- a/netbeans.apache.org/src/content/download/nb112/nb112.adoc
+++ b/netbeans.apache.org/src/content/download/nb112/nb112.adoc
@@ -58,7 +58,7 @@
 link:https://archive.apache.org/dist/netbeans/netbeans/11.2/Apache-NetBeans-11.2-bin-windows-x64.exe.sha512[SHA-512],
 link:https://archive.apache.org/dist/netbeans/netbeans/11.2/Apache-NetBeans-11.2-bin-windows-x64.exe.asc[PGP ASC])
 * link:https://archive.apache.org/dist/netbeans/netbeans/11.2/Apache-NetBeans-11.2-bin-linux-x64.sh[Apache-NetBeans-11.2-bin-linux-x64.sh] (
-link:https://archive.apache.org/dist/netbeans/11.2/Apache-NetBeans-11.2-bin-linux-x64.sh.sha512[SHA-512],
+link:https://archive.apache.org/dist/netbeans/netbeans/11.2/Apache-NetBeans-11.2-bin-linux-x64.sh.sha512[SHA-512],
 link:https://archive.apache.org/dist/netbeans/netbeans/11.2/Apache-NetBeans-11.2-bin-linux-x64.sh.asc[PGP ASC])
 * link:https://archive.apache.org/dist/netbeans/netbeans/11.2/Apache-NetBeans-11.2-bin-macosx.dmg[Apache-NetBeans-11.2-bin-macosx.dmg] (
 link:https://archive.apache.org/dist/netbeans/netbeans/11.2/Apache-NetBeans-11.2-bin-macosx.dmg.sha512[SHA-512],
@@ -84,7 +84,7 @@
 To build Apache NetBeans 11.2 from source you need:
 
 . Oracle's Java 8 or OpenJDK v8.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb113/index.adoc b/netbeans.apache.org/src/content/download/nb113/index.adoc
index 884fbb4..7ff769d 100644
--- a/netbeans.apache.org/src/content/download/nb113/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb113/index.adoc
@@ -45,21 +45,21 @@
 
 The highlights of enhancements in the Java area are focused on support for JDK 14.
 
-- link:https://openjdk.java.net/jeps/359[JEP 359]: Records (Preview Feature) -- syntax coloring for the new "record" keyword; Navigator shows equals, hashCode, toString, etc; and formatting support for records.
+- link:https://openjdk.org/jeps/359[JEP 359]: Records (Preview Feature) -- syntax coloring for the new "record" keyword; Navigator shows equals, hashCode, toString, etc; and formatting support for records.
 
 [.feature]
 --
 image::record-keyword.png[role="left", link="record-keyword.png"]
 -- 
 
-- link:https://openjdk.java.net/jeps/305[JEP 305]: Pattern Matching for instanceof (Preview Feature) 
+- link:https://openjdk.org/jeps/305[JEP 305]: Pattern Matching for instanceof (Preview Feature) 
 
 [.feature]
 --
 image::ezgif.com-video-to-gif.gif[role="left", link="ezgif.com-video-to-gif.gif"]
 --  
 
-TIP: link:https://openjdk.java.net/jeps/12[JEP 12] provides for a preview language or VM feature, which "is a new feature of the Java SE Platform that is fully specified, fully implemented, and yet impermanent. It is available in a JDK feature release to provoke developer feedback based on real world use; this may lead to it becoming permanent in a future Java SE Platform".
+TIP: link:https://openjdk.org/jeps/12[JEP 12] provides for a preview language or VM feature, which "is a new feature of the Java SE Platform that is fully specified, fully implemented, and yet impermanent. It is available in a JDK feature release to provoke developer feedback based on real world use; this may lead to it becoming permanent in a future Java SE Platform".
 
 Preview features can only be used if the Java compiler's `--enable-preview` flag is set, as shown below for Maven. 
 
@@ -95,9 +95,9 @@
 
 Other enhancements in the Java area.
 
-- link:https://openjdk.java.net/jeps/330[JEP 330]: Launch Single-File Source-Code Programs -- single Java source files can be created, outside of projects, in the Favorites window, and they can be run and debugged, if NetBeans is running on JDK 11 or later.
+- link:https://openjdk.org/jeps/330[JEP 330]: Launch Single-File Source-Code Programs -- single Java source files can be created, outside of projects, in the Favorites window, and they can be run and debugged, if NetBeans is running on JDK 11 or later.
  
-- link:https://openjdk.java.net/jeps/355[JEP 355]: Text Blocks (Preview) -- in addition to the Text Block features introduced to the Java Editor in previous 11.x releases, a new Java editor hint has been introduced in 11.3 for reverting from Text Block to String. 
+- link:https://openjdk.org/jeps/355[JEP 355]: Text Blocks (Preview) -- in addition to the Text Block features introduced to the Java Editor in previous 11.x releases, a new Java editor hint has been introduced in 11.3 for reverting from Text Block to String. 
 
 === Java EE
 
diff --git a/netbeans.apache.org/src/content/download/nb113/nb113.adoc b/netbeans.apache.org/src/content/download/nb113/nb113.adoc
index 2cae9cf..24b66b3 100644
--- a/netbeans.apache.org/src/content/download/nb113/nb113.adoc
+++ b/netbeans.apache.org/src/content/download/nb113/nb113.adoc
@@ -62,7 +62,7 @@
 
 - Javadoc for this release is available at https://bits.netbeans.org/11.3/javadoc
 
-TIP: The installers will NOT run under JDK 14 because usage is made of the Pack200 Tools and API, for packing and unpacking, which is removed in JDK 14, see link:https://openjdk.java.net/jeps/367[JEP 367]. 
+TIP: The installers will NOT run under JDK 14 because usage is made of the Pack200 Tools and API, for packing and unpacking, which is removed in JDK 14, see link:https://openjdk.org/jeps/367[JEP 367]. 
 
 ////
 NOTE: Using https below is highly recommended.
diff --git a/netbeans.apache.org/src/content/download/nb120/index.adoc b/netbeans.apache.org/src/content/download/nb120/index.adoc
index 4dece36..572af4f 100644
--- a/netbeans.apache.org/src/content/download/nb120/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb120/index.adoc
@@ -57,14 +57,14 @@
 
 ==== Java 14
 
-- link:https://openjdk.java.net/jeps/359[JEP 359]: Records (Preview Feature) -- syntax coloring for the new "record" keyword; Navigator shows equals, hashCode, toString, etc; and formatting support for records.
+- link:https://openjdk.org/jeps/359[JEP 359]: Records (Preview Feature) -- syntax coloring for the new "record" keyword; Navigator shows equals, hashCode, toString, etc; and formatting support for records.
 
 [.feature]
 --
 image::record-keyword.png[role="left", link="record-keyword.png"]
 -- 
 
-- link:https://openjdk.java.net/jeps/305[JEP 305]: Pattern Matching for instanceof (Preview Feature) 
+- link:https://openjdk.org/jeps/305[JEP 305]: Pattern Matching for instanceof (Preview Feature) 
 
 [.feature]
 --
@@ -73,7 +73,7 @@
 
 ==== Java 13
 
-- link:https://openjdk.java.net/jeps/355[JEP 355]: Text Blocks (Preview) -- Java editor hint has been introduced for converting to/from text blocks.
+- link:https://openjdk.org/jeps/355[JEP 355]: Text Blocks (Preview) -- Java editor hint has been introduced for converting to/from text blocks.
 
 [.feature]
 --
@@ -87,14 +87,14 @@
 
 ==== Java 12
 
-- link:https://openjdk.java.net/jeps/325[JEP 325]: Switch Expressions (Preview) – code completion for JEP-325 preview feature for multiple case labels, as shown below.
+- link:https://openjdk.org/jeps/325[JEP 325]: Switch Expressions (Preview) – code completion for JEP-325 preview feature for multiple case labels, as shown below.
 
 [.feature]
 --
 image::code-completion-multiple-case-2.png[role="left", link="code-completion-multiple-case-2.png"]
 -- 
 
-TIP: link:https://openjdk.java.net/jeps/12[JEP 12], introduced in JDK 12, provides for a preview language or VM feature, which "is a new feature of the Java SE Platform that is fully specified, fully implemented, and yet impermanent. It is available in a JDK feature release to provoke developer feedback based on real world use; this may lead to it becoming permanent in a future Java SE Platform".
+TIP: link:https://openjdk.org/jeps/12[JEP 12], introduced in JDK 12, provides for a preview language or VM feature, which "is a new feature of the Java SE Platform that is fully specified, fully implemented, and yet impermanent. It is available in a JDK feature release to provoke developer feedback based on real world use; this may lead to it becoming permanent in a future Java SE Platform".
 
 Preview features can only be used if the Java compiler's `--enable-preview` flag is set, as shown below for Maven. 
 
@@ -128,7 +128,7 @@
 
 ==== Java 11
  
-- link:https://openjdk.java.net/jeps/330[JEP 330]: Launch Single-File Source-Code Programs -- single Java source files can be created, outside of projects, in the Favorites window, and they can be run and debugged, if NetBeans is running on JDK 11 or later.
+- link:https://openjdk.org/jeps/330[JEP 330]: Launch Single-File Source-Code Programs -- single Java source files can be created, outside of projects, in the Favorites window, and they can be run and debugged, if NetBeans is running on JDK 11 or later.
 
 === JavaFX
 
diff --git a/netbeans.apache.org/src/content/download/nb121/index.adoc b/netbeans.apache.org/src/content/download/nb121/index.adoc
index 663d2e3..878a39f 100644
--- a/netbeans.apache.org/src/content/download/nb121/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb121/index.adoc
@@ -48,10 +48,10 @@
 
 == Java Editor
 
-- nb-javac for Java 14 usage when running NetBeans on earlier JDK releases (https://github.com/apache/netbeans/pull/2277)
-- New file template for creating Records (https://github.com/apache/netbeans/pull/2183)
-- Better support for code completion for Records (https://github.com/apache/netbeans/pull/2222)
-- Refactoring support for Records (https://github.com/apache/netbeans/pull/2164)
+- nb-javac for Java 14 usage when running NetBeans on earlier JDK releases (link:https://github.com/apache/netbeans/pull/2277[https://github.com/apache/netbeans/pull/2277])
+- New file template for creating Records (link:https://github.com/apache/netbeans/pull/2183[https://github.com/apache/netbeans/pull/2183])
+- Better support for code completion for Records (link:https://github.com/apache/netbeans/pull/2222[https://github.com/apache/netbeans/pull/2222])
+- Refactoring support for Records (link:https://github.com/apache/netbeans/pull/2164[https://github.com/apache/netbeans/pull/2164])
 
 === C/C++
 
@@ -62,7 +62,7 @@
 - Code completion and other editing support is through the Language Server Protocol, using the ccls language server, which the users need to provide themselves;
 -- A *very* rudimentary debugger using gdb (based on the Ant debugger, and gdb interface from CND).
 
-More details: https://github.com/apache/netbeans/pull/2234
+More details: link:https://github.com/apache/netbeans/pull/2234[https://github.com/apache/netbeans/pull/2234]
 
 === Gradle
 
@@ -71,19 +71,19 @@
 
 === PHP
 
-- Add new actions for Composer (https://github.com/apache/netbeans/pull/2173)
-- Show `false` and `true` instead of `0` and `1` as boolean values in the Variables window of the debugger (https://github.com/apache/netbeans/pull/2178)
-- Improve/Fix code analysis features(e.g.https://github.com/apache/netbeans/pull/2246, https://github.com/apache/netbeans/pull/2249)
+- Add new actions for Composer (link:https://github.com/apache/netbeans/pull/2173[https://github.com/apache/netbeans/pull/2173])
+- Show `false` and `true` instead of `0` and `1` as boolean values in the Variables window of the debugger (link:https://github.com/apache/netbeans/pull/2178[https://github.com/apache/netbeans/pull/2178])
+- Improve/Fix code analysis features(e.g.link:https://github.com/apache/netbeans/pull/2246[https://github.com/apache/netbeans/pull/2246], link:https://github.com/apache/netbeans/pull/2249[https://github.com/apache/netbeans/pull/2249])
 
 == HTML
 
-- Update the validator.jar (https://github.com/apache/netbeans/pull/2217)
-- Enable the code template completion (https://github.com/apache/netbeans/pull/2253)
-- Code completion and syntax highlighting for <script type="module"></script> (https://github.com/apache/netbeans/pull/2184)
+- Update the validator.jar (link:https://github.com/apache/netbeans/pull/2217[https://github.com/apache/netbeans/pull/2217])
+- Enable the code template completion (link:https://github.com/apache/netbeans/pull/2253[https://github.com/apache/netbeans/pull/2253])
+- Code completion and syntax highlighting for <script type="module"></script> (link:https://github.com/apache/netbeans/pull/2184[https://github.com/apache/netbeans/pull/2184])
 
 === CSS
 
-- Add formatting options (https://github.com/apache/netbeans/pull/2257) only "Tabs And Indents"
+- Add formatting options (link:https://github.com/apache/netbeans/pull/2257[https://github.com/apache/netbeans/pull/2257]) only "Tabs And Indents"
 
 === Miscellaneous
 
diff --git a/netbeans.apache.org/src/content/download/nb121/nb121.adoc b/netbeans.apache.org/src/content/download/nb121/nb121.adoc
index 4240bc2..3e85f93 100644
--- a/netbeans.apache.org/src/content/download/nb121/nb121.adoc
+++ b/netbeans.apache.org/src/content/download/nb121/nb121.adoc
@@ -104,7 +104,7 @@
 To build Apache NetBeans 12.1 from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb122/nb122.adoc b/netbeans.apache.org/src/content/download/nb122/nb122.adoc
index 0a61bd9..998b457 100644
--- a/netbeans.apache.org/src/content/download/nb122/nb122.adoc
+++ b/netbeans.apache.org/src/content/download/nb122/nb122.adoc
@@ -82,7 +82,7 @@
 To build Apache NetBeans 12.2 from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb123/nb123.adoc b/netbeans.apache.org/src/content/download/nb123/nb123.adoc
index e009e6e..ad6778e 100644
--- a/netbeans.apache.org/src/content/download/nb123/nb123.adoc
+++ b/netbeans.apache.org/src/content/download/nb123/nb123.adoc
@@ -83,7 +83,7 @@
 To build Apache NetBeans 12.3 from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb124/index.adoc b/netbeans.apache.org/src/content/download/nb124/index.adoc
index 20694f8..2ba2b3c 100644
--- a/netbeans.apache.org/src/content/download/nb124/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb124/index.adoc
@@ -43,16 +43,16 @@
 
 === Java 16 Support
  - Java 16, the latest release of Java at the time of Apache NetBeans 12.4, is supported, including nb-javac which has been upgraded to support Java 16. 
-nbjavac-upgrade-to-jdk-16: https://github.com/apache/netbeans/pull/2899
- - Replace usage of JDK internal, or in-house Base64 codecs by java.util.Base64: https://github.com/apache/netbeans/pull/2874
+nbjavac-upgrade-to-jdk-16: link:https://github.com/apache/netbeans/pull/2899[https://github.com/apache/netbeans/pull/2899]
+ - Replace usage of JDK internal, or in-house Base64 codecs by java.util.Base64: link:https://github.com/apache/netbeans/pull/2874[https://github.com/apache/netbeans/pull/2874]
 
 === Install OpenJDK 
 Go to Tools | Java Platform, click Add Platform, and then "Remote Universal OpenJDK Service", and you'll be able to download and register OpenJDK distros of your choice.
-https://github.com/apache/netbeans/pull/2854
-https://github.com/apache/netbeans/pull/2896
+link:https://github.com/apache/netbeans/pull/2854[https://github.com/apache/netbeans/pull/2854]
+link:https://github.com/apache/netbeans/pull/2896[https://github.com/apache/netbeans/pull/2896]
 
 === Jakarta EE
-Jakarta EE 9 Project Support: https://github.com/apache/netbeans/pull/2684
+Jakarta EE 9 Project Support: link:https://github.com/apache/netbeans/pull/2684[https://github.com/apache/netbeans/pull/2684]
 
 === Micronaut
 In the New Project dialog, choose "Java with Maven" and then "Micronaut Project", to get started with Micronaut development in Apache NetBeans 12.4.
@@ -62,48 +62,48 @@
  - HyperlinkProvider for Micronaut yaml config files implemented
  - WhereUsed RefactoringPlugin for Micronaut yaml config files implemented
  
-https://github.com/apache/netbeans/pull/2812
+link:https://github.com/apache/netbeans/pull/2812[https://github.com/apache/netbeans/pull/2812]
 
 === Payara
-Automatically detect & list Payara Platform version in the server registration panel: https://github.com/apache/netbeans/pull/2409
+Automatically detect & list Payara Platform version in the server registration panel: link:https://github.com/apache/netbeans/pull/2409[https://github.com/apache/netbeans/pull/2409]
 
 === Maven
- - Support for VM/app argument injection to (Maven) run and debug project actions: https://github.com/apache/netbeans/pull/2731
- - Avoid NPE when executing some Maven projects: https://github.com/apache/netbeans/pull/2833
+ - Support for VM/app argument injection to (Maven) run and debug project actions: link:https://github.com/apache/netbeans/pull/2731[https://github.com/apache/netbeans/pull/2731]
+ - Avoid NPE when executing some Maven projects: link:https://github.com/apache/netbeans/pull/2833[https://github.com/apache/netbeans/pull/2833]
 
 === Gradle
- - Upgrade Gradle Tooling to 7.0: https://github.com/apache/netbeans/pull/2861
- - Support Gradle Source Groups from Alien Projects: https://github.com/apache/netbeans/pull/2779
- - Fix NPE on Gradle settings when no network connection: https://github.com/apache/netbeans/pull/2879
- - Upgradle to JaCoCo 0.8.6 for Gradle Code Coverage: https://github.com/apache/netbeans/pull/2893
- - Clear NB Non-Project cache when we have more info from Gradle: https://github.com/apache/netbeans/pull/2837
+ - Upgrade Gradle Tooling to 7.0: link:https://github.com/apache/netbeans/pull/2861[https://github.com/apache/netbeans/pull/2861]
+ - Support Gradle Source Groups from Alien Projects: link:https://github.com/apache/netbeans/pull/2779[https://github.com/apache/netbeans/pull/2779]
+ - Fix NPE on Gradle settings when no network connection: link:https://github.com/apache/netbeans/pull/2879[https://github.com/apache/netbeans/pull/2879]
+ - Upgradle to JaCoCo 0.8.6 for Gradle Code Coverage: link:https://github.com/apache/netbeans/pull/2893[https://github.com/apache/netbeans/pull/2893]
+ - Clear NB Non-Project cache when we have more info from Gradle: link:https://github.com/apache/netbeans/pull/2837[https://github.com/apache/netbeans/pull/2837]
 
 === Ant
- - Support Ant Freeform projects with source Level 9+: https://github.com/apache/netbeans/pull/2794
- - Update nbbuild freeform project to open without errors: https://github.com/apache/netbeans/pull/2798
- - Improve Java/Jakarta EE with Ant based projects: https://github.com/apache/netbeans/pull/2491
+ - Support Ant Freeform projects with source Level 9+: link:https://github.com/apache/netbeans/pull/2794[https://github.com/apache/netbeans/pull/2794]
+ - Update nbbuild freeform project to open without errors: link:https://github.com/apache/netbeans/pull/2798[https://github.com/apache/netbeans/pull/2798]
+ - Improve Java/Jakarta EE with Ant based projects: link:https://github.com/apache/netbeans/pull/2491[https://github.com/apache/netbeans/pull/2491]
 
 == Web Frontend Enhancements
 
 === PHP Enhancements
- - PHP 8.0 Support: Named Arguments: https://github.com/apache/netbeans/pull/2894
- - Prevent generating abstract methods with PHPDoc return array type: https://github.com/apache/netbeans/pull/2886
- - Improved Fix Uses dialog: https://github.com/apache/netbeans/pull/2755
- - Fixed compatibility with Phing 3: https://github.com/apache/netbeans/pull/2776
- - Show new configuration files for PHP-CS-Fixer 3 in Important files : https://github.com/apache/netbeans/pull/2880
+ - PHP 8.0 Support: Named Arguments: link:https://github.com/apache/netbeans/pull/2894[https://github.com/apache/netbeans/pull/2894]
+ - Prevent generating abstract methods with PHPDoc return array type: link:https://github.com/apache/netbeans/pull/2886[https://github.com/apache/netbeans/pull/2886]
+ - Improved Fix Uses dialog: link:https://github.com/apache/netbeans/pull/2755[https://github.com/apache/netbeans/pull/2755]
+ - Fixed compatibility with Phing 3: link:https://github.com/apache/netbeans/pull/2776[https://github.com/apache/netbeans/pull/2776]
+ - Show new configuration files for PHP-CS-Fixer 3 in Important files : link:https://github.com/apache/netbeans/pull/2880[https://github.com/apache/netbeans/pull/2880]
 
 === HTML
- - Improved code completion for HTML forms: https://github.com/apache/netbeans/pull/2739
+ - Improved code completion for HTML forms: link:https://github.com/apache/netbeans/pull/2739[https://github.com/apache/netbeans/pull/2739]
 
 == Miscellaneous Enhancements
 
 === Markdown
- - Files with extension ".md" are recognized, with a special icon, and basic syntax coloring: https://github.com/apache/netbeans/pull/1428
+ - Files with extension ".md" are recognized, with a special icon, and basic syntax coloring: link:https://github.com/apache/netbeans/pull/1428[https://github.com/apache/netbeans/pull/1428]
 
 === FlatLaf Enhancements
- - Update FlatLaf from 1.0 to 1.1.1 and added "FlatLaf" options: https://github.com/apache/netbeans/pull/2839
- - Fix/improve styling of quicksearch field in menubar: https://github.com/apache/netbeans/pull/2900
- - Update from 1.1.1 to 1.1.2 and fix/improve options: https://github.com/apache/netbeans/pull/2872
+ - Update FlatLaf from 1.0 to 1.1.1 and added "FlatLaf" options: link:https://github.com/apache/netbeans/pull/2839[https://github.com/apache/netbeans/pull/2839]
+ - Fix/improve styling of quicksearch field in menubar: link:https://github.com/apache/netbeans/pull/2900[https://github.com/apache/netbeans/pull/2900]
+ - Update from 1.1.1 to 1.1.2 and fix/improve options: link:https://github.com/apache/netbeans/pull/2872[https://github.com/apache/netbeans/pull/2872]
 
 === Error Notifications 
- - Always display errors as an icon in bottom right corner in development builds: https://github.com/apache/netbeans/pull/2888
+ - Always display errors as an icon in bottom right corner in development builds: link:https://github.com/apache/netbeans/pull/2888[https://github.com/apache/netbeans/pull/2888]
diff --git a/netbeans.apache.org/src/content/download/nb124/nb124.adoc b/netbeans.apache.org/src/content/download/nb124/nb124.adoc
index f0b87a1..0036435 100644
--- a/netbeans.apache.org/src/content/download/nb124/nb124.adoc
+++ b/netbeans.apache.org/src/content/download/nb124/nb124.adoc
@@ -82,7 +82,7 @@
 To build Apache NetBeans 12.4 from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb125/nb125.adoc b/netbeans.apache.org/src/content/download/nb125/nb125.adoc
index 7a9c62d..ba5974c 100644
--- a/netbeans.apache.org/src/content/download/nb125/nb125.adoc
+++ b/netbeans.apache.org/src/content/download/nb125/nb125.adoc
@@ -82,7 +82,7 @@
 To build Apache NetBeans 12.5 from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb126/nb126.adoc b/netbeans.apache.org/src/content/download/nb126/nb126.adoc
index 386cd27..faaeff8 100644
--- a/netbeans.apache.org/src/content/download/nb126/nb126.adoc
+++ b/netbeans.apache.org/src/content/download/nb126/nb126.adoc
@@ -84,7 +84,7 @@
 To build Apache NetBeans 12.6 from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb13/nb13.adoc b/netbeans.apache.org/src/content/download/nb13/nb13.adoc
index 6e89e9c..8752a9d 100644
--- a/netbeans.apache.org/src/content/download/nb13/nb13.adoc
+++ b/netbeans.apache.org/src/content/download/nb13/nb13.adoc
@@ -90,7 +90,7 @@
 To build Apache NetBeans 13 from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb14/index.adoc b/netbeans.apache.org/src/content/download/nb14/index.adoc
index 7217cb1..22fbb7e 100644
--- a/netbeans.apache.org/src/content/download/nb14/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb14/index.adoc
@@ -105,7 +105,7 @@
 To build Apache NetBeans {netbeans-version} from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb15/index.adoc b/netbeans.apache.org/src/content/download/nb15/index.adoc
index 0db27c6..5311b31 100644
--- a/netbeans.apache.org/src/content/download/nb15/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb15/index.adoc
@@ -105,7 +105,7 @@
 To build Apache NetBeans {netbeans-version} from source you need:
 
 . A distribution of OpenJDK 8 or 11.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/download/nb90/index.adoc b/netbeans.apache.org/src/content/download/nb90/index.adoc
index c747c93..d6cf86a 100644
--- a/netbeans.apache.org/src/content/download/nb90/index.adoc
+++ b/netbeans.apache.org/src/content/download/nb90/index.adoc
@@ -99,7 +99,7 @@
 --
 image:nb90-module-info.png[Adding module-info.java, title="Adding module-info.java", role="left", link="nb90-module-info.png"]
 
-NetBeans 9 supports link:http://openjdk.java.net/projects/jigsaw/spec/[JPMS (Jigsaw)]. 
+NetBeans 9 supports link:https://openjdk.org/projects/jigsaw/spec/[JPMS (Jigsaw)]. 
 
 Modulepath was added as a paradigm to NetBeans in addition to Classpath.
 
@@ -132,7 +132,7 @@
 --
 image:nb90-javashell.png[Java Shell Support, title="Java Shell Support", role="left", link="nb90-javashell.png"]
 
-Java Shell is a new tool included in JDK9 defined in link:http://openjdk.java.net/jeps/222[JEP 222] to introduce REPL
+Java Shell is a new tool included in JDK9 defined in link:https://openjdk.org/jeps/222[JEP 222] to introduce REPL
 (read-eval-print-loop) capabilities to Java. 
 
 NetBeans provides integrated console-like UI for the Java Shell, leveraing NetBeans editor capabilites.
diff --git a/netbeans.apache.org/src/content/download/nb90/nb90.adoc b/netbeans.apache.org/src/content/download/nb90/nb90.adoc
index c5e9991..3b239e7 100644
--- a/netbeans.apache.org/src/content/download/nb90/nb90.adoc
+++ b/netbeans.apache.org/src/content/download/nb90/nb90.adoc
@@ -67,7 +67,7 @@
 To build Apache NetBeans (incubating) from source you need:
 
 . Oracle's Java 8 or Open JDK v8.
-. Apache Ant 1.10 or greater (https://ant.apache.org).
+. Apache Ant 1.10 or greater (link:https://ant.apache.org[https://ant.apache.org]).
 
 Once you have everything installed then:
 
diff --git a/netbeans.apache.org/src/content/help/commercial-support.adoc b/netbeans.apache.org/src/content/help/commercial-support.adoc
index 4c01af1..a8f83ad 100644
--- a/netbeans.apache.org/src/content/help/commercial-support.adoc
+++ b/netbeans.apache.org/src/content/help/commercial-support.adoc
@@ -38,9 +38,9 @@
 
 | Oliver Rettig
 | Java Swing,NetBeans APIs, NetBeans Platform
-| Oliver Rettig is a scientist in the field of motion analysis and a Java developer with a decade of experience in scientific desktop  application development, usually based on Swing and the NetBeans Platform (http://upperlimb.orat.de and  http://www.motion-science.org/). Oliver is available for work through his own company ORAT (http://www.orat.de).
+| Oliver Rettig is a scientist in the field of motion analysis and a Java developer with a decade of experience in scientific desktop  application development, usually based on Swing and the NetBeans Platform (link:http://upperlimb.orat.de[http://upperlimb.orat.de] and  link:http://www.motion-science.org/[http://www.motion-science.org/]). Oliver is available for work through his own company ORAT (link:http://www.orat.de[http://www.orat.de]).
 | Karlsruhe, Germany
-| link:mailto:oliver.rettig@orat.de[oliver.rettig@orat.de], http://www.orat.de
+| link:mailto:oliver.rettig@orat.de[oliver.rettig@orat.de], link:http://www.orat.de[http://www.orat.de]
 
 |====
 
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 757731f..da87975 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
@@ -44,7 +44,7 @@
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[version 7.4 or 8.0 with NetBeans C/C{pp} plugin] 
+|NetBeans IDE |xref:../../../download/index.adoc[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] 
 
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 ceb6be6..1291899 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
@@ -28,6 +28,8 @@
 :toc-title:
 :description: Adding Unit Tests to a C Project - NetBeans IDE Tutorial - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Adding Unit Tests to a C Project - NetBeans IDE Tutorial
+include::../../../inc/database.adoc[]
+
 
 _Contributed by link:mailto:susanm@netbeans.org[+_Susan Morgan_+] 
 March 2014_ [Revision number: V8.0-1]
@@ -40,7 +42,7 @@
 |===
 |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{pp} plugin] 
+|NetBeans IDE (including C/C++/Fortran support) |xref:../../../download/index.adoc[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] 
 
@@ -120,7 +122,7 @@
 [[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:{wikipedia}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]
@@ -267,7 +269,7 @@
 
 === How to Install CUnit on Windows and Cygwin
 
-In Cygwin you can install CUnit using the standard Cygwin installer, setup-x86.exe or setup-x86_64.exe, available from http://cygwin.com/install.html. The CUnit package is located in the "Libs" category and you can install it in the same way you install other packages.
+In Cygwin you can install CUnit using the standard Cygwin installer, setup-x86.exe or setup-x86_64.exe, available from link:http://cygwin.com/install.html[http://cygwin.com/install.html]. The CUnit package is located in the "Libs" category and you can install it in the same way you install other packages.
 
 Be sure to use the correct version. You must use 64-bit Cygwin and CUnit if you are running 64-bit NetBeans IDE.
 
@@ -687,7 +689,7 @@
 
 == 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{pp} 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 xref:../../../wiki/CND69UnitTestsPluginTutotial.adoc[C/C{pp} Unit Test Plugin Tutorial] on the NetBeans wiki.
 
 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 9a05ce6..1f118f6 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,7 +42,7 @@
 |===
 |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{pp} plugin] 
+|NetBeans IDE (including C/C++ support) |xref:../../../download/index.adoc[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 ] 
 |===
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 656bd90..b1283ec 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/debugging.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/debugging.adoc
@@ -42,7 +42,7 @@
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[version 7.4 or 8.0 with NetBeans C/C{pp} plugin module] 
+|NetBeans IDE |xref:../../../download/index.adoc[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] 
 |===
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 9efdfa1..f19e217 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/depchecking.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/depchecking.adoc
@@ -28,6 +28,8 @@
 :toc-title:
 :description: Make Dependency Checking - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Make Dependency Checking
+include::../../../inc/database.adoc[]
+
 
 Contributed by Alexey Vladykin
 March 2014 [Revision number: V8.0-1]
@@ -46,7 +48,7 @@
 |===
 |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{pp} plugin] 
+|NetBeans IDE (including C/C++ support) |xref:../../../download/index.adoc[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] 
 |===
@@ -167,7 +169,7 @@
 
 == References
 
-1. link:http://en.wikipedia.org/wiki/Make_%28software%29[Wikipedia article about  ``make`` ]
+1. link:{wikipedia}Make_%28software%29[Wikipedia article about  ``make`` ]
 2. link:http://make.paulandlesley.org/autodep.html[Advanced Auto-Dependency Generation]
 
 
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 73b0222..38a71ac 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,7 +45,7 @@
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[version 7.3 or more recent with NetBeans C/C{pp} plugin] 
+|NetBeans IDE |xref:../../../download/index.adoc[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] 
 |===
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 2228fb0..c0b671f 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,7 +42,7 @@
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[ version 7.4 or 8.0 with NetBeans C/C{pp} plugin] 
+|NetBeans IDE |xref../../../download/index.adoc[ 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] 
 |===
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 bc001d7..1d3f425 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/quickstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/quickstart.adoc
@@ -46,7 +46,7 @@
 |===
 |Software or Resource |Version Required 
 
-|NetBeans IDE |link:https://netbeans.org/downloads/index.html[ version 7.2 or more recent with NetBeans C/C{pp} plugin] 
+|NetBeans IDE |xref:../../../download/index.adoc[ 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] 
 
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 7bbfc38..8b5d0cf 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
@@ -28,6 +28,8 @@
 :toc-title:
 :description: C/C++ Remote Development - NetBeans IDE Tutorial - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, C/C++ Remote Development - NetBeans IDE Tutorial
+include::../../../inc/database.adoc[]
+
 
 March 2014 [Revision number: V8.0-1]
 
@@ -41,7 +43,7 @@
 |===
 |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{pp} plugin] 
+|NetBeans IDE (including C/C++ support) |xref:../../../download/index.adoc[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] 
 |===
@@ -104,7 +106,7 @@
 
 === 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:{wikipedia}Secure_Shell[Secure_Shell]
 
 The IDE provides its own ssh client, so you do not need to install the ssh client on your local machine.
 
@@ -141,7 +143,7 @@
 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].
 
-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:{wikipedia}Microsoft_Windows_Services_for_UNIX#Subsystem_for_UNIX-based_Applications_.28SUA.29[Microsoft_Windows_Services_for_UNIX]
 
 
 ==== Mac OS X configuration
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 e677732..734fd25 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd/toolchain.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd/toolchain.adoc
@@ -41,7 +41,7 @@
 |===
 |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) |xref:../../../download/index.adoc[Version 8.0] 
 
 |Java Development Kit (JDK) |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[Version 7 or 8] 
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/contributing.adoc b/netbeans.apache.org/src/content/kb/docs/contributing.adoc
index 7bba471..9784129 100644
--- a/netbeans.apache.org/src/content/kb/docs/contributing.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/contributing.adoc
@@ -38,7 +38,7 @@
 
 The NetBeans website is written mainly in link:https://asciidoc.org/[AsciiDoc], a way of creating technical components using plain text files. 
 
-We then generate HTML for the web using Groovy Server Page templates (these live in https://github.com/apache/netbeans-website/tree/master/netbeans.apache.org/src/content/templates ). These templates (and some other stuff like SCSS) are responsible for the layout of the web pages. 
+We then generate HTML for the web using Groovy Server Page templates (these live in link:https://github.com/apache/netbeans-website/tree/master/netbeans.apache.org/src/content/templates[https://github.com/apache/netbeans-website/tree/master/netbeans.apache.org/src/content/templates] ). These templates (and some other stuff like SCSS) are responsible for the layout of the web pages. 
 
 NOTE: The generated HTML is responsive, this is, it can be correctly visualized in mobile phones.
 
@@ -139,7 +139,7 @@
 
 == The Content
 
-Write the rest of the page using plain AsciiDoc. See the AsciiDoctor Writer's Guide for more information https://asciidoctor.org/docs/asciidoc-writers-guide/
+Write the rest of the page using plain AsciiDoc. See the AsciiDoctor Writer's Guide for more information link:https://asciidoctor.org/docs/asciidoc-writers-guide/[https://asciidoctor.org/docs/asciidoc-writers-guide/]
 
 You can structure the content using sections. Start each section with a level 1 header using two equal signs (subsections at level 2 and below just have more equal signs), like so:
 
@@ -213,7 +213,7 @@
 video::the-youtube-video-identifier[youtube, title="The title"] 
 ----
 
-where "the-youtube-video-identifier" is the id of the youtube video, for instance `O8cwpEY1OAQ` is the identifier for https://www.youtube.com/embed/O8cwpEY1OAQ
+where "the-youtube-video-identifier" is the id of the youtube video, for instance `O8cwpEY1OAQ` is the identifier for link:https://www.youtube.com/embed/O8cwpEY1OAQ[https://www.youtube.com/embed/O8cwpEY1OAQ]
 
 === Source code
 
@@ -279,7 +279,7 @@
 .icon:users[] 
 ----
 
-for a list of icons see https://fontawesome.com/icons?d=gallery
+for a list of icons see link:https://fontawesome.com/icons?d=gallery[https://fontawesome.com/icons?d=gallery]
 
 === Keyboard shortcuts
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/gui-binding.adoc b/netbeans.apache.org/src/content/kb/docs/java/gui-binding.adoc
index e6733b2..3d84deb 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/gui-binding.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/gui-binding.adoc
@@ -40,7 +40,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |version 7.1, 7.2, 7.3, 7.4, or 8.0 
+|xref:../../../download/index.adoc[NetBeans IDE] |version 7.1, 7.2, 7.3, 7.4, or 8.0 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 6 or higher 
 |===
diff --git a/netbeans.apache.org/src/content/kb/docs/java/hibernate-java-se.adoc b/netbeans.apache.org/src/content/kb/docs/java/hibernate-java-se.adoc
index daa5c0a..5d4ae32 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/hibernate-java-se.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/hibernate-java-se.adoc
@@ -52,7 +52,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java 
+|xref:../../../download/index.adoc[NetBeans IDE] |7.2, 7.3, 7.4, 8.0, Java 
 
 |link:http://java.sun.com/javase/downloads/index.jsp[+Java Development Kit (JDK)+] |version 7 or 8 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/javase-embedded.adoc b/netbeans.apache.org/src/content/kb/docs/java/javase-embedded.adoc
index 49bd3d9..54d4893 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/javase-embedded.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/javase-embedded.adoc
@@ -160,7 +160,7 @@
 
 === Configuring a Project to Use a Remote Platform
 
-To develop a Java SE embedded application on a remote platform using link:http://openjdk.java.net/jeps/161[+compact1, compact2, or compact3 runtime platforms+], JDK 8 needs to be registered in the IDE.
+To develop a Java SE embedded application on a remote platform using link:https://openjdk.org/jeps/161[+compact1, compact2, or compact3 runtime platforms+], JDK 8 needs to be registered in the IDE.
 
 *To enable JDK 8 support in NetBeans IDE:*
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/javase-jdk7.adoc b/netbeans.apache.org/src/content/kb/docs/java/javase-jdk7.adoc
index f51d73a..d71e51a 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/javase-jdk7.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/javase-jdk7.adoc
@@ -42,7 +42,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |version 7.4 or 8.0 
+|xref:../../../download/index.adoc[NetBeans IDE] |version 7.4 or 8.0 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 |===
@@ -102,7 +102,7 @@
 
 == Using New JDK 7 Language Constructs: Switch Statement
 
-JDK 7 brings a number of link:http://openjdk.java.net/projects/jdk7/features/[+new features and enhancements+] in different areas, including internationalization, I/O and networking, security, etc. The best way to illustrate the JDK 7 support by the IDE's Java Editor is to demonstrate a few language changes introduced by Project Coin.
+JDK 7 brings a number of link:https://openjdk.org/projects/jdk7/features[+new features and enhancements+] in different areas, including internationalization, I/O and networking, security, etc. The best way to illustrate the JDK 7 support by the IDE's Java Editor is to demonstrate a few language changes introduced by Project Coin.
 
 One of these changes is a "String in a switch". In the previous versions of Java, the argument of  ``switch``  had to be only of the following primitive data types:  ``byte`` ,  ``short`` ,  ``char`` ,  ``int`` , or  ``enum`` . Starting from JDK 7, you can use arguments of type  ``String``  in the expression of a  ``switch``  statement.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/javase-jdk8.adoc b/netbeans.apache.org/src/content/kb/docs/java/javase-jdk8.adoc
index 280e7d0..54c1696 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/javase-jdk8.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/javase-jdk8.adoc
@@ -31,7 +31,7 @@
 
 Written by Tomas Zezula and Alyona Stashkova
 
-NetBeans IDE supports link:http://openjdk.java.net/projects/jdk8/features/[+JDK 8 features+], such as lambda expressions, repeatable annotations, compact profiles, etc. When these constructs are used in your code, the IDE recognizes them, correctly highlights errors, and lets you automatically fix syntax. Thus, NetBeans IDE helps you write code that is compatible with link:http://download.oracle.com/otndocs/jcp/java_se-8-edr-spec/index.html[+Java SE 8 Release Contents Early Draft Review Specification+].
+NetBeans IDE supports link:https://openjdk.org/projects/jdk8/features[+JDK 8 features+], such as lambda expressions, repeatable annotations, compact profiles, etc. When these constructs are used in your code, the IDE recognizes them, correctly highlights errors, and lets you automatically fix syntax. Thus, NetBeans IDE helps you write code that is compatible with link:http://download.oracle.com/otndocs/jcp/java_se-8-edr-spec/index.html[+Java SE 8 Release Contents Early Draft Review Specification+].
 
 In this tutorial, you will learn how to get started with JDK 8 in NetBeans IDE and how to use the IDE support for such Java SE 8 features as compact profiles, lambda expressions, and repeating annotations.
 
@@ -44,7 +44,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |version 7.4 and 8.0 
+|xref:../../../download/index.adoc[NetBeans IDE] |version 7.4 and 8.0 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 8 
 |===
@@ -127,7 +127,7 @@
 
 == Using Compact Profiles Support
 
-Java SE 8 introduces link:http://openjdk.java.net/jeps/161[+subset profiles of the Java SE platform specification+] that can be used to deploy and run applications that do not require the entire platform.
+Java SE 8 introduces link:https://openjdk.org/jeps/161[+subset profiles of the Java SE platform specification+] that can be used to deploy and run applications that do not require the entire platform.
 
 Three profiles that have been defined so far are named _compact1_, _compact2_, and _compact3_. Each profile specifies a particular set of Java API packages and contains all of the APIs in profiles smaller than itself: _compact1_ is a subset of _compact2_, which is a subset of _compact3_, which in its turn is a subset of the _full JRE_. The table below lists packages that are comprised in each profile.
 
@@ -219,7 +219,7 @@
 
 == Using Lambda Expressions Support
 
-link:http://openjdk.java.net/projects/lambda/[+Lambda expressions+] address the bulkiness of anonymous inner classes by expressing the machinery of anonymous inner classes more compactly.
+link:https://openjdk.org/projects/lambda/[+Lambda expressions+] address the bulkiness of anonymous inner classes by expressing the machinery of anonymous inner classes more compactly.
 
 The general syntax of a lambda expression consists of a set of parameters, an arrow token, and a function body (either a single expression or a statement block):
 
@@ -293,7 +293,7 @@
 
 == Using Repeating Annotations Support
 
-Java SE 8 features include link:http://openjdk.java.net/jeps/120[+repeating annotations+] that enable you to apply annotations with the same type to a single program element, as shown in the following code example:
+Java SE 8 features include link:https://openjdk.org/jeps/120[+repeating annotations+] that enable you to apply annotations with the same type to a single program element, as shown in the following code example:
 
 
 [source,java]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jdk8-migration-screencast.adoc b/netbeans.apache.org/src/content/kb/docs/java/jdk8-migration-screencast.adoc
index 9e41521..40698f4 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jdk8-migration-screencast.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jdk8-migration-screencast.adoc
@@ -46,7 +46,7 @@
 
 == Related links
 
-* link:http://openjdk.java.net/projects/jdk8/[+JDK 8 Project Page+]
+* link:https://openjdk.org/projects/jdk8/[+JDK 8 Project Page+]
 * xref:javase-jdk8.adoc[+Overview of JDK 8 Support in NetBeans IDE+]
 * xref:../../../features/java/index.adoc[+NetBeans Feature Pages: Java+]
 * xref:../java-se.adoc[+General Java Development NetBeans Learning Trail+]
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 3d853ed..be8c5e5 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
@@ -47,9 +47,9 @@
 
 == Related links
 
-* link:http://openjdk.java.net/projects/jdk8/[JDK 8 Project Page]
+* link:https://openjdk.org/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:https://docs.oracle.com/javase/tutorial/java/javaOO/lambdaexpressions.html[+The Java Tutorials: Lambda Expressions+]
 * link:http://apex.oracle.com/pls/apex/f?p=44785:24:114639602012411::::P24_CONTENT_ID,P24_PREV_PAGE:7919,24[+Oracle Learning Library: Java SE 8 Lambda Series+]
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jmx-getstart.adoc b/netbeans.apache.org/src/content/kb/docs/java/jmx-getstart.adoc
index 297c962..c71ed51 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jmx-getstart.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jmx-getstart.adoc
@@ -69,7 +69,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0, Java bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |7.2, 7.3, 7.4, 8.0, Java bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jmx-manager-tutorial.adoc b/netbeans.apache.org/src/content/kb/docs/java/jmx-manager-tutorial.adoc
index 00c7558..6811747 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jmx-manager-tutorial.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jmx-manager-tutorial.adoc
@@ -71,7 +71,7 @@
 |===
 |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 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/jmx-tutorial.adoc b/netbeans.apache.org/src/content/kb/docs/java/jmx-tutorial.adoc
index 44bb2e4..2903e03 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/jmx-tutorial.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/jmx-tutorial.adoc
@@ -66,7 +66,7 @@
 |===
 |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 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java/profile-loadgenerator.adoc b/netbeans.apache.org/src/content/kb/docs/java/profile-loadgenerator.adoc
index 46bf3b9..26e218b 100644
--- a/netbeans.apache.org/src/content/kb/docs/java/profile-loadgenerator.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/java/profile-loadgenerator.adoc
@@ -49,7 +49,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.2, 7.3, 7.4, 8.0 
+|xref:../../../download/index.adoc[NetBeans IDE] |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 
 
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 c890ae8..e0aa076 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
@@ -60,7 +60,7 @@
 |===
 |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 
 
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 0d7bdcf..9548117 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
@@ -59,7 +59,7 @@
 |===
 |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 
 
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 15e2d97..76acce4 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
@@ -60,7 +60,7 @@
 |===
 |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 
 
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 4b053f7..1891c10 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
@@ -55,7 +55,7 @@
 |===
 |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 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/connect-db.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/connect-db.adoc
index f3fc49e..4df2092 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/connect-db.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/connect-db.adoc
@@ -41,7 +41,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java bundle, 6.8 or 6.9 
+|xref:../../../../download/index.adoc[NetBeans IDE] |Java bundle, 6.8 or 6.9 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 6 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/data-model.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/data-model.adoc
index 5172b38..6bb59aa 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/data-model.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/data-model.adoc
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Designing the Data Model - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Designing the Data Model
+include::../../../../inc/database.adoc[]
 
 
 This tutorial unit focuses on data modeling, or the process of creating a conceptual model of your storage system by identifying and defining the entities that your system requires, and their relationships to one another. The data model should contain all the logical and physical design parameters required to generate a script using the Data Definition Language (DDL), which can then be used to create a database.^<<footnote1,[1]>>^
@@ -88,7 +89,7 @@
 * *Top down:* In _top down_ development, you start with an existing Java implementation of the domain model, and have complete freedom with respect to the design of the database schema. You must create mapping metadata (i.e., annotations used in JPA entity classes), and can optionally use a persistence tool to automatically generate the schema.
 * *Bottom up:* _Bottom up_ development begins with an existing database schema. In this case, the easiest way to proceed is to use forward-engineering tools to extract metadata from the schema and generate annotated Java source code (JPA entity classes).
 
-For more information on top down and bottom up design strategies, see link:http://en.wikipedia.org/wiki/Data_modeling#Modeling_methodologies[+Data modeling: Modeling methodologies+] [Wikipedia].
+For more information on top down and bottom up design strategies, see link:{wikipedia}Data_modeling#Modeling_methodologies[Data modeling: Modeling methodologies] [Wikipedia].
 
 
 
@@ -334,7 +335,7 @@
 
 Since foreign keys must be of the same data type as the columns they reference, notice that `category_id` is of type `TINYINT`, similar to the `category` table's primary key. 
 
-[tips]#The entity-relationship diagram in this tutorial uses link:http://en.wikipedia.org/wiki/Entity-relationship_model#Crow.27s_Foot_Notation[+Crow's Foot+] notation. You can alter the relationship notation in WorkBench by choosing Model > Relationship Notation.#
+[tips]#The entity-relationship diagram in this tutorial uses link:{wikipedia}Entity-relationship_model#Crow.27s_Foot_Notation[Crow's Foot] notation. You can alter the relationship notation in WorkBench by choosing Model > Relationship Notation.#
 
 [start=3]
 . Double-click the relationship (i.e., click the dashed line between the two entities). The Relationship editor opens in the bottom region of the interface.
@@ -525,12 +526,12 @@
 * link:http://dev.mysql.com/librarian/[+The MySQL Community Librarian+]
 * link:http://dev.mysql.com/doc/workbench/en/index.html[+MySQL Workbench Reference Manual+]
 * link:http://dev.mysql.com/doc/refman/5.1/en/[+MySQL 5.1 Reference Manual+]
-* link:http://en.wikipedia.org/wiki/Innodb[+InnoDB+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/Database_model[+Database Model+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/Data_modeling[+Data Modeling+] [Wikipedia]
+* link:{wikipedia}Innodb[InnoDB] [Wikipedia]
+* link:{wikipedia}Database_model[Database Model] [Wikipedia]
+* link:{wikipedia}Data_modeling[Data Modeling] [Wikipedia]
 
 
 
 == References
 
-1. <<fn1,^>> Data Definition Language (DDL) is a subset of the SQL language and includes statements such as `CREATE TABLE`, `DROP`, and `ALTER`. Other subsets include Data Manipulation Language (DML), and Data Control Language (DCL). For more information, see link:http://en.wikipedia.org/wiki/Data_Definition_Language[+Data Definition Language+] [Wikipedia].
+1. <<fn1,^>> Data Definition Language (DDL) is a subset of the SQL language and includes statements such as `CREATE TABLE`, `DROP`, and `ALTER`. Other subsets include Data Manipulation Language (DML), and Data Control Language (DCL). For more information, see link:{wikipedia}Data_Definition_Language[Data Definition Language] [Wikipedia].
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/design.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/design.adoc
index c4784eb..59c4e5d 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/design.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/design.adoc
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Designing the Application - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Designing the Application
+include::../../../../inc/database.adoc[]
 
 
 The application that you design in this tutorial is based on a real-world scenario. After being introduced to the tutorial scenario, you consolidate a high-level list of customer requirements. You then prepare a diagram of the application's business process flow, and a series of _mockups_ which help both you and your customer get a clearer picture of how the final application will look to an end-user. Finally, you break down the customer requirements into a set of implementation tasks, and structure your application so that the responsibilities and interactions among functional components are clearly defined.
@@ -86,7 +87,7 @@
 
 The company staff are able to provide you with product and category images, descriptions and price details, as well as any website graphics that are to be used. The staff are also able to provide all text and language translations for the website.
 
-There are many practices and methods devoted to software development management. link:http://en.wikipedia.org/wiki/Agile_software_development[+Agile software development+] is one methodology that encourages frequent customer inspection, and places importance on adaptation during the development cycle. Although this is outside the scope of this tutorial, each tutorial unit concludes with a functional piece of software that could be presented to a customer for further communication and feedback.
+There are many practices and methods devoted to software development management. link:{wikipedia}Agile_software_development[Agile software development] is one methodology that encourages frequent customer inspection, and places importance on adaptation during the development cycle. Although this is outside the scope of this tutorial, each tutorial unit concludes with a functional piece of software that could be presented to a customer for further communication and feedback.
 
 
 
@@ -103,7 +104,7 @@
 
 
 
-You also begin creating mockups. There are numerous ways to go about this task. For example, you could use storyboard software, or create a set of wireframes to relay the relationships between pages. Another common method is known as link:http://en.wikipedia.org/wiki/Paper_prototyping[+paper prototyping+], where you collaborate with the customer by sketching ideas on paper.
+You also begin creating mockups. There are numerous ways to go about this task. For example, you could use storyboard software, or create a set of wireframes to relay the relationships between pages. Another common method is known as link:{wikipedia}Paper_prototyping[paper prototyping], where you collaborate with the customer by sketching ideas on paper.
 
 In this scenario, we've produced _mockups_ of the primary pages the user expects see when navigating through the website. When we later discuss the MVC design pattern, you'll note that these pages map to the _views_ used by the application.
 
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 80d09f4..9d8701e 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
@@ -85,7 +85,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java bundle, 6.8 or 6.9 
+|xref:../../../../download/index.adoc[NetBeans IDE] |Java bundle, 6.8 or 6.9 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 6 
 
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 32fb92d..26d4ad1 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Introduction - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Introduction
+include::../../../../inc/database.adoc[]
 
 
 == Tutorial Contents
@@ -174,7 +175,7 @@
 
 === Java as a Programming Language
 
-The Java language was conceptualized by link:http://en.wikipedia.org/wiki/James_Gosling[+James Gosling+], who began work on the project in 1991. The language was created with the following 5 design principles^<<footnote1,[1]>>^ in mind:
+The Java language was conceptualized by link:{wikipedia}James_Gosling[James Gosling], who began work on the project in 1991. The language was created with the following 5 design principles^<<footnote1,[1]>>^ in mind:
 
 1. *Simple, Object-Oriented, and Familiar:* Java contains a small, consistent core of fundamental concepts that can be grasped quickly. It was originally modeled after the then popular C++ language, so that programmers could easily migrate to Java. Also, it adheres to an _object-oriented_ paradigm; systems are comprised of encapsulated objects that communicate by passing messages to one another.
 2. *Robust and Secure:* The language includes compile-time and run-time checking to ensure that errors are identified quickly. It also contains network and file-access security features so that distributed applications are not compromised by intrusion or corruption.
@@ -255,7 +256,9 @@
 
 * link:http://java.sun.com/javaee/technologies/javaee5.jsp[+http://java.sun.com/javaee/technologies/javaee5.jsp+]
 
-A JSR's final release provides a _reference implementation_, which is a free implementation of the technology. In this tutorial, you utilize these implementations to develop the sample e-commerce application. For example, the GlassFish v3 application server, which is included in the standard Java download bundle for link:https://netbeans.org/downloads/6.8/index.html[+NetBeans 6.8+], is the reference implementation of the Java EE 6 platform specification (link:http://jcp.org/en/jsr/summary?id=316[+JSR 316+]). As a reference implementation for the Java EE platform, it includes reference implementations for the technologies included in the platform, such as Servlet, EJB and JPA technologies.
+A JSR's final release provides a _reference implementation_, which is a free implementation of the technology. 
+In this tutorial, you utilize these implementations to develop the sample e-commerce application. 
+For example, the GlassFish v3 application server, which is included in the standard Java download bundle for xref:../../../../download/index.adoc[NetBeans IDE], is the reference implementation of the Java EE 6 platform specification (link:http://jcp.org/en/jsr/summary?id=316[+JSR 316+]). As a reference implementation for the Java EE platform, it includes reference implementations for the technologies included in the platform, such as Servlet, EJB and JPA technologies.
 
 
 
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 0b64975..c1edb2e 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Adding Language Support - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Adding Language Support
+include::../../../../inc/database.adoc[]
 
 
 The goal of this tutorial unit is to demonstrate how to enable language support for a web application. "Language support" here refers to the ability to display page views according to the customer-specified languages. Within the context of the `AffableBean` application, we have agreed to provide support for both English and Czech, as per the previously outlined xref:design.adoc#requirements[+customer requirements+].
@@ -43,7 +44,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java bundle, 6.8 or 6.9 
+|xref:../../../../download/index.adoc[NetBeans IDE] |Java bundle, 6.8 or 6.9 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 6 
 
@@ -103,7 +104,7 @@
 bakery=pečivo
 ----
 
-In the above example, '`messages`' represents the base name, and the locale identifier is the two-letter code which is appended using an underscore. (i.e., '`en`' for English, '`cs`' for Czech). The two-letter codes are derived from the international link:http://en.wikipedia.org/wiki/ISO_639[+ISO 639+] standard, which lists codes that represent the names of languages. The ISO 639 standard is adopted by the link:http://www.w3.org/International/[+W3C Internationalization Activity+] and is used by all major browsers (these are the codes understood in the `Accept-Language` HTTP header). It is also internalized in the link:http://download.oracle.com/docs/cd/E17409_01/javase/6/docs/api/java/util/Locale.html[+`java.util.Locale`+] class.
+In the above example, '`messages`' represents the base name, and the locale identifier is the two-letter code which is appended using an underscore. (i.e., '`en`' for English, '`cs`' for Czech). The two-letter codes are derived from the international link:{wikipedia}ISO_639[ISO 639] standard, which lists codes that represent the names of languages. The ISO 639 standard is adopted by the link:http://www.w3.org/International/[+W3C Internationalization Activity+] and is used by all major browsers (these are the codes understood in the `Accept-Language` HTTP header). It is also internalized in the link:http://download.oracle.com/docs/cd/E17409_01/javase/6/docs/api/java/util/Locale.html[+`java.util.Locale`+] class.
 
 
 
@@ -1083,7 +1084,7 @@
 * link:http://java.sun.com/developer/technicalArticles/Intl/ResourceBundles/[+Java Internationalization: Localization with ResourceBundles+]
 * link:http://www.ibm.com/developerworks/java/library/j-jstl0415/[+A JSTL primer, Part 3: Presentation is everything+]
 * link:http://java.sun.com/javase/technologies/core/basic/intl/[+Java Internationalization+] [Technology Homepage]
-* link:http://en.wikipedia.org/wiki/Internationalization_and_localization[+Internationalization and localization+] [Wikipedia]
+* link:{wikipedia}Internationalization_and_localization[Internationalization and localization] [Wikipedia]
 * link:http://www.loc.gov/standards/iso639-2/php/code_list.php[+ISO 639-2 Language Code List+] [Library of Congress]
 * link:http://www.w3.org/International/articlelist#language[+W3C Internationalization Activity: Articles, best practices &amp; tutorials: Language+]
 * link:http://jquery.com/[+jQuery+]
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 1b247b5..7045c2a 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Managing Sessions - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Managing Sessions
+include::../../../../inc/database.adoc[]
 
 
 == Tutorial Contents
@@ -661,7 +662,7 @@
 
 image::images/headers-tab.png[title="Cookies are displayed under the Cookies tab in the HTTP Monitor"]
 
-See Wikipedia's link:http://en.wikipedia.org/wiki/List_of_HTTP_headers[+List of HTTP headers+] for more information on request and response headers.
+See Wikipedia's link:{wikipedia}List_of_HTTP_headers[List of HTTP headers] for more information on request and response headers.
 
 
 [start=12]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/netbeans-ecommerce-tutorial.asciidoc.disabled b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/netbeans-ecommerce-tutorial.asciidoc.disabled
index f37bd55..0e0af3e 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/netbeans-ecommerce-tutorial.asciidoc.disabled
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/netbeans-ecommerce-tutorial.asciidoc.disabled
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Introduction - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Introduction
+include::../../../../inc/database.adoc[]
 
 
 ==== Tutorial Contents
@@ -174,7 +175,7 @@
 
 === Java as a Programming Language
 
-The Java language was conceptualized by link:http://en.wikipedia.org/wiki/James_Gosling[+James Gosling+], who began work on the project in 1991. The language was created with the following 5 design principles^<<footnote1Intro,[1]>>^ in mind:
+The Java language was conceptualized by link:{wikipedia}James_Gosling[James Gosling], who began work on the project in 1991. The language was created with the following 5 design principles^<<footnote1Intro,[1]>>^ in mind:
 
 1. *Simple, Object-Oriented, and Familiar:* Java contains a small, consistent core of fundamental concepts that can be grasped quickly. It was originally modeled after the then popular C++ language, so that programmers could easily migrate to Java. Also, it adheres to an _object-oriented_ paradigm; systems are comprised of encapsulated objects that communicate by passing messages to one another.
 2. *Robust and Secure:* The language includes compile-time and run-time checking to ensure that errors are identified quickly. It also contains network and file-access security features so that distributed applications are not compromised by intrusion or corruption.
@@ -254,7 +255,7 @@
 
 * link:http://java.sun.com/javaee/technologies/javaee5.jsp[+http://java.sun.com/javaee/technologies/javaee5.jsp+]
 
-A JSR's final release provides a _reference implementation_, which is a free implementation of the technology. In this tutorial, you utilize these implementations to develop the sample e-commerce application. For example, the GlassFish v3 application server, which is included in the standard Java download bundle for link:https://netbeans.org/downloads/6.8/index.html[+NetBeans 6.8+], is the reference implementation of the Java EE 6 platform specification (link:http://jcp.org/en/jsr/summary?id=316[+JSR 316+]). As a reference implementation for the Java EE platform, it includes reference implementations for the technologies included in the platform, such as Servlet, EJB and JPA technologies.
+A JSR's final release provides a _reference implementation_, which is a free implementation of the technology. In this tutorial, you utilize these implementations to develop the sample e-commerce application. For example, the GlassFish v3 application server, which is included in the standard Java download bundle for xref:../../../../download/index.adoc[NetBeans IDE], is the reference implementation of the Java EE 6 platform specification (link:http://jcp.org/en/jsr/summary?id=316[+JSR 316+]). As a reference implementation for the Java EE platform, it includes reference implementations for the technologies included in the platform, such as Servlet, EJB and JPA technologies.
 
 
 
@@ -462,7 +463,7 @@
 
 The company staff are able to provide you with product and category images, descriptions and price details, as well as any website graphics that are to be used. The staff are also able to provide all text and language translations for the website.
 
-There are many practices and methods devoted to software development management. link:http://en.wikipedia.org/wiki/Agile_software_development[+Agile software development+] is one methodology that encourages frequent customer inspection, and places importance on adaptation during the development cycle. Although this is outside the scope of this tutorial, each tutorial unit concludes with a functional piece of software that could be presented to a customer for further communication and feedback.
+There are many practices and methods devoted to software development management. link:{wikipedia}Agile_software_development[Agile software development] is one methodology that encourages frequent customer inspection, and places importance on adaptation during the development cycle. Although this is outside the scope of this tutorial, each tutorial unit concludes with a functional piece of software that could be presented to a customer for further communication and feedback.
 
 
 
@@ -479,7 +480,7 @@
 
 
 
-You also begin creating mockups. There are numerous ways to go about this task. For example, you could use storyboard software, or create a set of wireframes to relay the relationships between pages. Another common method is known as link:http://en.wikipedia.org/wiki/Paper_prototyping[+paper prototyping+], where you collaborate with the customer by sketching ideas on paper.
+You also begin creating mockups. There are numerous ways to go about this task. For example, you could use storyboard software, or create a set of wireframes to relay the relationships between pages. Another common method is known as link:{wikipedia}Paper_prototyping[paper prototyping], where you collaborate with the customer by sketching ideas on paper.
 
 In this scenario, we've produced _mockups_ of the primary pages the user expects see when navigating through the website. When we later discuss the MVC design pattern, you'll note that these pages map to the _views_ used by the application.
 
@@ -1320,7 +1321,7 @@
 * *Top down:* In _top down_ development, you start with an existing Java implementation of the domain model, and have complete freedom with respect to the design of the database schema. You must create mapping metadata (i.e., annotations used in JPA entity classes), and can optionally use a persistence tool to automatically generate the schema.
 * *Bottom up:* _Bottom up_ development begins with an existing database schema. In this case, the easiest way to proceed is to use forward-engineering tools to extract metadata from the schema and generate annotated Java source code (JPA entity classes).
 
-For more information on top down and bottom up design strategies, see link:http://en.wikipedia.org/wiki/Data_modeling#Modeling_methodologies[+Data modeling: Modeling methodologies+] [Wikipedia].
+For more information on top down and bottom up design strategies, see link:{wikipedia}Data_modeling#Modeling_methodologies[Data modeling: Modeling methodologies] [Wikipedia].
 
 
 
@@ -1549,7 +1550,7 @@
 
 Since foreign keys must be of the same data type as the columns they reference, notice that `category_id` is of type `TINYINT`, similar to the `category` table's primary key. 
 
-[tips]#The entity-relationship diagram in this tutorial uses link:http://en.wikipedia.org/wiki/Entity-relationship_model#Crow.27s_Foot_Notation[+Crow's Foot+] notation. You can alter the relationship notation in WorkBench by choosing Model > Relationship Notation.#
+[tips]#The entity-relationship diagram in this tutorial uses link:{wikipedia}Entity-relationship_model#Crow.27s_Foot_Notation[Crow's Foot] notation. You can alter the relationship notation in WorkBench by choosing Model > Relationship Notation.#
 
 [start=3]
 . Double-click the relationship (i.e., click the dashed line between the two entities). The Relationship editor opens in the bottom region of the interface.
@@ -1728,15 +1729,15 @@
 * link:http://dev.mysql.com/librarian/[+The MySQL Community Librarian+]
 * link:http://dev.mysql.com/doc/workbench/en/index.html[+MySQL Workbench Reference Manual+]
 * link:http://dev.mysql.com/doc/refman/5.1/en/[+MySQL 5.1 Reference Manual+]
-* link:http://en.wikipedia.org/wiki/Innodb[+InnoDB+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/Database_model[+Database Model+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/Data_modeling[+Data Modeling+] [Wikipedia]
+* link:{wikipedia}Innodb[InnoDB] [Wikipedia]
+* link:{wikipedia}Database_model[Database Model] [Wikipedia]
+* link:{wikipedia}Data_modeling[Data Modeling] [Wikipedia]
 
 
 
 == References
 
-1. <<1DataModel,^>> Data Definition Language (DDL) is a subset of the SQL language and includes statements such as `CREATE TABLE`, `DROP`, and `ALTER`. Other subsets include Data Manipulation Language (DML), and Data Control Language (DCL). For more information, see link:http://en.wikipedia.org/wiki/Data_Definition_Language[+Data Definition Language+] [Wikipedia].
+1. <<1DataModel,^>> Data Definition Language (DDL) is a subset of the SQL language and includes statements such as `CREATE TABLE`, `DROP`, and `ALTER`. Other subsets include Data Manipulation Language (DML), and Data Control Language (DCL). For more information, see link:{wikipedia}Data_Definition_Language[Data Definition Language] [Wikipedia].
 
 
 
@@ -5182,7 +5183,7 @@
 Likewise, if you click the Header tab, you see the cookie listed, since '`Cookie`' is a request header that was sent by the client. 
 image::images/headers-tab.png[title="Cookies are displayed under the Cookies tab in the HTTP Monitor"]
 
-See Wikipedia's link:http://en.wikipedia.org/wiki/List_of_HTTP_headers[+List of HTTP headers+] for more information on request and response headers.
+See Wikipedia's link:{wikipedia}List_of_HTTP_headers[List of HTTP headers] for more information on request and response headers.
 
 
 [start=12]
@@ -6572,18 +6573,18 @@
 * link:http://jcp.org/aboutJava/communityprocess/final/jsr318/index.html[+JSR 318: EJB 3.1 Final Release+] [Specification Download]
 * link:http://download.oracle.com/docs/cd/E17410_01/javaee/6/tutorial/doc/bncih.html[+Java EE 6 Tutorial: Transactions+]
 * link:http://www.manning.com/panda/[+EJB 3 in Action+] [Book]
-* link:http://en.wikipedia.org/wiki/Database_transaction[+Database Transaction+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/Ejb[+Enterprise JavaBean+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/ACID[+ACID+] [Wikipedia]
+* link:{wikipedia}Database_transaction[Database Transaction] [Wikipedia]
+* link:{wikipedia}Ejb[Enterprise JavaBean] [Wikipedia]
+* link:{wikipedia}ACID[ACID] [Wikipedia]
 * link:http://jquery.com/[+jQuery+]
-* link:http://en.wikipedia.org/wiki/Jquery[+jQuery+] [Wikipedia]
+* link:{wikipedia}Jquery[jQuery] [Wikipedia]
 
 
 
 == References
 
-1. <<1Transaction,^>> This _all or nothing_ concept can be further extrapolated into the four defining characteristics of transactions: _atomicity_, _consistency_, _isolation_, and _durability_ (ACID). For more information, see: link:http://en.wikipedia.org/wiki/ACID[+ACID+] [Wikipedia].
-2. <<2Transaction,^>> Actually, for credit card number entries, validation typically ensures that the entered string conforms to the Luhn algorithm, which is a simple method of differentiating between valid numbers and a collection of random digits. This applies to the link:http://plugins.jquery.com/project/validate[+jQuery validation plugin+] as well. For more information, see link:http://en.wikipedia.org/wiki/Luhn_algorithm[+Luhn algorithm+] [Wikipedia].
+1. <<1Transaction,^>> This _all or nothing_ concept can be further extrapolated into the four defining characteristics of transactions: _atomicity_, _consistency_, _isolation_, and _durability_ (ACID). For more information, see: link:{wikipedia}ACID[+ACID+] [Wikipedia].
+2. <<2Transaction,^>> Actually, for credit card number entries, validation typically ensures that the entered string conforms to the Luhn algorithm, which is a simple method of differentiating between valid numbers and a collection of random digits. This applies to the link:http://plugins.jquery.com/project/validate[+jQuery validation plugin+] as well. For more information, see link:{wikipedia}Luhn_algorithm[+Luhn algorithm+] [Wikipedia].
 
 
 
@@ -6704,7 +6705,7 @@
 bakery=peÄŤivo
 ----
 
-In the above example, '`messages`' represents the base name, and the locale identifier is the two-letter code which is appended using an underscore. (i.e., '`en`' for English, '`cs`' for Czech). The two-letter codes are derived from the international link:http://en.wikipedia.org/wiki/ISO_639[+ISO 639+] standard, which lists codes that represent the names of languages. The ISO 639 standard is adopted by the link:http://www.w3.org/International/[+W3C Internationalization Activity+] and is used by all major browsers (these are the codes understood in the `Accept-Language` HTTP header). It is also internalized in the link:http://download.oracle.com/docs/cd/E17409_01/javase/6/docs/api/java/util/Locale.html[+`java.util.Locale`+] class.
+In the above example, '`messages`' represents the base name, and the locale identifier is the two-letter code which is appended using an underscore. (i.e., '`en`' for English, '`cs`' for Czech). The two-letter codes are derived from the international link:{wikipedia}ISO_639[ISO 639] standard, which lists codes that represent the names of languages. The ISO 639 standard is adopted by the link:http://www.w3.org/International/[+W3C Internationalization Activity+] and is used by all major browsers (these are the codes understood in the `Accept-Language` HTTP header). It is also internalized in the link:http://download.oracle.com/docs/cd/E17409_01/javase/6/docs/api/java/util/Locale.html[+`java.util.Locale`+] class.
 
 
 
@@ -7649,7 +7650,7 @@
 * link:http://java.sun.com/developer/technicalArticles/Intl/ResourceBundles/[+Java Internationalization: Localization with ResourceBundles+]
 * link:http://www.ibm.com/developerworks/java/library/j-jstl0415/[+A JSTL primer, Part 3: Presentation is everything+]
 * link:http://java.sun.com/javase/technologies/core/basic/intl/[+Java Internationalization+] [Technology Homepage]
-* link:http://en.wikipedia.org/wiki/Internationalization_and_localization[+Internationalization and localization+] [Wikipedia]
+* link:{wikipedia}Internationalization_and_localization[Internationalization and localization] [Wikipedia]
 * link:http://www.loc.gov/standards/iso639-2/php/code_list.php[+ISO 639-2 Language Code List+] [Library of Congress]
 * link:http://www.w3.org/International/articlelist#language[+W3C Internationalization Activity: Articles, best practices &amp; tutorials: Language+]
 * link:http://jquery.com/[+jQuery+]
@@ -8506,8 +8507,8 @@
 * link:http://java.sun.com/developer/technicalArticles/J2EE/security_annotation/[+Security Annotations and Authorization in GlassFish and the Java EE 5 SDK+]
 * link:http://www.infoq.com/news/2010/07/javaee6-security[+Java EE 6: Application Security Enhancements+]
 * link:http://refcardz.dzone.com/refcardz/getting-started-java-ee[+Getting Started with Java EE Security+] [RefCard]
-* link:http://en.wikipedia.org/wiki/Https[+HTTP Secure+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/Digital_certificate[+Public key certificate+] [Wikipedia]
+* link:{wikipedia}Https[HTTP Secure] [Wikipedia]
+* link:{wikipedia}Digital_certificate[Public key certificate] [Wikipedia]
 
 
 
@@ -8811,9 +8812,9 @@
 [[loadTest]]
 === Load Testing
 
-link:http://en.wikipedia.org/wiki/Load_testing[+Load testing+] a web application involves making concurrent requests for resources, typically by simulating multiple users, and then examining the server's behavior. We can use the test plan we created for this purpose, and make adjustments to the number of users and other settings to determine how the server behaves under the given work load.
+link:{wikipedia}Load_testing[Load testing] a web application involves making concurrent requests for resources, typically by simulating multiple users, and then examining the server's behavior. We can use the test plan we created for this purpose, and make adjustments to the number of users and other settings to determine how the server behaves under the given work load.
 
-Load testing should be performed with specific goals in mind, such as determining the link:http://en.wikipedia.org/wiki/Throughput[+throughput+] for the anticipated average and peak numbers of users. It is also worthwhile to assess the _response time_ for requests, to ensure that site customers are not having to wait too long to be served. In order to measure the response time, you need to take into account the time during which data spends traveling over the Internet. One way to do this is to compare test results between a local server, where network travel time is nearly non-existent, and results from testing the production server remotely. The following example demonstrates how you can perform tests using your local development server. Once you migrate an application to the production server, you can simply change the value for the server variable set under the test plan's User Defined Variables.
+Load testing should be performed with specific goals in mind, such as determining the link:{wikipedia}Throughput[throughput] for the anticipated average and peak numbers of users. It is also worthwhile to assess the _response time_ for requests, to ensure that site customers are not having to wait too long to be served. In order to measure the response time, you need to take into account the time during which data spends traveling over the Internet. One way to do this is to compare test results between a local server, where network travel time is nearly non-existent, and results from testing the production server remotely. The following example demonstrates how you can perform tests using your local development server. Once you migrate an application to the production server, you can simply change the value for the server variable set under the test plan's User Defined Variables.
 
 The results recorded in this and the following sections were arrived at by running tests on a computer with a 2.4 GHz Intel Core 2 Duo processor and 4 GB of memory. Naturally, the results you get depend on your computer's performance, and will likely not match those displayed here.
 
@@ -8852,7 +8853,7 @@
 * The `AffableBean/checkout` request, recorded at 33 milliseconds, takes much longer to process than most other requests. This is likely due to the fact that the initial request is redirected to the HTTP + SSL protocol on port 8181. So there are essentially two requests taking place.
 * The `AffableBean/purchase` request, recorded at 147 milliseconds, takes the most time to be served. This is likely due to both the write operations required on the database, and the fact that client-server communication takes place over an encrypted channel (i.e., using HTTPS).
 * According to the `Error` `%` column, no errors occurred from running the test. In other words, all server responses included an HTTP 200 status.
-* The `Avg.` `Bytes` column represents the average size of the sample response. We see that the JQuery core library (`jquery-1.4.2.js`) is the largest file that is served in the test plan, at nearly 164 KB. Because the file is served each time a new user accesses the site, it may be worth linking to this file on a public link:http://en.wikipedia.org/wiki/Content_delivery_network[+content delivery network+] (CDN) instead of maintaining it on the server. "Unburdening" the server in this manner could have a notable effect on its overall performance. 
+* The `Avg.` `Bytes` column represents the average size of the sample response. We see that the JQuery core library (`jquery-1.4.2.js`) is the largest file that is served in the test plan, at nearly 164 KB. Because the file is served each time a new user accesses the site, it may be worth linking to this file on a public link:{wikipedia}Content_delivery_network[content delivery network] (CDN) instead of maintaining it on the server. "Unburdening" the server in this manner could have a notable effect on its overall performance. 
 
 For further information, see the official jQuery documentation: link:http://docs.jquery.com/Downloading_jQuery#CDN_Hosted_jQuery[+CDN Hosted jQuery+].
 
@@ -8892,7 +8893,7 @@
 [[stressTest]]
 === Stress Testing
 
-In the tests we've so far conducted, the throughput for a single user was calculated at 41/min, and for 20 users it was 577/min. You can continue to increase the demand on the server to see if it's possible to determine what the maximum throughput value can be, given your local setup. This is an example of link:http://en.wikipedia.org/wiki/Stress_testing[+stress testing+], in which the system resources are purposely worked to their limits in order to arrive at a maximum capacity value.
+In the tests we've so far conducted, the throughput for a single user was calculated at 41/min, and for 20 users it was 577/min. You can continue to increase the demand on the server to see if it's possible to determine what the maximum throughput value can be, given your local setup. This is an example of link:{wikipedia}Stress_testing[stress testing], in which the system resources are purposely worked to their limits in order to arrive at a maximum capacity value.
 
 You can adjust the User Defined Variables, then run the test plan and examine the results. For example, experiment by increasing the number of users, or decreasing the ramp-up period or delay between requests.
 
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 b3ac96d..7e46d96 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
@@ -85,7 +85,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java bundle, 6.8 or 6.9 
+|xref:../../../../download/index.adoc[NetBeans IDE] |Java bundle, 6.8 or 6.9 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 6 
 
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 f10b005..10f1dcc 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Securing the Application - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Securing the Application
+include::../../../../inc/database.adoc[]
 
 
 == Tutorial Contents
@@ -80,7 +81,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java bundle, 6.8 or 6.9 
+|xref:../../../../download/index.adoc[NetBeans IDE] |Java bundle, 6.8 or 6.9 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 6 
 
@@ -906,5 +907,5 @@
 * link:http://java.sun.com/developer/technicalArticles/J2EE/security_annotation/[+Security Annotations and Authorization in GlassFish and the Java EE 5 SDK+]
 * link:http://www.infoq.com/news/2010/07/javaee6-security[+Java EE 6: Application Security Enhancements+]
 * link:http://refcardz.dzone.com/refcardz/getting-started-java-ee[+Getting Started with Java EE Security+] [RefCard]
-* link:http://en.wikipedia.org/wiki/Https[+HTTP Secure+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/Digital_certificate[+Public key certificate+] [Wikipedia]
+* link:{wikipedia}Https[HTTP Secure] [Wikipedia]
+* link:{wikipedia}Digital_certificate[Public key certificate] [Wikipedia]
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup-dev-environ.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup-dev-environ.adoc
index 9dbc497..a3883b4 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup-dev-environ.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/setup-dev-environ.adoc
@@ -466,7 +466,7 @@
 
 === Books
 
-* xref:../../articles/books.adoc[+NetBeans Books+]
+* xref:../../../articles/books.adoc[+NetBeans Books+]
 * link:http://www.apress.com/book/view/1590598954[+Pro NetBeans IDE 6 Rich Client Platform Edition+]
 * link:http://apress.com/book/view/1430219548[+Beginning Java EE 6 Platform with GlassFish 3: From Novice to Professional+]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/test-profile.adoc b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/test-profile.adoc
index 79f5859..d9c4347 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/test-profile.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/ecommerce/test-profile.adoc
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Testing and Profiling - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Testing and Profiling
+include::../../../../inc/database.adoc[]
 
 
 == Tutorial Contents
@@ -335,9 +336,9 @@
 [[loadTest]]
 === Load Testing
 
-link:http://en.wikipedia.org/wiki/Load_testing[+Load testing+] a web application involves making concurrent requests for resources, typically by simulating multiple users, and then examining the server's behavior. We can use the test plan we created for this purpose, and make adjustments to the number of users and other settings to determine how the server behaves under the given work load.
+link:{wikipedia}Load_testing[Load testing] a web application involves making concurrent requests for resources, typically by simulating multiple users, and then examining the server's behavior. We can use the test plan we created for this purpose, and make adjustments to the number of users and other settings to determine how the server behaves under the given work load.
 
-Load testing should be performed with specific goals in mind, such as determining the link:http://en.wikipedia.org/wiki/Throughput[+throughput+] for the anticipated average and peak numbers of users. It is also worthwhile to assess the _response time_ for requests, to ensure that site customers are not having to wait too long to be served. In order to measure the response time, you need to take into account the time during which data spends traveling over the Internet. One way to do this is to compare test results between a local server, where network travel time is nearly non-existent, and results from testing the production server remotely. The following example demonstrates how you can perform tests using your local development server. Once you migrate an application to the production server, you can simply change the value for the server variable set under the test plan's User Defined Variables.
+Load testing should be performed with specific goals in mind, such as determining the link:{wikipedia}Throughput[throughput] for the anticipated average and peak numbers of users. It is also worthwhile to assess the _response time_ for requests, to ensure that site customers are not having to wait too long to be served. In order to measure the response time, you need to take into account the time during which data spends traveling over the Internet. One way to do this is to compare test results between a local server, where network travel time is nearly non-existent, and results from testing the production server remotely. The following example demonstrates how you can perform tests using your local development server. Once you migrate an application to the production server, you can simply change the value for the server variable set under the test plan's User Defined Variables.
 
 The results recorded in this and the following sections were arrived at by running tests on a computer with a 2.4 GHz Intel Core 2 Duo processor and 4 GB of memory. Naturally, the results you get depend on your computer's performance, and will likely not match those displayed here.
 
@@ -377,7 +378,7 @@
 * The `AffableBean/checkout` request, recorded at 33 milliseconds, takes much longer to process than most other requests. This is likely due to the fact that the initial request is redirected to the HTTP + SSL protocol on port 8181. So there are essentially two requests taking place.
 * The `AffableBean/purchase` request, recorded at 147 milliseconds, takes the most time to be served. This is likely due to both the write operations required on the database, and the fact that client-server communication takes place over an encrypted channel (i.e., using HTTPS).
 * According to the `Error` `%` column, no errors occurred from running the test. In other words, all server responses included an HTTP 200 status.
-* The `Avg.` `Bytes` column represents the average size of the sample response. We see that the JQuery core library (`jquery-1.4.2.js`) is the largest file that is served in the test plan, at nearly 164 KB. Because the file is served each time a new user accesses the site, it may be worth linking to this file on a public link:http://en.wikipedia.org/wiki/Content_delivery_network[+content delivery network+] (CDN) instead of maintaining it on the server. "Unburdening" the server in this manner could have a notable effect on its overall performance. 
+* The `Avg.` `Bytes` column represents the average size of the sample response. We see that the JQuery core library (`jquery-1.4.2.js`) is the largest file that is served in the test plan, at nearly 164 KB. Because the file is served each time a new user accesses the site, it may be worth linking to this file on a public link:{wikipedia}Content_delivery_network[content delivery network] (CDN) instead of maintaining it on the server. "Unburdening" the server in this manner could have a notable effect on its overall performance. 
 
 For further information, see the official jQuery documentation: link:http://docs.jquery.com/Downloading_jQuery#CDN_Hosted_jQuery[+CDN Hosted jQuery+].
 
@@ -420,7 +421,7 @@
 [[stressTest]]
 === Stress Testing
 
-In the tests we've so far conducted, the throughput for a single user was calculated at 41/min, and for 20 users it was 577/min. You can continue to increase the demand on the server to see if it's possible to determine what the maximum throughput value can be, given your local setup. This is an example of link:http://en.wikipedia.org/wiki/Stress_testing[+stress testing+], in which the system resources are purposely worked to their limits in order to arrive at a maximum capacity value.
+In the tests we've so far conducted, the throughput for a single user was calculated at 41/min, and for 20 users it was 577/min. You can continue to increase the demand on the server to see if it's possible to determine what the maximum throughput value can be, given your local setup. This is an example of link:{wikipedia}Stress_testing[stress testing], in which the system resources are purposely worked to their limits in order to arrive at a maximum capacity value.
 
 You can adjust the User Defined Variables, then run the test plan and examine the results. For example, experiment by increasing the number of users, or decreasing the ramp-up period or delay between requests.
 
@@ -546,7 +547,7 @@
 
 
 [start=2]
-. If you are running the Profiler for the first time, you need to perform a calibration step on the JDK. To do so, choose Profile > Advanced Commands > Run Profiler Calibration. For more information, refer to the NetBeans User FAQ wiki: link:http://wiki.netbeans.org/FaqProfilerCalibration[+What exactly does the Profiler Calibration mean?+].
+. If you are running the Profiler for the first time, you need to perform a calibration step on the JDK. To do so, choose Profile > Advanced Commands > Run Profiler Calibration. For more information, refer to the NetBeans User FAQ wiki: xref:../../../../wiki/FaqProfilerCalibration.adoc[What exactly does the Profiler Calibration mean?].
 
 [start=3]
 . Click the Profile Project ( image:images/profile-btn.png[] ) button. When a project is profiled for the first time, its build script must be modified to enable profiling. The IDE warns you that it will modify the project's build script. 
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 b07535f..de0b09d 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: The NetBeans E-commerce Tutorial - Integrating Transactional Business Logic - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, The NetBeans E-commerce Tutorial - Integrating Transactional Business Logic
+include::../../../../inc/database.adoc[]
 
 
 == Tutorial Contents
@@ -1002,15 +1003,15 @@
 * link:http://jcp.org/aboutJava/communityprocess/final/jsr318/index.html[+JSR 318: EJB 3.1 Final Release+] [Specification Download]
 * link:http://download.oracle.com/docs/cd/E17410_01/javaee/6/tutorial/doc/bncih.html[+Java EE 6 Tutorial: Transactions+]
 * link:http://www.manning.com/panda/[+EJB 3 in Action+] [Book]
-* link:http://en.wikipedia.org/wiki/Database_transaction[+Database Transaction+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/Ejb[+Enterprise JavaBean+] [Wikipedia]
-* link:http://en.wikipedia.org/wiki/ACID[+ACID+] [Wikipedia]
+* link:{wikipedia}Database_transaction[Database Transaction] [Wikipedia]
+* link:{wikipedia}Ejb[Enterprise JavaBean] [Wikipedia]
+* link:{wikipedia}ACID[+ACID+] [Wikipedia]
 * link:http://jquery.com/[+jQuery+]
-* link:http://en.wikipedia.org/wiki/Jquery[+jQuery+] [Wikipedia]
+* link:{wikipedia}Jquery[jQuery] [Wikipedia]
 
 
 
 == References
 
-1. <<1,^>> This _all or nothing_ concept can be further extrapolated into the four defining characteristics of transactions: _atomicity_, _consistency_, _isolation_, and _durability_ (ACID). For more information, see: link:http://en.wikipedia.org/wiki/ACID[+ACID+] [Wikipedia].
-2. <<2,^>> Actually, for credit card number entries, validation typically ensures that the entered string conforms to the Luhn algorithm, which is a simple method of differentiating between valid numbers and a collection of random digits. This applies to the link:http://plugins.jquery.com/project/validate[+jQuery validation plugin+] as well. For more information, see link:http://en.wikipedia.org/wiki/Luhn_algorithm[+Luhn algorithm+] [Wikipedia].
+1. <<1,^>> This _all or nothing_ concept can be further extrapolated into the four defining characteristics of transactions: _atomicity_, _consistency_, _isolation_, and _durability_ (ACID). For more information, see: link:{wikipedia}ACID[ACID] [Wikipedia].
+2. <<2,^>> Actually, for credit card number entries, validation typically ensures that the entered string conforms to the Luhn algorithm, which is a simple method of differentiating between valid numbers and a collection of random digits. This applies to the link:http://plugins.jquery.com/project/validate[+jQuery validation plugin+] as well. For more information, see link:{wikipedia}Luhn_algorithm[Luhn algorithm] [Wikipedia].
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 fe9b492..f59460d 100644
--- a/netbeans.apache.org/src/content/kb/docs/javaee/entappclient.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javaee/entappclient.adoc
@@ -47,7 +47,7 @@
 |===
 |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 
 
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 55a5411..0819714 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
@@ -59,7 +59,7 @@
 |===
 |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 
 
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 e01da14..37a652c 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
@@ -51,7 +51,7 @@
 |===
 |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 
 
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 ab97107..9935835 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
@@ -47,7 +47,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.4, 8.0, Java EE bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |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 
 
@@ -65,7 +65,7 @@
 
 Before starting this tutorial you may want to familiarize yourself with the following documentation.
 
-* link:http://wiki.netbeans.org/MavenBestPractices[+Best Practices for Apache Maven in NetBeans IDE+]
+* xref:../../../wiki/MavenBestPractices.adoc[+Best Practices for Apache Maven in NetBeans IDE+]
 * link:http://books.sonatype.com/mvnref-book/reference/introduction.html[+Chapter 1. Introducing Apache Maven+] (from link:http://books.sonatype.com/mvnref-book/reference/index.html[+Maven: The Complete Reference +])
 
 
@@ -101,7 +101,7 @@
 
 NOTE: Indexes are quite large and it can take some time to update them all.
 
-For more details about using Maven in NetBeans IDE, see the section on link:https://netbeans.org/kb/docs/java/maven-hib-java-se.html#02[+Configuring Maven+] in the link:https://netbeans.org/kb/docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+] tutorial and also link:http://wiki.netbeans.org/MavenBestPractices[+Best Practices for Apache Maven in NetBeans IDE+].
+For more details about using Maven in NetBeans IDE, see the section on xref:../java/maven-hib-java-se.adoc#02[+Configuring Maven+] in the xref:../java/maven-hib-java-se.adoc[+Creating a Maven Swing Application Using Hibernate+] tutorial and also xref:../../../wiki/MavenBestPractices.adoc[+Best Practices for Apache Maven in NetBeans IDE+].
 
 
 == Creating the Enterprise Application
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 e91fb42..29ee7a3 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
@@ -59,7 +59,7 @@
 |===
 |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 
 
@@ -75,7 +75,7 @@
 
 Before starting this tutorial you may want to familiarize yourself with the following documentation.
 
-* link:http://wiki.netbeans.org/MavenBestPractices[+Best Practices for Apache Maven in NetBeans IDE+]
+* xref:../../../wiki/MavenBestPractices.adoc[Best Practices for Apache Maven in NetBeans IDE]
 * link:http://books.sonatype.com/mvnref-book/reference/introduction.html[+Chapter 1. Introducing Apache Maven+] (from link:http://books.sonatype.com/mvnref-book/reference/index.html[+Maven: The Complete Reference +])
 
 You can download link:https://netbeans.org/projects/samples/downloads/download/Samples%252FJavaEE%252FMavenEnterpriseApp.zip[+a zip archive of the finished project+].
@@ -120,7 +120,7 @@
 * If you are using NetBeans IDE 7.1 or earlier you will need to choose Window > Other > Maven Repository Browser and click the Update Indexes ( image:images/maven-refreshrepo.png[title="Update Indexes button"]  ) at the top of the Maven Repository Browser window.
 ====
 
-For more details about using Maven in NetBeans IDE, see the section on link:https://netbeans.org/kb/docs/java/maven-hib-java-se.html#02[+Configuring Maven+] in the link:https://netbeans.org/kb/docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+] tutorial and also link:http://wiki.netbeans.org/MavenBestPractices[+Best Practices for Apache Maven in NetBeans IDE+].
+For more details about using Maven in NetBeans IDE, see the section on xref:../java/maven-hib-java-se.adoc#02[Configuring Maven] in the xref:../java/maven-hib-java-se.adoc[Creating a Maven Swing Application Using Hibernate] tutorial and also xref:../../../wiki/MavenBestPractices.adoc[Best Practices for Apache Maven in NetBeans IDE].
 
 
 == Creating the Maven Enterprise Application Project
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 181f1af..c4940f0 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
@@ -82,7 +82,7 @@
 
 Before starting this tutorial you may want to familiarize yourself with the following documentation.
 
-* link:http://wiki.netbeans.org/MavenBestPractices[+Best Practices for Apache Maven in NetBeans IDE+]
+* xref:../../../wiki/MavenBestPractices.adoc[+Best Practices for Apache Maven in NetBeans IDE+]
 * link:http://books.sonatype.com/mvnref-book/reference/introduction.html[+Chapter 1. Introducing Apache Maven+] (from link:http://books.sonatype.com/mvnref-book/reference/index.html[+Maven: The Complete Reference +])
 * link:http://www.osgi.org/javadoc/r4v42/[+OSGi Framework+]
 
@@ -891,8 +891,8 @@
 
 For more information about using NetBeans IDE and Maven to develop OSGi bundles, see the following resources:
 
-* 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+]
+* xref:../../../wiki/OSGiAndNetBeans.adoc[+OSGi And NetBeans at wiki+]
+* xref:../../../wiki/MavenBestPractices.adoc[+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+]
 * 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 8ee3567..46a45cc 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
@@ -60,7 +60,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.3.1, 7.4, 8.0, Java EE version 
+|xref:../../../download/index.adoc[NetBeans IDE] |7.3.1, 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 
 
@@ -79,7 +79,7 @@
 
 Before starting this tutorial you may want to familiarize yourself with the following documentation.
 
-* link:http://wiki.netbeans.org/MavenBestPractices[+Best Practices for Apache Maven in NetBeans IDE+]
+* xref:../../../wiki/MavenBestPractices.adoc[Best Practices for Apache Maven in NetBeans IDE]
 * link:http://books.sonatype.com/mvnref-book/reference/introduction.html[+Chapter 1. Introducing Apache Maven+] (from link:http://books.sonatype.com/mvnref-book/reference/index.html[+Maven: The Complete Reference +])
 
 You can download link:http://web.archive.org/web/20210118011547/https://netbeans.org/project_downloads/samples/Samples/JavaEE/WhiteboardApp.zip[+a zip archive of the finished project+].
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 7a7a088..b1bc3e6 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
@@ -46,7 +46,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |7.3, 7.4, 8.0, Java EE bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |7.3, 7.4, 8.0, Java EE bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |JDK 7 or 8 
 
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 79fd3a4..8a04c63 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
@@ -43,7 +43,7 @@
 |===
 |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 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/java-card.adoc b/netbeans.apache.org/src/content/kb/docs/javame/java-card.adoc
index a19cd6d..6336b9f 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/java-card.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/java-card.adoc
@@ -28,12 +28,14 @@
 :toc-title:
 :description: Java Card Development Quick Start Guide - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Java Card Development Quick Start Guide
+include::../../../inc/database.adoc[]
+
 
 image::images/java-smart-card-sm.jpg[]
 
 _Contributed by Tim Boudreau, maintained by Ruth Kusterer_
 
-Java Card is an interesting platform to work with - a JVM that runs on link:http://en.wikipedia.org/wiki/Smart_card[+smart cards+] and tiny devices that fit in the palm of your hand. As of Java Card 3.0, it comes in two flavors:
+Java Card is an interesting platform to work with - a JVM that runs on link:{wikipedia}Smart_card[smart cards] and tiny devices that fit in the palm of your hand. As of Java Card 3.0, it comes in two flavors:
 
 *Classic*::: This is the same as earlier versions of Java Card. The platform is extremely limited. For example,  ``java.lang.String``  does not exist, there is no  ``java.lang.Object.hashCode()``  method, and no floating point numbers.
 *Extended*::: For newer, more powerful smart cards—this is new in Java Card 3.0. It supports a much more complete implementation of the Java Platform. Probably the coolest thing about it is native support for Servlets—you can actually write a web application using familiar APIs, which runs on a smart card!
diff --git a/netbeans.apache.org/src/content/kb/docs/javame/javacard.adoc b/netbeans.apache.org/src/content/kb/docs/javame/javacard.adoc
index d9db74a..210483c 100644
--- a/netbeans.apache.org/src/content/kb/docs/javame/javacard.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/javame/javacard.adoc
@@ -28,12 +28,14 @@
 :toc-title:
 :description: Java Card Development Quick Start Guide - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Java Card Development Quick Start Guide
+include::../../../inc/database.adoc[]
+
 
 image::images/java-smart-card-sm.jpg[]
 
 _Contributed by Tim Boudreau, maintained by Ruth Kusterer_
 
-Java Card is an interesting platform to work with - a JVM that runs on link:http://en.wikipedia.org/wiki/Smart_card[+smart cards+] and tiny devices that fit in the palm of your hand. As of Java Card 3.0, it comes in two flavors:
+Java Card is an interesting platform to work with - a JVM that runs on link:{wikipedia}Smart_card[smart cards] and tiny devices that fit in the palm of your hand. As of Java Card 3.0, it comes in two flavors:
 
 *Classic*::: This is the same as earlier versions of Java Card. The platform is extremely limited. For example,  ``java.lang.String``  does not exist, there is no  ``java.lang.Object.hashCode()``  method, and no floating point numbers.
 *Extended*::: For newer, more powerful smart cards—this is new in Java Card 3.0. It supports a much more complete implementation of the Java Platform. Probably the coolest thing about it is native support for Servlets—you can actually write a web application using familiar APIs, which runs on a smart card!
diff --git a/netbeans.apache.org/src/content/kb/docs/matisse.adoc b/netbeans.apache.org/src/content/kb/docs/matisse.adoc
index c8adc85..ffdefe0 100644
--- a/netbeans.apache.org/src/content/kb/docs/matisse.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/matisse.adoc
@@ -135,15 +135,15 @@
 
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans-part3[+How to Integrate JavaFX into a NetBeans Platform Wizard (Part 1)+] (_by Sean Phillips_)
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans[+How to Integrate JavaFX into the NetBeans Platform Menu bar+] (_by Geertjan Wielenga_)
-* link:http://wiki.netbeans.org/UsingNetbeansMatisseAndEclipseInParallel[+Using Netbeans Matisse And Eclipse In Parallel+]
+* xref:../../wiki/UsingNetbeansMatisseAndEclipseInParallel.adoc[Using Netbeans Matisse And Eclipse In Parallel]
 
 == Other Resources
 
 * link:http://download.oracle.com/javafx/[+JavaFX Documentation+]
-* link:http://wiki.netbeans.org/JavaFX[+NetBeans wiki page on JavaFX support+]
+* xref:../../wiki/JavaFX.adoc[NetBeans wiki page on JavaFX support]
 * link:http://docs.oracle.com/javase/tutorial/uiswing/index.html[+ docs.oracle.com Swing Tutorial+]
 * link:https://www.java.net//community/javafx/faqs[+JavaFX FAQs+]
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#GUI_Editor_.28Matisse.29[+GUI Editor FAQs+]
+* xref:../../wiki/NetBeansUserFAQ.adoc#GUI_Editor_.28Matisse.29[+GUI Editor FAQs+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG399[+Working with a JavaFX Project+] in _Developing Applications with NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG920[+Implementing Java GUIs+] in _Developing Applications with NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245[+Developing with Java Persistence+] in _Developing Applications with NetBeans IDE_
diff --git a/netbeans.apache.org/src/content/kb/docs/mobility.adoc b/netbeans.apache.org/src/content/kb/docs/mobility.adoc
index 07f0e6d..9fe5c66 100644
--- a/netbeans.apache.org/src/content/kb/docs/mobility.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/mobility.adoc
@@ -59,14 +59,14 @@
 
 == Other Resources
 
-* link:http://wiki.netbeans.org/JavaMESDKSupport[+NetBeans wiki page on Java ME SDK Support+]
+* xref:../../wiki/JavaMESDKSupport.adoc[+NetBeans wiki page on Java ME SDK Support+]
 * link:http://docs.oracle.com/javame/config/cldc/rel/8/rpi/html/getstart_rpi/debugging.htm#sthref31[+ Using NetBeans with the Raspberry Pi Board+] in _Oracle® Java ME Embedded Getting Started Guide for the Reference Platform (Raspberry Pi) Release 8 EA 2_
 * link:http://docs.oracle.com/javame/config/cldc/rel/3.3/win/gs/html/getstart_win32/setup_nbenv.htm[+ Using the Oracle Java ME SDK Software with NetBeans+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+ Developing Java ME Applications+] in _Developing Applications with NetBeans IDE_
 
 === NetBeans Mobility Community Resources
 
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#Java_ME.2FMobility[+NetBeans Mobility FAQs+]
+* xref:../../wiki/NetBeansUserFAQ.adoc#Java_ME.2FMobility[+NetBeans Mobility FAQs+]
 * link:http://forums.netbeans.org/javame-users.html[+NetBeans Java ME User Forum+]
 
 === Java ME Related Sites
diff --git a/netbeans.apache.org/src/content/kb/docs/php.adoc b/netbeans.apache.org/src/content/kb/docs/php.adoc
index 33ba718..fc13a08 100644
--- a/netbeans.apache.org/src/content/kb/docs/php.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/php.adoc
@@ -67,7 +67,7 @@
 
 * 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:../../wiki/HTML5.adoc[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)
@@ -78,7 +78,7 @@
 * 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)]
+* xref:../../wiki/HowToConfigureXDebug.adoc[How To Configure XDebug (Wiki)]
 
 === Testing and Debugging
 
@@ -138,8 +138,8 @@
 == 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]
+* xref:../../wiki/NB68symfony.adoc[Symfony on Windows in NetBeans 6.8]
+* xref:../../wiki/ConfiguringNetBeansProjectForWordPress.adoc[Configuring a NetBeans IDE Project for WordPress]
 
 == Other Resources
 
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 4effc45..639061a 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
@@ -254,7 +254,7 @@
 ----
 
 . If the lines are missing, add them, save  ``httpd.conf`` , and restart Apache.
-. Refresh the http://localhost:<port>/test.php page.
+. Refresh the pass:[http://localhost:<port>/test.php] page.
 
 ==== MySQL Database Server
 
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 e49d670..ccffb58 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 @@
 
 == 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 xref:../php.adoc#configuration[+prepare your environment+] for PHP development.
+Before creating a PHP project, you need to download and install the xref:../../../download/index.adoc[NetBeans IDE for PHP] and xref:../php.adoc#configuration[+prepare your environment+] for PHP development.
 
 To set up a PHP project:
 
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 d70f31a..15d6069 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: Lesson 2: Designing the Application. Reading from the Database - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Creating a Database Driven Application With PHP
+include::../../../inc/database.adoc[]
 
 In this lesson you create and configure the PHP project to develop your application, create a list of pages in the application, and define the relations between them. You also develop basic application functionality and test it against the data you entered in the sample database in lesson 1.
 
@@ -313,7 +314,7 @@
 
 Lastly, you free the mysqli result or OCI8 statement. You need to free all resources that use a connection before the connection will physically be closed. Otherwise PHP's internal refcounting system will keep the underlying DB connection open even if  ``$con``  is not usable following a  ``mysqli_close()``  or  ``oci_close()``  call.
 
-WARNING: Security Note: For MySQL, the  ``htmlentities($_GET["user"])``  parameter is escaped in order to prevent SQL injection attacks. See link:http://en.wikipedia.org/wiki/SQL_injection[+Wikipedia on SQL injections+] and the link:http://us3.php.net/mysql_real_escape_string[+mysql_real_escape_string documentation+]. Although in the context of this tutorial you are not at risk of harmful SQL injections, it is best practice to escape strings in MySQL queries that would be at risk of such an attack. OCI8 avoids this through bind variables.
+WARNING: Security Note: For MySQL, the  ``htmlentities($_GET["user"])``  parameter is escaped in order to prevent SQL injection attacks. See link:{wikipedia}SQL_injection[Wikipedia on SQL injections] and the link:http://us3.php.net/mysql_real_escape_string[+mysql_real_escape_string documentation+]. Although in the context of this tutorial you are not at risk of harmful SQL injections, it is best practice to escape strings in MySQL queries that would be at risk of such an attack. OCI8 avoids this through bind variables.
 
 This PHP block is now complete. If you are using a MySQL database, the  ``wishlist.php``  file now looks like this:
 
@@ -427,7 +428,7 @@
 * The SELECT query retrieves the wishes with their due dates for the specified wisher by his ID, which was retrieved in step 4, and stores the wishes and due dates in an array $result.
 * A loop displays the items of the $result array as rows in the table while the array is not empty.
 * The `<tr></tr>` tags form rows, the `<td></td>` tags form cells within rows, and `\n` starts a new line.
-* The  ``htmlentities``  function converts all characters that have HTML entity equivalents into HTML entities. This helps to prevent link:http://en.wikipedia.org/wiki/Cross-site_scripting[+cross-site scripting+].
+* The  ``htmlentities``  function converts all characters that have HTML entity equivalents into HTML entities. This helps to prevent link:{wikipedia}Cross-site_scripting[cross-site scripting].
 * Functions at the end free all resources (mysqli results and OCI8 statements) and close the database connection. Note you need to free all resources that use a connection before the connection can physically be closed. Otherwise PHP's internal refcounting system keeps the underlying DB connection open even if the connection is not usable following an  ``oci_close()``  or  ``mysqli_close()``  call.
 
 WARNING: Make sure you type the names of database fields exactly as they are specified during the database table creation. For Oracle, column names are returned as uppercase by default.
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 134eb03..a8d660e 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: Lesson 4: Optimizing the Code with Classes and Objects - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Lesson 4: Optimizing the Code with Classes and Objects
+include::../../../inc/database.adoc[]
 
 In this lesson you optimize the code to facilitate maintaining it in the future. This affects the files  `createNewWisher.php`  and  `wishlist.php` . Additionally, a new file called  `db.php`  is created.
 
@@ -263,7 +264,7 @@
 
 The code block executes the query  `SELECT ID FROM wishers WHERE name = [variable for name of the wisher]` . The query result is an array of IDs from the records that meet the query. If the array is not empty this automatically means that it contains one element because the field name is specified as UNIQUE during the table creation. In this case the function returns the first element of the  `$result`  array (the element with the zero numbered). If the array is empty the function returns null.
 
-*Security Note:* For the MySQL database, the  `$name ` string is escaped in order to prevent SQL injection attacks. See link:http://en.wikipedia.org/wiki/SQL_injection[+Wikipedia on SQL injections+] and the link:http://us3.php.net/mysql_real_escape_string[+mysql_real_escape_string documentation+]. Although in the context of this tutorial you are not at risk of harmful SQL injections, it is best practice to escape strings in MySQL queries that would be at risk of such an attack. The Oracle database avoids this issue by using bind variables.
+*Security Note:* For the MySQL database, the  `$name ` string is escaped in order to prevent SQL injection attacks. See link:{wikipedia}SQL_injection[Wikipedia on SQL injections] and the link:http://us3.php.net/mysql_real_escape_string[+mysql_real_escape_string documentation+]. Although in the context of this tutorial you are not at risk of harmful SQL injections, it is best practice to escape strings in MySQL queries that would be at risk of such an attack. The Oracle database avoids this issue by using bind variables.
 
 
 [[getWishesByID]]
diff --git a/netbeans.apache.org/src/content/kb/docs/platform.adoc b/netbeans.apache.org/src/content/kb/docs/platform.adoc
index 814d72e..bc58a7f 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform.adoc
@@ -29,13 +29,13 @@
 :description: NetBeans Platform Learning Trail - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, NetBeans Platform Learning Trail
 :reviewed: 2022-01-14
-
+include::../../inc/database.adoc[]
 
 == What is the NetBeans Platform?
 
 The NetBeans Platform is a broad Java framework on which you can base large desktop applications. 
 
-See link:https://en.wikipedia.org/wiki/List_of_NetBeans-based_software[a list of NetBeans based applications]
+See link:{wikipedia}List_of_NetBeans-based_software[a list of NetBeans based applications]
 that have been built on top of the NetBeans platform.
 
 NOTE: The fact that we use the NetBeans Platform to build the NetBeans IDE does not mean that
@@ -157,7 +157,7 @@
 You can use Maven and the NetBeans Platform to build great applications. Here're some
 tutorials to get you started:
 
-* link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices in NetBeans IDE+]
+* xref:../../wiki/MavenBestPractices.adoc[+Maven Best Practices in NetBeans IDE+]
 * link:https://bits.netbeans.org/mavenutilities/nbm-maven-plugin/[+About the NetBeans Module Maven Plugin+]
 * xref:../../tutorials/nbm-maven-commandline.adoc[+NetBeans Platform Maven Command Line Tutorial+]
 * xref:../../tutorials/nbm-maven-quickstart.adoc[+NetBeans Platform Quick Start Using Maven+]
@@ -223,10 +223,10 @@
 * xref:../../tutorials/nbm-visual_library.adoc[+Visual Library Tutorial+]
 * xref:../../tutorials/nbm-quick-start-visual.adoc[+Visual Library Tutorial for Java Applications+]
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+Visualize SQL Scripts with the NetBeans Platform+]
-* link:http://wiki.netbeans.org/VisualDatabaseExplorer[+A Visual Database Explorer for NetBeans+]
+* xref:../../wiki/VisualDatabaseExplorer.adoc[+A Visual Database Explorer for NetBeans+]
 * link:http://java.dzone.com/news/how-create-visual-applications[+How to Create Visual Applications in Java?+]
 * link:http://java.dzone.com/news/how-add-resize-functionality-v[+How to Add Resize Functionality to Visual Applications in Java?+]
-* link:https://netbeans.org/community/magazine/html/04/visuallibrary.html[+Creative Uses of the Visual Library+]
+* xref:../../community/magazine/html/04/visuallibrary.adoc[+Creative Uses of the Visual Library+]
 
 === Building custom project types
 
diff --git a/netbeans.apache.org/src/content/kb/docs/platform/index.adoc b/netbeans.apache.org/src/content/kb/docs/platform/index.adoc
index eca6b67..7da6f34 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform/index.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform/index.adoc
@@ -36,7 +36,7 @@
 
 The NetBeans Platform is a broad Java framework on which you can base large
 desktop applications. NetBeans IDE itself is
-link:http://platform.netbeans.org/screenshots.html[one of the hundreds of
+xref:../../projects/platform/screenshots.adoc[one of the hundreds of
 applications] based on the NetBeans Platform. The NetBeans Platform contains
 APIs that simplify the handling of windows, actions, files, and many other
 things typical in applications.
@@ -52,7 +52,7 @@
 
 == Getting Started
 
-*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc] ( xref:../../../download/index.adoc[download javadoc.zip for offline viewing])
+*  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
 *  link:https://mail-archives.apache.org/mod_mbox/netbeans-dev/[NetBeans Developer Mailing List]
 *  xref:../../../wiki/index.adoc[NetBeans Developer FAQ]
 *  xref:../../../tutorials/nbm-google.adoc[NetBeans Plugin Quick Start]
diff --git a/netbeans.apache.org/src/content/kb/docs/tools.adoc b/netbeans.apache.org/src/content/kb/docs/tools.adoc
index 22f2283..3bae58b 100644
--- a/netbeans.apache.org/src/content/kb/docs/tools.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/tools.adoc
@@ -44,7 +44,7 @@
 === Maven
 
 * xref:java/maven-hib-java-se.adoc[+Creating a Maven Swing Application Using Hibernate+]
-* link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices+]
+* xref:../../wiki/MavenBestPractices.adoc[+Maven Best Practices+]
 
 === Source Code Management
 
@@ -72,8 +72,8 @@
 == Community-Contributed Docs
 
 * Geertjan's Blog: link:https://blogs.oracle.com/geertjan/entry/git_in_netbeans_ide_7[+Git with Rebase in NetBeans IDE+]
-* link:http://wiki.netbeans.org/TutorialUsingSVNLocalRepository[+Using a Subversion (SVN) Local Repository+]
-* link:http://wiki.netbeans.org/AccessMssql[+Accessing MS Access / MS SQL from NetBeans+]
+* xref:../../wiki/TutorialUsingSVNLocalRepository.adoc[+Using a Subversion (SVN) Local Repository+]
+* xref:../../wiki/AccessMssql.adoc[+Accessing MS Access / MS SQL from NetBeans+]
 
 == Other Resources
 
@@ -81,6 +81,6 @@
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG620[+Working with Maven in NetBeans+] in _Developing Applications with NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG234[+Versioning Applications with Version Control+] in _Developing Applications with NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG348[+Working in a Collaborative Environment+] in _Developing Applications with NetBeans IDE_
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#Version_Control_Systems[+Version Control FAQs+]
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#Database_Connectivity[+Database Connectivity FAQs+]
+* xref:../../wiki/NetBeansUserFAQ.adoc#Version_Control_Systems[+Version Control FAQs+]
+* xref:../../wiki/NetBeansUserFAQ.adoc#Database_Connectivity[+Database Connectivity FAQs+]
 * link:http://www.mysql.com/why-mysql/java/[+MySQL and Java - Resources+]
diff --git a/netbeans.apache.org/src/content/kb/docs/web.adoc b/netbeans.apache.org/src/content/kb/docs/web.adoc
index 9c7881e..af84664 100644
--- a/netbeans.apache.org/src/content/kb/docs/web.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/web.adoc
@@ -70,15 +70,15 @@
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+Hierarchical Web Service Development with NetBeans IDE+] by Jayasurya Venug
 * link:http://buttso.blogspot.com/2011/02/using-jax-rs-with-weblogic-server-1034.html[+Steve Button's blog: Using JAX-RS [and NetBeans IDE] With WebLogic Server 10.3.4+]
 * link:http://www.adam-bien.com/roller/abien/entry/simplest_possible_ejb_3_13[+Simplest Possible EJB 3.1/REST (JSR 311) Component+], by Adam Bien
-* link:http://wiki.netbeans.org/TransformingSOAPMessagesWithXSLT[+Transforming SOAP Messages with XSLT+], by Siegfried Bolz
-* link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Creating a Java Client for del.icio.us RESTful Web Services+], by Amit Kumar Saha
-* link:http://wiki.netbeans.org/SOAPclientForOpenCalais[+A SOAP Client for Open Calais+], by Amit Kumar Saha
+* xref:../../wiki/TransformingSOAPMessagesWithXSLT.adoc[+Transforming SOAP Messages with XSLT+], by Siegfried Bolz
+* xref:../../wiki/JavaClientForDeliciousUsingNetBeans.adoc[+Creating a Java Client for del.icio.us RESTful Web Services+], by Amit Kumar Saha
+* xref:../../wiki/SOAPclientForOpenCalais.adoc[+A SOAP Client for Open Calais+], by Amit Kumar Saha
 
 == Screencasts
 
 * 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+]
+* java.net: link:https://download.java.net/javaee5/screencasts/metro-nb6/[+Secure and Reliable Web Services using Metro/GlassFish+]
+* YouTube: link:https://youtube.com/watch?v=K8OtFD6RLMM[+SOCRADES: Demonstration of Web Services on Sun SPOT Devices+]
 
 == Other Resources
 
@@ -91,7 +91,7 @@
 
 === FAQs
 
-* link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebServicesDevelopment[+Web Service Development FAQs+]
+* xref:../../wiki/NetBeansUserFAQ.adoc#section-NetBeansUserFAQ-WebServicesDevelopment[+Web Service Development FAQs+]
 
 === Tutorials and Other Docs
 
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 f939bd4..6833355 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: Connecting a Dojo Tree to an ArrayList using JSON - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Connecting a Dojo Tree to an ArrayList using JSON
+include::../../../inc/database.adoc[]
 
 Web 2.0 features are becoming increasingly predominant in web applications. Many web applications now use JavaScript toolkits such as link:http://www.dojotoolkit.org/[+Dojo+], which allow web pages to behave more like desktop interfaces while overcoming browser incompatibilities and utilizing code that is maintainable, accessible, and standards-compliant.
 
@@ -324,7 +325,7 @@
 
 indians.add(new Tribe("Eskimo-Aleut", "Arctic", "Alaska Natives"));
 ----
-Each `Tribe` object captures three points of information: _tribe_, _category_, and _region_. The data for this exercise has been taken from Wikipedia's entry on link:http://en.wikipedia.org/wiki/Native_Americans_in_the_United_States#Ethno-linguistic_classification[+Native Americans in the United States+]. As you can determine, multiple _tribes_ are classified within a _category_, and numerous categories may be contained within a larger _region_.
+Each `Tribe` object captures three points of information: _tribe_, _category_, and _region_. The data for this exercise has been taken from Wikipedia's entry on link:{wikipedia}Native_Americans_in_the_United_States#Ethno-linguistic_classification[Native Americans in the United States]. As you can determine, multiple _tribes_ are classified within a _category_, and numerous categories may be contained within a larger _region_.
 
 
 . Open the `Tribe` class in the editor, and note that it is basically a link:http://java.sun.com/docs/books/tutorial/javabeans/index.html[+JavaBean+], with the exception of the `toJSONObject()` method:
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 028d251..7d8ac41 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
@@ -28,6 +28,7 @@
 :toc-title:
 :description: Introduction to JavaServer Faces 2.x - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Introduction to JavaServer Faces 2.x
+include::../../../inc/database.adoc[]
 
 JavaServer Faces (JSF) is a user interface (UI) framework for Java web applications. It is designed to significantly ease the burden of writing and maintaining applications that run on a Java application server and render their UIs back to a target client. JSF provides ease-of-use in the following ways:
 
@@ -160,7 +161,7 @@
 [[managedBean]]
 == Creating a Managed Bean
 
-You can use JSF's managed beans to process user data and retain it between requests. A managed bean is a link:http://en.wikipedia.org/wiki/Plain_Old_Java_Object[+POJO+] (Plain Old Java Object) that can be used to store data, and is managed by the container (e.g., the GlassFish server) using the JSF framework.
+You can use JSF's managed beans to process user data and retain it between requests. A managed bean is a link:{wikipedia}Plain_Old_Java_Object[POJO] (Plain Old Java Object) that can be used to store data, and is managed by the container (e.g., the GlassFish server) using the JSF framework.
 
 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.
 
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 37d9d0c..82541c1 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
@@ -28,6 +28,8 @@
 :toc-title:
 :description: Introduction to the Wicket Web Framework - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Introduction to the Wicket Web Framework
+include::../../../inc/database.adoc[]
+
 
 This document takes you through the basics of creating reusable components and assembling them into a web application. Each component consists of a Java class and an HTML file. The framework that allows you to develop your application in this way is called Wicket. In addition to its component-based approach, a distinguishing feature of Wicket is the absence of XML configuration files. Instead of an XML configuration file, you use a Java class for application-wide settings, such as the identification of a home page.
 
@@ -665,7 +667,7 @@
 
 === Adding AJAX Features
 
-Instead of using JavaScript to add asynchronous web features (via link:http://en.wikipedia.org/wiki/Ajax_(programming)[+AJAX technology+]) to a Wicket application, Wicket makes available a Java component model that encapsulates AJAX features. Below, you are shown how to change the BannerPanel to include an AJAX autocomplete widget, instead of the label widget you created previously.
+Instead of using JavaScript to add asynchronous web features (via link:{wikipedia}Ajax_(programming)[AJAX technology]) to a Wicket application, Wicket makes available a Java component model that encapsulates AJAX features. Below, you are shown how to change the BannerPanel to include an AJAX autocomplete widget, instead of the label widget you created previously.
 
 1. On the HTML side of the  ``BannerPanel``  class, drag an AJAX Text Input item from the Palette (Ctrl-Shift-8), as shown below:
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/client.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/client.adoc
index f48e8ad..97e0dc9 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/client.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/client.adoc
@@ -40,7 +40,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java EE download bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |Java EE download bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or version 8 
 
@@ -49,7 +49,7 @@
 Oracle WebLogic Server 
 |===
 
-*Important:* You need to enable access to external schema to create the web service client. For more details, see the FAQ link:http://wiki.netbeans.org/FaqWSDLExternalSchema[+How to enable parsing of WSDL with an external schema?+]
+*Important:* You need to enable access to external schema to create the web service client. For more details, see the FAQ xref:../../../wiki/FaqWSDLExternalSchema.adoc[+How to enable parsing of WSDL with an external schema?+]
 
 *Note.* Both Tomcat and the GlassFish server can be installed with the Web and Java EE distribution of NetBeans IDE. Alternatively, you can visit the link:https://glassfish.java.net/download.html[+the GlassFish server downloads page+] or the link:http://tomcat.apache.org/download-60.cgi[+Apache Tomcat downloads page+].
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/flower_overview.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/flower_overview.adoc
index 7a0310d..b297760 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/flower_overview.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/flower_overview.adoc
@@ -57,7 +57,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java EE download bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |Java EE download bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/jax-ws.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/jax-ws.adoc
index 0aeeb73..93b5b9c 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/jax-ws.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/jax-ws.adoc
@@ -43,7 +43,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java EE download bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |Java EE download bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |JDK 7 or JDK 8
  
@@ -60,7 +60,7 @@
 [[extschema]]
 == Enabling Access to External Schema
 
-You need to enable the IDE and the GlassFish Server to access external schema to parse the WSDL file of the web service. To enable access you need to modify the configuration files of the IDE and the GlassFish Server. For more details, see the FAQ link:http://wiki.netbeans.org/FaqWSDLExternalSchema[+How to enable parsing of WSDL with an external schema?+]
+You need to enable the IDE and the GlassFish Server to access external schema to parse the WSDL file of the web service. To enable access you need to modify the configuration files of the IDE and the GlassFish Server. For more details, see the FAQ xref:../../../wiki/FaqWSDLExternalSchema.adoc[+How to enable parsing of WSDL with an external schema?+]
 
 
 === Configuring the IDE
@@ -74,7 +74,7 @@
 -J-Djavax.xml.accessExternalSchema=all
 ----
 
-For more about locating and modifying the `netbeans.conf` configuration file, see link:http://wiki.netbeans.org/FaqNetbeansConf[+Netbeans Conf FAQ+].
+For more about locating and modifying the `netbeans.conf` configuration file, see xref:../../../wiki/FaqNetbeansConf.adoc[+Netbeans Conf FAQ+].
 
 
 === Configuring the GlassFish Server
@@ -103,7 +103,7 @@
 
 1. Choose File > New Project (Ctrl-Shift-N on Linux and Windows, ⌘-Shift-N on MacOS). Select Web Application from the Java Web category or EJB Module from the Java EE category.
 
-*Note.* You can create a JAX-WS web service in a Maven project. Choose File > New Project (Ctrl-Shift-N on Linux and Windows, ⌘-Shift-N on MacOS) and then Maven Web Application or Maven EJB module from the Maven category. If you haven't used Maven with NetBeans before, see link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices+].
+*Note.* You can create a JAX-WS web service in a Maven project. Choose File > New Project (Ctrl-Shift-N on Linux and Windows, ⌘-Shift-N on MacOS) and then Maven Web Application or Maven EJB module from the Maven category. If you haven't used Maven with NetBeans before, see xref:../../../wiki/MavenBestPractices.adoc[+Maven Best Practices+].
 
 
 [start=2]
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/rest.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/rest.adoc
index e5393f1..c0098a0 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/rest.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/rest.adoc
@@ -28,6 +28,7 @@
 :toc-title:
 :description: Getting Started with RESTful Web Services - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Getting Started with RESTful Web Services
+include::../../../inc/database.adoc[]
 
 REpresentational State Transfer (REST) is an architectural style for distributed hypermedia systems, such as the World Wide Web. Central to the RESTful architecture is the concept of resources identified by universal resource identifiers (URIs). These resources can be manipulated using a standard interface, such as HTTP, and information is exchanged using representations of these resources. In this tutorial, you first learn a bit about REST and then you are shown how NetBeans IDE supports this architectural style.
 
@@ -40,7 +41,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java EE download bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |Java EE download bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 
@@ -97,7 +98,7 @@
 
 ==  RESTful Web Services, Persistence, and Entity Classes
 
-RESTful web services in Java rely on the link:http://en.wikipedia.org/wiki/Java_Persistence_API[+Java Persistence API+] to communicate with a database. Specifically, RESTful web services rely on _entity classes_ and a _persistence unit_, as defined in the Persistence API. Entity classes are Java classes that map to objects in a relational database. According to link:http://download.oracle.com/javaee/5/tutorial/doc/bnbqa.html[+The Java EE5 Tutorial+], "An entity is a lightweight persistence domain object. Typically an entity represents a table in a relational database, and each entity instance corresponds to a row in that table." A persistence unit consists of the set of entity classes, the data source, the persistence provider, and the persistence unit's own name, as defined in a  ``persistence.xml``  file.
+RESTful web services in Java rely on the link:{wikipedia}Java_Persistence_API[Java Persistence API] to communicate with a database. Specifically, RESTful web services rely on _entity classes_ and a _persistence unit_, as defined in the Persistence API. Entity classes are Java classes that map to objects in a relational database. According to link:http://download.oracle.com/javaee/5/tutorial/doc/bnbqa.html[+The Java EE5 Tutorial+], "An entity is a lightweight persistence domain object. Typically an entity represents a table in a relational database, and each entity instance corresponds to a row in that table." A persistence unit consists of the set of entity classes, the data source, the persistence provider, and the persistence unit's own name, as defined in a  ``persistence.xml``  file.
 
 You can use NetBeans IDE either to create entity classes and RESTful web services in the same process, or you can use the IDE to create RESTful web services from existing entity classes. In this tutorial, you use the RESTful Services from Database wizard to generate entity classes and RESTful web services in the same process. The wizard automatically generates the persistence unit.
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/wsit.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/wsit.adoc
index d9b2941..2c6e8eb 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/wsit.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/wsit.adoc
@@ -40,7 +40,7 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java EE download bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |Java EE download bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 6 or version 7 
 
diff --git a/netbeans.apache.org/src/content/kb/docs/websvc/zillow.adoc b/netbeans.apache.org/src/content/kb/docs/websvc/zillow.adoc
index 5952dbe..cef441a 100644
--- a/netbeans.apache.org/src/content/kb/docs/websvc/zillow.adoc
+++ b/netbeans.apache.org/src/content/kb/docs/websvc/zillow.adoc
@@ -44,13 +44,13 @@
 |===
 |Software or Resource |Version Required 
 
-|link:https://netbeans.org/downloads/index.html[+NetBeans IDE+] |Java EE download bundle 
+|xref:../../../download/index.adoc[NetBeans IDE] |Java EE download bundle 
 
 |link:http://www.oracle.com/technetwork/java/javase/downloads/index.html[+Java Development Kit (JDK)+] |version 7 or 8 
 
 |Java EE-compliant web or application server |Tomcat web server 7.x, 8.x GlassFish Server Open Source Edition 3.1.x, 4.x or link:http://www.oracle.com/technetwork/middleware/weblogic/overview/index.html[+Oracle WebLogic Server 11g-12c+]
 *Important:* If you use Tomcat with this Tutorial, see 
-link:http://wiki.netbeans.org/DeployREST2Tomcat55[+the NetBeans Wiki on Tomcat with REST+] 
+xref:../../../wiki/DeployREST2Tomcat55.adoc[the NetBeans Wiki on Tomcat with REST] 
 |===
 
 
@@ -259,11 +259,11 @@
 For more information about using NetBeans IDE to develop RESTful web services, SaaS, and other Java EE applications, see the following resources:
 
 * xref:rest.adoc[+Getting Started with RESTful Web Sevices+]
-* link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Creating a Java Client for del.icio.us RESTful Web Services+], by Amit Kumar Saha
-* link:http://wiki.netbeans.org/RESTRemoting[+NetBeans Wiki: RESTful Web Service Client Stub+]
-* xref:../web.adoc[+Web Services Learning Trail+]
-* YouTube: link:http://www.youtube.com/watch?v=cDdfVMro99s[+RESTful Web Services, Building and Deploying (Part 1)+]
-* YouTube: link:http://www.youtube.com/watch?v=_c-CCVy4_Eo[+NetBeans RESTful Testing and Invoking RESTful Resources (Part 2)+]
+* xref:../../../wiki/JavaClientForDeliciousUsingNetBeans.adoc[Creating a Java Client for del.icio.us RESTful Web Services], by Amit Kumar Saha
+* xref:../../../wiki/RESTRemoting.adoc[NetBeans Wiki: RESTful Web Service Client Stub]
+* xref:../web.adoc[Web Services Learning Trail]
+* YouTube: link:https://www.youtube.com/watch?v=cDdfVMro99s[RESTful Web Services, Building and Deploying (Part 1)]
+* YouTube: link:https://www.youtube.com/watch?v=_c-CCVy4_Eo[NetBeans RESTful Testing and Invoking RESTful Resources (Part 2)]
 
 To send comments and suggestions, get support, and keep informed about the latest developments on the NetBeans IDE Java EE development features, xref:../../../community/mailing-lists.adoc[+join the nbj2ee@netbeans.org mailing list+].
 
diff --git a/netbeans.apache.org/src/content/participate/netcat.adoc b/netbeans.apache.org/src/content/participate/netcat.adoc
index 4b3a52e..ac9257d 100644
--- a/netbeans.apache.org/src/content/participate/netcat.adoc
+++ b/netbeans.apache.org/src/content/participate/netcat.adoc
@@ -37,7 +37,7 @@
 to stress though that the NetCAT program is about quality acceptance and not
 about feature design.
 
-This program is the successor of link:http://wiki.netbeans.org/NetCAT[NetCAT] program, which was formerly run by Oracle Inc.
+This program is the successor of xref:../wiki/NetCAT.adoc[NetCAT] program, which was formerly run by Oracle Inc.
 
 == How can I participate in NetCAT?
 
diff --git a/netbeans.apache.org/src/content/participate/submit-pr.adoc b/netbeans.apache.org/src/content/participate/submit-pr.adoc
index 705f4ce..8858da1 100644
--- a/netbeans.apache.org/src/content/participate/submit-pr.adoc
+++ b/netbeans.apache.org/src/content/participate/submit-pr.adoc
@@ -65,7 +65,7 @@
 === Bootstrapping (do this once)
 
 Since you don't have write permissions to the GitHub apache mirror, you need to
-fork https://github.com/apache/netbeans in GitHub, this is done using
+fork link:https://github.com/apache/netbeans[https://github.com/apache/netbeans] in GitHub, this is done using
 the "fork" button on the top right of the GitHub page.
 
 You then need to clone the forked repository in your computer.
@@ -118,11 +118,11 @@
 
 If you have submitted many different commits it's a good idea to squash them together. See xref:submit-pr.adoc#squash[squashing commits on pull requests] for help on this.
 
-Once your code is ready to review create a *pull request* using the GitHub interface. See https://help.github.com/articles/creating-a-pull-request/ for help.
+Once your code is ready to review create a *pull request* using the GitHub interface. See link:https://help.github.com/articles/creating-a-pull-request/[https://help.github.com/articles/creating-a-pull-request/] for help.
 
 === Be patient
 
-Once your pull request is submitted to Apache NetBeans it will be visible in this address https://github.com/apache/netbeans/pulls.
+Once your pull request is submitted to Apache NetBeans it will be visible in this address link:https://github.com/apache/netbeans/pulls[https://github.com/apache/netbeans/pulls].
 
 The pull request will then be reviewed by the xref:../community/who.adoc[NetBeans Team], once there's time to do so. Please be patient, as this may take some time, depending on other duties and ongoing work.
 
@@ -146,7 +146,7 @@
 
 If the PR is merged into master as-is then all these commits will be in the master too, forever. Therefore, in this example, all three commits should be squashed into one so that only `X` is left.
 
-https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
+link:https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History[https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History]
 
 After submission (and certainly after someone starts reviewing the PR) you shouldn't touch the PR's history. 
 
@@ -200,13 +200,13 @@
 [[donating-code]]
 == Donating Code
 
-You may find official information here: https://incubator.apache.org/ip-clearance/
+You may find official information here: link:https://incubator.apache.org/ip-clearance/[https://incubator.apache.org/ip-clearance/]
 
 Donator can use pull request as show above. (squashed for having a better readability of the hash)
 
 In order to accept a donation the Apache NetBeans PMC should do a vote to accept the intention of donation.
 
-PMC will have to setup a form to append the list at https://incubator.apache.org/ip-clearance/ and open an issue to track donation.
+PMC will have to setup a form to append the list at link:https://incubator.apache.org/ip-clearance/[https://incubator.apache.org/ip-clearance/] and open an issue to track donation.
 
 Donator must ensure that the following step are ok (PMC member need to check): 
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-copyfqn.adoc b/netbeans.apache.org/src/content/tutorials/nbm-copyfqn.adoc
index dfefd52..09f2b91 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-copyfqn.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-copyfqn.adoc
@@ -622,7 +622,7 @@
 
 For more information about creating and developing NetBeans Module, see the following resources:
 
-*  link:http://wiki.netbeans.org/Java_DevelopersGuide[Java Developer's Guide]
-*  link:http://wiki.netbeans.org/RetoucheDeveloperFAQ[Retouche Developer FAQ]
+*  xref:../wiki/Java_DevelopersGuide.adoc[Java Developer's Guide]
+*  xref:../wiki/RetoucheDeveloperFAQ.adoc[Retouche Developer FAQ]
 *  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API Javadoc]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-crud.adoc b/netbeans.apache.org/src/content/tutorials/nbm-crud.adoc
index 0c70ab8..5679c37 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-crud.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-crud.adoc
@@ -176,7 +176,7 @@
 
 image::images/crud_72_wrap-4.png[]
 
-Let's assume the application is for analyzing customers at http://shop.org, in which case a unique identifier `org.shop.model` is appropriate for the code name base, since this module provides the model (also known as "domain") of the application.
+Let's assume the application is for analyzing customers at pass:[http://shop.org], in which case a unique identifier `org.shop.model` is appropriate for the code name base, since this module provides the model (also known as "domain") of the application.
 
 You now have your first custom module in your new application, which wraps the JAR containing the entity classes and the  ``persistence.xml``  file:
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-feedreader_background.adoc b/netbeans.apache.org/src/content/tutorials/nbm-feedreader_background.adoc
index ea579d6..1e55a5e 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-feedreader_background.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-feedreader_background.adoc
@@ -35,16 +35,16 @@
 
 == Table of Contents
 
-* <<15328,About Frequently Used Terms>>
-* <<95124,About the Feed Reader Application>>
-* <<73148,About this Tutorial>>
-* <<75087,Playing with the Application>>
+* <<a15328,About Frequently Used Terms>>
+* <<a95124,About the Feed Reader Application>>
+* <<a73148,About this Tutorial>>
+* <<a75087,Playing with the Application>>
 
-* <<77950,Installing the Application>>
-* <<88314,Introducing the Application>>
-* <<85058,Introducing the Sources>>
+* <<a77950,Installing the Application>>
+* <<a88314,Introducing the Application>>
+* <<a85058,Introducing the Sources>>
 
-
+[[a15328]]
 == About Frequently Used Terms
 
 This tutorial assumes that you have a basic conceptual understanding of the infrastructure that is built right into NetBeans. There is less to understand than you might think. Common terms to be familiar with are as follows:
@@ -58,7 +58,7 @@
 * * NetBeans APIs.* The public interfaces and classes which are available to module writers and application writers. They are divided into specific APIs for dealing with different types of functionality. The contents and behavior of the Java source packages and their subpackages, as specified in the API reference documentation, are the APIs. For the full NetBeans API List, click  link:https://bits.netbeans.org/dev/javadoc/[here] .
 * * Module Suite.* A group of interdependent modules that are deployed together. The IDE helps you to brand the suite -- for example, you can add a splash screen and you can specify the parts of the NetBeans Platform that you don't want your application to provide.
 
-
+[[a95124]]
 == About the Feed Reader Application
 
 While writing the Feed Reader Application, you will leverage a lot of the NetBeans infrastructure. The first piece you leverage is the System Filesystem. As pointed out earlier, the System Filesystem consists of configuration data: it is built from the configuration files (each of which is stored on disk as  `` layer.xml``  files) of all the modules in the system, which it writes into the user's settings directory.
@@ -71,7 +71,7 @@
 
 Next, you will create an Add Feed action on the root node. When the user adds an RSS feed, you do something very simple: you create a new Feed object (really just an object that contains the URL, <<62391,Creating the Feed Object>> ) and then serialize that Feed object as a file in your RSSFeeds folder. Since you're using NetBeans built-in infrastructure for visualizing files (because you're just getting the standard node for the folder, which can notice when files are added or removed), in a split second the node for the newly added feed will appear in the user interface. Using the System Filesystem this way means that the amount of code you have to write to save the list of RSS feeds on exit is... none at all! You save a feed when the user creates it, and that data is persisted to disk automatically. So, basically, you are just dropping Feed POJOs into a folder, and you happen to be showing a view of that folder. The system takes care of virtually everything else.
 
-
+[[a73148]]
 == About this Tutorial
 
 This tutorial intends to teach you the following:
@@ -83,12 +83,12 @@
 * Branding the application with items such as your own splash screen and titlebar.
 * Providing a distribution of the application.
 
-
+[[a75087]]
 == Playing with the Application
 
 Before you start writing the application, you might want to acquaint yourself with the final product. Fortunately, the Feed Reader Application is an official NetBeans sample, bundled with the IDE, and waiting for you to pull it from the New Project wizard.
 
-
+[[a77950]]
 === Installing the Application
 
 Take the following steps to install the sample:
@@ -106,7 +106,7 @@
 [start=4]
 1. Right-click the  `` Feed Reader Application ``  project node and choose Run Project. The application starts up. During installation, notice that a splash screen is displayed.
 
-
+[[a88314]]
 === Introducing the Application
 
 The Feed Reader Application displays the RSS/Atom Feeds window, containing a node called RSS/Atom Feeds.
@@ -132,7 +132,7 @@
 * Right-click a feed and choose Delete to remove a feed.
 * Right-click a feed entry and choose Open to open it in the editor pane.
 
-
+[[a85058]]
 === Introducing the Sources
 
 The FeedReader sample consists of main files (Java classes) and supporting files.
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-javacc-lexer.adoc b/netbeans.apache.org/src/content/tutorials/nbm-javacc-lexer.adoc
index 87317a2..b21372c 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-javacc-lexer.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-javacc-lexer.adoc
@@ -747,7 +747,7 @@
 
 Now your NetBeans Platform application will be able to find the lexer support that you are creating in this tutorial.
 
-
+[[defining]]
 == Defining Tokens and Assigning Colors
 
 Let's now work with the actual tokens that we're going to need. First, we'll update the  ``SJLanguageHierarchy``  with our tokens. After that, we'll map the tokens to fonts and colors. Finally, we'll register our new files in the virtual filesystem of the application we're working on.
@@ -982,7 +982,7 @@
 *  link:https://bits.netbeans.org/dev/javadoc/[NetBeans API List (Current Development Version)]
 *  xref:../kb/docs/platform.adoc[Other Related Tutorials]
 
-
+[[appendix]]
 == Appendix
 
 The complete list of tokens, referred to in step 1 of the section <<defining,Defining Tokens and Assigning Colors>> above, is as follows:
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-visual_library.adoc b/netbeans.apache.org/src/content/tutorials/nbm-visual_library.adoc
index 7615fb4..34a3c13 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-visual_library.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-visual_library.adoc
@@ -53,8 +53,8 @@
 
 All the information you need to know for working with the Visual Library API is collected at these two locations:
 
-*  link:https://netbeans.apache.org/graph/[Visual Library Project Page]
-*  link:https://netbeans.apache.org/graph/documentation.html[Visual Library 2.0 - Documentation]
+*  xref:../projects/platform/graph/index.adoc[Visual Library Project Page]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[Visual Library 2.0 - Documentation]
 
 
 == Setting Up the Module
@@ -257,7 +257,7 @@
 
 == Adding an IconNodeWidget via Drag and Drop Functionality
 
-Earlier, we used the  ``GraphSceneImpl``  class's constructor to pass a scene to the TopComponent's JScrollPane. So far, the scene exists but has no behavior. Behavior is added through actions. The action that we will look at in this section is called  `` link:https://netbeans.apache.org/graph/documentation.html#AcceptAction[AcceptAction]`` . This action enables drag and drop functionality. The drag and drop functionality could be applied to a widget, but here we apply it to the scene itself.
+Earlier, we used the  ``GraphSceneImpl``  class's constructor to pass a scene to the TopComponent's JScrollPane. So far, the scene exists but has no behavior. Behavior is added through actions. The action that we will look at in this section is called  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#AcceptAction[AcceptAction]`` . This action enables drag and drop functionality. The drag and drop functionality could be applied to a widget, but here we apply it to the scene itself.
 
 We use  ``createAcceptAction``  to specify what should happen when an item from the palette is dragged over the scene. Two methods are involved here. The first,  ``isAcceptable()`` , is used to determine whether the item is acceptable to the scene. Here you can test the item, by using the transferable. You can also set the drag image, which is all that we do in the implementation below. If  ``true``  is returned, the  ``accept``  method is called. Here we get the image from the transferable, using the same helper method as before. Then we call the  ``addNode``  method, instantiating a new  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/general/IconNodeWidget.html[IconNodeWidget] and passing the image retrieved from the transferable.
 
@@ -384,7 +384,7 @@
 
 == Adding Functionality to the Scene
 
-In the previous section, we added  `` link:https://netbeans.apache.org/graph/documentation.html#AcceptAction[AcceptAction]``  to the scene. We had to define two methods to specify whether the item should be dropped and for resolving the item. In this section, we use  `` link:https://netbeans.apache.org/graph/documentation.html#ZoomAction[ZoomAction]`` , to add zoom/unzoom functionality to the scene.
+In the previous section, we added  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#AcceptAction[AcceptAction]``  to the scene. We had to define two methods to specify whether the item should be dropped and for resolving the item. In this section, we use  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#ZoomAction[ZoomAction]`` , to add zoom/unzoom functionality to the scene.
 
 
 [start=1]
@@ -426,7 +426,7 @@
 
 == Adding Functionality to the IconNodeWidget
 
-Earlier we added  `` link:https://netbeans.apache.org/graph/documentation.html#MoveAction[MoveAction]``  to the IconNodeWidget, to enable move behavior for the widget. In the same way, a lot of other behavior can be added to the widget. In this section, we add  `` link:https://netbeans.apache.org/graph/documentation.html#HoverAction[HoverAction]`` ,  `` link:https://netbeans.apache.org/graph/documentation.html#SelectAction[SelectAction]`` , and  `` link:https://netbeans.apache.org/graph/documentation.html#InplaceEditorAction[InplaceEditorAction]`` .
+Earlier we added  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#MoveAction[MoveAction]``  to the IconNodeWidget, to enable move behavior for the widget. In the same way, a lot of other behavior can be added to the widget. In this section, we add  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#HoverAction[HoverAction]`` ,  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#SelectAction[SelectAction]`` , and  `` link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html#InplaceEditorAction[InplaceEditorAction]`` .
 
 The  ``InplaceEditorAction``  will let the user change the label:
 
@@ -540,5 +540,5 @@
 
 For more information on working with the Visual Library API, see:
 
-*  link:https://netbeans.apache.org/graph/[Visual Library Project Page]
-*  link:https://netbeans.apache.org/graph/documentation.html[Visual Library 2.0 - Documentation]
+*  xref:../projects/platform/graph/index.adoc[Visual Library Project Page]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[Visual Library 2.0 - Documentation]
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-visual_library2.adoc b/netbeans.apache.org/src/content/tutorials/nbm-visual_library2.adoc
index 66281d6..5e9095c 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-visual_library2.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-visual_library2.adoc
@@ -43,8 +43,8 @@
 
 All the information you need to know for working with the Visual Library API, as well as with the Database Explorer API, is collected at the following locations:
 
-*  link:https://netbeans.apache.org/graph/[Visual Library Project Page]
-*  link:https://netbeans.apache.org/graph/documentation.html[Visual Library 2.0 - Documentation]
+*  xref:../projects/platform/graph/index.adoc[Visual Library Project Page]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[Visual Library 2.0 - Documentation]
 *  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library API Javadoc]
 *  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/overview-summary.html[Database Explorer API Javadoc]
 
@@ -545,8 +545,8 @@
 For more information on working with the Visual Library API, see:
 
 *  link:http://www.javalobby.org/eps/netbeans_visual_library/[Roman Strobl's Visual Library Screencast] on Javalobby.
-*  link:https://netbeans.apache.org/graph/[Visual Library Project Page]
-*  link:https://netbeans.apache.org/graph/documentation.html[Visual Library 2.0 - Documentation]
+*  xref:../projects/platform/graph/index.adoc[Visual Library Project Page]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[Visual Library 2.0 - Documentation]
 *  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library API Javadoc]
 *  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-db/overview-summary.html[Database Explorer API Javadoc]
 
diff --git a/netbeans.apache.org/src/content/tutorials/nbm-visual_library4.adoc b/netbeans.apache.org/src/content/tutorials/nbm-visual_library4.adoc
index 1cac710..7a83f63 100644
--- a/netbeans.apache.org/src/content/tutorials/nbm-visual_library4.adoc
+++ b/netbeans.apache.org/src/content/tutorials/nbm-visual_library4.adoc
@@ -46,8 +46,8 @@
 
 All the information you need to know for working with the Visual Library API is collected at these two locations:
 
-*  link:https://netbeans.apache.org/graph/[Visual Library Project Page]
-*  link:https://netbeans.apache.org/graph/documentation.html[Visual Library 2.0 - Documentation]
+*  xref:../projects/platform/graph/index.adoc[Visual Library Project Page]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[Visual Library 2.0 - Documentation]
 
 
 == Setting Up the Application
@@ -219,5 +219,5 @@
 For more information on working with the Visual Library API, see:
 
 *  link:http://www.javalobby.org/eps/netbeans_visual_library/[Roman Strobl's Visual Library Screencast] on Javalobby.
-*  link:https://netbeans.apache.org/graph/[Visual Library Project Page]
-*  link:https://netbeans.apache.org/graph/documentation.html[Visual Library 2.0 - Documentation]
+*  xref:../projects/platform/graph/index.adoc[Visual Library Project Page]
+*  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[Visual Library 2.0 - Documentation]
diff --git a/netbeans.apache.org/src/content/wiki/APIReviews.adoc b/netbeans.apache.org/src/content/wiki/APIReviews.adoc
index dde2ed6..5d7bd5c 100644
--- a/netbeans.apache.org/src/content/wiki/APIReviews.adoc
+++ b/netbeans.apache.org/src/content/wiki/APIReviews.adoc
@@ -99,8 +99,8 @@
 [[List_of_Suggested_Improvements]]
 == List of Suggested Improvements
 
-* link:http://bz.apache.org/netbeans/buglist.cgi?issue_status=UNCONFIRMED&amp;issue_status=NEW&amp;issue_status=STARTED&amp;issue_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;issueidtype=include&amp;issue_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;short_desc=&amp;short_desc_type=substring&amp;long_desc=&amp;long_desc_type=substring&amp;issue_file_loc=&amp;issue_file_loc_type=substring&amp;status_whiteboard=TCR+TCA+tcr+tca&amp;status_whiteboard_type=anywords&amp;keywords=&amp;keywords_type=exactlyanywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=[Open TCRs and TCAs]
-* link:http://bz.apache.org/netbeans/buglist.cgi?issue_status=RESOLVED&amp;issue_status=VERIFIED&amp;issue_status=CLOSED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;issueidtype=include&amp;issue_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;short_desc=&amp;short_desc_type=substring&amp;long_desc=&amp;long_desc_type=substring&amp;issue_file_loc=&amp;issue_file_loc_type=substring&amp;status_whiteboard=TCR+TCA+tcr+tca&amp;status_whiteboard_type=anywords&amp;keywords=&amp;keywords_type=exactlyanywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=[Closed TCRs and TCAs]
+* link:https://bz.apache.org/netbeans/buglist.cgi?issue_status=UNCONFIRMED&amp;issue_status=NEW&amp;issue_status=STARTED&amp;issue_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;issueidtype=include&amp;issue_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;short_desc=&amp;short_desc_type=substring&amp;long_desc=&amp;long_desc_type=substring&amp;issue_file_loc=&amp;issue_file_loc_type=substring&amp;status_whiteboard=TCR+TCA+tcr+tca&amp;status_whiteboard_type=anywords&amp;keywords=&amp;keywords_type=exactlyanywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=[Open TCRs and TCAs]
+* link:https://bz.apache.org/netbeans/buglist.cgi?issue_status=RESOLVED&amp;issue_status=VERIFIED&amp;issue_status=CLOSED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;issueidtype=include&amp;issue_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;short_desc=&amp;short_desc_type=substring&amp;long_desc=&amp;long_desc_type=substring&amp;issue_file_loc=&amp;issue_file_loc_type=substring&amp;status_whiteboard=TCR+TCA+tcr+tca&amp;status_whiteboard_type=anywords&amp;keywords=&amp;keywords_type=exactlyanywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=[Closed TCRs and TCAs]
 
 [NOTE]
 ====
diff --git a/netbeans.apache.org/src/content/wiki/BugtrackingCookbook.adoc b/netbeans.apache.org/src/content/wiki/BugtrackingCookbook.adoc
index d2623b7..1145e97 100644
--- a/netbeans.apache.org/src/content/wiki/BugtrackingCookbook.adoc
+++ b/netbeans.apache.org/src/content/wiki/BugtrackingCookbook.adoc
@@ -193,7 +193,7 @@
 * for more info see:
 ** javadoc on `IssueStatusProvider`
 ** and `org.yourorghere.xxx.XXXIssueStatusProvider`
-* link:http://wiki.netbeans.org/TaskDashboardDesignSpec[The Tasks Dashboard UI spec]
+* xref:TaskDashboardDesignSpec.adoc[The Tasks Dashboard UI spec]
 * note that this feature is not mandatory
 
 
diff --git a/netbeans.apache.org/src/content/wiki/DefFaqMapApisToTasks.adoc b/netbeans.apache.org/src/content/wiki/DefFaqMapApisToTasks.adoc
index b73333a..ce59ba7 100644
--- a/netbeans.apache.org/src/content/wiki/DefFaqMapApisToTasks.adoc
+++ b/netbeans.apache.org/src/content/wiki/DefFaqMapApisToTasks.adoc
@@ -87,7 +87,7 @@
 
 === Create a graph editor such as the Mobility Pack uses
 
-Use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library], which builds on top of Swing to make animated, graph-oriented UIs easy to build.  More info, tutorials and webcasts can be found in the link:http://platform.netbeans.org/graph[platform.netbeans.org/graph] project.
+Use the link:https://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/overview-summary.html[Visual Library], which builds on top of Swing to make animated, graph-oriented UIs easy to build.  More info, tutorials and webcasts can be found in the xref:../projects/platform/graph/index.adoc[platform.netbeans.org/graph] project.
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqApiSpi.adoc b/netbeans.apache.org/src/content/wiki/DevFaqApiSpi.adoc
index 8ac7a81..c3ab28c 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqApiSpi.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqApiSpi.adoc
@@ -26,10 +26,12 @@
 :toc: left
 :toc-title:
 :syntax: true
+include::../inc/database.adoc[]
+
 
 == What is an SPI?  How is it different from an API?
 
-link:http://en.wikipedia.org/wiki/Api[API] is a general term - an acronym for _Application Programming Interface_ - it means something (in Java, usually some Java classes) a piece of software exposes, which allows other software to communicate with it.
+link:{wikipedia}Api[API] is a general term - an acronym for _Application Programming Interface_ - it means something (in Java, usually some Java classes) a piece of software exposes, which allows other software to communicate with it.
 
 SPI stands for _Service Provider Interface_.  It is a subset of all things that can be API specific to situations where a library is providing classes which are *called by* the application (or API library), and which typically change the things the application is able to do.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAppLifecycleHooks.adoc b/netbeans.apache.org/src/content/wiki/DevFaqAppLifecycleHooks.adoc
index ebb5b73..4eb0027 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAppLifecycleHooks.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAppLifecycleHooks.adoc
@@ -97,7 +97,7 @@
 
 === Further reading
 
-You can get more details along with code examples link:http://wiki.netbeans.org/BookNBPlatformCookbookCH01#Module_Installer[here].
+You can get more details along with code examples xref:BookNBPlatformCookbookCH01.adoc#Module_Installer[here].
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc
index 5ac0045..912dd7d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqAutoUpdateAPIJavadoc.asciidoc
@@ -32,7 +32,7 @@
 Since NetBeans 6.0 there is a public *API* to use *Autoupdate Services*. Autoupdate API provides several services to applications built on NetBeans Platform: it allows users to download and install available updates of installed plugins, search and install new plugins from subscribed Update Centers, browsing and manipulating plugins already installed. To use these services NetBeans Platform supplies a GUI (_Plugin Manager_ in _Tools->Plugins_ menu item) to easy call these services. AutoUpdate API also cares about registration of Update Centers.
 
 * Where to find Javadoc? link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/overview-summary.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-autoupdate-services/overview-summary.html]
-* Which version of NetBeans should I use? This API was firstly introduced in NetBeans 6.0 Platform where the API was still in development. In NetBeans 6.1 Platform it was made official API, it means further changes should be backward compatible. Use link:http://platform.netbeans.org/platform-get.html[NetBeans Platform of the latest version] for the best performance.
+* Which version of NetBeans should I use? This API was firstly introduced in NetBeans 6.0 Platform where the API was still in development. In NetBeans 6.1 Platform it was made official API, it means further changes should be backward compatible. Use xref:../download/index.adoc[NetBeans Platform of the latest version] for the best performance.
 
 === Related articles
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
index 4fd86b0..685956b 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDataLoader.adoc
@@ -26,6 +26,8 @@
 :toc: left
 :toc-title:
 :syntax: true
+include::../inc/database.adoc[]
+
 
 == What is a DataLoader?
 
@@ -54,7 +56,7 @@
 
 === DataLoader Details
 
-link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataLoader.html[DataLoaders] are factories for DataObjects.  A DataLoader is typically associated with one or more link:http://en.wikipedia.org/wiki/MIME[MIME types] (such as `text/x-java`), and is allowed to be the system-wide factory for DataObjects for individual files of that MIME type.
+link:https://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/DataLoader.html[DataLoaders] are factories for DataObjects.  A DataLoader is typically associated with one or more link:{wikipedia}MIME[MIME types] (such as `text/x-java`), and is allowed to be the system-wide factory for DataObjects for individual files of that MIME type.
 
 MIME type is typically determined by the file extension, though it can depend on content for things like XML files. xref:DevFaqFileRecognition.adoc[(more about how NetBeans recognizes files)].
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqDialogsApiIntro.adoc b/netbeans.apache.org/src/content/wiki/DevFaqDialogsApiIntro.adoc
index 3c0e9f6..00915a0 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqDialogsApiIntro.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqDialogsApiIntro.adoc
@@ -31,7 +31,7 @@
 
 The link:https://bits.netbeans.org/dev/javadoc/org-openide-dialogs/[Dialogs API] provides support for dialogs and wizards.
 
-Whenever you'd use JDialog or JOptionPane in Swing, using the Dialogs API provides some alternatives.  These are easier to use as they automatically take care of centering and other display details, but also allow you to later plug in a different implementation of how they're actually "displayed."  Instead of showing them on screen, for example, you could link:http://wiki.netbeans.org/DevFaqLookupHowToOverride[override the default] `DialogDisplayer` class to specify your own that logged them to a printer or read them aloud using speech synthesis.
+Whenever you'd use JDialog or JOptionPane in Swing, using the Dialogs API provides some alternatives.  These are easier to use as they automatically take care of centering and other display details, but also allow you to later plug in a different implementation of how they're actually "displayed."  Instead of showing them on screen, for example, you could xref:DevFaqLookupHowToOverride.adoc[override the default] `DialogDisplayer` class to specify your own that logged them to a printer or read them aloud using speech synthesis.
 
 I'll illustrate three of the most common use cases.  The first is when you want to simply show a dialog box with some text:
 image:OkDialog.png[]
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc b/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
index 0b771ca..c90d335 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqExportImport.adoc
@@ -33,7 +33,7 @@
 
 See the official API documentation at link:https://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html[http://bits.netbeans.org/dev/javadoc/org-netbeans-modules-options-api/overview-summary.html]
 
-For historical interests the design document can be found at link:http://wiki.netbeans.org/ExportImportOptions#section-ExportImportOptions-ImplementationDetails[Export/Import Options in NetBeans - Proposal].
+For historical interests the design document can be found at xref:ExportImportOptions.adoc#section-ExportImportOptions-ImplementationDetails[Export/Import Options in NetBeans - Proposal].
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc b/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
index 827ee3a..895d82d 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqFileRecognition.adoc
@@ -26,25 +26,27 @@
 :toc: left
 :toc-title:
 :syntax: true
+include::../inc/database.adoc[]
+
 
 == How does NetBeans recognize files?
 
-A lot of applications show some UI that displays folders of files;  also a lot of NetBeans UI is created by showing virtual files in the link:http://wiki.netbeans.org/DevFaqSystemFilesystem[configuration filesystem].  When a folder is expanded in the UI, files of known types have their own icons, menu items, actions, properties, child nodes and behavior.
+A lot of applications show some UI that displays folders of files;  also a lot of NetBeans UI is created by showing virtual files in the xref:DevFaqSystemFilesystem.adoc[configuration filesystem].  When a folder is expanded in the UI, files of known types have their own icons, menu items, actions, properties, child nodes and behavior.
 
 The way NetBeans detects files is this:  
 
-* The "files" being shown are [link:http://wiki.netbeans.org/DevFaqFileObject[http://wiki.netbeans.org/DevFaqFileObject] `FileObject`]s - wrappers around `java.io.File`, or in the case of configuration files, typically wrappers around data stored in a _virtual filesystem_, such as inside XML files in modules.  
-* What you're actually seeing is `link:http://wiki.netbeans.org/DevFaqWhatIsANode[Node]`s, which are the things that provide actions, localized names, etc. to files or other things.
+* The "files" being shown are [xref:DevFaqFileObject.adoc[DevFaqFileObject] `FileObject`]s - wrappers around `java.io.File`, or in the case of configuration files, typically wrappers around data stored in a _virtual filesystem_, such as inside XML files in modules.  
+* What you're actually seeing is `xref:DevFaqWhatIsANode.adoc[Node]`s, which are the things that provide actions, localized names, etc. to files or other things.
 
-* Between `Node`s and `FileObject`s are `link:http://wiki.netbeans.org/DevFaqDataObject[DataObject]s`.  A DataObject is like a FileObject, except that it knows what _kind of file_ is being shown.  There are different subclasses of DataObject for files with different file extensions, XML files with different DTDs, etc.
+* Between `Node`s and `FileObject`s are `xref:DevFaqDataObject.adoc[DataObject]s`.  A DataObject is like a FileObject, except that it knows what _kind of file_ is being shown.  There are different subclasses of DataObject for files with different file extensions, XML files with different DTDs, etc.
 
 * The various DataObject subclasses are provided by modules which implement support for particular file types (for example, the Image module makes it possible to recognize and open `.gif` and `.png` files), provides the icon for them, etc.
 
-* The "type" of a file is a link:http://en.wikipedia.org/wiki/MIME[MIME type], just as email attachments use - for example, a `.java` file has the MIME type `text/x-java` and a `.gif` file has the MIME type `image/gif`.
+* The "type" of a file is a link:{wikipedia}MIME[MIME type], just as email attachments use - for example, a `.java` file has the MIME type `text/x-java` and a `.gif` file has the MIME type `image/gif`.
 
 * A module which wants to implement support for a file type registers a `link:https://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/MIMEResolver.html[MIMEResolver]` that is given a chance to claim a file the first time the system sees it (typically you do not write your own MIMEResolver, you just declaratively register a MIME type against a file extension or XML DTD).
 
-* That module (or some other one) also provides a `link:http://wiki.netbeans.org/DevFaqDataLoader[DataLoader]` &mdash; a factory for custom link:http://wiki.netbeans.org/DevFaqDataObject[DataObject]s that are specific to this file type.  The DataObject in turn provides the Node (icon, etc.) that you see in the user interface.
+* That module (or some other one) also provides a `xref:DevFaqDataLoader.adoc[DataLoader]` &mdash; a factory for custom xref:DevFaqDataObject.adoc[DataObject]s that are specific to this file type.  The DataObject in turn provides the Node (icon, etc.) that you see in the user interface.
 
 So, to recap &mdash; when you expand a folder, and the system goes about showing a tree of nodes representing files, what happens is:
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc b/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
index 869f10e..25ea108 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqModulesDeclarativeVsProgrammatic.adoc
@@ -31,7 +31,7 @@
 
 Long ago, in a galaxy far far away, most objects in NetBeans were created during startup.  That works fine for a small application.  It is disaster for a large application - with each new component in the system, startup time gets longer, garbage collections get more frequent and memory requirements rise.
 
-Because of this, today, most of the APIs you will use to install things into the the IDE or a link:http://platform.netbeans.org/[NetBeans Platform-based application] involve a text entry of some sort,
+Because of this, today, most of the APIs you will use to install things into the the IDE or a xref:../kb/docs/platform/index.adoc[NetBeans Platform-based application] involve a text entry of some sort,
 such as xref:DevFaqModulesLayerFile.adoc[putting something in an XML file]), or a plain-text file naming some classes in your JAR file's `META-INF/services` directory &mdash; _not_ running Java code.
 *A well-behaved module should do nothing on startup.*
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNetBeansPlatformManager.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNetBeansPlatformManager.adoc
index b4b54cd..6e647d9 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNetBeansPlatformManager.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNetBeansPlatformManager.adoc
@@ -29,7 +29,7 @@
 
 == How do I set up a NetBeans Platform in the IDE
 
-By default, a NetBeans Platform application will use the developer's copy of the IDE as the platform.  This is certainly easy, but there are also link:http://wiki.netbeans.org/DevFaqGeneralWhereIsPlatformHowToBuild[drawbacks to using the current IDE as a platform]. With that in mind, lets check out, and reference our own copy of the NetBeans source code. This way we can also use breakpoints to step through the NetBeans source code, make changes, and create patches!
+By default, a NetBeans Platform application will use the developer's copy of the IDE as the platform.  This is certainly easy, but there are also xref:DevFaqGeneralWhereIsPlatformHowToBuild.adoc[drawbacks to using the current IDE as a platform]. With that in mind, lets check out, and reference our own copy of the NetBeans source code. This way we can also use breakpoints to step through the NetBeans source code, make changes, and create patches!
 
 At a high level the steps are as follows. First get the NetBeans source code checked out. This part is interesting because what you end up with is a complete copy of the NetBeans source repository on your local file system. The second thing you need to do is build the NetBeans platform using the source repository that you just checked out. This is important because without building the platform you will not have the dependencies required by the platform modules. The next step is to create a new platform reference. Of course the platform to reference will be the one that you just checked out and built. Then finally, in your module suite's project properties, select the platform reference that you just created.
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
index 1825846..8f62deb 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNodeInjectingLookupContents.adoc
@@ -48,7 +48,7 @@
 
 === Injecting Lookup Contents
 
-First, be sure this is something you really need.  Typically, you expose some model object from your Node, and link:http://wiki.netbeans.org/DevFaqActionContextSensitive[write Actions that are sensitive to it].
+First, be sure this is something you really need.  Typically, you expose some model object from your Node, and xref:DevFaqActionContextSensitive.adoc[write Actions that are sensitive to it].
 
 However, if you want to use built-in actions (such as link:https://bits.netbeans.org/dev/javadoc/org-openide-actions/org/openide/actions/OpenAction.html[OpenAction]) over your custom Nodes, and the module which created the Node does not provide the `Openable` or `OpenCookie` object which, for example, `OpenAction` needs, then you do need some way for other modules to inject contents into your lookup.  If you are both injecting an object into the lookup, and writing an action against that object in the same module (and not expecting other modules to also add actions sensitive to your Converter's type), you can probably skip the injecting of lookup contents, and just go straight to the Node's model object.
 
@@ -125,7 +125,7 @@
 
 The action implementation can be any Action subclass, so we can omit the code for that - but its classname for this example will be `org.netbeans.demo.elookup.FooAction`.
 
-All we need to do now is register both of these objects in the link:http://wiki.netbeans.org/DevFaqSystemFilesystem[System Filesystem] and we will have working code.
+All we need to do now is register both of these objects in the xref:DevFaqSystemFilesystem.adoc[System Filesystem] and we will have working code.
 
 [source,xml]
 ----
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc b/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
index 29ce540..4346bca 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqNonSingletonTopComponents.adoc
@@ -26,10 +26,12 @@
 :toc: left
 :toc-title:
 :syntax: true
+include::../inc/database.adoc[]
+
 
 == How can I change my TopComponent to not be a singleton (NB version up to 6.9)?
 
-The "New Window Component" wizard in the NetBeans IDE generates a link:http://en.wikipedia.org/wiki/Singleton_pattern[singleton] TopComponent.  That's fine for windows that there should only be one of.  Particularly if you are xref:DevFaqEditorTopComponent.adoc[creating some kind of editor], you will want to create multiple instances of your TopComponent.
+The "New Window Component" wizard in the NetBeans IDE generates a link:{wikipedia}Singleton_pattern[singleton] TopComponent.  That's fine for windows that there should only be one of.  Particularly if you are xref:DevFaqEditorTopComponent.adoc[creating some kind of editor], you will want to create multiple instances of your TopComponent.
 
 === The really easy way
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqReplaceWindowSystem.adoc b/netbeans.apache.org/src/content/wiki/DevFaqReplaceWindowSystem.adoc
index 732c325..d04af5a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqReplaceWindowSystem.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqReplaceWindowSystem.adoc
@@ -36,7 +36,7 @@
 But if you still want to do it, you can:
 
 * Create an implementation of the `org.openide.windows.WindowManager` interface
-* Register your implementation into the default lookup and link:http://wiki.netbeans.org/DevFaqLookupHowToOverride[replace any others]
+* Register your implementation into the default lookup and xref:DevFaqLookupHowToOverride.adoc[replace any others]
 
 Of course, there's a lot of work involved in creating your own WindowManager implementation, but you can have a look at the `org.openide.windows.DummyWindowManager` class for starters.  It's a simple implementation that opens all TopComponents in their own frame but which can also make windows invisible which is handy for testing.  
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqSuitesVsClusters.adoc b/netbeans.apache.org/src/content/wiki/DevFaqSuitesVsClusters.adoc
index 9dbfa35..2dbc1ce 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqSuitesVsClusters.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqSuitesVsClusters.adoc
@@ -82,7 +82,7 @@
 
 * `harness/README` in your IDE distribution
 * the *Help > Contents* pages on modules and applications
-* link:http://platform.netbeans.org/articles/installation.html[http://platform.netbeans.org/articles/installation.html]
+* xref:../projects/platform/articles/installation.adoc[Installation Structure]
 
 ==== No Suites In NetBeans IDE Sources
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc b/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
index a361671..a1cf46a 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqThreadingBuiltIn.adoc
@@ -34,7 +34,7 @@
 Specifically they are
 
 * The Actions API - if you override `asynchronous` to return true (or don't override it - for historical reasons this is the default), your action's `performAction` method will run in the background
-* The Nodes API - to compute node children that are expensive to create, use `link:http://wiki.netbeans.org/DevFaqNodesChildFactory[ChildFactory]` and specify `true` as the boolean argument to `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Children.html#create(org.openide.nodes.ChildFactory,%20boolean)[Children.create()]`
+* The Nodes API - to compute node children that are expensive to create, use `xref:DevFaqNodesChildFactory.adoc[ChildFactory]` and specify `true` as the boolean argument to `link:https://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/Children.html#create(org.openide.nodes.ChildFactory,%20boolean)[Children.create()]`
 * Various parsing APIs - for syntax highlighting languages and so forth - usually you just provide a task to do, and it will automatically call you in the background when a reparse is being done
 * QuickSearch API - searchers are typically called in background thread by infrastructure in  link:https://bits.netbeans.org/dev/javadoc/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/SearchProvider.html#evaluate%28org.netbeans.spi.quicksearch.SearchRequest,%20org.netbeans.spi.quicksearch.SearchResponse%29[SearchProvider.evaluate(...)]
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc b/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
index e3f23fd..69db0ea 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqUsingSimpletests.adoc
@@ -70,7 +70,7 @@
 
 It should now be possible to run a class that extends JellyTestCase, and for the IDE to display this correctly.
 
-Support for functional tests on Maven-based NetBeans applications should be present from 7.0, with the resolution of link:http://netbeans.org/bugzilla/show_bug.cgi?id=190992[http://netbeans.org/bugzilla/show_bug.cgi?id=190992] For more information, see link:http://netbeans.dzone.com/nb-mvn-functional-tests[http://netbeans.dzone.com/nb-mvn-functional-tests]
+Support for functional tests on Maven-based NetBeans applications should be present from 7.0, with the resolution of link:https://bz.apache.org/netbeans/show_bug.cgi?id=190992[https://bz.apache.org/netbeans/show_bug.cgi?id=190992] For more information, see link:http://netbeans.dzone.com/nb-mvn-functional-tests[http://netbeans.dzone.com/nb-mvn-functional-tests]
 
 == TODO
 
@@ -83,7 +83,7 @@
 
 == NOTES
 
-MockLookup and other link:http://wiki.netbeans.org/UsefulTestClassesInModules[classes mentioned on the Useful Test Classes in Modules] are not available in the platform.
+MockLookup and other xref:UsefulTestClassesInModules.adoc[classes mentioned on the Useful Test Classes in Modules] are not available in the platform.
 
 * You can add additional libraries needed for unit tests by setting the `test.unit.cp.extra` property (e.g. in the module's project.properties file) to point to those libraries.  It does not matter where these libraries (JAR files) reside, and you can refer to them using a hardcoded path (BAD) or via a relative path -- even using `$suite.dir` as a starting point in case they're used by multiple modules in the suite.  In the latter case, you can define the test.unit.cp.extra property in the suite's platform.properties (NOT project.properties) file.  Be aware that this may limit your ability to define additional things at the individual module level, so it might be better to define a standard suite-wide property like `standard.unit.test.libs` to point to things used throughout the suite, then have individual modules define `test.unit.cp.extra` to include this plus potentially some other things.  Items defined in the `test.unit.cp.extra` property are used at both compile time and runtime, it seems.
 * The `test.qa-functional.cp.extra` property works the same way for functional tests.
@@ -91,7 +91,7 @@
 
 == Converting Tests for Applications Which Previously Used XTest
 
-Essentially, you need only remove the XTest build and configuration files from your modules and replace them with a few lines of code in your tests' `suite()` method.  More information is available in the link:http://wiki.netbeans.org/XTestReplacementCookBook[XTest Replacement Cookbook]
+Essentially, you need only remove the XTest build and configuration files from your modules and replace them with a few lines of code in your tests' `suite()` method.  More information is available in the xref:XTestReplacementCookBook.adoc[XTest Replacement Cookbook]
 
 == Apache Migration Information
 
diff --git a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
index 32f23ca..724c864 100644
--- a/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
+++ b/netbeans.apache.org/src/content/wiki/DevFaqWhatIsACluster.adoc
@@ -131,7 +131,7 @@
 A _cluster_ is a compatibility unit and has a version. It is set of modules that is developed by the same group of people, built and released at one time.
 
 Most of the reasoning that lead to creation of the concept can be found in:
-link:http://platform.netbeans.org/articles/installation.html[Installation Structure]
+xref:../projects/platform/articles/installation.adoc[Installation Structure]
 
 == Apache Migration Information