You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@training.apache.org by dp...@apache.org on 2019/04/27 08:06:10 UTC

[incubator-training] branch master updated: Add MIT license to LICENSE. (#4)

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

dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-training.git


The following commit(s) were added to refs/heads/master by this push:
     new 521ef2f  Add MIT license to LICENSE. (#4)
521ef2f is described below

commit 521ef2ff1ac05e97d315f54ab1a574c2ae0b1021
Author: Justin Mclean <ju...@classsoftware.com>
AuthorDate: Sat Apr 27 18:06:05 2019 +1000

    Add MIT license to LICENSE. (#4)
---
 LICENSE                                            | 28 ++++++++++++++++++++++
 NOTICE                                             |  6 -----
 .../src/main/asciidoc/index.adoc                   |  6 ++---
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/LICENSE b/LICENSE
index d645695..f9781e2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,31 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+----------------------------------------------
+
+This product includes a modified version of this file:
+tools/maven-revealjs-asciidoctor-templte/libs/docinfo-hack/document.html.slim
+developed at https://github.com/asciidoctor/asciidoctor-reveal.js
+
+Available under an MIT license:
+
+The MIT License
+Copyright (C) 2012-2019 Olivier Bilodeau, Charles Moulliard, Dan Allen and the Asciidoctor Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/NOTICE b/NOTICE
index ea2389d..42c8ea1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,9 +3,3 @@ Copyright 2019 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-----------------------------------------------
-
-This product includes a modified version of a file:
-tools/maven-revealjs-asciidoctor-templte/libs/docinfo-hack/document.html.slim
-developed at https://github.com/asciidoctor/asciidoctor-reveal.js
diff --git a/tools/maven-revealjs-asciidoctor-templte/src/main/asciidoc/index.adoc b/tools/maven-revealjs-asciidoctor-templte/src/main/asciidoc/index.adoc
index 0028c86..012fcb8 100644
--- a/tools/maven-revealjs-asciidoctor-templte/src/main/asciidoc/index.adoc
+++ b/tools/maven-revealjs-asciidoctor-templte/src/main/asciidoc/index.adoc
@@ -18,12 +18,12 @@
 ////
 
 include::_settings.adoc[]
-:presenter_name: Some Cool Guy
+:presenter_name: Some Cool Person
 :presenter_company: Apache Software Foundation
 
 == Example Presentation
-Doc Writer <mr...@apache.org>
-2014-09-09
+Doc Writer <co...@apache.org>
+{docdate}
 :revnumber: {project-version}
 :example-caption!: