From 5fd8dc67e423d0f55f399130abf6ef4581c77c87 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sat, 18 May 2019 21:59:13 -0400
Subject: [PATCH 1/8] Remove unreferenced assets

---
 .../java-admin-client/assets/webstart.small.jpg  | Bin 1806 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/main/xar-resources/data/java-admin-client/assets/webstart.small.jpg

diff --git a/src/main/xar-resources/data/java-admin-client/assets/webstart.small.jpg b/src/main/xar-resources/data/java-admin-client/assets/webstart.small.jpg
deleted file mode 100644
index 079fc1b10efc2a94c0f39bdfcdedf44e1e1e5a28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1806
zcmV+p2l4nvNk%w1VORhc0QUd@?Bv;~b~)3HIOW{S>3k9E+|B>lbK1O_)30^qoI<{P
zEX0aK;?B0xrg^?)0o%x_;fN>7oKntxB;1NF>9k(yvs|WI2E(I#>a}3x)4tE2ZQ-q2
zw3KD$v0m1JC8}Ko#)LJ-p>^AnJI1AM-G(O7x}EFc)y9}lt#T~h&bj~AZ`Gt%+^bvi
zykz9o#kOJt&z@4Tj8XOO=kn|0-_yU*p;N711lp-ty_<5mV*=Z%TJr7X|JQNh%CXIi
zJK3jJ%C3yTXAaAIBg2+X#h!5c`1aDkrOtvY*QQqM;M2o)BC}xw)}>e0y_N5{VcDoz
z(W7qg>EG6*RnwwX(4bV)i8ITKI>v!7%ea~0u3XiTJ@me1^u1*N|No;}2mji2z-9pS
zzh>xn3jcxy>xd!hf*JF?V)VRY@T5iayJ7RXVDF$n?Uga^n>p-{Df#yD(SIbuaU1yb
z@b&NL`1SGGgC@v%Bgc6o>y9bXge&~|_{)ek+l3~?dnx$!@bc>6|Ef5!Uj+ZRN&l4{
z*?u4YjuX6O0so{g(6^b(gfZT$TFI1C&Yn@nh&lh9CjYTP|GZDvcNf@m5Zc9~$c#zJ
zYY))4k<N%X|Mi2fgi*<cHr%OL<JQ5oi%9>H1?hnq!-hQaykp0(jP18z$$BHqom0Y>
zU(=pj|A-6bizxK$<?Xm(<&`(ihB45uir2uJy^2u%{QK{^WAnRX$(~x|uUy@iK-a&T
z=bAq7xnawxaJ+sp#g<*hsCdt#aHM`g`uFtg<JI4-Tkp7E^15O1xnIkhP|UK0`1J3~
zo>b4DQ>cYa>zO#@k1xNcfA8nqz=lBBr&!v+pxVWy+`ysS!=>KGp|Nu+x^*V)qD0fV
zn!uZHzn^Qzo?FwSR?MJo#ioGMr(o2(lI)&8*vhlp%(LCfwcE$3-psbqw2`KOLZpLC
zs)Iz&uzlUku)2jt%7ZZ7s#vIPDAKlxw1Y{~p;fYXFtd6y!=i1(qHVg6OY!R9(yV~Q
zlv(SPG3(#bA^8LV00000EC2ui09XJQ000R808fD#NU)&6g9sBUT*$CtLV=jRNSsKq
zqQ#3CGiuz((IO@=4!(pLNwTELlPFWFT*<QK$uABZ7}!Fyrp=o*F|b&Lv!~CWK!XZ3
z;K0yKp*AtJbH@Uy)2C2x8ZcxOY6}(*VkMImwX0X3Q*#*LLbj~gvs`pc>Js4rixz0P
ztkS`xL#ViT^P<J@gb4+>ddnKfAvUmC9ZlFyD)K5zTw$ELAXsI%^4S{zx`ex1dGHG!
zXF`h}O*%rC0f{3hnngM^5*l4bU=Tg(hO$z1JFJL?0Rxk|il$7VqAcF1T(!KFs+UDs
z<`@yEY;e+=G>;db&1m1wy?c!)57^%S=+6ChYz*3+Oo`kDfUa)s`@VT|B0RY_UCOPv
zacoDIH<sv=8Ejoxk_CC)UAKe^X*B5IgANW8&n6E<5zGUdY)}Id6hO!XY$J4-1_jpa
zunq^O#n4_25zN<#5vTo<SugmU#tv-UWQK)0JG`L`F%Uwi!V(LrVdRlW8o2=s(}=^!
zJhz;~NDa?qAVmd8N&zC4YE&?UGe-Caz%nZu<06croB*RUSacx@5<f^WL}vM%kQpt-
zB$?!pfk1-BpMVDXrw{vdp~oDEb}@%Ejda0)7J+J!LKnOw@TV>5bddszCIrxh2|hGJ
z2Oam6&_xJVn2Lj`Ay|rr4<>Z~v49n^E|86&f<h8VAcCyn>#xB2D#9MsGysAont-s#
zA|L?6fB?V>Flj%y_$t5*bf7?wrk>6K0yJIFVGpZ&s0u_E;0Pds0K3$>N3G)o8>}FK
z*ziaj_~xr`zO57>Ll<($(S;0G6v03htms<>I$dO<z!mT);6lUax`4tT$OLdf7k*rW
zNEbvT^6@tB_~C*)+JKxy7oa4vGAPXKyYC}5d;ka=IOnW$&J!F#jW2!lK?x;2@RLU~
zJ5RuH7fg3?04xH#@W&s0d?T<q0V{Ao7f|G}H55mD^9R$eVDnEGm*lbXCI0NZGaw&)
zaEKdp*KIc*b=U!i1Q{Uf!?X-~!(m4qc-Wna2X`o;xE&tUA;BG_kOBt;d<b!e5Tr;z
zf(H`t0RiWHq{4>;N{~_q1bah(x&#muZujel#O(+fwAXGsAq}X~g9dT*?z;v(sL}u-
zwij>w@yI8yeDaQbV8I||L@)jHpG49?0eUpuv>pXC5XmRghcEv4<d<)L`GZ(sK_LXR
z@BaJkOHxS?^w&>+C6d6e|Ni{<@BjbrD}?$`A%+4P@PG(RpaK`jzy><-feA!~1-#&i
wF<9_|7|fssH^{*bdhmlF)SxH4U<xmo@PsH#p$b>X!WO#lg)n5HDFOljJ9ho4{Qv*}


From 8d2b984292911ddb625967941d96ea5db07bac3a Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sat, 18 May 2019 22:09:23 -0400
Subject: [PATCH 2/8] Adjust navigation header

- Move Author Reference to other documentation administration
- Correct link to CONTRIBUTIING.md
---
 src/main/xar-resources/templates/page.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/xar-resources/templates/page.html b/src/main/xar-resources/templates/page.html
index 0acb4b0f..0fb7b00c 100755
--- a/src/main/xar-resources/templates/page.html
+++ b/src/main/xar-resources/templates/page.html
@@ -29,8 +29,8 @@
             <li class="nav-item dropdown" id="about">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Home</a>
               <div class="dropdown-menu">
+                  <a class="dropdown-item" href="https://exist-db.org">eXist-db.org</a>
                   <a class="dropdown-item" href="{${dashboard.pkg.abbrev}}/index.html">Dashboard</a>
-                  <a class="dropdown-item" href="http://exist-db.org">eXist-db.org</a>
               </div>
             </li>
             <li class="nav-item dropdown" id="demo">
@@ -60,21 +60,21 @@
                 <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="{${fundocs.pkg.abbrev}}/index.html">XQuery Functions</a>
                 <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="http://exist-db.org/exist/apps/wiki/">News / Wiki</a>
-                  <a class="dropdown-item" href="http://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</a>
+                  <a class="dropdown-item" href="getting-help.xml">Getting Help</a>
               </div>
             </li>
             <li class="nav-item dropdown" id="development">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Development</a>
               <div class="dropdown-menu">
                   <a class="dropdown-item" href="{${exide.pkg.abbrev}}/index.html">eXide</a>
-                  <a class="dropdown-item" href="http://exist-db.org/api/index.html">Javadocs</a>
-                  <a class="dropdown-item" href="https://github.com/eXist-db/exist/issues">Bug Tracker</a>
+                  <a class="dropdown-item" href="https://exist-db.org/api/index.html">Javadocs</a>
+                  <a class="dropdown-item" href="https://github.com/eXist-db/exist/issues">Issue Tracker</a>
                   <a class="dropdown-item" href="https://github.com/eXist-db/exist">Source code</a>
-                  <a class="dropdown-item" href="https://github.com/eXist-db/exist#contributing-to-exist">Submit Patches</a>
+                <a class="dropdown-item" href="https://github.com/eXist-db/exist/blob/develop/CONTRIBUTING.md">Contributing to eXist</a>
                 <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="diagnostics.html">Documentation Diagnostics</a>
-                  <a class="dropdown-item" href="editorial-view.html">Documentation Editorial</a>
+                  <a class="dropdown-item" href="editorial-view.html">Editorial View</a>
+                  <a class="dropdown-item" href="author-reference.xml">Author Reference</a>
               </div>
             </li>
             <li class="nav-item dropdown" id="administration">

From ec367ef61b38cb5c99ab4fa8f021b96f4dbcca61 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sat, 18 May 2019 22:09:52 -0400
Subject: [PATCH 3/8] =?UTF-8?q?Remove=20reference=20to=20Wolfgang=E2=80=99?=
 =?UTF-8?q?s=20laptop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/advanced-installation/listings/listing-2.txt           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/xar-resources/data/advanced-installation/listings/listing-2.txt b/src/main/xar-resources/data/advanced-installation/listings/listing-2.txt
index cfa5e925..3859ad17 100644
--- a/src/main/xar-resources/data/advanced-installation/listings/listing-2.txt
+++ b/src/main/xar-resources/data/advanced-installation/listings/listing-2.txt
@@ -1,4 +1,4 @@
-Wolfgangs-MacBook-Air:eXist wolf$ java -jar exist-installer/target/exist-installer-5.0.0-RC8-SNAPSHOT.jar
+$ java -jar exist-installer/target/exist-installer-5.0.0-RC8-SNAPSHOT.jar
 Select target path [/Users/wolf/Source/trunk/eXist] 
 /Applications/eXist/
 press 1 to continue, 2 to quit, 3 to redisplay

From 238ede6f483ecdc5fb2699e25f3da6fc1a54b6f7 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sat, 18 May 2019 22:25:08 -0400
Subject: [PATCH 4/8] Review documentation TOC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Grammar
- Reduce phrases like “This article will tell you how to…” or “Provides you with information about how to” to “How to…”
---
 .../data/documentation/documentation.xml      | 214 ++++++++----------
 1 file changed, 95 insertions(+), 119 deletions(-)

diff --git a/src/main/xar-resources/data/documentation/documentation.xml b/src/main/xar-resources/data/documentation/documentation.xml
index e1ee2b39..0817092d 100644
--- a/src/main/xar-resources/data/documentation/documentation.xml
+++ b/src/main/xar-resources/data/documentation/documentation.xml
@@ -3,27 +3,26 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Documentation</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>getting-started</keyword>
         </keywordset>
     </info>
 
     <para>Welcome to eXist-db. This article serves as an index to the eXist-db documentation
-        articles, which will help you getting to know, install and use eXist-db.</para>
+        articles, which will help you get to know, install, and use eXist-db.</para>
 
     <!-- ================================================================== -->
 
     <sect1 xml:id="start">
         <title>Getting Started</title>
-        <para>The following articles and resources will help you getting started using eXist.</para>
+        <para>The following articles and resources will help you get started using eXist-db.</para>
 
         <variablelist>
             <varlistentry>
                 <term> <link xlink:href="basic-installation">Basic Installation</link> </term>
                 <listitem>
-                    <para>How to do a basic installation of eXist-db and fire it up for the first
-                        time.</para>
+                    <para>How to install eXist-db and fire it up for the first time.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -31,7 +30,7 @@
                 <listitem>
                     <para>For the first steps with your freshly installed eXist-db, watch the
                         screencasts available on the <link condition="_blank"
-                        xlink:href="http://exist-db.org">eXist-db homepage</link> </para>
+                        xlink:href="https://exist-db.org">eXist-db homepage</link>.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -46,54 +45,52 @@
             <varlistentry>
                 <term> <link xlink:href="getting-help">Getting Help</link> </term>
                 <listitem>
-                    <para>This article will tell you where to go for help and advice.</para>
+                    <para>Where to go for help and advice.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="dashboard">Dashboard</link> </term>
                 <listitem>
-                    <para>Learn how to use and populate eXist-db's main user interface, the
+                    <para>How to use and populate eXist-db's main user interface, the
                         dashboard.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="uploading-files">Uploading files</link> </term>
                 <listitem>
-                    <para>Learn how to get files in and populate your database.</para>
+                    <para>How to get files in and populate your database.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="webdav">WebDAV</link> </term>
                 <listitem>
-                    <para>One of the ways to easily view and populate the database is using the
-                        WebDAV protocol.</para>
+                    <para>How to upload and manage files in the database with a WebDAV client.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="using-collections">Using Collections in eXist-db</link> </term>
                 <listitem>
-                    <para>Provide information about how to set up a collection structure in
-                        eXist-db.</para>
+                    <para>How to set up a collection structure in eXist-db.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="learning-xquery">Learning XQuery</link> </term>
                 <listitem>
-                    <para>Provides tips and resources for newcomers to XQuery and eXist-db</para>
+                    <para>Tips and resources for newcomers to XQuery and eXist-db.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="oxygen">How to use oXygen together with eXist-db</link> </term>
                 <listitem>
                     <para>If you're using <link condition="_blank"
-                        xlink:href="http://oxygenxml.com/">oXygen</link>, this article describes how
-                        to make the most of it in combination with eXIst-db.</para>
+                        xlink:href="https://oxygenxml.com/">oXygen</link>, this article describes how
+                        to make the most of it in combination with eXist-db.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="getting-help-how-to-report">How to report an issue</link> </term>
                 <listitem>
-                    <para>If you think you found a bug, this article will tell you how to report
+                    <para>If you think you've found a bug, this article will tell you how to report
                         it.</para>
                 </listitem>
             </varlistentry>
@@ -116,42 +113,42 @@
             <varlistentry>
                 <term> <link xlink:href="learning-xquery">Learning XQuery</link> </term>
                 <listitem>
-                    <para>This provides tips and resources for newcomers to XQuery and
-                        eXist-db</para>
+                    <para>Tips and resources for newcomers to XQuery and eXist-db.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="xquery">XQuery in eXist-db</link> </term>
                 <listitem>
                     <para>This discusses the XQuery implementation of eXist-db for the somewhat more
-                        experienced user</para>
+                        experienced user.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="kwic">KWIC (Keywords In Context)</link> </term>
                 <listitem>
-                    <para>This article will learn you how to display search results in context
-                        (parts of the document surrounding the search match).</para>
+                    <para>How to display search results in context (parts of the document
+                        surrounding the search match).</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="update_ext">XQuery Update Extensions</link> </term>
                 <listitem>
-                    <para>Tells you how to update XML stored in the database using eXist-db's update
+                    <para>How to update XML stored in the database using eXist-db's XQuery Update
                         extension.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="xqdoc">xqDoc</link> </term>
                 <listitem>
-                    <para>Describes the built-in XQuery documentation system.</para>
+                    <para>Describes eXist-db's support for the xqDoc, a standard for documenting your
+                        XQuery functions and libraries with specially-formatted comments.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term> <link xlink:href="xqsuite">XQsuite</link> </term>
+                <term> <link xlink:href="xqsuite">XQSuite</link> </term>
                 <listitem>
-                    <para>This is an annotation-based framework that allows you to add tests to
-                        XQuery functions and execute them.</para>
+                    <para>How to add tests to your XQuery functions with XQSuite, an annotation-based
+                        framework.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -171,22 +168,21 @@
                 <term> <link xlink:href="development-starter">Getting Started with Web Application
                     Development</link> </term>
                 <listitem>
-                    <para>This will help you build a basic web application using the built-in <link
-                        xlink:href="templating.xml">HTML templating framework</link>.</para>
+                    <para>How to build a basic web application using the built-in <link
+                        xlink:href="templating">HTML templating framework</link>.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="using-collections">Using Collections in eXist-db</link> </term>
                 <listitem>
-                    <para>Provide information about how to set up your application's collection
-                        structure in eXist-db.</para>
+                    <para>How to set up your application's collection structure in eXist-db.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="xmldb">xmldb module</link> </term>
                 <listitem>
-                    <para>Provides an overview of the functions to query and manipulate the database
-                        contents in the xmldb module.</para>
+                    <para>An overview of the xmldb XQuery function module for querying and
+                        manipulating database contents.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -199,33 +195,31 @@
             <varlistentry>
                 <term> <link xlink:href="xsl-transform">XSL Transformations</link> </term>
                 <listitem>
-                    <para>Explains how to perform XSL Transformation in XQuery code.</para>
+                    <para>How to perform XSL Transformation with XQuery.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="indexing">Indexing</link> </term>
                 <listitem>
-                    <para>This will provide you with an overview of eXist-db's indexes and how to
-                        configure them. More about indexing in:</para>
+                    <para>An overview of eXist-db's indexes and how to configure them. More about
+                        indexing in:</para>
                     <variablelist>
                         <varlistentry>
                             <term> <link xlink:href="lucene">Full Text indexing</link> </term>
                             <listitem>
-                                <para>Will provide with all the information necessary to use
-                                    eXist-db's Lucene based full-text indexing.</para>
+                                <para>How to use eXist-db's Lucene based full-text indexing.</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term> <link xlink:href="ngram">N-Gram Index</link> </term>
                             <listitem>
-                                <para>Provides information on how to configure the
-                                    <code>ngram</code> index.</para>
+                                <para>How to configure the <code>ngram</code> index.</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term> <link xlink:href="newrangeindex">Range Index</link> </term>
                             <listitem>
-                                <para>This article describes eXist-db's super fast modularized range
+                                <para>How to use eXist-db's super fast modularized range
                                     index based on Apache Lucene.</para>
                                 <para>There is also an <link xlink:href="oldrangeindex">older
                                     version of the range index</link>, kept for compatibility
@@ -244,21 +238,21 @@
                         <varlistentry>
                             <term> <link xlink:href="validation">XML Validation</link> </term>
                             <listitem>
-                                <para>Explains how to do XML validation in eXist-db.</para>
+                                <para>How to validate XML in eXist-db.</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
-                            <term> <link xlink:href="xqsuite">XQsuite</link> </term>
+                            <term> <link xlink:href="xqsuite">XQSuite</link> </term>
                             <listitem>
-                                <para>This is an annotation-based framework that allows you to add
-                                    unit tests to XQuery functions and execute them.</para>
+                                <para>XQSuite is an annotation-based framework that allows you to
+                                    add unit tests to XQuery functions and execute them.</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term> <link xlink:href="integration-testing">Integration testing</link> </term>
                             <listitem>
-                                <para>Provides information on how to configure automated test
-                                    pipelines, and recommends minimal test configurations.</para>
+                                <para>How to configure automated test pipelines, and recommends
+                                    minimal test configurations.</para>
                             </listitem>
                         </varlistentry>
                     </variablelist>
@@ -267,15 +261,15 @@
             <varlistentry>
                 <term> <link xlink:href="xinclude">XInclude Support</link> </term>
                 <listitem>
-                    <para>Explains how to use XInclude in eXist-db.</para>
+                    <para>How to use XInclude in eXist-db.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="beginners-guide-to-xrx-v4">The beginners guide to
                     XRX</link> </term>
                 <listitem>
-                    <para>This article will learn you how to create a simple application using XRX
-                        (XForms, REST, XQuery).</para>
+                    <para>How to create a simple application using XRX (XForms, REST, and
+                        XQuery).</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -287,22 +281,21 @@
             <varlistentry>
                 <term> <link xlink:href="contentextraction">Content extraction</link> </term>
                 <listitem>
-                    <para>Shows how to extract and index non-XML contents, like PDF or Word
+                    <para>How to extract and index non-XML contents, like PDF or Word
                         documents.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_rest">REST-Style Web API</link> </term>
                 <listitem>
-                    <para>Explains how to use eXist-db's REST interface, a useful tool in building
+                    <para>How to use eXist-db's REST interface, a useful tool in building
                         applications.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="http-request-session">HTTP Request/Session</link> </term>
                 <listitem>
-                    <para>Provides information about the functions available working with HTTP
-                        requests and sessions.</para>
+                    <para>An overview of functions for working with HTTP requests and sessions.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -321,26 +314,26 @@
             <varlistentry>
                 <term> <link xlink:href="xforms">XForms Introduction</link> </term>
                 <listitem>
-                    <para>Introduces the bright shiny world of XForms inside eXist-db to you.</para>
+                    <para>Introduces the bright shiny world of XForms inside eXist-db.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="tuning">Tuning the Database</link> </term>
                 <listitem>
-                    <para>Explains what you can do to optimize your queries and indexes.</para>
+                    <para>How to optimize your queries and indexes.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="triggers">Configuring Database Triggers</link> </term>
                 <listitem>
-                    <para> Will tell you how to use and configure triggers in your database that
-                        fire when things get created, updated or deleted.</para>
+                    <para>How to use and configure triggers in your database that fire when things
+                        get created, updated or deleted.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="versioning">Versioning Extension</link> </term>
                 <listitem>
-                    <para>Explains how to use the built-in versioning system of eXist-db.</para>
+                    <para>How to use the built-in versioning system of eXist-db.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -358,25 +351,25 @@
             <varlistentry>
                 <term> <link xlink:href="devguide_rest">REST-Style Web API</link> </term>
                 <listitem>
-                    <para>Explains how to use eXist-db's REST interface.</para>
+                    <para>How to use eXist-db's REST interface.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_soap">SOAP Interface Developer's Guide</link> </term>
                 <listitem>
-                    <para>Explains how to add a SOAP interface to eXist-db using Java code.</para>
+                    <para>How to add a SOAP interface to eXist-db using Java code.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_xmlrpc">XML-RPC API Developer's Guide</link> </term>
                 <listitem>
-                    <para>Explains how to interface with eXist-db using the XML-RPC API.</para>
+                    <para>How to interface with eXist-db using the XML-RPC API.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="webdav">WebDAV</link> </term>
                 <listitem>
-                    <para>Explains how to use eXist-db's WebDAV interface.</para>
+                    <para>How to use eXist-db's WebDAV interface.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -433,88 +426,72 @@
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term> <link xlink:href="exist-building">Building eXist</link> </term>
+                <term> <link xlink:href="exist-building">Building eXist-db</link> </term>
                 <listitem>
                     <para>How to build Java <code>.jar</code> files from an
-                        eXist distribution.</para>
+                        eXist-db distribution.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="faq_performance">Performance FAQ</link> </term>
                 <listitem>
-                    <para>Contains a short FAQ about eXist-db's performance.</para>
+                    <para>A short FAQ about eXist-db's performance.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="production_good_practice">Production Use - Good
                     Practice</link> </term>
                 <listitem>
-                    <para>When you use eXist-db on a production system, please read this for
-                        advice.</para>
+                    <para>How to configure eXist-db for use on a production system.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="production_web_proxying">Production use - Proxying eXist-db
                     behind a Web Server</link> </term>
                 <listitem>
-                    <para>You can proxy eXist-db behind a web server like Nginx or Apache. This
-                        article will provide you with some examples.</para>
+                    <para>How to proxy eXist-db behind a web server like Nginx or Apache.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="jmx">JMX</link> </term>
                 <listitem>
-                    <para>eXist has a JMX interface for access to internal statistics about memory,
+                    <para>eXist-db has a JMX interface for access to internal statistics about memory,
                         caching, etc.</para>
                 </listitem>
             </varlistentry>
-            <varlistentry>
-                <term> <link xlink:href="incompatibilities">incompatibilities overview</link> </term>
-                <listitem>
-                    <para>Consult this article when you upgrade from an older version of
-                        eXist-db.</para>
-                </listitem>
-            </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="scheduler">Scheduler Module</link> </term>
                 <listitem>
-                    <para>Scheduling jobs (like backups) is a useful tool in an eXist-db
-                        installation.</para>
+                    <para>How to schedule jobs (like backups).</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="security">Security</link> </term>
                 <listitem>
-                    <para>The security model of eXist. Also explains how to connect eXist-db to
-                        other authentication realms like LDAP or OAuth.</para>
+                    <para>The security model of eXist-db. Also, how to connect eXist-db to other
+                        authentication realms like LDAP or OAuth.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="tuning">Tuning the Database</link> </term>
                 <listitem>
-                    <para>Explains what you can do to optimize the database's performance.</para>
+                    <para>How to optimize the database's performance.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="faq_performance">Performance FAQ</link> </term>
                 <listitem>
-                    <para>Contains a short FAQ about eXist-db's performance.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term/>
-                <listitem>
-                    <para/>
+                    <para>A short FAQ about eXist-db's performance.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="upgrading">Upgrade Guide</link> </term>
                 <listitem>
-                    <para>Helps you updating to a new version of eXist-db.</para>
+                    <para>How to upgrade from an older version of eXist-db.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term> <link xlink:href="incompatibilities">incompatibilities overview</link> </term>
+                <term> <link xlink:href="incompatibilities">Incompatibilities</link> </term>
                 <listitem>
                     <para>Consult this article when you upgrade from an older version of
                         eXist-db.</para>
@@ -544,90 +521,90 @@
                 <term> <link xlink:href="devguide_xmldb">Writing Java Applications with the XML:DB
                     API</link> </term>
                 <listitem>
-                    <para>Explains how to work with eXist-db from Java code using the XML:DB API.
+                    <para>How to work with eXist-db from Java code using the XML:DB API.
                         This API provides a common interface to native or XML-enabled databases and
                         supports the development of portable, reusable applications.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term> <link xlink:href="exist-building">Building eXist</link> </term>
+                <term> <link xlink:href="exist-building">Building eXist-db</link> </term>
                 <listitem>
-                    <para>How to build Java <code>.jar</code> files from an
-                        eXist distribution.</para>
+                    <para>How to build Java <code>.jar</code> files from an eXist-db
+                        distribution.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_indexes">Developer's Guide to Modularized
                     Indexes</link> </term>
                 <listitem>
-                    <para>Explains how the internal indexing mechanism works and how to add your own
-                        indexes to it.</para>
+                    <para>How the internal indexing mechanism works and how to add your own indexes
+                        to it.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_log4j">Log4j Logging Guide</link> </term>
                 <listitem>
-                    <para>This article explains how to add logging to your Java code using
-                        Log4J.</para>
+                    <para>How to add logging to your Java code using Log4J.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_soap">SOAP Interface Developer's Guide</link> </term>
                 <listitem>
-                    <para>Explains how to add a SOAP interface to eXist-db using Java code.</para>
+                    <para>How to add a SOAP interface to eXist-db using Java code.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_xmlrpc">XML-RPC API Developer's Guide</link> </term>
                 <listitem>
-                    <para>Explains how to interface with eXist-db using the XML-RPC API.</para>
+                    <para>How to interface with eXist-db using the XML-RPC API.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="extensions">Extension Modules</link> </term>
                 <listitem>
-                    <para>Provides an overview of how to create eXist-db extension modules (in Java)
-                        and contains a list of available extension modules.</para>
+                    <para>How to create eXist-db extension modules (in Java); contains a list of
+                        available extension modules.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="jmx">JMX</link> </term>
                 <listitem>
-                    <para>eXist provides access to various management interfaces using JMX.</para>
+                    <para>eXist-db provides access to various management interfaces using
+                        JMX.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_indexes">Developer's Guide to Modularized
                     Indexes</link> </term>
                 <listitem>
-                    <para>Explains how the internal indexing mechanism works and how to add your own
-                        indexes to it.</para>
+                    <para>How the internal indexing mechanism works and how to add your own indexes
+                        to it.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_log4j">Log4j Logging Guide</link> </term>
                 <listitem>
-                    <para>This article explains how to add logging to your Java code using
+                    <para>How to add logging to your Java code using
                         Log4J.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_soap">SOAP Interface Developer's Guide</link> </term>
                 <listitem>
-                    <para>Explains how to add a SOAP interface to eXist-db using Java code.</para>
+                    <para>How to add a SOAP interface to eXist-db using Java code.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_xmlrpc">XML-RPC API Developer's Guide</link> </term>
                 <listitem>
-                    <para>Explains how to interface with eXist-db using the XML-RPC API.</para>
+                    <para>How to interface with eXist-db using the XML-RPC API.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="extensions">Extension Modules</link> </term>
                 <listitem>
-                    <para>Provides an overview of how to create eXist-db extension modules (in Java)
-                        and contains a list of available extension modules.</para>
+                    <para>How to create eXist-db extension modules (in Java) and contains a list of
+                        available extension modules.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -646,28 +623,27 @@
             <varlistentry>
                 <term> <link xlink:href="devguide_manifesto">eXist-db Developer Manifesto</link> </term>
                 <listitem>
-                    <para>This article lays out guidelines for developers that wish to contribute to
-                        eXist-db's code base itself.</para>
+                    <para>Guidelines for developers who wish to contribute to eXist-db's code
+                        base.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="devguide_codereview">Code Review Guide</link> </term>
                 <listitem>
-                    <para>Provides instructions how to review somebody else's (or your own of
-                        course) code.</para>
+                    <para>How to review somebody else's (or your own of course) code.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="author-reference">Author Reference</link> </term>
                 <listitem>
-                    <para>Explains how to write a documentation article for eXist-db (like the ones
-                        you are looking at now).</para>
+                    <para>How to write a documentation article for eXist-db (like the ones you are
+                        looking at now).</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term> <link xlink:href="legal">Legal Statement</link> </term>
                 <listitem>
-                    <para>Provides information about the legal status of eXist as an open source
+                    <para>The legal status of eXist-db as an open source
                         product.</para>
                 </listitem>
             </varlistentry>

From d0c59f43378a7855f0bf8a71c239cf35534419ac Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sat, 18 May 2019 23:28:12 -0400
Subject: [PATCH 5/8] Remove xml extension from internal article links
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From author guidelines: “use the target's document name (without the .xml extension) as the link address.”
---
 src/main/xar-resources/data/backup/backup.xml |  2 +-
 .../basic-installation/basic-installation.xml | 10 ++++----
 .../beginners-guide-to-xrx-v4.xml             | 11 +++++----
 .../data/configuration/configuration.xml      | 16 ++++++-------
 .../data/dashboard/dashboard.xml              |  4 ++--
 .../development-starter.xml                   |  4 ++--
 .../data/extensions/extensions.xml            |  2 +-
 .../data/getting-help/getting-help.xml        |  6 ++---
 .../incompatibilities/incompatibilities.xml   |  8 +++----
 .../xar-resources/data/indexing/indexing.xml  | 12 +++++-----
 .../java-admin-client/java-admin-client.xml   |  2 +-
 .../data/learning-xquery/learning-xquery.xml  |  6 ++---
 src/main/xar-resources/data/lucene/lucene.xml |  2 +-
 .../data/templating/templating.xml            |  6 ++---
 .../data/troubleshooting/troubleshooting.xml  |  2 +-
 .../data/upgrading/upgrading.xml              | 24 +++++++++----------
 .../data/validation/validation.xml            |  4 ++--
 .../data/versioning/versioning.xml            |  4 ++--
 src/main/xar-resources/data/webdav/webdav.xml |  2 +-
 src/main/xar-resources/data/xquery/xquery.xml | 18 +++++++-------
 20 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/src/main/xar-resources/data/backup/backup.xml b/src/main/xar-resources/data/backup/backup.xml
index c3348817..9a7ab838 100644
--- a/src/main/xar-resources/data/backup/backup.xml
+++ b/src/main/xar-resources/data/backup/backup.xml
@@ -323,7 +323,7 @@
                 <programlisting xlink:href="listings/listing-6.txt"/>
                 <para>You can also subscribe to the notifications made available by the SanityReport
                     MBean to be informed of sanity check results. Please consult eXist-db's <link
-                    xlink:href="jmx.xml">JMX documentation</link> on how to configure this.</para>
+                    xlink:href="jmx">JMX documentation</link> on how to configure this.</para>
             </sect3>
 
         </sect2>
diff --git a/src/main/xar-resources/data/basic-installation/basic-installation.xml b/src/main/xar-resources/data/basic-installation/basic-installation.xml
index a6c58872..a5c81c02 100644
--- a/src/main/xar-resources/data/basic-installation/basic-installation.xml
+++ b/src/main/xar-resources/data/basic-installation/basic-installation.xml
@@ -131,7 +131,7 @@
             </listitem>
             <listitem>
                 <para>More advanced installation methods (like installing on a headless system) are
-                    described in the <link xlink:href="advanced-installation.xml#headless">Advanced
+                    described in the <link xlink:href="advanced-installation#headless">Advanced
                     Installation</link> article. If you wish to compile and run exist from source
                     please see the article on <link xlink:href="exist-building.xml">building
                     eXist</link></para>
@@ -252,7 +252,7 @@
 
         <note>
             <para>eXist-db can also be run as a background service. For more information see the
-                <link xlink:href="advanced-installation.xml#headless">Advanced Installation</link>
+                <link xlink:href="advanced-installation#headless">Advanced Installation</link>
                 article.</para>
         </note>
 
@@ -318,14 +318,14 @@
                 <literal>bin/</literal> sub-directory. On Linux or Mac, enter
                 <code>bin/startup.sh</code>, on Windows <code>bin\startup.bat</code>. More
                 information about these start-up scripts in the <link
-                xlink:href="advanced-installation.xml#headless">Advanced Installation</link>
+                xlink:href="advanced-installation#headless">Advanced Installation</link>
                 article.</para>
 
             <note>
                 <title>Having trouble?</title>
                 <para>If you're having trouble launching eXist-db, see our articles on <link
                     xlink:href="troubleshooting">Troubleshooting</link> and <link
-                    xlink:href="advanced-installation.xml#headless">Advanced
+                    xlink:href="advanced-installation#headless">Advanced
                     Installation</link>.</para>
             </note>
         </sect2>
@@ -351,7 +351,7 @@
             </mediaobject>
         </informalfigure>
         <para>Seeing it? Congratulations! (Not seeing it? See our article on <link
-            xlink:href="troubleshooting.xml">Troubleshooting</link>).</para>
+            xlink:href="troubleshooting">Troubleshooting</link>).</para>
 
         <para>All right, ready to dive in! Your local installation includes everything you need.
             Access is easy, through the applications on the <link xlink:href="{dashboard}/"
diff --git a/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml b/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
index 4695c8e1..048a407b 100644
--- a/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
+++ b/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
@@ -4,7 +4,7 @@
 
     <info>
         <title>Creating CRUDS applications with XRX in eXist</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>getting-started</keyword>
             <keyword>application-development</keyword>
@@ -235,7 +235,8 @@
                     interchange of applications, the EXPath Community has created a specification
                     for application metadata, called EXPath Packaging System. eXist supports and
                     extends this module. This tutorial will not cover this file's structure, but you
-                    can learn more about this by reading <link xlink:href="https://exist-db.org/exist/apps/doc/repo.xml"/>. </para>
+                    can learn more about this by reading about the <link xlink:href="repo">Package 
+                        Repository</link>. </para>
             </listitem>
         </orderedlist>
         <para>You are always free to change the names of the collection or the queries, but as
@@ -400,7 +401,7 @@
                 also creates a Lucene full text index for all words in the term name, term
                 definition and term publish-status-code. (By using the repo.xml Deployment
                 Descriptor's "prepare" field, you can automate the installation of this
-                collection.xconf file into the target location; see <link xlink:href="https://exist-db.org/exist/apps/doc/repo.xml#D1.4.10"/>.)</para>
+                collection.xconf file into the target location; see <link xlink:href="repo#D1.4.10"/>.)</para>
         </sect2>
 
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -709,7 +710,7 @@
                 <para>Create an XQuery module to centralize some of the common code and reduce
                     duplication and then reference these functions in each of your queries. For
                     example, you could put the HTML boilerplate into a style module. You could also
