diff --git a/source/apacheds/basic-ug/3.2-basic-authorization.md b/source/apacheds/basic-ug/3.2-basic-authorization.md
index e225e36..55307f5 100644
--- a/source/apacheds/basic-ug/3.2-basic-authorization.md
+++ b/source/apacheds/basic-ug/3.2-basic-authorization.md
@@ -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 v2.0 Advanced User's Guide](advanced-user-guide.html) provides a detailed authorization chapter
+* The [ApacheDS v2.0 Advanced User's Guide](../advanced-user-guide.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/kerberos-ug/1.1-introduction.md b/source/apacheds/kerberos-ug/1.1-introduction.md
index d461bc0..9eae4a2 100644
--- a/source/apacheds/kerberos-ug/1.1-introduction.md
+++ b/source/apacheds/kerberos-ug/1.1-introduction.md
@@ -11,7 +11,7 @@
 ## Table of content
 
 * [1.1.1 - Realms](1.1.1-realms.html)
-* [1.1.2 - Principal](1.1.2-Principals.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/news.md b/source/apacheds/news.md
index 42f1298..9c475ce 100644
--- a/source/apacheds/news.md
+++ b/source/apacheds/news.md
@@ -14,8 +14,7 @@
 This is a major release of ApacheDS. It brings many bug fixes, and is the first version implementing LDAP transactions,
 which are now used internally for atomic operations, but can also be used through an extended operation, to apply many
 operations in one transaction.
-We also have changed the Cache system we were using (ehcache) to use the more efficient and lighter [Caffeine]
-(https://github.com/ben-manes/caffeine/wiki).
+We also have changed the Cache system we were using (ehcache) to use the more efficient and lighter [Caffeine](https://github.com/ben-manes/caffeine/wiki).
 Otherwise, we don't anymore store certificates in the server by default, but use an external keystore.
 
 We can't anymore produce the Mac OSX installer package, we are working on finding a solution for that issue (Apple
diff --git a/source/mavibot/developer-guide.md b/source/mavibot/developer-guide.md
index cb84e64..c855af6 100644
--- a/source/mavibot/developer-guide.md
+++ b/source/mavibot/developer-guide.md
@@ -127,7 +127,7 @@
 
 # Releasing Mavibot
 
-Since we are using Nexus for releases the release process is as follows (see also [http://www.apache.org/dev/publishing-maven-artifacts.html#staging-maven](publishing-maven-artifacts.html)).
+Since we are using Nexus for releases the release process is as follows (see also [http://www.apache.org/dev/publishing-maven-artifacts.html#staging-maven](http://www.apache.org/dev/publishing-maven-artifacts.html#staging-maven)).
 
 ## Test the Project
     
diff --git a/source/sources.md b/source/sources.md
index 3d5e744..c84cb13 100644
--- a/source/sources.md
+++ b/source/sources.md
@@ -10,7 +10,7 @@
 
 If you just want to browse the source code, you can use one of the web interfaces:
 
-* [web interface to Gitbox](https://gitbox.apache.org/repos/asf?a=project_list&s=directory-)
+* [web interface to Gitbox](https://gitbox.apache.org/repos/asf#directory)
 * [web interface to GitHub](https://github.com/apache?q=directory-)
 * [web interface to Subversion](https://svn.apache.org/viewvc/directory)