Fixed many doco broken links
diff --git a/source/apacheds/advanced-ug/4.2.3-enabling-access-control.md b/source/apacheds/advanced-ug/4.2.3-enabling-access-control.md
index 3c69c30..554f1bb 100644
--- a/source/apacheds/advanced-ug/4.2.3-enabling-access-control.md
+++ b/source/apacheds/advanced-ug/4.2.3-enabling-access-control.md
@@ -10,7 +10,7 @@
 
 # 4.2.3 - Enabling Access Control
 
-The Access Control Subsystem (ACI) is described in the Basic User Guide. The ACI is disabled by default and the simplest way to enable it is to [use Apache Directory Studio](apacheds/basic-ug/3.2-basic-authorization.html#enable-the-aci-subsystem).
+The Access Control Subsystem (ACI) is described in the Basic User Guide. The ACI is disabled by default and the simplest way to enable it is to [use Apache Directory Studio](../basic-ug/3.2-basic-authorization.html#enable-the-aci-subsystem).
 
 After the server has started, the relevant entry can be found in *config.ldif_migrated* :
 
diff --git a/source/apacheds/advanced-ug/4.2.6.2-selections.md b/source/apacheds/advanced-ug/4.2.6.2-selections.md
index ec4083a..c78cdf8 100644
--- a/source/apacheds/advanced-ug/4.2.6.2-selections.md
+++ b/source/apacheds/advanced-ug/4.2.6.2-selections.md
@@ -1,6 +1,6 @@
 ---
 title: 4.2.6.2 - Selections
-navPrev: 4.2.6-1-how-it-works.html
+navPrev: 4.2.6.1-how-it-works.html
 navPrevText: 4.2.6.1 - How it works
 navUp: 4.2.6-the-acdf-engine.html
 navUpText: 4.2.6 - The ACDF Engine
diff --git a/source/apacheds/advanced-ug/4.2.6.3-constraints.md b/source/apacheds/advanced-ug/4.2.6.3-constraints.md
index 54c73a5..f045072 100644
--- a/source/apacheds/advanced-ug/4.2.6.3-constraints.md
+++ b/source/apacheds/advanced-ug/4.2.6.3-constraints.md
@@ -1,6 +1,6 @@
 ---
 title: 4.2.6.3 - Constraints
-navPrev: 4.2.6-2-selections.html
+navPrev: 4.2.6.2-selections.html
 navPrevText: 4.2.6.2 - Selections
 navUp: 4.2.6-the-acdf-engine.html
 navUpText: 4.2.6 - The ACDF Engine
diff --git a/source/apacheds/advanced-ug/4.2.6.4-priority.md b/source/apacheds/advanced-ug/4.2.6.4-priority.md
index 47af7df..6a139e7 100644
--- a/source/apacheds/advanced-ug/4.2.6.4-priority.md
+++ b/source/apacheds/advanced-ug/4.2.6.4-priority.md
@@ -1,6 +1,6 @@
 ---
 title: 4.2.6.4 - Priority
-navPrev: 4.2.6-3-constraints.html
+navPrev: 4.2.6.3-constraints.html
 navPrevText: 4.2.6.3 - Constraints
 navUp: 4.2.6-the-acdf-engine.html
 navUpText: 4.2.6 - The ACDF Engine
diff --git a/source/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.md b/source/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.md
index d1cf5b3..238b2bb 100644
--- a/source/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.md
+++ b/source/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.md
@@ -4,8 +4,8 @@
 navPrevText: 4.2.7.1 - Enable Authenticated Users to Browse and Read Entries
 navUp: 4.2.7-using-acis-trail.html
 navUpText: 4.2.7 Using ACIs trail
-navNext: 4.2.7.3-.html
-navNextText: 4.2.7.3 - 
+navNext: 4.2.8-acis-administration.html
+navNextText: 4.2.8 - ACIs administration
 ---
 
 # 4.2.7.2 - Allow Self Password Modify
diff --git a/source/apacheds/advanced-ug/5.4-replication.md b/source/apacheds/advanced-ug/5.4-replication.md
index 47b4e71..62f81b5 100644
--- a/source/apacheds/advanced-ug/5.4-replication.md
+++ b/source/apacheds/advanced-ug/5.4-replication.md
@@ -23,7 +23,7 @@
 * Add the configuration of the partition whose data needs to be replicated.
   For example if we like to replicate the partition dc=apache,dc=org then
   make sure to configure this partition in all the servers that are configured to replicate.
-  See [Adding Partition](../basic-ug/1.4.3-adding-partition.md)
+  See [Adding Partition](../basic-ug/1.4.3-adding-partition.html)
  
 
 ## Configuring Producer-Consumer replication
diff --git a/source/apacheds/advanced-user-guide.md b/source/apacheds/advanced-user-guide.md
index f4ba217..33f1b27 100644
--- a/source/apacheds/advanced-user-guide.md
+++ b/source/apacheds/advanced-user-guide.md
@@ -27,18 +27,18 @@
         * [2.2.5 - Generic instance Layout](advanced-ug/2.2.5-generic-instance-layout.html)
 * [3. Administrative Model](advanced-ug/3-admin-model.html)
 	* [3.1 - Administration Point](advanced-ug/3.1-administrative-points.html)
-	* [3.2 - Operations on an Administrative Point](3.2-operations-on-an-administrativepoint.html)
+	* [3.2 - Operations on an Administrative Point](advanced-ug/3.2-operations-on-an-administrativepoint.html)
 * [4 - Security](advanced-ug/4-authentication-and-authorization.html)
     * [4.1 - Authentication](advanced-ug/4.1-authentication.html)
         * [4.1.1 - Simple authentication](advanced-ug/4.1.1-simple-authn.html)
             * [4.1.1.1 - Anonymous Authentication](advanced-ug/4.1.1.1-anonymous-authn.html)
             * [4.1.1.2 - Name/Password Authentication](advanced-ug/4.1.1.2-name-password-authn.html)
-            * [4.1.1.2 - Unauthenticated Authentication](advanced-ug/4.1.1.2-unauthenticated-authn.html)
+            * [4.1.1.3 - Unauthenticated Authentication](advanced-ug/4.1.1.3-unauthenticated-authn.html)
         * [4.1.2 - SASL authentication](advanced-ug/4.1.2-sasl-authn.html)
-            * [4.1.2.1 - SASL PLAIN text Authentication](4.1.2.1-sasl-plain-text-authn.html)
-            * [4.1.2.2 - SASL CRAM-MD5 Authentication](4.1.2.2-sasl-cram-md5-authn.html)
-            * [4.1.2.3 - SASL DIGEST-MD5 Authentication](4.1.2.3-sasl-digest-md5-authn.html)
-            * [4.1.2.4 - SASL GSSAPI Authentication](4.1.2.4-sasl-gssapi-authn.html)
+            * [4.1.2.1 - SASL PLAIN text Authentication](advanced-ug/4.1.2.1-sasl-plain-text-authn.html)
+            * [4.1.2.2 - SASL CRAM-MD5 Authentication](advanced-ug/4.1.2.2-sasl-cram-md5-authn.html)
+            * [4.1.2.3 - SASL DIGEST-MD5 Authentication](advanced-ug/4.1.2.3-sasl-digest-md5-authn.html)
+            * [4.1.2.4 - SASL GSSAPI Authentication](advanced-ug/4.1.2.4-sasl-gssapi-authn.html)
             * [4.1.2.5 - SASL EXTERNAL Authentication](advanced-ug/4.1.2.5-sasl-external-authn.html)
             * [4.1.2.6 - SASL NTLM Authentication](advanced-ug/4.1.2.6-sasl-ntlm-authn.html)
         * [4.1.3 - Kerberos authentication](advanced-ug/4.1.3-kerberos-authn.html)
@@ -63,7 +63,7 @@
             * [4.2.6.4 - Priority](advanced-ug/4.2.6.4-priority.html)
         * [4.2.7 - Using ACIs Trail](advanced-ug/4.2.7-using-acis-trail.html)
             * [4.2.7.1 - Enable Authenticated Users to Browse and Read Entries](advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html)
-        * [4.2.8 - ACI Administration](advanced-ug/4.2.8-aci-administration.html)
+        * [4.2.8 - ACI Administration](advanced-ug/4.2.8-acis-administration.html)
         * [4.2.9 - Migration from other LDAP Servers](advanced-ug/4.2.9-migration-from-other-ldap-servers.html)
         * [4.2.10 - ACI grammar](advanced-ug/4.2.10-aci-grammar.html)
         * [4.2.11 - Links and References](advanced-ug/4.2.11-links-and-references.html)
@@ -73,7 +73,7 @@
     * [5.2 - Starting and stopping](advanced-ug/5.2-start-stop.html)
     * [5.3 - Logs](advanced-ug/5.3-logs.html)
     * [5.4 - Replication](advanced-ug/5.4-replication.html)
-    * [5.5 - Cache](5.5-cache.html)
+    * [5.5 - Cache](advanced-ug/5.5-cache.html)
 * [6 - Implementing a simple custom Interceptor for ApacheDS](advanced-ug/6-implementing-interceptor.html)
 * [7 - Embedding ApacheDS in Java](advanced-ug/7-embedding-apacheds.html)
 * [8 - Operational Attributes](advanced-ug/8-operational-attributes.html)
diff --git a/source/apacheds/basic-ug/3.2-basic-authorization.md b/source/apacheds/basic-ug/3.2-basic-authorization.md
index 7324d05..3347dc2 100644
--- a/source/apacheds/basic-ug/3.2-basic-authorization.md
+++ b/source/apacheds/basic-ug/3.2-basic-authorization.md
@@ -135,7 +135,7 @@
 
 ![Enable access control](images/enable-access-control.png)
 
-However, ACI subsystem can also be enabled with an ldapmodify operation. [This technique discussed in the Advanced User Guide](apacheds/advanced-ug/4.2.3-enabling-access-control.html).
+However, ACI subsystem can also be enabled with an ldapmodify operation. [This technique discussed in the Advanced User Guide](../advanced-ug/4.2.3-enabling-access-control.html).
 
 A restart of the server is necessary for this change to take effect. 
 
@@ -531,5 +531,5 @@
 ## Resources 
 
 * [Practices in Directory Groups](http://middleware.internet2.edu/dir/groups/docs/internet2-mace-dir-groups-best-practices-200210.htm) describes how to use groups within LDAP directories. Highly recommended.
-* The [ApacheDS v1.0 Advanced User's Guide](../advanced-users-guide.html) provides a detailed authorization chapter
+* The [ApacheDS v1.0 Advanced User's Guide](../advanced-ug.html) provides a detailed authorization chapter
 * [RFC 2849](http://www.faqs.org/rfcs/rfc2849.html) The LDAP Data Interchange Format (LDIF) is used extensively in this section
diff --git a/source/apacheds/download-old-versions.md b/source/apacheds/download-old-versions.md
index cd6db0a..94fc9c1 100644
--- a/source/apacheds/download-old-versions.md
+++ b/source/apacheds/download-old-versions.md
@@ -26,7 +26,7 @@
 | ApacheDS 2.0.0-M11 binaries | [Download](https://archive.apache.org/dist/directory/apacheds/dist/2.0.0-M11/), [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M11/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M11/xref/index.html) | 03/Mar/2013 |
 | ApacheDS 2.0.0-M11 sources | [Download](https://archive.apache.org/dist/directory/apacheds/2.0.0-M11/), [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M11/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M11/xref/index.html) | 03/Mar/2013 |
 | ApacheDS 2.0.0-M10 binaries | [Download](https://archive.apache.org/dist/directory/apacheds/dist/2.0.0-M10/), [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M10/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M10/xref/index.html) | 28/Jan/2013 |
-| ApacheDS 2.0.0-M10 sources | [Download](https://archive.apache.org/dist/directory/apacheds/2.0.0-M10/), [Javadoc](hhttps://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M10/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M10/xref/index.html) | 28/Jan/2013 |
+| ApacheDS 2.0.0-M10 sources | [Download](https://archive.apache.org/dist/directory/apacheds/2.0.0-M10/), [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M10/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M10/xref/index.html) | 28/Jan/2013 |
 | ApacheDS 2.0.0-M9 | [Download](https://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M9), [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M9/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M9/xref/index.html) | 02/Jan/2013 |
 | ApacheDS 2.0.0-M8 | [Download](https://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M8), [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M8/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M8/xref/index.html) | 12/Oct/2012 |
 | ApacheDS 2.0.0-M7 | [Download](https://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M7), [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M7/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/apacheds/gen-docs/2.0.0-M7/xref/index.html) | 21/May/2012 |
diff --git a/source/apacheds/kerberos-ug/1-kerberos.md b/source/apacheds/kerberos-ug/1-kerberos.md
index dacbd2a..bad4b1b 100644
--- a/source/apacheds/kerberos-ug/1-kerberos.md
+++ b/source/apacheds/kerberos-ug/1-kerberos.md
@@ -10,7 +10,7 @@
 
 * [1.1 - Introduction](1.1-introduction.html)
     * [1.1.1 - Realms](1.1.1-realms.html)
-    * [1.1.2 - Principal](1.1.2-Principal.html)
+    * [1.1.2 - Principal](1.1.2-Principals.html)
     * [1.1.3 - Keys](1.1.3-keys.html)
     * [1.1.4 - KDC (Key Distribution Center)](1.1.4-kdc.html)
     * [1.1.5 - Database](1.1.5-database.html)
diff --git a/source/apacheds/kerberos-ug/1.2-resources.md b/source/apacheds/kerberos-ug/1.2-resources.md
index fa8cfaa..95591f9 100644
--- a/source/apacheds/kerberos-ug/1.2-resources.md
+++ b/source/apacheds/kerberos-ug/1.2-resources.md
@@ -1,6 +1,6 @@
 ---
 title: 1.2 - Resources
-navPrev: 1.1-intoduction.html
+navPrev: 1.1-introduction.html
 navPrevText: 1.1 - Introduction
 navUp: 1-kerberos.html
 navUpText: 1 - What is Kerberos ?
diff --git a/source/apacheds/kerberos-ug/6-glossary.md b/source/apacheds/kerberos-ug/6-glossary.md
index 32c428f..f6f4886 100644
--- a/source/apacheds/kerberos-ug/6-glossary.md
+++ b/source/apacheds/kerberos-ug/6-glossary.md
@@ -1,7 +1,7 @@
 ---
 title: 6 - Kerberos Glossary
 navPrev: 5-interopability.html
-navPrevText: 5 - Interopability
+navPrevText: 5 - Interoperability
 navUp: ../kerberos-user-guide.html
 navUpText: Kerberos User Guide
 ---
diff --git a/source/api/download-old-versions.md b/source/api/download-old-versions.md
index fcd9dce..c8a5344 100644
--- a/source/api/download-old-versions.md
+++ b/source/api/download-old-versions.md
@@ -10,7 +10,7 @@
 
 | Version| Download Link | Javadoc & XRef |  Date |
 |:-:|:-:|:-:|:-:|
-| Apache LDAP API 2.0.0 | [Download](https://archive.apache.org/dist/directory/api/dist/2.0.0) | [Javadoc](hhttps://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0/xref/index.html) |13/Nov/2019 |
+| Apache LDAP API 2.0.0 | [Download](https://archive.apache.org/dist/directory/api/dist/2.0.0) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0/xref/index.html) |13/Nov/2019 |
 | Apache LDAP API 2.0.0.AM4 | [Download](https://archive.apache.org/dist/directory/api/dist/2.0.0.AM4) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0.AM4/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0.AM4/xref/index.html) |09/Jun/2019 |
 | Apache LDAP API 2.0.0.AM3 | [Download](https://archive.apache.org/dist/directory/api/dist/2.0.0.AM3) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0.AM3/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0.AM3/xref/index.html) |15/May/2019 |
 | Apache LDAP API 2.0.0.AM2 | [Download](https://archive.apache.org/dist/directory/api/dist/2.0.0.AM2) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0.AM2/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/2.0.0.AM2/xref/index.html) |03/Sep/2018 |
@@ -26,7 +26,7 @@
 |:-:|:-:|:-:|:-:|
 | Apache LDAP API 1.0.2 | [Download](https://archive.apache.org/dist/directory/api/dist/1.0.2) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.2/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.2/xref/index.html) |06/Jun/2018 |
 | Apache LDAP API 1.0.1 | [Download](https://archive.apache.org/dist/directory/api/dist/1.0.1) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.1/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.1/xref/index.html) |19/May/2018 |
-| Apache LDAP API 1.0.0 | [Download](https://archive.apache.org/dist/directory/api/dist/1.0.0) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.9/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0/xref/index.html) |07/June/2017 |
+| Apache LDAP API 1.0.0 | [Download](https://archive.apache.org/dist/directory/api/dist/1.0.0) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0/xref/index.html) |07/June/2017 |
 | Apache LDAP API 1.0.0-RC2 | [Download](https://archive.apache.org/dist/directory/api/dist/1.0.0-RC2) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0-RC2/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0-RC2/xref/index.html) |02/Nov/2016 |
 | Apache LDAP API 1.0.0-RC1 | [Download](https://archive.apache.org/dist/directory/api/dist/1.0.0-RC1) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0-RC1/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0-RC1/xref/index.html) |17/Jun/2016 |
 | Apache LDAP API 1.0.0-M33 | [Download](https://archive.apache.org/dist/directory/api/dist/1.0.0-M33) | [Javadoc](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0-M33/apidocs/index.html), [Xref](https://svn.apache.org/repos/infra/websites/production/directory/content/api/gen-docs/1.0.0-M33/xref/index.html) |21/Dec/2015 |
diff --git a/source/api/internal-design-guide/5-network.md b/source/api/internal-design-guide/5-network.md
index 5103646..6c3aede 100644
--- a/source/api/internal-design-guide/5-network.md
+++ b/source/api/internal-design-guide/5-network.md
@@ -286,7 +286,7 @@
 
 This class, which is part of the _mina_ module, instanciate an instance of the statefull **LDAP** encoder and decoder classes, _LdapProtocolEncoder_ and _LdapProtocolDecoder_, which also belongs to the _mina_ module.
 
-What is important to remember is that **TCP** is not dealing with **LDAP** messages, but with bytes. The decoder must be able to start decoding a message, even if it does not have all the necessary bytes to decode a full **LDAP** message. It should also be able to decode more than one message if the bytes it received contains more than the bytes necessary to hold a message. All of this is handle by MINA anyway, but we must provide a way for the decoder to keep the current state. Check the [codec](codec.html) page for more explainations.
+What is important to remember is that **TCP** is not dealing with **LDAP** messages, but with bytes. The decoder must be able to start decoding a message, even if it does not have all the necessary bytes to decode a full **LDAP** message. It should also be able to decode more than one message if the bytes it received contains more than the bytes necessary to hold a message. All of this is handle by MINA anyway, but we must provide a way for the decoder to keep the current state. Check the [codec](6-codec.html) page for more explainations.
 
 
 ## SSL Handling