From 09cf2386b7f6e7199d89384c5ff208b213000fe6 Mon Sep 17 00:00:00 2001 From: Jan Haffner Date: Fri, 26 Oct 2018 12:33:18 +0200 Subject: [PATCH 1/3] [DOC] Fix documentation --- .../Localization.de_DE/ChangeLog/Index.rst | 2 +- .../Localization.de_DE/Developer/Index.rst | 2 +- Documentation/Localization.de_DE/Includes.txt | 21 +++++++++++++++++++ Documentation/Localization.de_DE/Index.rst | 2 +- .../Localization.de_DE/Introduction/Index.rst | 2 +- .../Localization.de_DE/User/Index.rst | 4 ++-- Documentation/User/Index.rst | 2 +- 7 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 Documentation/Localization.de_DE/Includes.txt diff --git a/Documentation/Localization.de_DE/ChangeLog/Index.rst b/Documentation/Localization.de_DE/ChangeLog/Index.rst index 7e65c82..44b56aa 100644 --- a/Documentation/Localization.de_DE/ChangeLog/Index.rst +++ b/Documentation/Localization.de_DE/ChangeLog/Index.rst @@ -3,7 +3,7 @@ .. -------------------------------------------------- .. -*- coding: utf-8 -*- with BOM. -.. include:: ../../Includes.txt +.. include:: ../Includes.txt .. _changelog: diff --git a/Documentation/Localization.de_DE/Developer/Index.rst b/Documentation/Localization.de_DE/Developer/Index.rst index 4be6803..563cba5 100644 --- a/Documentation/Localization.de_DE/Developer/Index.rst +++ b/Documentation/Localization.de_DE/Developer/Index.rst @@ -3,7 +3,7 @@ .. -------------------------------------------------- .. -*- coding: utf-8 -*- with BOM. -.. include:: ../../Includes.txt +.. include:: ../Includes.txt .. _developer: diff --git a/Documentation/Localization.de_DE/Includes.txt b/Documentation/Localization.de_DE/Includes.txt new file mode 100644 index 0000000..a111144 --- /dev/null +++ b/Documentation/Localization.de_DE/Includes.txt @@ -0,0 +1,21 @@ +.. ================================================== +.. FOR YOUR INFORMATION +.. -------------------------------------------------- +.. -*- coding: utf-8 -*- with BOM. + +.. This is 'Includes.txt'. It is included at the very top of each and + every ReST source file in this documentation project (= manual). + + +.. ================================================== +.. DEFINE SOME TEXT ROLES +.. -------------------------------------------------- + +.. role:: typoscript(code) + +.. role:: ts(typoscript) + :class: typoscript + +.. role:: php(code) + +.. highlight:: php diff --git a/Documentation/Localization.de_DE/Index.rst b/Documentation/Localization.de_DE/Index.rst index d008ec9..8c6e2eb 100644 --- a/Documentation/Localization.de_DE/Index.rst +++ b/Documentation/Localization.de_DE/Index.rst @@ -3,7 +3,7 @@ .. -------------------------------------------------- .. -*- coding: utf-8 -*- with BOM. -.. include:: ../Includes.txt +.. include:: Includes.txt .. _start: diff --git a/Documentation/Localization.de_DE/Introduction/Index.rst b/Documentation/Localization.de_DE/Introduction/Index.rst index 27f9143..aef7eae 100644 --- a/Documentation/Localization.de_DE/Introduction/Index.rst +++ b/Documentation/Localization.de_DE/Introduction/Index.rst @@ -3,7 +3,7 @@ .. -------------------------------------------------- .. -*- coding: utf-8 -*- with BOM. -.. include:: ../../Includes.txt +.. include:: ../Includes.txt .. _introduction: diff --git a/Documentation/Localization.de_DE/User/Index.rst b/Documentation/Localization.de_DE/User/Index.rst index 005d7c5..842a4ea 100644 --- a/Documentation/Localization.de_DE/User/Index.rst +++ b/Documentation/Localization.de_DE/User/Index.rst @@ -3,7 +3,7 @@ .. -------------------------------------------------- .. -*- coding: utf-8 -*- with BOM. -.. include:: ../../Includes.txt +.. include:: ../Includes.txt .. _user-manual: @@ -37,7 +37,7 @@ Optionale Konfiguration .. code-block:: typoscript :linenos: - :emphasize-lines: 7, 11, 15, 19 + :emphasize-lines: 7, 11, 15 plugin.tx_jhcaptcha { settings { diff --git a/Documentation/User/Index.rst b/Documentation/User/Index.rst index 77dd0d6..b231b13 100644 --- a/Documentation/User/Index.rst +++ b/Documentation/User/Index.rst @@ -37,7 +37,7 @@ Optional Configuration .. code-block:: typoscript :linenos: - :emphasize-lines: 7, 11, 15, 19 + :emphasize-lines: 7, 11, 15 plugin.tx_jhcaptcha { settings { From 6c8bbbed772e64631022f8c1ad1a7c2b4e2d0aaa Mon Sep 17 00:00:00 2001 From: Jan Haffner Date: Fri, 26 Oct 2018 12:33:54 +0200 Subject: [PATCH 2/3] [DOC] Migrate settings files to the new format --- Documentation/Localization.de_DE/Settings.cfg | 25 ++++++++++++ Documentation/Localization.de_DE/Settings.yml | 38 ------------------- Documentation/Settings.cfg | 25 ++++++++++++ Documentation/Settings.yml | 38 ------------------- 4 files changed, 50 insertions(+), 76 deletions(-) create mode 100644 Documentation/Localization.de_DE/Settings.cfg delete mode 100644 Documentation/Localization.de_DE/Settings.yml create mode 100644 Documentation/Settings.cfg delete mode 100644 Documentation/Settings.yml diff --git a/Documentation/Localization.de_DE/Settings.cfg b/Documentation/Localization.de_DE/Settings.cfg new file mode 100644 index 0000000..083d73a --- /dev/null +++ b/Documentation/Localization.de_DE/Settings.cfg @@ -0,0 +1,25 @@ +[general] +copyright = 2015-2018 +project = Google reCAPTCHA v2.0 +release = 2.1.0 +version = 2.1.0 + +[html_theme_options] +github_branch = +github_commit_hash = +github_repository = +path_to_documentation_dir = +github_revision_msg = +github_sphinx_locale = +project_contact = +project_discussions = +project_home = https://github.com/TehTux/jh_captcha +project_issues = https://github.com/TehTux/jh_captcha/issues +project_repository = https://github.com/TehTux/jh_captcha.git +use_opensearch = + +[intersphinx_mapping] +t3tsref = http://docs.typo3.org/typo3cms/TyposcriptReference/ + +[notify] +about_new_build = info@jan-haffner.de diff --git a/Documentation/Localization.de_DE/Settings.yml b/Documentation/Localization.de_DE/Settings.yml deleted file mode 100644 index 051dafe..0000000 --- a/Documentation/Localization.de_DE/Settings.yml +++ /dev/null @@ -1,38 +0,0 @@ -# This is the project specific Settings.yml file. -# Place Sphinx specific build information here. -# Settings given here will replace the settings of 'conf.py'. - -# Below is an example of intersphinx mapping declaration -# Add more mappings depending on what manual you want to link to -# Remove entirely if you don't need cross-linking - ---- -conf.py: - copyright: 2015-2018 - project: Google reCAPTCHA v2.0 - version: 2.1.0 - release: 2.1.0 - extensions: - - sphinx.ext.intersphinx - - t3sphinx.ext.t3extras - - t3sphinx.ext.t3tablerows - - t3sphinx.ext.targets - - sphinxcontrib.googlechart - - sphinxcontrib.googlemaps - - sphinxcontrib.slide - - sphinxcontrib.youtube - intersphinx_mapping: - t3tsref: - - http://docs.typo3.org/typo3cms/TyposcriptReference/ - - null - latex_documents: - - - Index - - jh_captcha.tex - - reCAPTCHA v2.0 - - Jan Haffner - - manual - latex_elements: - papersize: a4paper - pointsize: 10pt - preamble: \usepackage{typo3} -... diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg new file mode 100644 index 0000000..083d73a --- /dev/null +++ b/Documentation/Settings.cfg @@ -0,0 +1,25 @@ +[general] +copyright = 2015-2018 +project = Google reCAPTCHA v2.0 +release = 2.1.0 +version = 2.1.0 + +[html_theme_options] +github_branch = +github_commit_hash = +github_repository = +path_to_documentation_dir = +github_revision_msg = +github_sphinx_locale = +project_contact = +project_discussions = +project_home = https://github.com/TehTux/jh_captcha +project_issues = https://github.com/TehTux/jh_captcha/issues +project_repository = https://github.com/TehTux/jh_captcha.git +use_opensearch = + +[intersphinx_mapping] +t3tsref = http://docs.typo3.org/typo3cms/TyposcriptReference/ + +[notify] +about_new_build = info@jan-haffner.de diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml deleted file mode 100644 index 051dafe..0000000 --- a/Documentation/Settings.yml +++ /dev/null @@ -1,38 +0,0 @@ -# This is the project specific Settings.yml file. -# Place Sphinx specific build information here. -# Settings given here will replace the settings of 'conf.py'. - -# Below is an example of intersphinx mapping declaration -# Add more mappings depending on what manual you want to link to -# Remove entirely if you don't need cross-linking - ---- -conf.py: - copyright: 2015-2018 - project: Google reCAPTCHA v2.0 - version: 2.1.0 - release: 2.1.0 - extensions: - - sphinx.ext.intersphinx - - t3sphinx.ext.t3extras - - t3sphinx.ext.t3tablerows - - t3sphinx.ext.targets - - sphinxcontrib.googlechart - - sphinxcontrib.googlemaps - - sphinxcontrib.slide - - sphinxcontrib.youtube - intersphinx_mapping: - t3tsref: - - http://docs.typo3.org/typo3cms/TyposcriptReference/ - - null - latex_documents: - - - Index - - jh_captcha.tex - - reCAPTCHA v2.0 - - Jan Haffner - - manual - latex_elements: - papersize: a4paper - pointsize: 10pt - preamble: \usepackage{typo3} -... From 3172e5922543c065df641092af4d8cced7388f80 Mon Sep 17 00:00:00 2001 From: Jan Haffner Date: Fri, 26 Oct 2018 12:37:07 +0200 Subject: [PATCH 3/3] [RELEASE] Set version to 2.1.1 + Update changelog --- Documentation/ChangeLog/Index.rst | 6 ++++++ Documentation/Localization.de_DE/ChangeLog/Index.rst | 6 ++++++ Documentation/Localization.de_DE/Settings.cfg | 4 ++-- Documentation/Settings.cfg | 4 ++-- README.md | 4 ++-- ext_emconf.php | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst index ab03204..b1ef2f2 100644 --- a/Documentation/ChangeLog/Index.rst +++ b/Documentation/ChangeLog/Index.rst @@ -14,6 +14,12 @@ ChangeLog 2.0.x ----- +2.1.1 +^^^^^ + +* [DOC] Fix bugs in the documentation +* [DOC] Migrate settings file to the new format + 2.1.0 ^^^^^ diff --git a/Documentation/Localization.de_DE/ChangeLog/Index.rst b/Documentation/Localization.de_DE/ChangeLog/Index.rst index 44b56aa..c35d15a 100644 --- a/Documentation/Localization.de_DE/ChangeLog/Index.rst +++ b/Documentation/Localization.de_DE/ChangeLog/Index.rst @@ -14,6 +14,12 @@ 2.0.x ----- +2.1.1 +^^^^^ + +* [DOC] Fehler in der Dokumentation behoben +* [DOC] Dokumentation Settings-Datei zu neuen format migriert + 2.1.0 ^^^^^ diff --git a/Documentation/Localization.de_DE/Settings.cfg b/Documentation/Localization.de_DE/Settings.cfg index 083d73a..6fb14c9 100644 --- a/Documentation/Localization.de_DE/Settings.cfg +++ b/Documentation/Localization.de_DE/Settings.cfg @@ -1,8 +1,8 @@ [general] copyright = 2015-2018 project = Google reCAPTCHA v2.0 -release = 2.1.0 -version = 2.1.0 +release = 2.1.1 +version = 2.1.1 [html_theme_options] github_branch = diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index 083d73a..6fb14c9 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -1,8 +1,8 @@ [general] copyright = 2015-2018 project = Google reCAPTCHA v2.0 -release = 2.1.0 -version = 2.1.0 +release = 2.1.1 +version = 2.1.1 [html_theme_options] github_branch = diff --git a/README.md b/README.md index 6c8375b..a702e65 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Use Google reCAPTCHA v2.0 in your own TYPO3 extensions, EXT:form, EXT:powermail ## Documentation * [EN - latest](https://docs.typo3.org/typo3cms/extensions/jh_captcha/) -* [EN - 1.3.1](https://docs.typo3.org/typo3cms/extensions/jh_captcha/1.3.1/) +* [EN - 2.1.1](https://docs.typo3.org/typo3cms/extensions/jh_captcha/2.1.1/) * [DE - latest](https://docs.typo3.org/typo3cms/extensions/jh_captcha/de-de/) -* [DE - 1.3.1](https://docs.typo3.org/typo3cms/extensions/jh_captcha/de-de/1.3.1/) +* [DE - 2.1.1](https://docs.typo3.org/typo3cms/extensions/jh_captcha/de-de/2.1.1/) ## Installation diff --git a/ext_emconf.php b/ext_emconf.php index e40f094..7f8b0ad 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -11,7 +11,7 @@ 'uploadfolder' => '0', 'createDirs' => '', 'clearCacheOnLoad' => 0, - 'version' => '2.1.0', + 'version' => '2.1.1', 'constraints' => array( 'depends' => array( 'typo3' => '7.6.0-8.7.99',