-                    explore eXist's HTML templating module; see <link xlink:href="https://exist-db.org/exist/apps/doc/templating.xml"/>.</para>
+                    explore eXist's <link xlink:href="templating">HTML templating module</link>.</para>
             </listitem>
             <listitem>
                 <para>Change the <code>list-items.xq</code> to use HTML tables to view each
@@ -769,7 +770,7 @@
             <listitem>
                 <para>Modify the collection configuration file for the
                     <code>/db/apps/terms/data</code> collection to enable versioning when items are
-                    updated. See <link xlink:href="https://exist-db.org/exist/apps/doc/versioning.xml"/>.</para>
+                    updated. See <link xlink:href="versioning">Versioning Extensions</link>.</para>
             </listitem>
         </orderedlist>
     </sect1>
diff --git a/src/main/xar-resources/data/configuration/configuration.xml b/src/main/xar-resources/data/configuration/configuration.xml
index b2e0693a..1be066f6 100644
--- a/src/main/xar-resources/data/configuration/configuration.xml
+++ b/src/main/xar-resources/data/configuration/configuration.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Application Server Configuration</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>operations</keyword>
         </keywordset>
@@ -423,7 +423,7 @@
                 <title> <tag>db-connection</tag>/<tag>default-permissions</tag> element</title>
 
                 <para>Specifies the default permissions for all resources and collections in eXist
