Merge d4b5f00 into e8e28a4

Documentation/Includes.txt

@@ -5,10 +5,8 @@
 .. role:: html(code)
 .. role:: js(code)
 .. role:: php(code)
-.. role:: typoscript(code)
-
-.. role:: ts(typoscript)
-   :class: typoscript
 
 .. default-role:: code
 .. highlight:: php
+
+.. |copyright| replace:: 2020

Documentation/Index.rst

@@ -7,7 +7,9 @@ TYPO3 Surf |version| documentation
 ==================================
 
 **What is Surf**
-Surf package is a complete automated deployment tool. It is best used but by far not limited to deploy TYPO3 CMS and Flow applications. It's inspired by some features of Capistrano (thanks) concerning the Git workflow.
+Surf package is a complete automated deployment tool.
+It is best used but by far not limited to deploy TYPO3 CMS, Flow and Neos applications.
+It's inspired by some features of Capistrano (thanks) concerning the Git workflow.
 
 .. only:: html
 
@@ -24,33 +26,31 @@ Surf package is a complete automated deployment tool. It is best used but by far
       Surf, Deployment, TYPO3, Flow, Neos
 
    :Copyright:
-      2018
+      |copyright|
 
    :Author:
       The contributors of the TYPO3 Surf project
 
    :License:
-      The deployment package is licensed under GNU General Public License, version 3 or later
-      (http://www.gnu.org/licenses/gpl.html). Initial development was sponsored by
-      [networkteam - Flow Framework Agentur](https://networkteam.com/fokus/flow-framework.html).
-
+      The deployment package is licensed under `GNU General Public License <http://www.gnu.org/licenses/gpl.html>`_, version 3 or later.
+      Initial development was sponsored by `networkteam - Flow Framework Agentur <https://networkteam.com/fokus/flow-framework.html>`_.
 
    :Rendered:
       |today|
 
 **TYPO3**
-   The content of this document is related to TYPO3 CMS,
-   a GNU/GPL CMS/Framework available from `typo3.org
-   <https://typo3.org/>`_ .
+
+The content of this document is related to TYPO3 CMS,
+a GNU/GPL CMS/Framework available from `typo3.org <https://typo3.org/>`_ .
 
 **About this manual:**
 
-   This is the official documentation to discover the main features and concepts of Surf.
+This is the official documentation to discover the main features and concepts of Surf.
 
-   If you find an error or something is missing in the documentation or in the code, please:
-   `Report a Problem <https://github.com/TYPO3/Surf/issues/new>`__
+If you find an error or something is missing, please:
+`Report a Problem <https://github.com/TYPO3/Surf/issues/new>`__
 
-   **Table of Contents**
+**Table of Contents**
 
 .. toctree::
      :maxdepth: 2
@@ -69,4 +69,3 @@ Surf package is a complete automated deployment tool. It is best used but by far
      SmokeTesting/Index
      Examples/Index
      Migration/Index
-

Documentation/Settings.cfg

@@ -1,9 +1,8 @@
 [general]
 
 project = Surf
-release = 2.0.0
-version = 2.0
-copyright = 2018
+release = 2.1.1
+version = 2.1
 
 [notify]
 
@@ -15,13 +14,8 @@ github_branch             = master
 github_repository         = TYPO3/Surf
 path_to_documentation_dir = Documentation
 
-project_home         = https://github.com/TYPO3/Surf
-project_issues       = https://github.com/TYPO3/Surf/issues
-project_repository   = https://github.com/TYPO3/Surf
+project_home       = https://github.com/TYPO3/Surf
+project_issues     = https://github.com/TYPO3/Surf/issues
+project_repository = https://github.com/TYPO3/Surf
 
 [intersphinx_mapping]
-
-t3tsref = http://docs.typo3.org/typo3cms/TyposcriptReference/
-t3editors = http://docs.typo3.org/typo3cms/EditorsTutorial/
-t3start = http://docs.typo3.org/typo3cms/GettingStartedTutorial/
-