TOMEE-2412 & TOMEE-2414 - pdf filename and tomee master link CI.
diff --git a/src/main/jbake/content/community/commercial.adoc b/src/main/jbake/content/community/commercial.adoc
index bd6c3cf..13adda6 100755
--- a/src/main/jbake/content/community/commercial.adoc
+++ b/src/main/jbake/content/community/commercial.adoc
@@ -12,7 +12,7 @@
 
 === Tomitribe
 
-Tomitribe is a company created by several founding members of the Apache TomEE community with the mission of uniting businesses using TomEE with responsible and sustainable Open Source. Our goal is to support both the community and fuel the success of business that rely TomEE with a complete set of consulting, training, and commercial support.
+https://www.tomitribe.com[Tomitribe] is a company created by several founding members of the Apache TomEE community with the mission of uniting businesses using TomEE with responsible and sustainable Open Source. Our goal is to support both the community and fuel the success of business that rely TomEE with a complete set of consulting, training, and commercial support.
 
 
 === ManageCat
diff --git a/src/main/jbake/content/community/sources.adoc b/src/main/jbake/content/community/sources.adoc
index ee8eea4..c02a476 100755
--- a/src/main/jbake/content/community/sources.adoc
+++ b/src/main/jbake/content/community/sources.adoc
@@ -59,7 +59,7 @@
 
 TomEE is using Buildbot for its continuous integration. You can access main builds (Ubuntu ones) at these address:
 
-- https://ci.apache.org/builders/tomee-trunk-ubuntu[TomEE Master]
+- https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8[TomEE Master]
 - https://ci.apache.org/builders/tomee-1.7.x-ubuntu[TomEE 1.7.x]
 
 === Issues
diff --git a/src/main/jbake/content/docs.adoc b/src/main/jbake/content/docs.adoc
index 5507038..3c61c32 100644
--- a/src/main/jbake/content/docs.adoc
+++ b/src/main/jbake/content/docs.adoc
@@ -6,7 +6,7 @@
 
 === Administration
 - link:admin/configuration/index.html[Server Configuration]
-- link:admin/directory-structure.html[Directory Structure]
+- link:admin/file-layout.html[Directory Structure]
 - link:admin/cluster/index.html[Clustering and High Availability (HA)]
 
 === Developers
diff --git a/src/main/jbake/content/security/index.adoc b/src/main/jbake/content/security/security.adoc
similarity index 100%
rename from src/main/jbake/content/security/index.adoc
rename to src/main/jbake/content/security/security.adoc
diff --git a/src/main/jbake/templates/menu.gsp b/src/main/jbake/templates/menu.gsp
index 5c9dbad..db28af6 100755
--- a/src/main/jbake/templates/menu.gsp
+++ b/src/main/jbake/templates/menu.gsp
@@ -30,7 +30,7 @@
 				<ul class="nav navbar-nav navbar-right main-nav">
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>docs.html">Documentation</a></li>
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>community/index.html">Community</a></li>
-					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>security/index.html">Security</a></li>
+					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>security/security.html">Security</a></li>
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>download-ng.html">Downloads</a></li>
 				</ul>
 			</div>