-                    (see <link xlink:href="security.xml"> User Authentication and Access
+                    (see <link xlink:href="security">User Authentication and Access
                     Control</link>). When this is not configured, the default <literal>mod</literal>
                     (similar to the Unix <code>chmod</code> command) is set to
                     <literal>0775</literal> in the <literal>resources</literal> and
@@ -463,7 +463,7 @@
                                     workaround, which will be removed in the future. Please use the
                                     n-gram or full-text indexes for case-insensitive queries or - if
                                     that is impossible - specify a <link
-                                    xlink:href="xquery.xml#collations">collation</link>.</para>
+                                    xlink:href="xquery#collations">collation</link>.</para>
                             </warning>
                         </listitem>
                     </varlistentry>
@@ -574,7 +574,7 @@
                     <literal>class</literal> and <literal>id</literal>. The other attributes, as
                     well as any nested elements, are specific to the index implementation. Detailed
                     information is available in the article on <link
-                    xlink:href="indexing.xml#moduleconf">Configuring Database Indexes</link>.</para>
+                    xlink:href="indexing#moduleconf">Configuring Database Indexes</link>.</para>
             </sect3>
 
             <sect3 xml:id="indexer-stopwords">
@@ -594,7 +594,7 @@
                 <para>Configuring indexes via the default settings is <emphasis>not</emphasis>
                     recommended. If you need a global collection configuration, store one for the
                     root collection <literal>/db</literal>. For more information, see <link
-                    xlink:href="indexing.xml">Configuring Indexes</link>.</para>
+                    xlink:href="indexing">Configuring Indexes</link>.</para>
             </sect3>
         </sect2>
 
@@ -735,7 +735,7 @@
             <para>The serializer is responsible for serializing XML documents or document fragments
                 back into XML. This configuration element defines default settings for various
                 parameters, which can also be specified programmatically. All settings can be
-                overwritten by XQuery <link xlink:href="xquery.xml#serialization">serialization
+                overwritten by XQuery <link xlink:href="xquery#serialization">serialization
                 options</link>.</para>
             <sect3 xml:id="serializer-att">
                 <title> <tag>serializer</tag> attributes</title>
@@ -821,7 +821,7 @@
                 catalog files. Catalog files are used to locate DTDs, schemas and resolve external
                 entities in general.</para>
             <para>Please refer to the corresponding documentation on <link
-                xlink:href="validation.xml">XML Validation</link>.</para>
+                xlink:href="validation">XML Validation</link>.</para>
         </sect2>
 
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -990,7 +990,7 @@
                     which must point to the XQuery source code of the module, for instance:</para>
                 <programlisting language="xml"><![CDATA[&amp;lt;module uri="http://exist-db.org/xquery/kwic" src="resource:org/exist/xquery/lib/kwic.xql"/&amp;gt;]]></programlisting>
                 <para>For the <code>src</code> attribute, eXist understands the <link
-                    xlink:href="xquery.xml#module-system">same types of URIs</link> as in an
+                    xlink:href="xquery#module-system">same types of URIs</link> as in an
                     ordinary XQuery import statement.</para>
             </sect3>
         </sect2>
diff --git a/src/main/xar-resources/data/dashboard/dashboard.xml b/src/main/xar-resources/data/dashboard/dashboard.xml
index 0fd3e06e..7cd3870a 100644
--- a/src/main/xar-resources/data/dashboard/dashboard.xml
+++ b/src/main/xar-resources/data/dashboard/dashboard.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Dashboard</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>getting-started</keyword>
         </keywordset>
@@ -180,6 +180,6 @@
     <para>[To be completed...]</para>
     <para>Plugins are loaded and unloaded on demand via dojo's AMD loader. They are modular, self-contained units. To add a new plugin, you need to
       provide an HTML and a <literal>.js</literal> file, which defines a subclass of the base plugin class. The source code for the dashboard is
-      available on <link  xlink:href="http://github.com/eXist-db/dashboard">GitHub</link>.</para>
+      available on <link xlink:href="https://github.com/eXist-db/dashboard">GitHub</link>.</para>
   </sect1>-->
 </article>
diff --git a/src/main/xar-resources/data/development-starter/development-starter.xml b/src/main/xar-resources/data/development-starter/development-starter.xml
index 7f3a2383..fa0d37f3 100644
--- a/src/main/xar-resources/data/development-starter/development-starter.xml
+++ b/src/main/xar-resources/data/development-starter/development-starter.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Getting Started with Web Application Development</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>getting-started</keyword>
             <keyword>application-development</keyword>
@@ -30,7 +30,7 @@
                 eXide.</para>
         </listitem>
         <listitem>
-            <para>An <link xlink:href="templating.xml">HTML templating framework</link> for a clean
+            <para>An <link xlink:href="templating">HTML templating framework</link> for a clean
                 separation of HTML page content and application logic.</para>
         </listitem>
         <listitem>
diff --git a/src/main/xar-resources/data/extensions/extensions.xml b/src/main/xar-resources/data/extensions/extensions.xml
index 2dbb6fe9..9a548b43 100644
--- a/src/main/xar-resources/data/extensions/extensions.xml
+++ b/src/main/xar-resources/data/extensions/extensions.xml
@@ -327,7 +327,7 @@
             <para>Various functions for <link
                     xlink:href="http://www.opengeospatial.org/standards/gml">GML</link> geometries,
                 whether indexed or not. More information about the design is available <link
-                    xlink:href="devguide_indexes.xml">here</link>.</para>
+                    xlink:href="devguide_indexes">Developer's Guide to Modularized Indexes</link>.</para>
             <itemizedlist>
                 <listitem>
                     <para>Creator: Pierrick Brihaye</para>
diff --git a/src/main/xar-resources/data/getting-help/getting-help.xml b/src/main/xar-resources/data/getting-help/getting-help.xml
index 093b05e0..b34d6f16 100644
--- a/src/main/xar-resources/data/getting-help/getting-help.xml
+++ b/src/main/xar-resources/data/getting-help/getting-help.xml
@@ -3,7 +3,7 @@
         schematypens="http://purl.oclc.org/dsdl/schematron"?><article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <info>
     <title>Getting Help</title>
-    <date>1Q18</date>
+    <date>2Q19</date>
     <keywordset>
       <keyword>getting-started</keyword>
     </keywordset>
@@ -18,7 +18,7 @@
   <sect1 xml:id="community-support">
     <title>Community Support</title>
 
-    <para>Besides eXist-db's extensive <link xlink:href="documentation">documentation set</link>, eXist-db has a large and active community of users
+    <para>Besides eXist-db's extensive <link xlink:href="documentation">documentation</link>, eXist-db has a large and active community of users
       and developers. The community uses mailing lists, chat, a wiki, and social media to get and give help, follow the latest developments and share
       tips and discoveries.</para>
     <para>The book, "eXist: a NoSQL Document Database and Application Platform" was published in 2014 and is available from <link xlink:href="http://shop.oreilly.com/product/0636920026525.do" condition="_blank">O'Reilly.com</link>.</para>
@@ -35,7 +35,7 @@
       question that you can't find the answer to, or you just want to join the discussion, <link xlink:href="https://lists.sourceforge.net/lists/listinfo/exist-open" condition="_blank">subscribe to the mailing list</link>. It's free and
       you can unsubscribe anytime.</para>
     <note>
-      <para>Please <link xlink:href="getting-help-how-to-report.xml">consult this page</link> for tips how to best report issues.</para>
+      <para>For reporting issues, please consult the <link xlink:href="getting-help-how-to-report">How to Report Issues</link> article.</para>
     </note>
     <para>Besides exist-open, there is a mailing list dedicated solely to the XQuery language: the <link xlink:href="http://x-query.com/mailman/listinfo/talk">xquery-talk mailing list</link>. It's a great place to ask questions about XQuery, from
       basic to advanced.</para>
diff --git a/src/main/xar-resources/data/incompatibilities/incompatibilities.xml b/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
index b8d80328..981d5497 100644
--- a/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
+++ b/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Known Issues when upgrading</title>
-        <date>4Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>operations</keyword>
         </keywordset>
@@ -115,7 +115,7 @@
                 <para>2.2 introduces a <emphasis>new range index module</emphasis>. Old index
                     definitions will still work though as we made sure to keep backwards compatible.
                     If you would like to upgrade to the new index, check its <link
-                    xlink:href="newrangeindex.xml">documentation</link>.</para>
+                    xlink:href="newrangeindex">documentation</link>.</para>
             </listitem>
             <listitem>
                 <para>The XQuery engine has been updated to support the changed syntax for
@@ -267,7 +267,7 @@
                         <para>The previous <literal>auto</literal> setting was apparently too
                             confusing for new users who did not know what to do if eXist-db refused
                             to store a document due to failing validation. If you are familiar with
-                            <link xlink:href="validation.xml">validation</link>, the use of catalog
+                            <link xlink:href="validation">validation</link>, the use of catalog
                             files and the like, feel free to set the default back to
                             <literal>auto</literal> or <literal>yes</literal>.</para>
                     </listitem>
@@ -277,7 +277,7 @@
                     <listitem>
                         <para>eXist-db does no longer require Cocoon for viewing documentation and
                             samples. Cocoon has been largely replaced by eXist-db's own <link
-                            xlink:href="urlrewrite.xml">URL rewriting and MVC
+                            xlink:href="urlrewrite">URL rewriting and MVC
                             framework</link>.</para>
                         <para>Consequently, we now limit Cocoon to one directory of the web
                             application (<literal>webapp/cocoon</literal>) and moved all the Cocoon
diff --git a/src/main/xar-resources/data/indexing/indexing.xml b/src/main/xar-resources/data/indexing/indexing.xml
index 9010705f..fa2cfc5b 100644
--- a/src/main/xar-resources/data/indexing/indexing.xml
+++ b/src/main/xar-resources/data/indexing/indexing.xml
@@ -45,18 +45,18 @@
                     <code>fn:id()</code>. </para>
             </listitem>
             <listitem>
-                <para> <emphasis> <link xlink:href="newrangeindex.xml">New Range Indexes</link>
+                <para> <emphasis> <link xlink:href="newrangeindex">New Range Indexes</link>
                     </emphasis>: A (rewritten) range index which provides superior performance on
                     large data sets.</para>
             </listitem>
             <listitem>
-                <para> <emphasis> <link xlink:href="lucene.xml">Full Text Indexes</link>
+                <para> <emphasis> <link xlink:href="lucene">Full Text Indexes</link>
                     </emphasis>: This full text indexing module features faster and customizable
                     full text indexing by transparently integrating Lucene into the XQuery engine.
                     Prefer this index over the Legacy Full Text Index. </para>
             </listitem>
             <listitem>
-                <para> <emphasis> <link xlink:href="ngram.xml">NGram Indexes</link> </emphasis>:
+                <para> <emphasis> <link xlink:href="ngram">NGram Indexes</link> </emphasis>:
                     These map specific text nodes and attributes of the documents in a collection to
                     splitted tokens of n-characters (where n = 3 by default). This is very efficient
                     for exact substring searches and for queries on scripts (mostly non-European
@@ -64,16 +64,16 @@
                     therefore a bad match for the Lucene full text index. </para>
             </listitem>
             <listitem>
-                <para> <emphasis> <link xlink:href="oldrangeindex.xml">Legacy Range Indexes</link>
+                <para> <emphasis> <link xlink:href="oldrangeindex">Legacy Range Indexes</link>
                     </emphasis>: These map specific text nodes and attributes of documents in a
                     collection to typed values.</para>
             </listitem>
             <listitem>
-                <para> <emphasis> <link xlink:href="devguide_indexes.xml#spatial">Spatial
+                <para> <emphasis> <link xlink:href="devguide_indexes#spatial">Spatial
                     Indexes</link> (Experimental)</emphasis>: A working proof-of-concept index,
                     which listens for spatial geometries described through the Geography Markup
                     Language (GML). A detailed description of the implementation can be found in the
-                    <link xlink:href="devguide_indexes.xml#spatial">Developer's Guide to Modularized
+                    <link xlink:href="devguide_indexes#spatial">Developer's Guide to Modularized
                     Indexes</link>.</para>
             </listitem>
         </orderedlist>
diff --git a/src/main/xar-resources/data/java-admin-client/java-admin-client.xml b/src/main/xar-resources/data/java-admin-client/java-admin-client.xml
index a3b8c63b..9a79a384 100644
--- a/src/main/xar-resources/data/java-admin-client/java-admin-client.xml
+++ b/src/main/xar-resources/data/java-admin-client/java-admin-client.xml
@@ -253,7 +253,7 @@
                 therefore work with remote as well as embedded database instances. The correct
                 database instance is determined through the XML:DB base URI as specified in the
                 properties file or through command-line options. The <link
-                xlink:href="deployment.xml">deployment</link> article describes how different
+                xlink:href="deployment">deployment</link> article describes how different
                 servers are addressed using the XML:DB URI.</para>
             <para>The XML:DB base URI used by the client for connections is defined by the
                 <literal>uri=</literal> property. By default, this is set to
diff --git a/src/main/xar-resources/data/learning-xquery/learning-xquery.xml b/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
index 73cf7623..a550c90d 100644
--- a/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
+++ b/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
@@ -3,7 +3,7 @@
         schematypens="http://purl.oclc.org/dsdl/schematron"?><article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <info>
         <title>Learning XQuery and eXist-db</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>xquery</keyword>
             <keyword>getting-started</keyword>
@@ -92,7 +92,7 @@
         <sect2 xml:id="update">
             <title>Learning how to update XML documents</title>
 
-            <para>eXist comes with a set of operations for updating on-disk XML documents. <link xlink:href="update_ext.xml">eXist XQuery Update Operations</link> </para>
+            <para>eXist comes with a set of operations for updating on-disk XML documents. <link xlink:href="update_ext">eXist XQuery Update Operations</link> </para>
         </sect2>
 
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -126,7 +126,7 @@
 
             <para>Most developers who do XQuery more than a few hours a day eventually end up using
                 a full commercial XQuery IDE, with oXygen being the best integrated with eXist. See
-                <link xlink:href="oxygen.xml">Using oXygen</link>. </para>
+                <link xlink:href="oxygen">Using oXygen</link>. </para>
             <para> An important feature is the XQuery auto-complete. As you type within XQuery, all
                 eXist functions and their parameters are listed. For example if you type
                 <code>xmldb:</code>, all the functions of the XMLDB module will automatically appear
diff --git a/src/main/xar-resources/data/lucene/lucene.xml b/src/main/xar-resources/data/lucene/lucene.xml
index 8eece32f..fb2432cb 100644
--- a/src/main/xar-resources/data/lucene/lucene.xml
+++ b/src/main/xar-resources/data/lucene/lucene.xml
@@ -39,7 +39,7 @@
             <code>buffer</code>. It defines the amount of memory (in megabytes) Lucene will use for
             buffering index entries before they are written to disk. See the <link
                 condition="_blank"
-                xlink:href="http://lucene.apache.org/core/4_10_4/core/org/apache/lucene/index/IndexWriterConfig.html#setRAMBufferSizeMB(double)"
+                xlink:href="https://lucene.apache.org/core/4_10_4/core/org/apache/lucene/index/IndexWriterConfig.html#setRAMBufferSizeMB(double)"
                 >Lucene Javadocs</link>.</para>
 
         <para>Like other indexes, you create a Lucene index by configuring it in a
diff --git a/src/main/xar-resources/data/templating/templating.xml b/src/main/xar-resources/data/templating/templating.xml
index d2868a9e..6dcbabab 100644
--- a/src/main/xar-resources/data/templating/templating.xml
+++ b/src/main/xar-resources/data/templating/templating.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>HTML Templating Module</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>application-development</keyword>
         </keywordset>
@@ -274,7 +274,7 @@
             and configures the URL rewriting to call this for any path ending in
             <literal>.html</literal>. Using eXide is therefore the easiest way to get started with
             the templating framework. </para>
-        <para>Please consult the <link xlink:href="development-starter.xml">Getting Started with Web
+        <para>Please consult the <link xlink:href="development-starter">Getting Started with Web
             Application Development</link> guide.</para>
     </sect1>
 
@@ -289,7 +289,7 @@
             xlink:href="https://github.com/eXist-db/shared-resources">shared-resources</link>
             application also exports the module. This will always be the latest version. You could
             therefore define a dependency on the shared-resources app (see the <link
-            xlink:href="repo.xml">packaging documentation</link>). You can now just import the
+            xlink:href="repo">packaging documentation</link>). You can now just import the
             module by its namespace URI, but without specifying a location:</para>
         <programlisting language="xquery">import module namespace templates="http://exist-db.org/xquery/templates";</programlisting>
         <para>The documentation and demo applications all read the templating module from
diff --git a/src/main/xar-resources/data/troubleshooting/troubleshooting.xml b/src/main/xar-resources/data/troubleshooting/troubleshooting.xml
index a805aac9..a9443af8 100644
--- a/src/main/xar-resources/data/troubleshooting/troubleshooting.xml
+++ b/src/main/xar-resources/data/troubleshooting/troubleshooting.xml
@@ -15,7 +15,7 @@
 
     <para>This document contains hints and tips about troubleshooting problems. It also tells you
         where to find information (version numbers, log information, etc.). See also <link
-        xlink:href="getting-help.xml">Getting Help</link>.</para>
+        xlink:href="getting-help">Getting Help</link>.</para>
 
     <!-- ================================================================== -->
 
diff --git a/src/main/xar-resources/data/upgrading/upgrading.xml b/src/main/xar-resources/data/upgrading/upgrading.xml
index 30df3c04..9e944e8c 100644
--- a/src/main/xar-resources/data/upgrading/upgrading.xml
+++ b/src/main/xar-resources/data/upgrading/upgrading.xml
@@ -49,7 +49,7 @@
       </listitem>
       <listitem>
         <para>Create a
-          <link xlink:href="backup.xml">backup</link>
+          <link xlink:href="backup">backup</link>
           of the data from your existing installation.</para>
       </listitem>
       <listitem>
@@ -61,7 +61,7 @@
         <para>Remove the still <emphasis>empty</emphasis>
           <code>data</code> directory from the new installation. By default the data directory is
           located at <code>$EXIST_HOME/data</code>. If you are not sure where the data directory is,
-          check the main logfile <link xlink:href="troubleshooting.xml#logs">
+          check the main logfile <link xlink:href="troubleshooting#logs">
             <code>exist.log</code>
           </link>, searching for entries after start-up pertaining to <code>DATA_DIR</code>. </para>
       </listitem>
@@ -72,7 +72,7 @@
         <para>Start the new eXist instance.</para>
       </listitem>
       <listitem>
-        <para>Check the <link xlink:href="troubleshooting.xml#logs">
+        <para>Check the <link xlink:href="troubleshooting#logs">
             <code>exist.log</code>
           </link>
           for any errors during startup.</para>
@@ -141,7 +141,7 @@
           Always install the new version into a fresh new directory.</para>
       </listitem>
       <listitem>
-        <para>Perform a full <link xlink:href="backup.xml#restore">restore</link> of the backup onto the new version of
+        <para>Perform a full <link xlink:href="backup#restore">restore</link> of the backup onto the new version of
           eXist.</para>
       </listitem>
     </orderedlist>
@@ -153,7 +153,7 @@
     <title>Upgrading from Source</title>
     <para>The following steps only apply to users who wish to upgrade eXist instances that were
       built from (modified) source code, instead of from the provided installers.</para>
-    <para>Before attempting to upgrade always perform a <link xlink:href="backup.xml">full
+    <para>Before attempting to upgrade always perform a <link xlink:href="backup">full
         backup</link>. Stop eXist after the backup has been generated.</para>
     <orderedlist><listitem><para>Determine which files contain local modification and would be in conflict with updated files
           from the new version of exist-db, by running <code>git status</code> inside the local
@@ -198,11 +198,11 @@
         <tbody>
           <row>
             <entry>
-              <para>latest</para>
+              <para>Latest</para>
             </entry>
             <entry>
               <para>
-                <link xlink:href="http://exist-db.org/exist/apps/wiki/blogs/eXist/">release notes</link>
+                <link xlink:href="https://exist-db.org/exist/apps/wiki/blogs/eXist/">Release notes</link>
               </para>
             </entry>
           </row>
@@ -212,7 +212,7 @@
             </entry>
             <entry>
               <para>
-                <link xlink:href="incompatibilities.xml#v4.5.0">special notes</link>
+                <link xlink:href="incompatibilities#v4.5.0">Special notes</link>
               </para>
             </entry>
           </row>
@@ -222,7 +222,7 @@
             </entry>
             <entry>
               <para>
-                <link xlink:href="incompatibilities.xml#v3.0">special notes</link>
+                <link xlink:href="incompatibilities#v3.0">Special notes</link>
               </para>
             </entry>
           </row>
@@ -232,7 +232,7 @@
             </entry>
             <entry>
               <para>
-                <link xlink:href="incompatibilities.xml#v2.2">special notes</link>
+                <link xlink:href="incompatibilities#v2.2">Special notes</link>
               </para>
             </entry>
           </row>
@@ -242,7 +242,7 @@
             </entry>
             <entry>
               <para>
-                <link xlink:href="incompatibilities.xml#v2.0">special notes</link>
+                <link xlink:href="incompatibilities#v2.0">Special notes</link>
               </para>
             </entry>
           </row>
@@ -252,7 +252,7 @@
             </entry>
             <entry>
               <para>
-                <link xlink:href="incompatibilities.xml#v1.4">special notes</link>
+                <link xlink:href="incompatibilities#v1.4">Special notes</link>
               </para>
             </entry>
           </row>
diff --git a/src/main/xar-resources/data/validation/validation.xml b/src/main/xar-resources/data/validation/validation.xml
index 69e00c9b..59964873 100644
--- a/src/main/xar-resources/data/validation/validation.xml
+++ b/src/main/xar-resources/data/validation/validation.xml
@@ -138,7 +138,7 @@
 
             <para>Within the database the validation mode for each individual collection can be
                 configured using <emphasis>collection.xconf</emphasis> documents (in the same way
-                these are used for configuring <link xlink:href="indexing.xml">indexes</link>).
+                these are used for configuring <link xlink:href="indexing">indexes</link>).
                 These documents need to be stored in <code>/db/system/config/db/...</code>.</para>
             <para>The following example <code>collection.xconf</code> file turns implicit validation
                 off:</para>
@@ -405,7 +405,7 @@
     <sect1 xml:id="sect4a">
         <title>Interactive Client</title>
 
-        <para>The interactive shell mode of the <link xlink:href="java-admin-client.xml">Java Admin
+        <para>The interactive shell mode of the <link xlink:href="java-admin-client">Java Admin
             Client</link> provides a simple <emphasis>validate</emphasis> command that accepts the
             similar explicit validation arguments.</para>
     </sect1>
diff --git a/src/main/xar-resources/data/versioning/versioning.xml b/src/main/xar-resources/data/versioning/versioning.xml
index 698329c2..ee9929d2 100644
--- a/src/main/xar-resources/data/versioning/versioning.xml
+++ b/src/main/xar-resources/data/versioning/versioning.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Versioning Extensions</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>application-development</keyword>
         </keywordset>
@@ -83,7 +83,7 @@
             <para>To enable versioning for a collection, you have to edit the collection's
                 <literal>collection.xconf</literal> configuration file. This file must be stored
                 below the <literal>/db/system/config</literal> collection. As described in the <link
-                xlink:href="indexing.xml">Configuring Indexes</link> document, the
+                xlink:href="indexing">Configuring Indexes</link> document, the
                 <literal>/db/system/config</literal> collection mirrors the hierarchical structure
                 of the main collection tree.</para>
             <para>Within <literal>collection.xconf</literal>, you must register the trigger class
diff --git a/src/main/xar-resources/data/webdav/webdav.xml b/src/main/xar-resources/data/webdav/webdav.xml
index 78751d89..8449beb0 100644
--- a/src/main/xar-resources/data/webdav/webdav.xml
+++ b/src/main/xar-resources/data/webdav/webdav.xml
@@ -269,7 +269,7 @@
     <title>Serialization</title>
 
     <para> When retrieving an XML document via the WebDAV interface, the default serialization
-      settings as defined in <link xlink:href="configuration.xml#conf.xml">conf.xml</link> are used. It is however possible to
+      settings as defined in <link xlink:href="configuration#conf.xml">conf.xml</link> are used. It is however possible to
       define custom serialization settings specific for the WebDAV interface. </para>
     <para> Copy the file <literal>extensions/webdav/src/main/resources/webdav.properties</literal>
       into <literal>$EXIST_HOME/etc</literal> directory and uncomment/modify the parameters. Changes
diff --git a/src/main/xar-resources/data/xquery/xquery.xml b/src/main/xar-resources/data/xquery/xquery.xml
index 6867bfc0..2cbd21a0 100644
--- a/src/main/xar-resources/data/xquery/xquery.xml
+++ b/src/main/xar-resources/data/xquery/xquery.xml
@@ -190,10 +190,10 @@
     <sect1 xml:id="full-text">
         <title>Full Text Search</title>
 
-        <para>eXist-db has an implementation-specific <link xlink:href="lucene.xml">Full Text Search
+        <para>eXist-db has an implementation-specific <link xlink:href="lucene">Full Text Search
             facility</link>, built on the <link condition="_blank"
             xlink:href="https://lucene.apache.org/">Apache Lucene</link> library (see the full
-            documentation on <link xlink:href="indexing.xml">indexing</link> in eXist-db). eXist-db
+            documentation on <link xlink:href="indexing">indexing</link> in eXist-db). eXist-db
             does not currently support the official W3C <link condition="_blank"
             xlink:href="https://www.w3.org/TR/xpath-full-text/">"XQuery and XPath Full Text
             3.0"</link> specification.</para>
@@ -205,7 +205,7 @@
     <sect1 xml:id="update">
         <title>XQuery Update</title>
 
-        <para>eXist-db has an implementation-specific <link xlink:href="update_ext.xml">XQuery
+        <para>eXist-db has an implementation-specific <link xlink:href="update_ext">XQuery
             Update facility</link>, which predates the development of the official W3C XQuery Update
             facility. eXist-db does currently not support the official <link
             xlink:href="https://www.w3.org/TR/xquery-update/">"XQuery Update Facility 3.0"</link>
@@ -228,7 +228,7 @@
             whether the module is implemented in Java or XQuery. For modules implemented in Java,
             the documentation is taken directly from the signature provided by the class
             implementing the <literal>Function</literal> interface. For modules implemented in
-            XQuery, the function descriptions are taken from <link xlink:href="xqdoc.xml"
+            XQuery, the function descriptions are taken from <link xlink:href="xqdoc"
             >XQDoc-formatted comments and annotations</link>.</para>
     </sect1>
 
@@ -237,7 +237,7 @@
     <sect1 xml:id="module-system">
         <title>The Module System</title>
 
-        <para>eXist-db supports the creation of <link xlink:href="development-starter.xml">web
+        <para>eXist-db supports the creation of <link xlink:href="development-starter">web
             applications in XQuery</link>. This can result in complex XQuery scripts, consisting of
             several thousand lines of code. Packaging related functions in modules is therefore an
             important feature. eXist-db allows modules to be imported from a variety of
@@ -325,7 +325,7 @@
 
             <para>The eXist-db package repository makes it easy to manage and deploy external
                 packages (<code>.xar</code> archives) containing Java or XQuery libraries and even
-                full eXist-db applications. See the <link xlink:href="repo.xml">Package
+                full eXist-db applications. See the <link xlink:href="repo">Package
                 Repository</link> documentation.</para>
         </sect2>
 
@@ -430,9 +430,9 @@
             <note>
                 <para>Besides the basic methods for creating a Java-based XQuery module described
                     here, eXist-db provides a pluggable module interface that allows extension
-                    modules to be easily developed in Java. See <link xlink:href="extensions.xml"
+                    modules to be easily developed in Java. See <link xlink:href="extensions"
                     >XQuery Extension Modules</link> for the full documentation on this eXist-db
-                    development best practice. Also, see the <link xlink:href="repo.xml">Package
+                    development best practice. Also, see the <link xlink:href="repo">Package
                     Repository</link> documentation for information on distributing and deploying
                     XQuery and Java libraries for eXist-db.</para>
             </note>
@@ -920,7 +920,7 @@
             <title>Packaging System</title>
             <para>eXist-db implements the <link xlink:href="http://expath.org/spec/pkg">Packaging
                 System</link>, an EXPath community specification for library and application
-                packages. See the <link xlink:href="repo.xml">Package Repository</link>
+                packages. See the <link xlink:href="repo">Package Repository</link>
                 documentation.</para>
         </sect2>
 

From 3a0682bf2a7b737632ab0c94f6231082281b7cd8 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sat, 18 May 2019 23:35:53 -0400
Subject: [PATCH 6/8] Audit HTTP links, switch to HTTPS where supported

---
 .../data/ant-tasks/ant-tasks.xml              |  2 +-
 .../author-reference/author-reference.xml     |  8 +++---
 .../basic-installation/basic-installation.xml | 10 +++----
 .../beginners-guide-to-xrx-v4.xml             | 12 ++++-----
 .../contentextraction/contentextraction.xml   |  2 +-
 .../development-starter.xml                   |  2 +-
 .../devguide_indexes/devguide_indexes.xml     | 22 ++++++++--------
 .../data/devguide_log4j/devguide_log4j.xml    |  8 +++---
 .../data/devguide_rest/devguide_rest.xml      |  4 +--
 .../data/devguide_xmlrpc/devguide_xmlrpc.xml  |  4 +--
 .../data/extensions/extensions.xml            |  4 +--
 .../data/faq_performance/faq_performance.xml  | 10 +++----
 .../getting-help-how-to-report.xml            |  2 +-
 .../data/getting-help/getting-help.xml        |  6 ++---
 .../incompatibilities/incompatibilities.xml   |  2 +-
 .../integration-testing.xml                   |  4 +--
 src/main/xar-resources/data/jmx/jmx.xml       |  2 +-
 .../data/learning-xquery/learning-xquery.xml  |  2 +-
 src/main/xar-resources/data/legal/legal.xml   |  8 +++---
 src/main/xar-resources/data/lucene/lucene.xml | 12 ++++-----
 .../data/oldrangeindex/oldrangeindex.xml      |  4 +--
 src/main/xar-resources/data/oxygen/oxygen.xml |  8 +++---
 .../production_good_practice.xml              |  8 +++---
 .../production_web_proxying.xml               |  6 ++---
 src/main/xar-resources/data/repo/repo.xml     |  2 +-
 .../data/scheduler/scheduler.xml              |  2 +-
 .../xar-resources/data/security/security.xml  |  4 +--
 .../xar-resources/data/testing/testing.xml    |  2 +-
 .../data/troubleshooting/troubleshooting.xml  |  6 ++---
 src/main/xar-resources/data/tuning/tuning.xml |  4 +--
 .../data/update_ext/update_ext.xml            |  4 +--
 .../data/upgrading/upgrading.xml              |  2 +-
 .../data/uploading-files/uploading-files.xml  |  4 +--
 .../data/validation/validation.xml            | 24 ++++++++---------
 src/main/xar-resources/data/webdav/webdav.xml | 26 +++++++++----------
 src/main/xar-resources/data/xforms/xforms.xml |  8 +++---
 src/main/xar-resources/data/xquery/xquery.xml | 20 +++++++-------
 .../data/xsl-transform/xsl-transform.xml      |  6 ++---
 src/main/xar-resources/templates/page.html    |  6 ++---
 39 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/src/main/xar-resources/data/ant-tasks/ant-tasks.xml b/src/main/xar-resources/data/ant-tasks/ant-tasks.xml
index a8c9abe7..f3b1cac4 100644
--- a/src/main/xar-resources/data/ant-tasks/ant-tasks.xml
+++ b/src/main/xar-resources/data/ant-tasks/ant-tasks.xml
@@ -16,7 +16,7 @@
 
     <!-- ================================================================== -->
 
-    <para>eXist-db provides a library for the <link xlink:href="http://ant.apache.org"
+    <para>eXist-db provides a library for the <link xlink:href="https://ant.apache.org"
                 ><code>Ant</code></link> build tool to automate common system administration and
         operation tasks, like backup/restore or importing files. The latest version of eXist-db's
         Ant Tasks can be found on Maven Central as the artifact <link xlink:href="https://search.maven.org/search?q=g:org.exist-db%20AND%20a:exist-ant">exist-ant</link>.</para>
diff --git a/src/main/xar-resources/data/author-reference/author-reference.xml b/src/main/xar-resources/data/author-reference/author-reference.xml
index 3c60f63b..af5529ed 100644
--- a/src/main/xar-resources/data/author-reference/author-reference.xml
+++ b/src/main/xar-resources/data/author-reference/author-reference.xml
@@ -6,7 +6,7 @@
 
     <info>
         <title>Author Reference</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>authoring</keyword>
             <keyword>exist</keyword>
@@ -162,7 +162,7 @@ but does not because its too simple)</programlisting>
         <title>Technical guidelines</title>
 
         <para>More information about DocBook itself can be found on the <link condition="_blank"
-            xlink:href="http://docbook.org/">official DocBook site</link>.</para>
+            xlink:href="https://docbook.org/">official DocBook site</link>.</para>
 
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
@@ -633,9 +633,9 @@ but does not because its too simple)</programlisting>
                         <para>Links to external sources are done with the <tag>link</tag> element.
                             Place the target's full URI in the <code>xlink:href</code> attribute.
                             For instance,
-                            <code><![CDATA[&amp;lt;link xlink:href="http://exist-db.org/exist/apps/homepage/index.html"&amp;gt;]]></code>
+                            <tag>link xlink:href="https://exist-db.org/exist/apps/homepage/index.html"</tag>
                             links to the <link condition="_blank"
-                            xlink:href="http://exist-db.org/exist/apps/homepage/index.html">eXist
+                            xlink:href="https://exist-db.org/exist/apps/homepage/index.html">eXist
                             home page</link>.</para>
                         <para>To open the link on a new page, add
                             <code>condition="_blank"</code>.</para>
diff --git a/src/main/xar-resources/data/basic-installation/basic-installation.xml b/src/main/xar-resources/data/basic-installation/basic-installation.xml
index a5c81c02..2c47c3a3 100644
--- a/src/main/xar-resources/data/basic-installation/basic-installation.xml
+++ b/src/main/xar-resources/data/basic-installation/basic-installation.xml
@@ -48,8 +48,8 @@
                 environment. Java comes in a number of versions, so it is important that you use the
                 version that eXist-db requires: Java 8 (since eXist-db 3.0). For instructions about
                 running Java on your operating system, see Oracle's <link condition="_blank"
-                xlink:href="http://www.java.com/en/download/help/index_installing.xml">Installing
-                Java</link> page. <link condition="_blank" xlink:href="http://openjdk.java.net"
+                xlink:href="https://www.java.com/en/download/help/index_installing.xml">Installing
+                Java</link> page. <link condition="_blank" xlink:href="https://openjdk.java.net"
                 >OpenJDK</link> is a good open source alternative to the Oracle JVM and known to
                 work well with eXist-db.</para>
             <para>eXist-db runs with both the Java JRE (Java Runtime Environment) and the JDK (Java
@@ -64,7 +64,7 @@
                 on commercial Linux distributions. Users of other distributions are better served by
                 distribution-specific instructions. More information for specific versions of Linux
                 can be found at <link condition="_blank"
-                xlink:href="http://livingtao.blogspot.com/2012/01/few-easy-steps-to-install-sunoracle-jdk.html"
+                xlink:href="https://livingtao.blogspot.com/2012/01/few-easy-steps-to-install-sunoracle-jdk.html"
                 >Amazon Linux</link>, <link condition="_blank"
                 xlink:href="http://www.webupd8.org/2012/01/install-oracle-java-jdk-7-in-ubuntu-via.html"
                 >Ubuntu</link> and <link condition="_blank"
@@ -95,7 +95,7 @@
         <itemizedlist>
             <listitem>
                 <para>Download the installer by following the download link on the <link
-                    xlink:href="http://exist-db.org/">eXist-db homepage</link> page. We recommend
+                    xlink:href="https://exist-db.org/">eXist-db homepage</link> page. We recommend
                     that you download the latest stable release.</para>
                 <para>The installer is a single file called
                     <literal>eXist-db-setup-[version].jar</literal> (for instance
@@ -109,7 +109,7 @@
                             <code>.jar</code> file.</para>
                         <note>
                             <para>On Mac OS X 10.7 and higher, a security feature called <link
-                                xlink:href="http://support.apple.com/kb/HT5290">Gatekeeper</link>
+                                xlink:href="https://support.apple.com/kb/HT5290">Gatekeeper</link>
                                 may prevent the installer from running since eXist-db is not
                                 registered with Apple. To circumvent the warning dialog and allow
                                 the installer to run, right-click or control-click the file and
diff --git a/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml b/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
index 048a407b..e0609555 100644
--- a/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
+++ b/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
@@ -57,7 +57,7 @@
             <para>To use this guide you will need to have following tools in place: </para>
             <orderedlist>
                 <listitem>
-                    <para> <emphasis role="bold">eXist</emphasis>: You will need to have <link xlink:href="http://exist-db.org">eXist</link> running on your local system.
+                    <para> <emphasis role="bold">eXist</emphasis>: You will need to have <link xlink:href="https://exist-db.org">eXist</link> running on your local system.
                         By default eXist runs on port <code>8080</code> so that when you set your
                         web browser to <link xlink:href="http://localhost:8080/exist/">http://localhost:8080/exist/</link> you should see the eXist homepage come
                         up.</para>
@@ -586,7 +586,7 @@
                 allows users to enter multi-line descriptions for definitions of terms. The last
                 control is the <tag>xf:select1</tag> control that allows the user to select one
                 value from a list of values. (For a complete discussion of the XForms controls we
-                suggest you use the XForms Wikibook at <link xlink:href="http://en.wikibooks.org/wiki/XForms">http://en.wikibooks.org/wiki/XForms</link>. The Input Form Controls section goes
+                suggest you use the XForms Wikibook at <link xlink:href="https://en.wikibooks.org/wiki/XForms">http://en.wikibooks.org/wiki/XForms</link>. The Input Form Controls section goes
                 through each of the controls in the XForms specification. In addition to the
                 standard controls there are other controls that can also be integrated directly into
                 XForms, such as rich-text editors.)</para>
@@ -786,22 +786,22 @@
         <para>Wiki Books:</para>
         <itemizedlist>
             <listitem>
-                <para> <link xlink:href="http://en.wikibooks.org/wiki/XForms">XForms Wikibook</link> </para>
+                <para> <link xlink:href="https://en.wikibooks.org/wiki/XForms">XForms Wikibook</link> </para>
                 <para>Dan McCreary</para>
             </listitem>
             <listitem>
-                <para> <link xlink:href="http://en.wikibooks.org/wiki/XRX">XRX Wikibook</link> </para>
+                <para> <link xlink:href="https://en.wikibooks.org/wiki/XRX">XRX Wikibook</link> </para>
                 <para>Dan McCreary</para>
             </listitem>
             <listitem>
-                <para> <link xlink:href="http://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</link> </para>
+                <para> <link xlink:href="https://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</link> </para>
                 <para>Chris Wallace; Dan McCreary</para>
             </listitem>
         </itemizedlist>
         <para>Articles:</para>
         <itemizedlist>
             <listitem>
-                <para> <link xlink:href="http://en.wikipedia.org/wiki/XRX_%28web_application_architecture%29">XRX (web application architecture)</link> </para>
+                <para> <link xlink:href="https://en.wikipedia.org/wiki/XRX_%28web_application_architecture%29">XRX (web application architecture)</link> </para>
             </listitem>
             <listitem>
                 <para> <link xlink:href="http://news.oreilly.com/2008/07/xrx-xqueries-in-exist.html">XRX: XQueries in eXist</link> </para>
diff --git a/src/main/xar-resources/data/contentextraction/contentextraction.xml b/src/main/xar-resources/data/contentextraction/contentextraction.xml
index b87386ee..275e8163 100644
--- a/src/main/xar-resources/data/contentextraction/contentextraction.xml
+++ b/src/main/xar-resources/data/contentextraction/contentextraction.xml
@@ -17,7 +17,7 @@
         contains functions for extracting the content of the binary files, and returning the content
         as XML. In this form, the content can then be queried, indexed, and manipulated. It useful
         especially in conjunction with Lucene indexes.</para>
-    <para>The Content Extraction is built on the <link xlink:href="http://tika.apache.org/">Apache
+    <para>The Content Extraction is built on the <link xlink:href="https://tika.apache.org/">Apache
         Tika</link> library. Tika understands a large variety of formats, ranging from PDF documents
         to spreadsheets and image metadata.</para>
 
diff --git a/src/main/xar-resources/data/development-starter/development-starter.xml b/src/main/xar-resources/data/development-starter/development-starter.xml
index fa0d37f3..c00211ce 100644
--- a/src/main/xar-resources/data/development-starter/development-starter.xml
+++ b/src/main/xar-resources/data/development-starter/development-starter.xml
@@ -44,7 +44,7 @@
 
     <note>
         <para> Those working on data sets in TEI may want to look at <link
-            xlink:href="http://teipublisher.com">TEI Publisher</link> also. It includes an
+            xlink:href="https://teipublisher.com">TEI Publisher</link> also. It includes an
             application generator tailored at digital editions. The created app packages include all
             the basic functionality needed for browsing the edition, searching it or producing PDFs
             and ePUBs.</para>
diff --git a/src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml b/src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml
index 7318ce6a..97f26eb0 100644
--- a/src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml
+++ b/src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml
@@ -65,7 +65,7 @@
                 <listitem>
                     <para>A spatial index that stores some of the geometric characteristics of <link
                             condition="_blank"
-                            xlink:href="http://www.opengeospatial.org/standards/gml">Geography
+                            xlink:href="https://www.opengeospatial.org/standards/gml">Geography
                             Markup Language</link> geometries (tested against GML version 2.1.2).
                         For instance:</para>
                     <programlisting language="xml" xlink:href="listings/listing-1.xml"/>
@@ -74,19 +74,19 @@
                     <itemizedlist>
                         <listitem>
                             <para>The <link condition="_blank"
-                                xlink:href="http://en.wikipedia.org/wiki/Spatial_referencing_systems"
+                                xlink:href="https://en.wikipedia.org/wiki/Spatial_referencing_systems"
                                 >spatial referencing system</link> (<literal>osgb:BNG</literal> for
                                 this polygon)</para>
                         </listitem>
                         <listitem>
                             <para>The polygon itself, stored in a binary form (<link
                                 condition="_blank"
-                                xlink:href="http://en.wikipedia.org/wiki/Well-known_text">Well-Known
+                                xlink:href="https://en.wikipedia.org/wiki/Well-known_text">Well-Known
                                 Binary</link>)</para>
                         </listitem>
                         <listitem>
                             <para>The coordinates of its <link condition="_blank"
-                                xlink:href="http://en.wikipedia.org/wiki/Minimum_bounding_rectangle"
+                                xlink:href="https://en.wikipedia.org/wiki/Minimum_bounding_rectangle"
                                 >bounding box</link> </para>
                         </listitem>
                     </itemizedlist>
@@ -730,7 +730,7 @@
                             <entry> <para>WKT</para> </entry>
                             <entry> <para>VARCHAR</para> </entry>
                             <entry> <para>The <link
-                                xlink:href="http://de.wikipedia.org/wiki/Well_Known_Text">Well-Known
+                                xlink:href="https://de.wikipedia.org/wiki/Well_Known_Text">Well-Known
                                 Text</link> representation of the geometry</para> </entry>
                             <entry/>
                         </row>
@@ -788,7 +788,7 @@
                             <entry> <para>VARCHAR</para> </entry>
                             <entry> <para>The WKT representation of the geometry</para> </entry>
                             <entry> <para>In the <link
-                                xlink:href="http://en.wikipedia.org/wiki/EPSG:4326">epsg:4326</link>
+                                xlink:href="https://en.wikipedia.org/wiki/EPSG:4326">epsg:4326</link>
                                 SRS</para> </entry>
                         </row>
                         <row>
@@ -963,7 +963,7 @@
                 GML parsing. It is <literal>null</literal> if the geometry is topologically not well
                 formed. This latter case is maybe a too restrictive feature of Geotools parser which
                 also throws <literal>NullPointerException</literal>s (!) if the GML is somehow not
-                well-formed. See <link xlink:href="http://jira.codehaus.org/browse/GEOT-742"
+                well-formed. See <link xlink:href="https://osgeo-org.atlassian.net/browse/GEOT-742"
                 >GEOT-742</link> for more information on this issue.</para>
             <para> <literal>documentDeleted</literal> is a flag indicating that the current document
                 has been deleted and that we don't have to process it any more. Remember that
@@ -1076,13 +1076,13 @@
                 <literal>org.geotools.gml.producer.GeometryTransformer</literal> which needs some
                 polishing because, despite it is called a transformer, it doesn't cope easily with a
                 <literal>Handler</literal> and returns a... <literal>String</literal> ! See <link
-                xlink:href="http://codehaus01a.managed.contegix.com/browse/GEOT-1315"
+                    xlink:href="https://osgeo-org.atlassian.net/browse/GEOT-1315"
                 >GEOT-1315</link>.</para>
             <para>The last method is also a utility method:</para>
             <programlisting xlink:href="listings/listing-98.txt"/>
             <para>It implements a workaround for our test file SRS which isn't yet known by Geotools
                 libraries (see <link
-                xlink:href="http://codehaus01a.managed.contegix.com/browse/GEOT-1307"
+                    xlink:href="https://osgeo-org.atlassian.net/browse/GEOT-1307"
                 >GEOT-1307</link>), then it tries to get the transformation from our cache. If it
                 doesn't succeed, it tries to find one in the libraries that are in the CLASSPATH.
                 Should those libraries lack the Bursa-Wolf parameters, it will make another attempt
@@ -1260,7 +1260,7 @@
                 operates in the <literal>http://exist-db.org/xquery/spatial</literal> namespace
                 (whose default prefix is <literal>spatial</literal>).</para>
             <para>The functions signatures are documented together with the functions themselves in
-                <link xlink:href="http://demo.exist-db.org/xquery/functions.xq">this page</link>.
+                <link xlink:href="https://demo.exist-db.org/xquery/functions.xq">this page</link>.
                 Here we will only look at their <literal>eval()</literal> methods.</para>
             <para>The first functions set we will describe is
                 <literal>org.exist.xquery.modules.spatial.FunSpatialSearch</literal>, which performs
@@ -1386,7 +1386,7 @@
                 seconds, including some default fulltext indexing. Let's close the upload window and
                 quit the interactive client.</para>
             <para>Let's look our our GML file looks like on GML Viewer, a free viewer provided by
-                <link xlink:href="http://www.snowflakesoftware.co.uk/products/gmlviewer/index.htm"
+                <link xlink:href="https://wiki.snowflakesoftware.com/display/GV50DOC"
                 >Snowflake software</link>:</para>
             <informalfigure>
                 <mediaobject>
diff --git a/src/main/xar-resources/data/devguide_log4j/devguide_log4j.xml b/src/main/xar-resources/data/devguide_log4j/devguide_log4j.xml
index f8ac099a..0bb64897 100644
--- a/src/main/xar-resources/data/devguide_log4j/devguide_log4j.xml
+++ b/src/main/xar-resources/data/devguide_log4j/devguide_log4j.xml
@@ -11,7 +11,7 @@
 
     <!-- ================================================================== -->
 
-    <para>This article explains how to add logging to eXist-db using <link xlink:href="http://logging.apache.org/log4j/">Log4j</link> in Java code.</para>
+    <para>This article explains how to add logging to eXist-db using <link xlink:href="https://logging.apache.org/log4j/">Log4j</link> in Java code.</para>
 
     <!-- ================================================================== -->
 
@@ -29,7 +29,7 @@
         <para>A big issue with the use of the logging system in troubleshooting is that it requires
             a <emphasis>restart</emphasis> for changes to the log configuration. Customers are often
             extremely reluctant to restart their production servers.</para>
-        <para>To amend these problems <link xlink:href="http://logging.apache.org/log4j/">Log4j</link> is introduced. Log4j is the most powerful Java-based logging library
+        <para>To amend these problems <link xlink:href="https://logging.apache.org/log4j/">Log4j</link> is introduced. Log4j is the most powerful Java-based logging library
             available today and is used by most of the application servers on the market.</para>
 
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -113,13 +113,13 @@
                     <listitem>
                         <para>Various free and commercial products provide specialized viewing
                             capabilities for Log4j logs. Apache provides a very useful Log4j log
-                            viewer <link xlink:href="http://logging.apache.org/log4j/docs/chainsaw.html">Chainsaw</link>.</para>
+                            viewer <link xlink:href="https://logging.apache.org/chainsaw">Chainsaw</link>.</para>
                     </listitem>
                 </varlistentry>
             </variablelist>
 
 
-            <para>For more information visit the <link xlink:href="http://logging.apache.org/log4j/">Log4j website</link> website. </para>
+            <para>For more information visit the <link xlink:href="https://logging.apache.org/log4j/">Log4j website</link> website. </para>
 
             <note>
                 <para>Java 1.4 and higher’s <code>java.util.logging</code> API is very similar to
diff --git a/src/main/xar-resources/data/devguide_rest/devguide_rest.xml b/src/main/xar-resources/data/devguide_rest/devguide_rest.xml
index 8e83f1f6..6c355835 100644
--- a/src/main/xar-resources/data/devguide_rest/devguide_rest.xml
+++ b/src/main/xar-resources/data/devguide_rest/devguide_rest.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>REST-Style Web API</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>application-development</keyword>
             <keyword>interfaces</keyword>
@@ -323,7 +323,7 @@
             images, CSS stylesheets or Javascript files into a database collection, it is entirely
             possible to serve a complex application out of the database. For instance, have a look
             at the example <link
-            xlink:href="http://demo.exist-db.org/exist/apps/demo/examples/web/index.html">Using
+            xlink:href="https://demo.exist-db.org/exist/apps/demo/examples/web/index.html">Using
             XQuery for Web Applications</link> on the demo server.</para>
     </sect1>
 
diff --git a/src/main/xar-resources/data/devguide_xmlrpc/devguide_xmlrpc.xml b/src/main/xar-resources/data/devguide_xmlrpc/devguide_xmlrpc.xml
index 0b381be3..cddc3da4 100644
--- a/src/main/xar-resources/data/devguide_xmlrpc/devguide_xmlrpc.xml
+++ b/src/main/xar-resources/data/devguide_xmlrpc/devguide_xmlrpc.xml
@@ -23,10 +23,10 @@
     <para>XML-RPC (XML Remote Procedural Call) provides a simple way to access eXist-db by calling remote procedures from a wide variety of programming languages and environments, like CGI scripts, PHP, JSP and more.
     </para>
     <para>For a Java server, eXist uses the XML-RPC library created by Hannes Wallnoefer which recently has moved to Apache (see:
-      <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://xml.apache.org/xmlrpc">http://xml.apache.org/xmlrpc</link>).
+      <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://xml.apache.org/xmlrpc">http://xml.apache.org/xmlrpc</link>).
     </para>
     <para>Perl examples use the RPC::XML package, which should be available at every CPAN mirror (see
-      <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.cpan.org">CPAN</link>).</para>
+      <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://www.cpan.org">CPAN</link>).</para>
     <para>The following is a small example, which shows how to talk to eXist-db from Java using the Apache XML-RPC library. This example can be found in
       <literal>samples/org/exist/examples/xmldb/Retrieve.java</literal>.</para>
 
diff --git a/src/main/xar-resources/data/extensions/extensions.xml b/src/main/xar-resources/data/extensions/extensions.xml
index 9a548b43..f69d0c7e 100644
--- a/src/main/xar-resources/data/extensions/extensions.xml
+++ b/src/main/xar-resources/data/extensions/extensions.xml
@@ -325,8 +325,8 @@
         <sect2 xml:id="module_spatial">
             <title>Spatial module</title>
             <para>Various functions for <link
-                    xlink:href="http://www.opengeospatial.org/standards/gml">GML</link> geometries,
-                whether indexed or not. More information about the design is available <link
+                    xlink:href="https://www.opengeospatial.org/standards/gml">GML</link> geometries,
+                whether indexed or not. More information about the design is available in the <link
                     xlink:href="devguide_indexes">Developer's Guide to Modularized Indexes</link>.</para>
             <itemizedlist>
                 <listitem>
diff --git a/src/main/xar-resources/data/faq_performance/faq_performance.xml b/src/main/xar-resources/data/faq_performance/faq_performance.xml
index 951055c4..d395c07d 100644
--- a/src/main/xar-resources/data/faq_performance/faq_performance.xml
+++ b/src/main/xar-resources/data/faq_performance/faq_performance.xml
@@ -3,7 +3,7 @@
         schematypens="http://purl.oclc.org/dsdl/schematron"?><article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <info>
         <title>Performance FAQ</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>operations</keyword>
         </keywordset>
@@ -129,19 +129,19 @@
 
         <itemizedlist>
             <listitem>
-                <para>On size vs. structure: <link xlink:href="http://markmail.org/message/jagye4wqirqpkowm">Wolfgang Meier,
+                <para>On size vs. structure: <link xlink:href="https://markmail.org/message/jagye4wqirqpkowm">Wolfgang Meier,
                     exist-open mailing list, Apr 29, 2010</link> </para>
             </listitem>
             <listitem>
-                <para>On querying while writing: <link xlink:href="http://markmail.org/message/6boozu74ttequcoo">Wolfgang Meier,
+                <para>On querying while writing: <link xlink:href="https://markmail.org/message/6boozu74ttequcoo">Wolfgang Meier,
                     exist-open mailing list, Jan 19, 2012</link> </para>
             </listitem>
             <listitem>
-                <para>On multiple concurrent users thread dumps, and memory monitoring, <link xlink:href="http://markmail.org/message/p5zzlnjg2j6wb7gr">Wolfgang Meier,
+                <para>On multiple concurrent users thread dumps, and memory monitoring, <link xlink:href="https://markmail.org/message/p5zzlnjg2j6wb7gr">Wolfgang Meier,
                     exist-open mailing list, Jan 19, 2012</link> </para>
             </listitem>
             <listitem>
-                <para>On limits of collection and document ids: <link xlink:href="http://markmail.org/message/2n2vnisdonpk4yt6">Pierrick Brihaye,
+                <para>On limits of collection and document ids: <link xlink:href="https://markmail.org/message/2n2vnisdonpk4yt6">Pierrick Brihaye,
                     exist-open mailing list, Oct 4, 2007</link> </para>
             </listitem>
         </itemizedlist>
diff --git a/src/main/xar-resources/data/getting-help-how-to-report/getting-help-how-to-report.xml b/src/main/xar-resources/data/getting-help-how-to-report/getting-help-how-to-report.xml
index 3b8a2cb8..65342a9b 100644
--- a/src/main/xar-resources/data/getting-help-how-to-report/getting-help-how-to-report.xml
+++ b/src/main/xar-resources/data/getting-help-how-to-report/getting-help-how-to-report.xml
@@ -75,7 +75,7 @@
                 </listitem>
                 <listitem>
                     <para>Check if the issue has been solved in the latest version of eXist-db; For
-                        this the web based tool <link xlink:href="http://exist-db.org/exist/apps/eXide/index.html">eXide</link>
+                        this the web based tool <link xlink:href="https://exist-db.org/exist/apps/eXide/index.html">eXide</link>
                         can be used.</para>
                 </listitem>
                 <listitem>
diff --git a/src/main/xar-resources/data/getting-help/getting-help.xml b/src/main/xar-resources/data/getting-help/getting-help.xml
index b34d6f16..fac8e174 100644
--- a/src/main/xar-resources/data/getting-help/getting-help.xml
+++ b/src/main/xar-resources/data/getting-help/getting-help.xml
@@ -31,7 +31,7 @@
       </mediaobject>
     </figure>
     <para>The <link xlink:href="https://lists.sourceforge.net/lists/listinfo/exist-open" condition="_blank">exist-open</link> mailing list is the
-      primary forum for asking questions and getting help. Finding the answer to a question can sometimes be as simple as <link xlink:href="http://exist-open.markmail.org/search/?q=" condition="_blank">searching the mailing list's archives</link>. Whether you have a
+      primary forum for asking questions and getting help. Finding the answer to a question can sometimes be as simple as <link xlink:href="https://exist-open.markmail.org/" condition="_blank">searching the mailing list's archives</link>. Whether you have a
       question that you can't find the answer to, or you just want to join the discussion, <link xlink:href="https://lists.sourceforge.net/lists/listinfo/exist-open" condition="_blank">subscribe to the mailing list</link>. It's free and
       you can unsubscribe anytime.</para>
     <note>
@@ -43,7 +43,7 @@
     <para>Follow <link xlink:href="https://twitter.com/#!/existdb" condition="_blank">@existdb</link> on Twitter for news and announcements about
       eXist-db. Use the <link xlink:href="https://twitter.com/#!/search?q=%23existdb" condition="_blank">#existdb</link> hash tag (note: no dash in
       #existdb). </para>
-    <para>Find links about eXist-db on <code>Del.icio.us</code> using the <link xlink:href="http://www.delicious.com/tag/existdb" condition="_blank">existdb</link> tag. Meet the eXist-db professionals on <link xlink:href="http://www.linkedin.com/groups?mostPopular=&amp;gid=35624" condition="_blank">LinkedIn</link>. Subscribe to the <link xlink:href="http://atomic.exist-db.org/blogs/eXist/" condition="_blank">eXist
+    <para>Meet eXist-db professionals on <link xlink:href="https://www.linkedin.com/groups?mostPopular=&amp;gid=35624" condition="_blank">LinkedIn</link>. Subscribe to the <link xlink:href="http://atomic.exist-db.org/blogs/eXist/" condition="_blank">eXist
         Developer Blog</link>, powered by the eXist-based AtomicWiki project.</para>
   </sect1>
 
@@ -54,7 +54,7 @@
 
     <para>eXist-db began as and continues to thrive as an open source community, built on the contributions of volunteers. Recognizing the need for
       professional solutions for eXist-db, members of our development team and community have come together commercially under the umbrella of <link xlink:href="http://www.existsolutions.com" condition="_blank">eXist Solutions</link>. They are available for  Consultancy, Training or Bespoke
-      Development. We also offer <link xlink:href="http://exist-db.org/exist/apps/homepage/index.html#subscriptions" condition="_blank">support
+      Development. We also offer <link xlink:href="https://exist-db.org/exist/apps/homepage/index.html#subscriptions" condition="_blank">support
         subscriptions</link> with service level agreements tailored to customer's requirements. Please contact us at <link xlink:href="mailto:info@existsolutions.com">info@existsolutions.com</link>. </para>
   </sect1>
 </article>
\ No newline at end of file
diff --git a/src/main/xar-resources/data/incompatibilities/incompatibilities.xml b/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
index 981d5497..a5a99973 100644
--- a/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
+++ b/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
@@ -93,7 +93,7 @@
             <listitem>
                 <para>eXist-db v3.0 is the culmination of almost 1,500 changes. For more information
                     on new features head to the <link
-                    xlink:href="http://exist-db.org/exist/apps/wiki/blogs/eXist//eXist-db-v3"
+                    xlink:href="https://exist-db.org/exist/apps/wiki/blogs/eXist//eXist-db-v3"
                     >blog</link>.</para>
             </listitem>
         </itemizedlist>
diff --git a/src/main/xar-resources/data/integration-testing/integration-testing.xml b/src/main/xar-resources/data/integration-testing/integration-testing.xml
index 118a442b..7be75560 100644
--- a/src/main/xar-resources/data/integration-testing/integration-testing.xml
+++ b/src/main/xar-resources/data/integration-testing/integration-testing.xml
@@ -3,7 +3,7 @@
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <info>
     <title>Integration Testing</title>
-    <date>4Q18</date>
+    <date>2Q19</date>
     <keywordset>
       <keyword>application-development</keyword>
       <keyword>testing</keyword>
@@ -113,7 +113,7 @@
       <para>Common tools for browser testing include
         <link condition="_blank" xlink:href="https://www.cypress.io">Cypress</link>,
         <link condition="_blank" xlink:href="https://docs.seleniumhq.org">Selenium</link>, and
-        <link condition="_blank" xlink:href="http://webdriver.io">WebDriver</link>. As before the choice is up to you, whichever you choose it should be clearly documented so your contributors know how to adjust test cases for new features and how to
+        <link condition="_blank" xlink:href="https://webdriver.io">WebDriver</link>. As before the choice is up to you, whichever you choose it should be clearly documented so your contributors know how to adjust test cases for new features and how to
         maintain your tests. We focus on Cypress, as it does not require any additional steps for configuring a browser first.</para>
       <note>
         <para>If you need to perform cross-browser testing you can take a look at services such as
diff --git a/src/main/xar-resources/data/jmx/jmx.xml b/src/main/xar-resources/data/jmx/jmx.xml
index be7ecb36..cef9c1e7 100644
--- a/src/main/xar-resources/data/jmx/jmx.xml
+++ b/src/main/xar-resources/data/jmx/jmx.xml
@@ -32,7 +32,7 @@
             system properties:</para>
         <programlisting xlink:href="listings/listing-1.txt"/>
         <warning>
-            <para>These options makes the server publicly accessible. Please check the Oracle <link xlink:href="http://docs.oracle.com/javase/1.5.0/docs/guide/management/agent.html">
+            <para>These options makes the server publicly accessible. Please check the Oracle <link xlink:href="https://docs.oracle.com/javase/1.5.0/docs/guide/management/agent.html">
                 JMX documentation</link> for details.</para>
         </warning>
         <para>The extension can now be activated by passing a <code>-j</code> or <code>-jmx</code>
diff --git a/src/main/xar-resources/data/learning-xquery/learning-xquery.xml b/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
index a550c90d..44f50636 100644
--- a/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
+++ b/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
@@ -115,7 +115,7 @@
             <para>XML is an inherently recursive data structure: trees contain sub-trees. Therefore
                 many XQuery functions for transforming documents are best designed using recursion.
                 A good place to start learning recursion is the identity node filter functions in
-                the <link condition="_blank" xlink:href="http://en.wikibooks.org/wiki/XQuery">XQuery
+                the <link condition="_blank" xlink:href="https://en.wikibooks.org/wiki/XQuery">XQuery
                 Wikibook</link>.</para>
         </sect2>
 
diff --git a/src/main/xar-resources/data/legal/legal.xml b/src/main/xar-resources/data/legal/legal.xml
index 67ab618c..74bc0fcf 100644
--- a/src/main/xar-resources/data/legal/legal.xml
+++ b/src/main/xar-resources/data/legal/legal.xml
@@ -4,7 +4,7 @@
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <info>
     <title>Legal Statement</title>
-    <date>1Q18</date>
+    <date>2Q19</date>
     <keywordset>
       <keyword>exist</keyword>
     </keywordset>
@@ -74,13 +74,13 @@
           (a GitHub repository) </para>
       </listitem>
       <listitem>
-        <para>A <link xlink:href="http://en.wikipedia.org/wiki/Open_source_software" condition="_blank">Definition</link> of open source software. </para>
+        <para>A <link xlink:href="https://en.wikipedia.org/wiki/Open_source_software" condition="_blank">Definition</link> of open source software. </para>
       </listitem>
       <listitem>
-        <para>The original text of the <link xlink:href="http://www.gnu.org/licenses/lgpl-2.1.txt" condition="_blank">L-GPL license</link>. </para>
+        <para>The original text of the <link xlink:href="https://www.gnu.org/licenses/lgpl-2.1.txt" condition="_blank">L-GPL license</link>. </para>
       </listitem>
       <listitem>
-        <para>An <link xlink:href="http://www.tldrlegal.com/license/gnu-lesser-general-public-license-v2.1-(lgpl-2.1)" condition="_blank">explanation</link> of
+        <para>An <link xlink:href="https://tldrlegal.com/license/gnu-lesser-general-public-license-v2.1-(lgpl-2.1)" condition="_blank">explanation</link> of
           the L-GPL license. </para>
       </listitem>
     </itemizedlist>
diff --git a/src/main/xar-resources/data/lucene/lucene.xml b/src/main/xar-resources/data/lucene/lucene.xml
index fb2432cb..e57b5793 100644
--- a/src/main/xar-resources/data/lucene/lucene.xml
+++ b/src/main/xar-resources/data/lucene/lucene.xml
@@ -19,7 +19,7 @@
     <sect1 xml:id="intro">
         <title>Introduction</title>
 
-        <para>The full text index module is based on <link condition="_blank" xlink:href="http://lucene.apache.org">Apache Lucene</link>. </para>
+        <para>The full text index module is based on <link condition="_blank" xlink:href="https://lucene.apache.org">Apache Lucene</link>. </para>
         <para>The full-text index module is tightly integrated with eXist-db's <emphasis>modularized
             indexing architecture</emphasis>: the index behaves like a plug-in which adds itself to
             the database's index pipelines. Once configured, the index will be notified of relevant
@@ -43,7 +43,7 @@
                 >Lucene Javadocs</link>.</para>
 
         <para>Like other indexes, you create a Lucene index by configuring it in a
-            <literal>collection.xconf</literal> document as explained in <link xlink:href="indexing.xml#idxconf">documentation</link>. For example:</para>
+            <literal>collection.xconf</literal> document as explained in <link xlink:href="indexing#idxconf">documentation</link>. For example:</para>
 
         <example>
             <title>collection.xconf for version 2.2</title>
@@ -146,7 +146,7 @@
                 back to the section.</para>
             <para>If you query a larger context, you can use the <link xlink:href="kwic">KWIC</link>
                 module to show the user text <emphasis>surrounding</emphasis> each match. Or you can
-                ask eXist-db to <link xlink:href="kwic.xml#highlight">highlight each match</link>
+                ask eXist-db to <link xlink:href="kwic#highlight">highlight each match</link>
                 with an <tag>exist:match</tag> tag, which you can later use to locate the matches
                 within the text.</para>
         </sect2>
@@ -281,11 +281,11 @@
 
             <programlisting language="xml" xlink:href="listings/listing-29.xml"/>
 
-            <para>In the example above, we define that Lucene's <link condition="_blank" xlink:href="http://lucene.apache.org/core/4_10_4/analyzers-common/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</link> should be used by default (the <tag>analyzer</tag> element
+            <para>In the example above, we define that Lucene's <link condition="_blank" xlink:href="https://lucene.apache.org/core/4_10_4/analyzers-common/org/apache/lucene/analysis/standard/StandardAnalyzer.html">StandardAnalyzer</link> should be used by default (the <tag>analyzer</tag> element
                 without <literal>id</literal> attribute). We provide an additional analyzer and
                 assign it the id <literal>ws</literal>, by which the analyzer can be referenced in
                 the actual index definitions.</para>
-            <para>The <link condition="_blank" xlink:href="http://lucene.apache.org/core/4_10_4/analyzers-common/org/apache/lucene/analysis/core/WhitespaceAnalyzer.html">whitespace analyzer</link> is the most basic one. As the name implies, it tokenizes
+            <para>The <link condition="_blank" xlink:href="https://lucene.apache.org/core/4_10_4/analyzers-common/org/apache/lucene/analysis/core/WhitespaceAnalyzer.html">whitespace analyzer</link> is the most basic one. As the name implies, it tokenizes
                 the text at white space characters, but treats all other characters - including
                 punctuation - as part of the token. The tokens are not converted to lower case and
                 there's no stopword filter applied.</para>
@@ -320,7 +320,7 @@
                         <para><code>java.lang.reflect.Field</code></para>
                     </listitem>
                 </itemizedlist>
-                <para> The value <link condition="_blank" xlink:href="http://lucene.apache.org/core/4_10_4/core/org/apache/lucene/util/Version.html#LUCENE_CURRENT">Version#LUCENE_CURRENT</link> is always added as first parameter for the
+                <para> The value <link condition="_blank" xlink:href="https://lucene.apache.org/core/4_10_4/core/org/apache/lucene/util/Version.html#LUCENE_CURRENT">Version#LUCENE_CURRENT</link> is always added as first parameter for the
                     analyzer constructor (a fallback mechanism is present for older analyzers). The
                     previously valid values <code>java.io.File</code> and <code>java.util.Set</code>
                     can not be used since Lucene 4.</para>
diff --git a/src/main/xar-resources/data/oldrangeindex/oldrangeindex.xml b/src/main/xar-resources/data/oldrangeindex/oldrangeindex.xml
index 4b720b67..dc7c98e2 100644
--- a/src/main/xar-resources/data/oldrangeindex/oldrangeindex.xml
+++ b/src/main/xar-resources/data/oldrangeindex/oldrangeindex.xml
@@ -3,7 +3,7 @@
         schematypens="http://purl.oclc.org/dsdl/schematron"?><article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <info>
         <title>Legacy Range index</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>indexing</keyword>
         </keywordset>
@@ -28,7 +28,7 @@
 
         <programlisting language="xml" xlink:href="listings/listing-1.xml"/>
         <para>With this short inventory, the text nodes of the <tag>price</tag> elements have dollar
-            values expressed as a floating-point number, (e.g. "299.99"), which has an <link xlink:href="http://www.w3.org/TR/xmlschema-0/">XML Schema Definition</link> (XSD) data
+            values expressed as a floating-point number, (e.g. "299.99"), which has an <link xlink:href="https://www.w3.org/TR/xmlschema-0/">XML Schema Definition</link> (XSD) data
             type of <literal>xs:double</literal>. Using this built-in type to define a range index,
             we can improve the efficiency of searches for <tag>price</tag> values. During indexing,
             eXist-db will apply this data type selection by attempting to cast all <tag>price</tag>
diff --git a/src/main/xar-resources/data/oxygen/oxygen.xml b/src/main/xar-resources/data/oxygen/oxygen.xml
index 6cad86dd..342c62ba 100644
--- a/src/main/xar-resources/data/oxygen/oxygen.xml
+++ b/src/main/xar-resources/data/oxygen/oxygen.xml
@@ -3,7 +3,7 @@
         schematypens="http://purl.oclc.org/dsdl/schematron"?><article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <info>
     <title>Using oXygen with eXist-db</title>
-    <date>1Q18</date>
+    <date>2Q19</date>
     <keywordset>
       <keyword>getting-started</keyword>
     </keywordset>
@@ -11,7 +11,7 @@
 
   <!-- ================================================================== -->
 
-  <para>This article describes how to use eXist-db in combination with the <link xlink:href="http://oxygenxml.com/" condition="_blank">oXygen XML Editor</link> IDE.</para>
+  <para>This article describes how to use eXist-db in combination with the <link xlink:href="https://oxygenxml.com/" condition="_blank">oXygen XML Editor</link> IDE.</para>
 
   <!-- ================================================================== -->
 
@@ -19,7 +19,7 @@
     <title>Overview</title>
 
     <para>
-      <link xlink:href="http://oxygenxml.com/" condition="_blank">oXygen XML Editor</link> is a powerful
+      <link xlink:href="https://oxygenxml.com/" condition="_blank">oXygen XML Editor</link> is a powerful
       IDE for working with XML in general but also with eXist-db. Its eXist-db specific capabilities include:</para>
     <itemizedlist>
       <listitem>
@@ -35,7 +35,7 @@
         <para>Executing queries and displaying results</para>
       </listitem>
     </itemizedlist>
-    <para> This article describes how to configure oXygen to work with eXist-db. See also <link xlink:href="http://oxygenxml.com/xml_editor/eXist_support.html" condition="_blank">oXygen's eXist-db support</link> article.</para>
+    <para> This article describes how to configure oXygen to work with eXist-db. See also <link xlink:href="https://oxygenxml.com/xml_editor/eXist_support.html" condition="_blank">oXygen's eXist-db support</link> article.</para>
   </sect1>
 
   <!-- ================================================================== -->
diff --git a/src/main/xar-resources/data/production_good_practice/production_good_practice.xml b/src/main/xar-resources/data/production_good_practice/production_good_practice.xml
index e26e0f10..59957837 100644
--- a/src/main/xar-resources/data/production_good_practice/production_good_practice.xml
+++ b/src/main/xar-resources/data/production_good_practice/production_good_practice.xml
@@ -35,7 +35,7 @@
                 <para>eXist-db is written in Java - so for performance and security reasons, please
                     ensure that you have the latest and greatest Java JDK release that is compatible
                     with your version of eXist. The latest version can always be found here at:
-                    <link condition="_blank" xlink:href="http://java.sun.com"
+                    <link condition="_blank" xlink:href="https://java.sun.com"
                     >http://java.sun.com</link> and the recommended major version for a given eXist
                     release can be found at: <link condition="_blank"
                     xlink:href="https://bintray.com/existdb/releases/exist#read"
@@ -415,9 +415,9 @@
         <para>eXist-db, like any Web Application Server, should
             not be directly exposed to the Web. Instead, we strongly recommend proxying eXist-db
             through a Web Server such as <link condition="_blank"
-            xlink:href="http://wiki.nginx.org/Main">Nginx</link> or <link condition="_blank"
-            xlink:href="http://httpd.apache.org/">Apache HTTPD</link>. See <link
-            xlink:href="production_web_proxying.xml">here</link> for further details.</para>
+            xlink:href="https://wiki.nginx.org/Main">Nginx</link> or <link condition="_blank"
+            xlink:href="https://httpd.apache.org/">Apache HTTPD</link>. See <link
+            xlink:href="production_web_proxying">here</link> for further details.</para>
         <para>If you proxy eXist-db through a Web Server, you can also configure your firewall to
             allow external access directly to the Web Server only. If done correctly this means that
             web users will not be able to access any eXist-db services directly, except your
diff --git a/src/main/xar-resources/data/production_web_proxying/production_web_proxying.xml b/src/main/xar-resources/data/production_web_proxying/production_web_proxying.xml
index 62b1bfc6..2e19d00e 100644
--- a/src/main/xar-resources/data/production_web_proxying/production_web_proxying.xml
+++ b/src/main/xar-resources/data/production_web_proxying/production_web_proxying.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Production use - Proxying eXist-db behind a Web Server</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>operations</keyword>
         </keywordset>
@@ -53,7 +53,7 @@
         <para>Examples are provided for:</para>
         <variablelist spacing="compact">
             <varlistentry>
-                <term> <link condition="_blank" xlink:href="http://wiki.nginx.org/Main">Nginx</link> </term>
+                <term> <link condition="_blank" xlink:href="https://wiki.nginx.org/Main">Nginx</link> </term>
                 <listitem>
                     <para>A very small but extremely powerful Web Server which is also simple to
                         configure. It powers some of the biggest sites on the Web. See <xref
@@ -61,7 +61,7 @@
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term> <link condition="_blank" xlink:href="http://httpd.apache.org/">Apache
+                <term> <link condition="_blank" xlink:href="https://httpd.apache.org/">Apache
                     HTTPD</link> </term>
                 <listitem>
                     <para>Likely the most prolific Web Server used on the web. See <xref
diff --git a/src/main/xar-resources/data/repo/repo.xml b/src/main/xar-resources/data/repo/repo.xml
index e60c5472..0d2c40f5 100644
--- a/src/main/xar-resources/data/repo/repo.xml
+++ b/src/main/xar-resources/data/repo/repo.xml
@@ -154,7 +154,7 @@
                     <code>expath-pkg.xml</code> descriptor. For eaxample:</para>
                 <programlisting language="xml">&lt;dependency package="http://exist-db.org/apps/shared"/&gt;</programlisting>
                 <para>It is also possible to create a dependency on a specific version, based on
-                    <link condition="_blank" xlink:href="http://http://semver.org/">Semantic
+                    <link condition="_blank" xlink:href="https://semver.org/">Semantic
                     Versioning</link>. This can be done by adding either of the attributes:
                     <code>version</code>, <code>semver</code>, <code>semver-min</code>,
                     <code>semver-max</code>: </para>
diff --git a/src/main/xar-resources/data/scheduler/scheduler.xml b/src/main/xar-resources/data/scheduler/scheduler.xml
index 1cec3f21..3cdfd1d9 100644
--- a/src/main/xar-resources/data/scheduler/scheduler.xml
+++ b/src/main/xar-resources/data/scheduler/scheduler.xml
@@ -45,7 +45,7 @@
                         </para>
                     </note>
                     <para>There is an XQuery library module, <link condition="_blank"
-                        xlink:href="http://www.exist-db.org/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/scheduler&amp;location=java:org.exist.xquery.modules.scheduler.SchedulerModule&amp;details=true"
+                        xlink:href="https://www.exist-db.org/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/scheduler&amp;location=java:org.exist.xquery.modules.scheduler.SchedulerModule&amp;details=true"
                         >Scheduler Module</link>, which provides functions for scheduling jobs and
                         managing jobs scheduled for execution. The scheduler XQuery library module
                         is activated by uncommenting the following in eXist-db's
diff --git a/src/main/xar-resources/data/security/security.xml b/src/main/xar-resources/data/security/security.xml
index b20791d8..d3e9f27a 100644
--- a/src/main/xar-resources/data/security/security.xml
+++ b/src/main/xar-resources/data/security/security.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Security</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>operations</keyword>
             <keyword>application-development</keyword>
@@ -441,7 +441,7 @@
             <para>More information about ACLs is available as <link condition="_blank"
                 xlink:href="http://www.adamretter.org.uk/presentations/security-in-existdb_xml-prague_existdb_20120210.pdf"
                 >slides</link> (PDF) and a presentation on <link condition="_blank"
-                xlink:href="http://www.youtube.com/watch?v=Z_Dryy9DtVo">YouTube</link>.</para>
+                xlink:href="https://www.youtube.com/watch?v=Z_Dryy9DtVo">YouTube</link>.</para>
         </sect2>
     </sect1>
 
diff --git a/src/main/xar-resources/data/testing/testing.xml b/src/main/xar-resources/data/testing/testing.xml
index 0ccac0c2..9a4b55d5 100644
--- a/src/main/xar-resources/data/testing/testing.xml
+++ b/src/main/xar-resources/data/testing/testing.xml
@@ -34,7 +34,7 @@
             <link xlink:href="xqsuite">Unit testing:</link>
           </emphasis>These tests typically operate at the level of individual functions. eXist-db has its own unit testing framework for XQuery named
           <link xlink:href="xqsuite">XQSuite</link>. It is prominently used in our bug reports and
-          <link xlink:href="https://github.com/eXist-db/exist/tree/develop/test/src/xquery">source-code repo</link>. Most applications will need to run multiple unit test tools to test, e.g. Java, JavaScript, and XQuery code.</para>
+          <link xlink:href="https://github.com/eXist-db/exist">source-code repo</link>. Most applications will need to run multiple unit test tools to test, e.g. Java, JavaScript, and XQuery code.</para>
       </listitem>
       <listitem>
         <para>
diff --git a/src/main/xar-resources/data/troubleshooting/troubleshooting.xml b/src/main/xar-resources/data/troubleshooting/troubleshooting.xml
index a9443af8..d94493a5 100644
--- a/src/main/xar-resources/data/troubleshooting/troubleshooting.xml
+++ b/src/main/xar-resources/data/troubleshooting/troubleshooting.xml
@@ -101,7 +101,7 @@
                             <term>Windows</term>
                             <listitem>
                                 <para><link condition="_blank"
-                                        xlink:href="http://confluence.atlassian.com/display/DOC/Setting+the+JAVA_HOME+Variable+in+Windows"
+                                        xlink:href="https://confluence.atlassian.com/display/DOC/Setting+the+JAVA_HOME+Variable+in+Windows"
                                         >Setting <code>JAVA_HOME</code> on Windows</link></para>
                                 <para/>
                             </listitem>
@@ -110,7 +110,7 @@
                             <term>Linux</term>
                             <listitem>
                                 <para><link condition="_blank"
-                                        xlink:href="http://www.cyberciti.biz/faq/linux-unix-set-java_home-path-variable/"
+                                        xlink:href="https://www.cyberciti.biz/faq/linux-unix-set-java_home-path-variable/"
                                         >Setting <code>JAVA_HOME</code> on Linux</link></para>
                             </listitem>
                         </varlistentry>
@@ -118,7 +118,7 @@
                             <term>macOS</term>
                             <listitem>
                                 <para><link
-                                        xlink:href="http://osxdaily.com/2015/07/28/set-enviornment-variables-mac-os-x/"
+                                        xlink:href="https://osxdaily.com/2015/07/28/set-enviornment-variables-mac-os-x/"
                                         >Setting <code>JAVA_HOME</code> on macOS</link></para>
                             </listitem>
                         </varlistentry>
diff --git a/src/main/xar-resources/data/tuning/tuning.xml b/src/main/xar-resources/data/tuning/tuning.xml
index 661f0b3b..b386a3a0 100644
--- a/src/main/xar-resources/data/tuning/tuning.xml
+++ b/src/main/xar-resources/data/tuning/tuning.xml
@@ -134,7 +134,7 @@
                 "^Joe.*")</code>) You can also use a full text index for the latter. </para>
             <para>Range indexes on strings are by default <emphasis>case-sensitive</emphasis>. To be
                 more precise: they are sensitive to the default <link condition="_blank"
-                xlink:href="http://en.wikipedia.org/wiki/Collation">collation</link>. If you need
+                xlink:href="https://en.wikipedia.org/wiki/Collation">collation</link>. If you need
                 case-insensitive queries, consider using an ngram index.</para>
         </sect2>
 
@@ -176,7 +176,7 @@
 
             <para>eXist-db uses internal indexes to directly locate an element or attribute by name.
                 It doesn't need to <link condition="_blank"
-                xlink:href="http://en.wikipedia.org/wiki/Tree_traversal">traverse</link> the
+                xlink:href="https://en.wikipedia.org/wiki/Tree_traversal">traverse</link> the
                 document tree. This means that direct selection of a node through a single
                 descendant step is <emphasis>faster</emphasis> than walking the child axis. For
                 example:</para>
diff --git a/src/main/xar-resources/data/update_ext/update_ext.xml b/src/main/xar-resources/data/update_ext/update_ext.xml
index 0f5a963d..0386d94e 100644
--- a/src/main/xar-resources/data/update_ext/update_ext.xml
+++ b/src/main/xar-resources/data/update_ext/update_ext.xml
@@ -3,7 +3,7 @@
         schematypens="http://purl.oclc.org/dsdl/schematron"?><article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <info>
     <title>XQuery Update Extension</title>
-    <date>1Q18</date>
+    <date>2Q19</date>
     <keywordset>
       <keyword>xquery</keyword>
     </keywordset>
@@ -25,7 +25,7 @@
     <sect2 xml:id="w3c-rec">
       <title>Relationship to W3C Recommendation</title>
 
-      <para>This extension was created well before the W3C working group created the <link xlink:href="http://www.w3.org/TR/xquery-update-10/" condition="_blank">XQuery Update
+      <para>This extension was created well before the W3C working group created the <link xlink:href="https://www.w3.org/TR/xquery-update-10/" condition="_blank">XQuery Update
           Facility 1.0</link> recommendation and therefore differs substantially from it. </para>
     </sect2>
 
diff --git a/src/main/xar-resources/data/upgrading/upgrading.xml b/src/main/xar-resources/data/upgrading/upgrading.xml
index 9e944e8c..85236de7 100644
--- a/src/main/xar-resources/data/upgrading/upgrading.xml
+++ b/src/main/xar-resources/data/upgrading/upgrading.xml
@@ -20,7 +20,7 @@
     <para>The primary goal of an upgrade is to migrate your eXist application to a new version,
       while preserving the contents of your database.</para>
     <para>Before embarking on an upgrade, you should first review the new version's release notes
-      (see the <link xlink:href="http://exist-db.org/exist/apps/wiki/blogs/eXist/"
+      (see the <link xlink:href="https://exist-db.org/exist/apps/wiki/blogs/eXist/"
         condition="_blank">eXist Developer's Blog</link> for an archive of all past release notes).
       The release notes introduce the new version's features, improvements and bug fixes. They can
       also outline any new requirements (for instance the required version of Java). </para>
diff --git a/src/main/xar-resources/data/uploading-files/uploading-files.xml b/src/main/xar-resources/data/uploading-files/uploading-files.xml
index 7251d990..76a09c0c 100644
--- a/src/main/xar-resources/data/uploading-files/uploading-files.xml
+++ b/src/main/xar-resources/data/uploading-files/uploading-files.xml
@@ -3,7 +3,7 @@
         schematypens="http://purl.oclc.org/dsdl/schematron"?><article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <info>
     <title>Getting Data into eXist-db</title>
-    <date>1Q18</date>
+    <date>2Q19</date>
     <keywordset>
       <keyword>getting-started</keyword>
     </keywordset>
@@ -78,7 +78,7 @@
     <title>Uploading files with a WebDAV client</title>
 
     <para>A WebDAV client lets you manage eXist-db database collections and documents almost like directories and files in a filesystem. WebDAV
-      clients, or applications with built-in WebDAV support, include Windows Explorer, macOS Finder, <link xlink:href="http://www.webdav.org/cadaver">cadaver</link>, <link xlink:href="http://www.konqueror.org/">KDE Konqueror</link>, <link xlink:href="http://www.oxygenxml.com/">oXygen XML Editor</link>, <link xlink:href="http://www.altova.com/">XML Spy</link>, <link xlink:href="http://www.libreoffice.org/">LibreOffice</link>, <link xlink:href="http://panic.com/transmit/">Transmit</link> (MacOS only),
+      clients, or applications with built-in WebDAV support, include Windows Explorer, macOS Finder, <link xlink:href="http://www.webdav.org/cadaver">cadaver</link>, <link xlink:href="https://www.konqueror.org/">KDE Konqueror</link>, <link xlink:href="https://www.oxygenxml.com/">oXygen XML Editor</link>, <link xlink:href="https://www.altova.com/">XML Spy</link>, <link xlink:href="https://www.libreoffice.org/">LibreOffice</link>, <link xlink:href="https://panic.com/transmit/">Transmit</link> (MacOS only),
       and many others.</para>
 
     <para>To connect a WebDAV client to eXist-db, you need the URL for eXist's WebDAV interface and an eXist-db username and password. eXist-db's
diff --git a/src/main/xar-resources/data/validation/validation.xml b/src/main/xar-resources/data/validation/validation.xml
index 59964873..623bdd8b 100644
--- a/src/main/xar-resources/data/validation/validation.xml
+++ b/src/main/xar-resources/data/validation/validation.xml
@@ -108,9 +108,9 @@
 
             <para>All grammars (XML schema, DTD) used for implicit validation must be registered
                 with eXist using <link condition="_blank"
-                xlink:href="http://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
+                xlink:href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
                 >OASIS catalog</link> files. The actual resolving is performed by the Apache <link
-                condition="_blank" xlink:href="http://xml.apache.org/commons/components/resolver/"
+                condition="_blank" xlink:href="https://xml.apache.org/commons/components/resolver/"
                 >xml-commons resolver</link> library.</para>
             <para>Catalogs can be stored on disk and/or in the database.</para>
             <para>It is possible to configure multiple catalog entries in <tag>entity-resolver</tag>
@@ -177,7 +177,7 @@
                 <link condition="_blank"
                 xlink:href="https://docs.oracle.com/javase/10/docs/api/javax/xml/parsers/package-summary.html"
                 > <code>javax.xml.parsers</code> </link> API. The actual validation is performed by
-                the <link condition="_blank" xlink:href="http://xerces.apache.org/xerces2-j/"
+                the <link condition="_blank" xlink:href="https://xerces.apache.org/xerces2-j/"
                 >Xerces2</link> library.</para>
             <para>When parsing an XML document and a reference to a grammar (either DTD or XSD) is
                 found, the parser attempts to resolve the grammar reference by following
@@ -302,7 +302,7 @@
             <para>The Jing validation functions are based on James Clark's <link condition="_blank"
                 xlink:href="http://www.thaiopensource.com/relaxng/jing.html">Jing</link> library.
                 eXist uses the maintained version that is available via <link condition="_blank"
-                xlink:href="http://code.google.com/p/jing-trang/">Google Code</link>. The library
+                xlink:href="https://code.google.com/p/jing-trang/">Google Code</link>. The library
                 relies on the <link condition="_blank"
                 xlink:href="http://www.thaiopensource.com/relaxng/api/jing/com/thaiopensource/validate/ValidationDriver.html"
                 ><code>com.thaiopensource.validate.ValidationDriver</code></link> which supports a
@@ -423,9 +423,9 @@
 
             <listitem>
                 <para>The explicit validation is performed by <link condition="_blank"
-                    xlink:href="http://xerces.apache.org/xerces2-j/javadocs/api/javax/xml/validation/package-summary.html"
+                    xlink:href="https://xerces.apache.org/xerces2-j/javadocs/api/javax/xml/validation/package-summary.html"
                     >Xerces</link> (XML schema, DTD) and by <link condition="_blank"
-                    xlink:href="http://www.oxygenxml.com/onvdl.html">oNVDL</link>: oXygen XML NVDL
+                    xlink:href="https://www.oxygenxml.com/onvdl.html">oNVDL</link>: oXygen XML NVDL
                     implementation based on Jing (XSD, RelaxNG, Schematron and Namespace-based
                     Validation Dispatching Language).</para>
             </listitem>
@@ -440,17 +440,17 @@
         <itemizedlist>
             <listitem>
                 <para>Apache <link condition="_blank"
-                    xlink:href="http://xml.apache.org/commons/components/resolver/">xml-commons
+                    xlink:href="https://xml.apache.org/commons/components/resolver/">xml-commons
                     resolver</link> </para>
             </listitem>
             <listitem>
                 <para>OASIS <link condition="_blank"
-                    xlink:href="http://www.oasis-open.org/committees/entity/">XML Catalog
+                    xlink:href="https://www.oasis-open.org/committees/entity/">XML Catalog
                     Specification</link> V1.1</para>
             </listitem>
             <listitem>
                 <para>Xerces <link condition="_blank"
-                    xlink:href="http://xerces.apache.org/xerces2-j/faq-grammars.html">caching
+                    xlink:href="https://xerces.apache.org/xerces2-j/faq-grammars.html">caching
                     grammars</link>.</para>
             </listitem>
             <listitem>
@@ -459,15 +459,15 @@
             </listitem>
             <listitem>
                 <para> <link
-                    xlink:href="http://en.wikipedia.org/wiki/Namespace-based_Validation_Dispatching_Language"
+                    xlink:href="https://en.wikipedia.org/wiki/Namespace-based_Validation_Dispatching_Language"
                     >NVDL</link> (Namespace-based Validation Dispatching Language)</para>
             </listitem>
             <listitem>
-                <para> <link condition="_blank" xlink:href="http://en.wikipedia.org/wiki/Schematron"
+                <para> <link condition="_blank" xlink:href="https://en.wikipedia.org/wiki/Schematron"
                     >Schematron</link> </para>
             </listitem>
             <listitem>
-                <para> <link condition="_blank" xlink:href="http://en.wikipedia.org/wiki/RELAX_NG"
+                <para> <link condition="_blank" xlink:href="https://en.wikipedia.org/wiki/RELAX_NG"
                     >Relax NG</link> </para>
             </listitem>
         </itemizedlist>
diff --git a/src/main/xar-resources/data/webdav/webdav.xml b/src/main/xar-resources/data/webdav/webdav.xml
index 8449beb0..236368d3 100644
--- a/src/main/xar-resources/data/webdav/webdav.xml
+++ b/src/main/xar-resources/data/webdav/webdav.xml
@@ -12,12 +12,12 @@
 
   <!-- ================================================================== -->
 
-  <para>eXist-db ships with a <link xlink:href="http://en.wikipedia.org/wiki/WebDAV" condition="_blank">WebDAV</link> interface.
+  <para>eXist-db ships with a <link xlink:href="https://en.wikipedia.org/wiki/WebDAV" condition="_blank">WebDAV</link> interface.
     WebDAV makes it possible to manage database collections and documents just like directories and
     files in a file system. You can copy, move, delete, view or edit files with any application
-    supporting the WebDAV protocol, including Windows Explorer, macOS Finder, <link xlink:href="http://www.webdav.org/cadaver" condition="_blank">cadaver</link>, <link xlink:href="http://www.konqueror.org/" condition="_blank">KDE Konqueror</link>, <link xlink:href="http://www.oxygenxml.com/" condition="_blank">oXygen XML Editor</link>, <link xlink:href="http://www.altova.com/" condition="_blank">XML Spy</link>, <link xlink:href="http://www.libreoffice.org/" condition="_blank">LibreOffice</link> and many others (see <xref linkend="compatibility"/>
+    supporting the WebDAV protocol, including Windows Explorer, macOS Finder, <link xlink:href="http://www.webdav.org/cadaver" condition="_blank">cadaver</link>, <link xlink:href="https://www.konqueror.org/" condition="_blank">KDE Konqueror</link>, <link xlink:href="https://www.oxygenxml.com/" condition="_blank">oXygen XML Editor</link>, <link xlink:href="https://www.altova.com/" condition="_blank">XML Spy</link>, <link xlink:href="https://www.libreoffice.org/" condition="_blank">LibreOffice</link> and many others (see <xref linkend="compatibility"/>
     below).</para>
-  <para>In the default configuration the WebDAV server can be accessed via the URLs <link xlink:href="http://localhost:8080/exist/webdav/db/">http://localhost:8080/exist/webdav/db/</link> and <link xlink:href="https://localhost:8443/exist/webdav/db/">https://localhost:8443/exist/webdav/db/</link> (since eXist-db 2.0). </para>
+  <para>In the default configuration the WebDAV server can be accessed via the URLs <literal>http://localhost:8080/exist/webdav/db/</literal> and <literal>http://localhost:8443/exist/webdav/db/</literal> (since eXist-db 2.0). </para>
 
   <!-- ================================================================== -->
 
@@ -38,15 +38,15 @@
       </listitem>
       <listitem>
         <para>The size of an XML document is presented as a multiple of 4096 bytes, which is eXist's
-          internal pagesize (see <link xlink:href="configuration.xml#conf.xml">conf.xml</link>). The actual size of an XML
+          internal pagesize (see <link xlink:href="configuration#conf.xml">conf.xml</link>). The actual size of an XML
           document stored in the database can not be determined because the size depends on many
           factors, among which the serialization parameters applied.</para>
       </listitem>
     </itemizedlist>
     <para>The Milton-based WebDAV interface has been successfully tested with: Windows Web Folders
-      (Windows XP/7), <link xlink:href="http://www.jscape.com/products/file-transfer-clients/anyclient/" condition="_blank">AnyClient</link> (cross-platform), macOS Finder, <link xlink:href="http://www.panic.com/transmit/" condition="_blank">Transmit</link> (macOS), <link xlink:href="http://cyberduck.ch/" condition="_blank">Cyberduck</link>, davfs2 version 1.4.5
+      (Windows XP/7), <link xlink:href="https://www.jscape.com/products/file-transfer-clients/anyclient/" condition="_blank">AnyClient</link> (cross-platform), macOS Finder, <link xlink:href="https://www.panic.com/transmit/" condition="_blank">Transmit</link> (macOS), <link xlink:href="https://cyberduck.ch/" condition="_blank">Cyberduck</link>, davfs2 version 1.4.5
       (Linux), OxygenXML and LibreOffice.</para>
-    <para>The following clients are reported to have issues: <link xlink:href="http://en.wikipedia.org/wiki/GVFS" condition="_blank">GVFS</link> (Nautilus) and <link xlink:href="http://www.netdrive.net/" condition="_blank">NetDrive</link>. However, this can change over time!</para>
+    <para>The following clients are reported to have issues: <link xlink:href="https://en.wikipedia.org/wiki/GVFS" condition="_blank">GVFS</link> (Nautilus) and <link xlink:href="https://www.netdrive.net/" condition="_blank">NetDrive</link>. However, this can change over time!</para>
   </sect1>
 
   <!-- ================================================================== -->
@@ -66,13 +66,13 @@
       <itemizedlist>
         <listitem>
           <para>Be aware that there are multiple versions of WebDAV Microsoft libraries (and
-            different flavors of bugs). See <link xlink:href="http://greenbytes.de/tech/webdav/webfolder-client-list.html" condition="_blank">Web Folder Client (MSDAIPP.DLL) Versions and Issues</link>.</para>
+            different flavors of bugs). See <link xlink:href="https://greenbytes.de/tech/webdav/webfolder-client-list.html" condition="_blank">Web Folder Client (MSDAIPP.DLL) Versions and Issues</link>.</para>
         </listitem>
         <listitem>
           <para>Windows Vista and Windows 7 both restrict access to WebDAV servers that use Basic
             HTTP authentication on non-SSL connections. This restriction can be solved by changing a
-            registry key. Read more on <link xlink:href="http://support.microsoft.com/kb/841215" condition="_blank">MSDN</link> and
-            <link xlink:href="http://greenbytes.de/tech/webdav/webdav-redirector-list.html" condition="_blank">greenbytes.de</link>. However, SSL connections do bring improved
+            registry key. Read more on <link xlink:href="https://support.microsoft.com/kb/841215" condition="_blank">MSDN</link> and
+            <link xlink:href="https://greenbytes.de/tech/webdav/webdav-redirector-list.html" condition="_blank">greenbytes.de</link>. However, SSL connections do bring improved
             security.</para>
         </listitem>
       </itemizedlist>
@@ -116,7 +116,7 @@
           in a collection are serialized to determine the exact sizes of these documents. This is a
           rather expensive and time consuming operation for large documents and for collections with
           many documents.</para>
-        <para>As an alternative it is recommended to use <link xlink:href="http://www.panic.com/transmit/" condition="_blank">Transmit</link> or <link xlink:href="http://cyberduck.ch/" condition="_blank">Cyberduck</link> instead.</para>
+        <para>As an alternative it is recommended to use <link xlink:href="https://www.panic.com/transmit/" condition="_blank">Transmit</link> or <link xlink:href="https://cyberduck.ch/" condition="_blank">Cyberduck</link> instead.</para>
         <para>For macOS 10.8 the WebDAV client has become functional (again) in 10.8.2, but still
           the client does not work perfectly, for instance at bulk operations.</para>
       </note>
@@ -148,7 +148,7 @@
           </imageobject>
         </mediaobject>
       </informalfigure>
-      <para> More info on the <link xlink:href="http://www.oxygenxml.com/xml_editor/ftp_webdav.html/" condition="_blank">oXygen</link> product pages. </para>
+      <para> More info on the <link xlink:href="https://www.oxygenxml.com/xml_editor/ftp_webdav.html/" condition="_blank">oXygen</link> product pages. </para>
       <note>
         <para>Note on SSL connections in oXygen: You may encounter an error: <emphasis>"Error:
           sun.security.validator.ValidatorException: PKIX path building failed:
@@ -156,7 +156,7 @@
           certification path to requested target."</emphasis>
         </para>
         <para>In order to avoid this error, you'll need to add the Server certificate to your
-          trusted certificates keystore (<link xlink:href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jsse/JSSERefGuide.html#CustomizingStores" condition="_blank">more info</link>).</para>
+          trusted certificates keystore (<link xlink:href="https://java.sun.com/j2se/1.5.0/docs/guide/security/jsse/JSSERefGuide.html#CustomizingStores" condition="_blank">more info</link>).</para>
       </note>
       <warning>
         <para>When saving a document to the WebDAV server via oXygen, remember to double check that
@@ -234,7 +234,7 @@
       <title>LibreOffice</title>
 
       <para>For LibreOffice and OpenOffice.org the recommended way for opening documents stored in
-        eXist-db is using the 'native' WebDAV client, as documented in the <link xlink:href="http://help.libreoffice.org/Common/Opening_a_Document_Using_WebDAV_over_HTTPS" condition="_blank">LibreOffice Help</link> documentation.</para>
+        eXist-db is using the 'native' WebDAV client, as documented in the <link xlink:href="https://help.libreoffice.org/Common/Opening_a_Document_Using_WebDAV_over_HTTPS" condition="_blank">LibreOffice Help</link> documentation.</para>
       <warning>
         <para>When using LibreOffice on MacOS, do not write documents to a network share that is
           mounted via Finder as documented earlier, since this could corrupt your database. The
diff --git a/src/main/xar-resources/data/xforms/xforms.xml b/src/main/xar-resources/data/xforms/xforms.xml
index 17a56700..575cb1b2 100644
--- a/src/main/xar-resources/data/xforms/xforms.xml
+++ b/src/main/xar-resources/data/xforms/xforms.xml
@@ -232,7 +232,7 @@
 
             <itemizedlist>
                 <listitem>
-                    <para> <link condition="_blank" xlink:href="http://www.w3.org/TR/xforms/">XForms
+                    <para> <link condition="_blank" xlink:href="https://www.w3.org/TR/xforms/">XForms
                         v1.1 (W3C Recommendation)</link> </para>
                 </listitem>
             </itemizedlist>
@@ -266,16 +266,16 @@
                         >betterFORM coverage</link> of W3C XForms 1.1 Test Suite</para>
                 </listitem>
                 <listitem>
-                    <para> <link condition="_blank" xlink:href="http://en.wikibooks.org/wiki/XForms"
+                    <para> <link condition="_blank" xlink:href="https://en.wikibooks.org/wiki/XForms"
                         >XForms Wikibook</link> is a useful place to learn XForms</para>
                 </listitem>
                 <listitem>
-                    <para> <link condition="_blank" xlink:href="http://en.wikibooks.org/wiki/XRX"
+                    <para> <link condition="_blank" xlink:href="https://en.wikibooks.org/wiki/XRX"
                         >XRX Wikibook</link> about XML application building</para>
                 </listitem>
                 <listitem>
                     <para> <link condition="_blank"
-                        xlink:href="http://en.wikibooks.org/wiki/XSLTForms">XSLTForms
+                        xlink:href="https://en.wikibooks.org/wiki/XSLTForms">XSLTForms
                         Wikibook</link> provides specific information on XSLTForms</para>
                 </listitem>
                 <listitem>
diff --git a/src/main/xar-resources/data/xquery/xquery.xml b/src/main/xar-resources/data/xquery/xquery.xml
index 2cbd21a0..111df27d 100644
--- a/src/main/xar-resources/data/xquery/xquery.xml
+++ b/src/main/xar-resources/data/xquery/xquery.xml
@@ -27,15 +27,15 @@
     <sect1 xml:id="current-status-of-xquery-support">
         <title>Current Status of XQuery Support</title>
 
-        <para>eXist-db implements <link condition="_blank" xlink:href="http://www.w3.org/TR/xquery/"
+        <para>eXist-db implements <link condition="_blank" xlink:href="https://www.w3.org/TR/xquery/"
             >XQuery 3.1: An XML Query Language</link> and <link condition="_blank"
-            xlink:href="http://www.w3.org/TR/xpath-functions/">"XPath and XQuery Functions and
+            xlink:href="https://www.w3.org/TR/xpath-functions/">"XPath and XQuery Functions and
             Operators 3.1"</link>, with the exception of certain <link
             xlink:href="#unsupported-features">unsupported features and functions</link>. For
             complete documentation on functions in eXist-db, see <link condition="_blank"
             xlink:href="/exist/apps/fundocs">XQuery Function Documentation</link>.</para>
         <para>eXist-db's XQuery implementation has been tested against the official <link
-            condition="_blank" xlink:href="http://dev.w3.org/2006/xquery-test-suite/">XML Query Test
+            condition="_blank" xlink:href="https://dev.w3.org/2006/xquery-test-suite/">XML Query Test
             Suite (XQTS)</link>. An updated test suite runner to test conformance against the
             official <link condition="_blank" xlink:href="https://dev.w3.org/2011/QT3-test-suite/"
             >XQuery/XPath/XSLT 3.* Test Suite (QT3)</link> is being planned.</para>
@@ -67,11 +67,11 @@
             <itemizedlist>
                 <listitem>
                     <para> <link condition="_blank"
-                        xlink:href="http://www.w3.org/TR/xquery/#id-schema-import-feature">schema
+                        xlink:href="https://www.w3.org/TR/xquery/#id-schema-import-feature">schema
                         import</link> and <link condition="_blank"
-                        xlink:href="http://www.w3.org/TR/xquery/#id-schema-validation-feature"
+                        xlink:href="https://www.w3.org/TR/xquery/#id-schema-validation-feature"
                         >schema validation features</link> (defined as <link condition="_blank"
-                        xlink:href="http://www.w3.org/TR/xquery/#id-conform-optional-features"
+                        xlink:href="https://www.w3.org/TR/xquery/#id-conform-optional-features"
                         >optional</link> in the XQuery specification). Instead, eXist-db provides a
                         <link condition="_blank"
                         xlink:href="/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/validation"
@@ -356,7 +356,7 @@
 
         <para>eXist-db supports calls to arbitrary Java methods from within XQuery. The binding
             mechanism follows the short-cut technique introduced by <link condition="_blank"
-            xlink:href="http://saxon.sf.net">Saxon</link>.</para>
+            xlink:href="http://saxon.sourceforge.net/">Saxon</link>.</para>
         <para>The class of the external function is identified by the namespace URI of the function
             call. This namespace URI must start with the prefix <literal>java:</literal>, followed
             by the fully qualified class name of the class. For example, the following code snippet
@@ -599,7 +599,7 @@
         <title>Serialization</title>
 
         <para>Serialization is the transformation of query results into a binary stream. eXist-db
-            implements the <link condition="_blank" xlink:href="http://www.w3.org/TR/xquery/">"XSLT
+            implements the <link condition="_blank" xlink:href="https://www.w3.org/TR/xquery/">"XSLT
             and XQuery Serialization 3.1"</link> specification. For example, the following
             serialization declaration instructs eXist-db to serialize query results as JSON and to
             supply a JSON media-type:</para>
@@ -804,7 +804,7 @@
                     <term> <code>declare option exist:implicit-timezone "duration";</code> </term>
                     <listitem>
                         <para>Specifies the <link condition="_blank"
-                            xlink:href="http://www.w3.org/TR/xquery/#dt-timezone">implicit
+                            xlink:href="https://www.w3.org/TR/xquery/#dt-timezone">implicit
                             timezone</link> for the XQuery context.</para>
                     </listitem>
                 </varlistentry>
@@ -812,7 +812,7 @@
                     <term> <code>declare option exist:current-dateTime "dateTime";</code> </term>
                     <listitem>
                         <para>Specifies the <link condition="_blank"
-                            xlink:href="http://www.w3.org/TR/xquery/#GLdt-date-time">current
+                            xlink:href="https://www.w3.org/TR/xquery/#GLdt-date-time">current
                             dateTime</link> for the XQuery context.</para>
                     </listitem>
                 </varlistentry>
diff --git a/src/main/xar-resources/data/xsl-transform/xsl-transform.xml b/src/main/xar-resources/data/xsl-transform/xsl-transform.xml
index 28475efe..7be943d9 100644
--- a/src/main/xar-resources/data/xsl-transform/xsl-transform.xml
+++ b/src/main/xar-resources/data/xsl-transform/xsl-transform.xml
@@ -5,7 +5,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>XSL transformations</title>
-        <date>1Q18</date>
+        <date>2Q19</date>
         <keywordset>
             <keyword>application-development</keyword>
         </keywordset>
@@ -91,9 +91,9 @@
                     <term>$attributes</term>
                     <listitem>
                         <para>Pass attributes to the transformation factory. Verify the <link
-                            xlink:href="http://docs.oracle.com/javase/8/docs/api/javax/xml/transform/TransformerFactory.html#setAttribute-java.lang.String-java.lang.Object-"
+                            xlink:href="https://docs.oracle.com/javase/8/docs/api/javax/xml/transform/TransformerFactory.html#setAttribute-java.lang.String-java.lang.Object-"
                             >Java</link> or <link
-                            xlink:href="http://www.saxonica.com/html/documentation/javadoc/net/sf/saxon/lib/FeatureKeys.html"
+                            xlink:href="https://www.saxonica.com/html/documentation/javadoc/net/sf/saxon/lib/FeatureKeys.html"
                             >Saxon</link> documentation for more details.</para>
                         <para>Its contents must be an XML fragment, like this:</para>
                         <programlisting language="xml" xlink:href="listings/listing-9.xml"/>
diff --git a/src/main/xar-resources/templates/page.html b/src/main/xar-resources/templates/page.html
index 0fb7b00c..e274456e 100755
--- a/src/main/xar-resources/templates/page.html
+++ b/src/main/xar-resources/templates/page.html
@@ -10,7 +10,7 @@
   <link rel="stylesheet" type="text/css" href="resources/styles/atom-one-dark.css" />
 </head>
 
-<body id="grey-top" class="site:expand-links?base=http://exist-db.org/">
+<body id="grey-top" class="site:expand-links?base=https://exist-db.org/">
   <div class="grey-bot">
     <div class="container" id="main-container">
       <div class="row">
@@ -100,7 +100,7 @@
   <div class="container">
     <div class="row">
       <div class="col-md-12">
-        <a id="poweredby" href="http://exist-db.org" />
+        <a id="poweredby" href="https://exist-db.org" />
       </div>
     </div>
   </div>
@@ -108,7 +108,7 @@
     <div class="container">
       <ul>
         <li>
-          <a href="http://exist-db.org">eXist-db.org</a>
+          <a href="https://exist-db.org">eXist-db.org</a>
         </li>
         <li>
           <a href="documentation.xml">Documentation</a>

From cb268c507e147e2cac4c8ca945b689eb2b1cefaf Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sun, 19 May 2019 00:18:59 -0400
Subject: [PATCH 7/8] Normalize intra-app links, esp fundocs

and miscellaneous catches
---
 .../author-reference/author-reference.xml     |  4 +--
 .../beginners-guide-to-xrx-v4.xml             |  2 +-
 .../devguide_indexes/devguide_indexes.xml     |  2 +-
 .../data/extensions/extensions.xml            |  2 +-
 .../data/getting-help/getting-help.xml        |  3 +-
 .../incompatibilities/incompatibilities.xml   |  2 +-
 .../data/learning-xquery/learning-xquery.xml  | 31 ++++++++++++++-----
 .../data/scheduler/scheduler.xml              |  2 +-
 .../xar-resources/data/security/security.xml  |  8 ++---
 src/main/xar-resources/data/xmldb/xmldb.xml   |  4 +--
 src/main/xar-resources/data/xquery/xquery.xml | 12 +++----
 src/main/xar-resources/templates/page.html    |  9 +++---
 12 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/src/main/xar-resources/data/author-reference/author-reference.xml b/src/main/xar-resources/data/author-reference/author-reference.xml
index af5529ed..f73d4bc1 100644
--- a/src/main/xar-resources/data/author-reference/author-reference.xml
+++ b/src/main/xar-resources/data/author-reference/author-reference.xml
@@ -589,7 +589,7 @@ but does not because its too simple)</programlisting>
                         <para>A <tag>tag</tag> element surrounds its content with &lt; and &gt; and
                             formats it like code. Meant to make life easier:
                             <code><![CDATA[<tag>xxx</tag>]]></code> is the shorter version of
-                            <code><![CDATA[<code>&lt;xxx&gt;</code>]]></code>.</para>
+                            <code><![CDATA[<code><xxx></code>]]></code>.</para>
                     </listitem>
                 </varlistentry>
 
@@ -649,7 +649,7 @@ but does not because its too simple)</programlisting>
                             use the <tag>link</tag> element. However, use the target's document name
                             (without the <code>.xml</code> extension) as the link address. For
                             instance,
-                            <code><![CDATA[&amp;lt;link xlink:href="documentation"&amp;gt;]]></code>
+                            <tag>link xlink:href="documentation"</tag>
                             links to the <link xlink:href="documentation">documentation home
                             page</link>.</para>
                     </listitem>
diff --git a/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml b/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
index e0609555..b7dde432 100644
--- a/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
+++ b/src/main/xar-resources/data/beginners-guide-to-xrx-v4/beginners-guide-to-xrx-v4.xml
@@ -101,7 +101,7 @@
             <para>This example will use the following terms and concepts:</para>
             <para> <emphasis role="bold">XRX</emphasis> is the name of the web application
                 architecture that we are introducing in this guide. The term XRX comes from the
-                combination of XForms, REST, and XQuery. The term was <link xlink:href="http://archive.oreilly.com/pub/post/xrx_a_simple_elegant_disruptiv_1.html">coined</link> by Dan McCreary. XForms are used in the client (web browser), REST is
+                combination of XForms, REST, and XQuery. The term was <link xlink:href="https://web.archive.org/web/20171224124316/http://archive.oreilly.com/pub/post/xrx_a_simple_elegant_disruptiv_1.html">coined</link> by Dan McCreary. XForms are used in the client (web browser), REST is
                 the interface between the client and the server, and XQuery is the server language.
                 Two of the most significant advantages of XRX over other architectures are: (1) it
                 does not require users to translate data into Java or .Net objects, and (2) it does
diff --git a/src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml b/src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml
index 97f26eb0..96c1f5bf 100644
--- a/src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml
+++ b/src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml
@@ -1260,7 +1260,7 @@
                 operates in the <literal>http://exist-db.org/xquery/spatial</literal> namespace
                 (whose default prefix is <literal>spatial</literal>).</para>
             <para>The functions signatures are documented together with the functions themselves in
-                <link xlink:href="https://demo.exist-db.org/xquery/functions.xq">this page</link>.
+                <link xlink:href="{${fundocs.pkg.abbrev}}">the XQuery function documentation</link>.
                 Here we will only look at their <literal>eval()</literal> methods.</para>
             <para>The first functions set we will describe is
                 <literal>org.exist.xquery.modules.spatial.FunSpatialSearch</literal>, which performs
diff --git a/src/main/xar-resources/data/extensions/extensions.xml b/src/main/xar-resources/data/extensions/extensions.xml
index f69d0c7e..164f2389 100644
--- a/src/main/xar-resources/data/extensions/extensions.xml
+++ b/src/main/xar-resources/data/extensions/extensions.xml
@@ -42,7 +42,7 @@
             <para>eXist-db will require a restart to load any new modules added. </para>
         </note>
         <para>Once a Module is configured and loaded eXist-db will display the module and its
-            function definitions as part of the <link xlink:href="{fundocs}">function library</link>
+            function definitions as part of the <link xlink:href="{${fundocs.pkg.abbrev}}">function library</link>
             page or through <literal>util:decribe-function()</literal>.</para>
     </sect1>
 
diff --git a/src/main/xar-resources/data/getting-help/getting-help.xml b/src/main/xar-resources/data/getting-help/getting-help.xml
index fac8e174..90250ccb 100644
--- a/src/main/xar-resources/data/getting-help/getting-help.xml
+++ b/src/main/xar-resources/data/getting-help/getting-help.xml
@@ -34,12 +34,13 @@
       primary forum for asking questions and getting help. Finding the answer to a question can sometimes be as simple as <link xlink:href="https://exist-open.markmail.org/" condition="_blank">searching the mailing list's archives</link>. Whether you have a
       question that you can't find the answer to, or you just want to join the discussion, <link xlink:href="https://lists.sourceforge.net/lists/listinfo/exist-open" condition="_blank">subscribe to the mailing list</link>. It's free and
       you can unsubscribe anytime.</para>
+    <para>You can also search the <link xlink:href="https://stackoverflow.com/questions/tagged/exist-db" condition="_blank">exist-db tag on Stackoverflow</link> for questions and answers.</para>
     <note>
       <para>For reporting issues, please consult the <link xlink:href="getting-help-how-to-report">How to Report Issues</link> article.</para>
     </note>
     <para>Besides exist-open, there is a mailing list dedicated solely to the XQuery language: the <link xlink:href="http://x-query.com/mailman/listinfo/talk">xquery-talk mailing list</link>. It's a great place to ask questions about XQuery, from
       basic to advanced.</para>
-    <para>Also, there are numerous excellent resources for learning XQuery, including the <link xlink:href="http://en.wikibooks.org/wiki/XQuery" condition="_blank">XQuery wikibook</link> and Priscilla Walmsley's <link xlink:href="http://shop.oreilly.com/product/9780596006341.do" condition="_blank">XQuery book</link>.</para>
+    <para>See our list of resources for <link xlink:href="learning-xquery">learning XQuery</link>.</para>
     <para>Follow <link xlink:href="https://twitter.com/#!/existdb" condition="_blank">@existdb</link> on Twitter for news and announcements about
       eXist-db. Use the <link xlink:href="https://twitter.com/#!/search?q=%23existdb" condition="_blank">#existdb</link> hash tag (note: no dash in
       #existdb). </para>
diff --git a/src/main/xar-resources/data/incompatibilities/incompatibilities.xml b/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
index a5a99973..cc582300 100644
--- a/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
+++ b/src/main/xar-resources/data/incompatibilities/incompatibilities.xml
@@ -123,7 +123,7 @@
                     old syntax for map constructors though (<code>map { x:= "y"}</code> instead of
                     <code>map { x: "y" }</code> in XQuery 3.1), so old code should run without
                     modifications. All map module functions from XQuery 3.1 are <link
-                    xlink:href="{fundocs}/view.html?uri=http://www.w3.org/2005/xpath-functions/map&amp;location=java:org.exist.xquery.functions.map.MapModule"
+                    xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://www.w3.org/2005/xpath-functions/map"
                     >available</link>.</para>
             </listitem>
             <listitem>
diff --git a/src/main/xar-resources/data/learning-xquery/learning-xquery.xml b/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
index 44f50636..7919fc59 100644
--- a/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
+++ b/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
@@ -25,18 +25,18 @@
         <para>XQuery is unique in the development stack: It replaces both SQL and the traditional
             software layers that convert SQL into presentation formats such as HTML, PDF and ePub.
             XQuery can both retrieve information from your database and format it for presentation. </para>
-        <para>Learning how to select basic data from an XML document can be learned in just a few
+        <para>Learning how to select basic data from an XML document can be accomplished in just a few
             hours, especially if you are already familiar with SQL and other functional programming
-            languages. Learning how to create custom XQuery functions, how to design XQuery modules
+            languages. Learning how to create custom XQuery functions, how to design XQuery modules,
             and how to execute unit tests on XQuery takes considerably longer.</para>
 
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
+        
         <sect2 xml:id="learning-example">
             <title>Learning by Example</title>
 
             <para>Many people find that they learn a new language best by reading and trying small
-                examples of code. One of the ideal locations for this is the <link condition="_blank" xlink:href="http://en.wikibooks.org/wiki/XQuery#Beginning_Examples">XQuery Wikibook
+                examples of code. One of the ideal locations for this is the <link condition="_blank" xlink:href="https://en.wikibooks.org/wiki/XQuery#Beginning_Examples">XQuery Wikibook
                 Beginning Examples</link>. These examples are all designed and tested to work with
                 eXist. Please let us know if there are specific examples you would like to
                 see.</para>
@@ -56,12 +56,12 @@
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
         <sect2 xml:id="learning-flowr">
-            <title>Learning FLOWR statements</title>
+            <title>Learning FLWOR statements</title>
 
-            <para>Iteration in XQuery uses parallel programming statements called FLOWR (For, Let,
-                Order by, Where, Return). Each loop of a FLOWR statement is performed in a separate
+            <para>Iteration in XQuery uses parallel programming statements called FLWOR (For, Let,
+                Where, Order by, Return). Each loop of a FLWOR statement is performed in a separate
                 thread of execution. As a result you cannot use the output of any computation in a
-                FLOWR loop as input for the next iteration. This concept can be difficult to learn
+                FLWOR loop as input for the next iteration. This concept can be difficult to learn
                 if you have never used parallel programming systems.</para>
         </sect2>
 
@@ -133,6 +133,21 @@
                 in a drop-down list. As you continue to type or select a function the parameters and
                 types are also shown. This becomes an important time-saver!</para>
         </sect2>
+        
+        <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+        
+        <sect2 xml:id="other-resources">
+            <title>Other Resources</title>
+            
+            <para>See Priscilla Walmsley's book, <link
+                xlink:href="http://shop.oreilly.com/product/0636920035589.do" condition="_blank"
+                    >XQuery</link> on the XQuery language, Adam Retter and Erik Siegel's book, <link
+                    xlink:href="http://shop.oreilly.com/product/0636920026525.do"
+                    condition="_blank">eXist: a NoSQL Document Database and Application
+                    Platform</link>, on XQuery application development, and the <link
+                    xlink:href="https://github.com/joewiz/learn-xquery" condition="_blank">Learning
+                    XQuery</link> list.</para>
+        </sect2>
 
     </sect1>
 
diff --git a/src/main/xar-resources/data/scheduler/scheduler.xml b/src/main/xar-resources/data/scheduler/scheduler.xml
index 3cdfd1d9..30cfee6c 100644
--- a/src/main/xar-resources/data/scheduler/scheduler.xml
+++ b/src/main/xar-resources/data/scheduler/scheduler.xml
@@ -45,7 +45,7 @@
                         </para>
                     </note>
                     <para>There is an XQuery library module, <link condition="_blank"
-                        xlink:href="https://www.exist-db.org/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/scheduler&amp;location=java:org.exist.xquery.modules.scheduler.SchedulerModule&amp;details=true"
+                        xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/scheduler"
                         >Scheduler Module</link>, which provides functions for scheduling jobs and
                         managing jobs scheduled for execution. The scheduler XQuery library module
                         is activated by uncommenting the following in eXist-db's
diff --git a/src/main/xar-resources/data/security/security.xml b/src/main/xar-resources/data/security/security.xml
index d3e9f27a..4f1b41cf 100644
--- a/src/main/xar-resources/data/security/security.xml
+++ b/src/main/xar-resources/data/security/security.xml
@@ -21,7 +21,7 @@
         models.</para>
     <para>As well as the mechanisms described in this article, you should also note the presence of
         the <link
-        xlink:href="http://www.exist-db.org/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/securitymanager&amp;location=java:org.exist.xquery.functions.securitymanager.SecurityManagerModule&amp;details=true"
+            xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/securitymanager"
         >Security Manager XQuery library module</link>, which enables you to perform many user and
         security related tasks programmatically from XQuery.</para>
 
@@ -87,7 +87,7 @@
             <listitem>
                 <para>Change the password programmatically, for instance from within eXide, by using
                     the <code>sm:passwd()</code> function of the <link
-                    xlink:href="http://www.exist-db.org/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/securitymanager&amp;location=java:org.exist.xquery.functions.securitymanager.SecurityManagerModule&amp;details=true"
+                        xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/securitymanager"
                     >Security Manager XQuery library module</link>.</para>
             </listitem>
         </itemizedlist>
@@ -137,7 +137,7 @@
             <listitem>
                 <para>Create a user programmatically, for instance from within eXide, by using the
                     <code>sm:create-account()</code> function of the <link
-                    xlink:href="http://www.exist-db.org/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/securitymanager&amp;location=java:org.exist.xquery.functions.securitymanager.SecurityManagerModule&amp;details=true"
+                        xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/securitymanager"
                     >Security Manager XQuery library module</link>.</para>
             </listitem>
         </itemizedlist>
@@ -300,7 +300,7 @@
                     <listitem>
                         <para>Do it programmatically, for instance from within eXide, by using the
                             one of the functions of the <link
-                            xlink:href="http://www.exist-db.org/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/securitymanager&amp;location=java:org.exist.xquery.functions.securitymanager.SecurityManagerModule&amp;details=true"
+                                xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/securitymanager"
                             >Security Manager XQuery library module</link>.</para>
                     </listitem>
                 </itemizedlist>
diff --git a/src/main/xar-resources/data/xmldb/xmldb.xml b/src/main/xar-resources/data/xmldb/xmldb.xml
index b8309e53..be1df438 100644
--- a/src/main/xar-resources/data/xmldb/xmldb.xml
+++ b/src/main/xar-resources/data/xmldb/xmldb.xml
@@ -4,7 +4,7 @@
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <info>
     <title>The xmldb module</title>
-    <date>1Q18</date>
+    <date>2Q19</date>
     <keywordset>
       <keyword>application-development</keyword>
     </keywordset>
@@ -14,7 +14,7 @@
 
   <para>The xmldb module (<literal>http://exist-db.org/xquery/xmldb</literal> function namespace)
     contains functions for manipulating database contents. The full list of functions and their
-    documentation can be found in the <link xlink:href="/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/xmldb&amp;location=java:org.exist.xquery.functions.xmldb.XMLDBModule">Function Documentation Library</link>. This article handles some of the highlights and main
+    documentation can be found in the <link xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/xmldb">Function Documentation Library</link>. This article handles some of the highlights and main
     uses for this module.</para>
 
   <!-- ================================================================== -->
diff --git a/src/main/xar-resources/data/xquery/xquery.xml b/src/main/xar-resources/data/xquery/xquery.xml
index 111df27d..e65daf25 100644
--- a/src/main/xar-resources/data/xquery/xquery.xml
+++ b/src/main/xar-resources/data/xquery/xquery.xml
@@ -33,7 +33,7 @@
             Operators 3.1"</link>, with the exception of certain <link
             xlink:href="#unsupported-features">unsupported features and functions</link>. For
             complete documentation on functions in eXist-db, see <link condition="_blank"
-            xlink:href="/exist/apps/fundocs">XQuery Function Documentation</link>.</para>
+            xlink:href="{${fundocs.pkg.abbrev}}">XQuery Function Documentation</link>.</para>
         <para>eXist-db's XQuery implementation has been tested against the official <link
             condition="_blank" xlink:href="https://dev.w3.org/2006/xquery-test-suite/">XML Query Test
             Suite (XQTS)</link>. An updated test suite runner to test conformance against the
@@ -74,7 +74,7 @@
                         xlink:href="https://www.w3.org/TR/xquery/#id-conform-optional-features"
                         >optional</link> in the XQuery specification). Instead, eXist-db provides a
                         <link condition="_blank"
-                        xlink:href="/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/validation"
+                        xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/validation"
                         >validation module</link> containing extension functions to perform XML
                         validation.</para>
                 </listitem>
@@ -222,7 +222,7 @@
         <title>Function Library</title>
 
         <para>A complete list of XQuery functions supported by eXist-db can be found in the <link
-            condition="_blank" xlink:href="/exist/apps/fundocs">XQuery Function
+            condition="_blank" xlink:href="{${fundocs.pkg.abbrev}}">XQuery Function
             Documentation</link>. </para>
         <para>Each module's documentation is generated from a different sources, depending on
             whether the module is implemented in Java or XQuery. For modules implemented in Java,
@@ -931,9 +931,9 @@
                 >RESTXQ</link>, an EXQuery community effort to develop a clean approach for the
                 deployment of RESTful services based on XQuery code annotations. This is in addition
                 to eXist-db's native function libraries for performing HTTP <link
-                xlink:href="/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/request"
+                xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/request"
                 >requests</link> and <link
-                xlink:href="/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/response"
+                xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/response"
                 >responses</link>.</para>
         </sect2>
 
@@ -943,7 +943,7 @@
                 Module</link>, an EXPath community specification and module for performing
                 compression. This is in addition to eXist-db's native function libraries for
                 performing <link
-                xlink:href="/exist/apps/fundocs/view.html?uri=http://exist-db.org/xquery/compression"
+                xlink:href="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/compression"
                 >compression</link>.</para>
         </sect2>
     </sect1>
diff --git a/src/main/xar-resources/templates/page.html b/src/main/xar-resources/templates/page.html
index e274456e..6af4ced7 100755
--- a/src/main/xar-resources/templates/page.html
+++ b/src/main/xar-resources/templates/page.html
@@ -54,11 +54,10 @@
             <li class="nav-item dropdown" id="documentation">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Documentation</a>
               <div class="dropdown-menu">
-                  <a class="dropdown-item" href="documentation.xml">Documentation</a>
-                  <a class="dropdown-item" href="author-reference.xml">Author Guidelines</a>
-                  <a class="dropdown-item" href="getting-help.xml">Get Support</a>
-                <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="{${fundocs.pkg.abbrev}}/index.html">XQuery Functions</a>
+                <a class="dropdown-item" href="documentation">Documentation</a>
+                <a class="dropdown-item" href="{${fundocs.pkg.abbrev}}/index.html">Function Library</a>
+                <a class="dropdown-item" href="https://exist-db.org/exist/apps/wiki/blogs/eXist/">News &amp; Articles</a>
+                <a class="dropdown-item" href="https://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</a>
                 <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="getting-help.xml">Getting Help</a>
               </div>

From 4c2ed83e264e41ba27512ea481e5b516efb70080 Mon Sep 17 00:00:00 2001
From: Joe Wicentowski <joewiz@gmail.com>
Date: Sun, 19 May 2019 11:49:18 -0400
Subject: [PATCH 8/8] Correct section ID based on title change

---
 .../xar-resources/data/learning-xquery/learning-xquery.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/xar-resources/data/learning-xquery/learning-xquery.xml b/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
index 7919fc59..36b0da57 100644
--- a/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
+++ b/src/main/xar-resources/data/learning-xquery/learning-xquery.xml
@@ -55,7 +55,7 @@
 
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-        <sect2 xml:id="learning-flowr">
+        <sect2 xml:id="learning-flwor">
             <title>Learning FLWOR statements</title>
 
             <para>Iteration in XQuery uses parallel programming statements called FLWOR (For, Let,
@@ -151,4 +151,4 @@
 
     </sect1>
 
-</article>
\ No newline at end of file
+</article>