diff --git a/CHANGELOG.md b/CHANGELOG.md index 77b9d6a..6f72e7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # New in 2020.6 - CHANGELOG can be created from file -- New section for Glossary -- New release action -- Latest aciidoctor stuff -- Latest Gradle +- Use new and simplified release action +- Update to latest Aciidoctor versions +- Update to latest Gradle diff --git a/docs/42-glossary/00-glossary.adoc b/docs/42-glossary/00-glossary.adoc deleted file mode 100755 index 95bd6a9..0000000 --- a/docs/42-glossary/00-glossary.adoc +++ /dev/null @@ -1,42 +0,0 @@ - -// tag::DE[] -[glossary] -== Glossar - -[glossary] - -Curriculum:: - Der Lehrplan. Dieses Beispiel zeigt, dass auch in der nächsten Zeile geschrieben werden kann. - -Modul:: Ein Teil des Curriculums, der sich um einen speziellen Bereich dreht. - -Schulung:: Das Beibringen der Themen des Lehrplans. -+ -Mit Lehrzeile zwischen zwei Zeilen und Folgendem: + - -1. Einem ersten Punkt und -2. einem zweiten Punkt, der etwas erklärt. - -// end::DE[] - -// tag::EN[] -[glossary] -== Glossary - -[glossary] - -Curriculum:: -Well, the curriculum. This example shows that you can write the description in the line _after_ the definition. - -Module:: Part of the curriculum, covering one specific part. - -Training:: Teaching the topics of the curriculum. -+ -Includes a blank line between two lines and the following: + - -1. A first enumerated bullet and -2. a second bullet, that explains something. - -// end::EN[] - - diff --git a/docs/curriculum-template.adoc b/docs/curriculum-template.adoc index 4a61c97..ab2253c 100644 --- a/docs/curriculum-template.adoc +++ b/docs/curriculum-template.adoc @@ -58,8 +58,5 @@ include::05-module-block-5/00-structure.adoc[{include_configuration}] <<< include::20-examples/00-examples.adoc[{include_configuration}] -<<< -include::42-glossary/00-glossary.adoc[{include_configuration}] - <<< include::99-references/00-references.adoc[{include_configuration}]