This is an automated email from the ASF dual-hosted git repository. mbo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/db-jdo-site.git
The following commit(s) were added to refs/heads/master by this push: new 83bd734 JDO-779: new adoc files for License and Coding Standards 83bd734 is described below commit 83bd73426b93e31bf091912a9b8669672a5689bf Author: Michael Bouschen <michael.bousc...@akquinet.de> AuthorDate: Wed Jun 17 22:06:43 2020 +0200 JDO-779: new adoc files for License and Coding Standards --- src/main/asciidoc/coding-standards.adoc | 13 +++++++++++++ src/main/asciidoc/license.adoc | 14 ++++++++++++++ src/main/template/document.html.erb | 4 ++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/asciidoc/coding-standards.adoc b/src/main/asciidoc/coding-standards.adoc new file mode 100644 index 0000000..e673a09 --- /dev/null +++ b/src/main/asciidoc/coding-standards.adoc @@ -0,0 +1,13 @@ +:_basedir: +:_imagesdir: images/ +:grid: cols +:development: + +[[index]] + +== Coding Standardsanchor:Codeing_Standars[] + +The JDO development team follows the http://cwiki.apache.org/GMOxDEV/Coding+standards[Apache Geronimo code style]. +Please use this code style if you submit patches and extensions to JDO. + +{empty} + diff --git a/src/main/asciidoc/license.adoc b/src/main/asciidoc/license.adoc new file mode 100644 index 0000000..58f9911 --- /dev/null +++ b/src/main/asciidoc/license.adoc @@ -0,0 +1,14 @@ +:_basedir: +:_imagesdir: images/ +:notoc: +:notitle: +:grid: cols +:general: + +[[index]] + +== Licenseanchor:Lisense[] + +The JDO API and the JDO TCK are licensed under the Apache License 2.0. For more information about licenses see the http://www.apache.org/licenses/LICENSE-2.0[Apache License page]. + +{empty} + diff --git a/src/main/template/document.html.erb b/src/main/template/document.html.erb index 400cb3b..4b0dd36 100644 --- a/src/main/template/document.html.erb +++ b/src/main/template/document.html.erb @@ -136,7 +136,7 @@ <li><a href="<%= (attr :_basedir) %>jdo_v_jpa_api.html">JDO v JPA : API</a></li> <li><a href="<%= (attr :_basedir) %>jdo_v_jpa_orm.html">JDO v JPA : ORM</a></li> <li role="separator" class="divider"></li> - <li><a href="<%= (attr :_basedir) %>http://www.apache.org/licenses/LICENSE-2.0">License</a></li> + <li><a href="<%= (attr :_basedir) %>license.html">License</a></li> <li><a href="<%= (attr :_basedir) %>impls.html">Implementations</a></li> <li><a href="<%= (attr :_basedir) %>jdo_3_0_overview.html">JDO 3.0 Overview</a></li> <li><a href="<%= (attr :_basedir) %>references.html">References</a></li> @@ -237,7 +237,7 @@ <li><a href="<%= (attr :_basedir) %>roadmap.html">RoadMap / TODO</a></li> <li><a href="<%= (attr :_basedir) %>downloads.html">Downloads</a></li> <li><a href="<%= (attr :_basedir) %>source-code.html">Source Code</a></li> - <li><a href="<%= (attr :_basedir) %>http://cwiki.apache.org/GMOxDEV/Coding+standards">Coding Standards</a></li> + <li><a href="<%= (attr :_basedir) %>coding-standards.html">Coding Standards</a></li> <li><a href="<%= (attr :_basedir) %>issuetracking.html">Issue Tracking</a></li> </ul> </li>