This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch FREEMARKER-154 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 52469b886cd3ed87b8f05d022e4a6126dbd14466 Author: ddekany <[email protected]> AuthorDate: Sun Feb 14 21:26:25 2021 +0100 Switched all examples to use [docgen.insertWithOutput]. Also upgraded to use latest Docgen. --- freemarker-generator-website/pom.xml | 1 - freemarker-generator-website/src/main/docgen/book.xml | 2 +- freemarker-generator-website/src/main/docgen/docgen.cjson | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/freemarker-generator-website/pom.xml b/freemarker-generator-website/pom.xml index 4dbf604..df471cd 100644 --- a/freemarker-generator-website/pom.xml +++ b/freemarker-generator-website/pom.xml @@ -72,7 +72,6 @@ <websitePomGenerated>${docgenInsertedOutputsDirectory}/**</websitePomGenerated> <templates>${docgenInsertedTemplatesDirectory}/**</templates> <exampleTemplates>${docgenInsertedExampleTemplatesDirectory}/**</exampleTemplates> - <exampleOutputs>${docgenInsertedExampleOutputDirectory}/**</exampleOutputs> </insertableFiles> <customVariables> <version>${project.version}</version> diff --git a/freemarker-generator-website/src/main/docgen/book.xml b/freemarker-generator-website/src/main/docgen/book.xml index f3dd4e8..a6fa463 100644 --- a/freemarker-generator-website/src/main/docgen/book.xml +++ b/freemarker-generator-website/src/main/docgen/book.xml @@ -848,7 +848,7 @@ freemarker-generator -e UTF-8 -l de_AT -Pcolumn="Order ID" \ </section> <section xml:id="named-uri"> - <title xml:id="named-uri">Named URI-s</title> + <title>Named URI-s</title> <para>Named URIs allow to identify <literal>DataSource</literal>-s (not a JDBC <literal>DataSource</literal>, <link linkend="datasources">but diff --git a/freemarker-generator-website/src/main/docgen/docgen.cjson b/freemarker-generator-website/src/main/docgen/docgen.cjson index eb1f80b..abbe401 100644 --- a/freemarker-generator-website/src/main/docgen/docgen.cjson +++ b/freemarker-generator-website/src/main/docgen/docgen.cjson @@ -102,7 +102,6 @@ insertableFiles: { websitePomGenerated: null // Must be overridden by the caller templates: null // Must be overridden by the caller exampleTemplates: null // Must be overridden by the caller - exampleOutputs: null // Must be overridden by the caller } insertableOutputCommands: { @@ -111,6 +110,7 @@ insertableOutputCommands: { mainMethod: execute systemProperties: { app.home: getCustomVariable("freemarkerGeneratorAppHome") + freemarkerGenerator.examples.deductSensitiveInformation: "true" } docgenWdReplacedWith: getCustomVariable("freemarkerGeneratorAppHome") }
