You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2018/04/10 12:51:56 UTC

[sling-site] branch master updated: Create /documentation/apidocs and make left menu smaller

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/master by this push:
     new aa85a67  Create /documentation/apidocs and make left menu smaller
aa85a67 is described below

commit aa85a67917cdb940fa0574f7b554b89b4045e054
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Apr 10 14:51:42 2018 +0200

    Create /documentation/apidocs and make left menu smaller
---
 src/main/jbake/assets/.htaccess                 |  1 +
 src/main/jbake/content/documentation/apidocs.md | 28 +++++++++++++++++++++++++
 src/main/jbake/content/javadoc-io.md            | 11 ----------
 src/main/jbake/templates/menu.tpl               |  6 +-----
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/main/jbake/assets/.htaccess b/src/main/jbake/assets/.htaccess
index e1dc6b8..a7d0065 100644
--- a/src/main/jbake/assets/.htaccess
+++ b/src/main/jbake/assets/.htaccess
@@ -113,3 +113,4 @@ Redirect Permanent /site/webdav.html /documentation/development/repository-based
 Redirect Permanent /site/wiki.html http://s.apache.org/sling.wiki
 Redirect Permanent /site/wrap-or-decorate-resources.html /documentation/the-sling-engine/wrap-or-decorate-resources.html
 Redirect Permanent /site/xslt-processing-pipeline.html /old-stuff/scriptengineintegration/xslt-processing-pipeline.html
+Redirect Permanent /javadoc-io.html /documentation/apidocs.html
\ No newline at end of file
diff --git a/src/main/jbake/content/documentation/apidocs.md b/src/main/jbake/content/documentation/apidocs.md
new file mode 100644
index 0000000..14c7c2d
--- /dev/null
+++ b/src/main/jbake/content/documentation/apidocs.md
@@ -0,0 +1,28 @@
+title=API Docs
+type=page
+status=published
+tags=api,documentation
+tableOfContents=false
+~~~~~~
+
+## Sling API Documentation
+
+Use these links to access the API docs of the various Sling versions:
+
+* [Sling 10](/apidocs/sling10/index.html)
+* [Sling 9](/apidocs/sling9/index.html)
+* [Sling 8](/apidocs/sling8/index.html)
+* [Sling 7](/apidocs/sling7/index.html)
+* [Sling 6](/apidocs/sling6/index.html)
+* [Sling 5](/apidocs/sling5/index.html)
+
+These apply to the "big" Sling releases, but in between those we often release individual
+modules, including their version-specific javadocs.
+
+[javadocs.io](http://www.javadoc.io/) also provides archived javadocs for all Sling modules, and actually
+for all open source software hosted at Maven Central.
+
+To get the javadocs of a particular module there, use an URL like `http://javadoc.io/doc/{org}/{artifact}/{version}`, like
+for example [http://www.javadoc.io/doc/org.apache.sling/org.apache.sling.api/2.9.0](http://www.javadoc.io/doc/org.apache.sling/org.apache.sling.api/2.9.0)
+
+
diff --git a/src/main/jbake/content/javadoc-io.md b/src/main/jbake/content/javadoc-io.md
deleted file mode 100644
index 137371f..0000000
--- a/src/main/jbake/content/javadoc-io.md
+++ /dev/null
@@ -1,11 +0,0 @@
-title=Sling API docs at javadoc.io		
-type=page
-status=published
-tags=api,documentation
-~~~~~~
-
-[javadocs.io](http://www.javadoc.io/) provides archived javadocs for all Sling modules (and actually
-for all open source software hosted at Maven Central).
-
-To get the javadocs of a particular module use an URL like `http://javadoc.io/doc/{org}/{artifact}/{version}`, like
-for example [http://www.javadoc.io/doc/org.apache.sling/org.apache.sling.api/2.9.0](http://www.javadoc.io/doc/org.apache.sling/org.apache.sling.api/2.9.0)
diff --git a/src/main/jbake/templates/menu.tpl b/src/main/jbake/templates/menu.tpl
index f2a7a75..f11bd3c 100644
--- a/src/main/jbake/templates/menu.tpl
+++ b/src/main/jbake/templates/menu.tpl
@@ -21,11 +21,7 @@ div(class:"menu"){
 		strong("API Docs")  br() newLine()
 		a(href:"${config.site_contextPath}apidocs/sling10/index.html", "Sling 10") br() newLine()
 		a(href:"${config.site_contextPath}apidocs/sling9/index.html", "Sling 9") br() newLine()
-		a(href:"${config.site_contextPath}apidocs/sling8/index.html", "Sling 8") br() newLine()
-		a(href:"${config.site_contextPath}apidocs/sling7/index.html", "Sling 7") br() newLine()
-		a(href:"${config.site_contextPath}apidocs/sling6/index.html", "Sling 6") br() newLine()
-		a(href:"${config.site_contextPath}apidocs/sling5/index.html", "Sling 5") br() newLine()
-		a(href:"${config.site_contextPath}javadoc-io.html", "Archive at javadoc.io") br() newLine()
+		a(href:"${config.site_contextPath}documentation/apidocs.html", "All versions") br() newLine()
 	}
 
 	p(){

-- 
To stop receiving notification emails like this one, please contact
bdelacretaz@apache.org.