From f851de342b9f9e608c95ae26796302b08517927d Mon Sep 17 00:00:00 2001
From: Sybille Peters <sypets@gmx.de>
Date: Mon, 20 Apr 2020 10:45:13 +0200
Subject: [PATCH] Maintenance update

- Add information to status in Includes.txt
- Remove "deprecated" in title

Related: TYPO3-Documentation/T3DocTeam#144
---
 Documentation/Includes.txt | 14 ++++++++++++++
 Documentation/Index.rst    | 32 ++++----------------------------
 Documentation/Settings.cfg |  6 +++---
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/Documentation/Includes.txt b/Documentation/Includes.txt
index 0bacf7d..11e2553 100644
--- a/Documentation/Includes.txt
+++ b/Documentation/Includes.txt
@@ -15,3 +15,17 @@
 
 .. default-role:: code
 .. highlight:: php
+
+
+.. ---------------------------------------------------------------------
+.. Add content below, which should be displayed at the top of EVERY page.
+.. ---------------------------------------------------------------------
+
+.. warning::
+
+   The information for this version |release| is outdated.
+   For resources on Extbase / Fluid, see:
+
+   * :ref:`Getting Started Tutorial > Next Steps > For Developers > Fluid / Extbase <t3start:next-steps-developers-extbase>`.
+
+   Contact: https://typo3.org/community/teams/documentation/#c9886
diff --git a/Documentation/Index.rst b/Documentation/Index.rst
index 56a856a..5e72702 100644
--- a/Documentation/Index.rst
+++ b/Documentation/Index.rst
@@ -3,32 +3,9 @@
 
 .. _start:
 
-============================================
-A TYPO3 Extbase and Fluid Guide (deprecated)
-============================================
-
-.. important::
-
-   `This guide has been deprecated and will soon be deleted. <https://docs.typo3.org/Home/About/News/2019/Index.html#news-2019-06-26>`__
-
-   For resources on Extbase / Fluid, see:
-
-   * :ref:`Getting Started Tutorial > Next Steps > For Developers > Fluid / Extbase <t3start:next-steps-developers-extbase>`.
-
-
-   Direct links to resources:
-
-   * `Fluid ViewHelper reference 9.5 <https://docs.typo3.org/other/typo3/view-helper-reference/9.5/en-us/Index.html>`__
-     (automatically generated, official documentation, online)
-   * `Fluid ViewHelper reference 8.7 <https://docs.typo3.org/m/typo3/guide-extbasefluid/8.7/en-us/Fluid/ViewHelper/Index.html>`__
-     (manually maintained, official documentation, may partly be outdated or incomplete)
-   * `Fluid ViewHelper reference 6.2 <https://docs.typo3.org/m/typo3/guide-extbasefluid/6.2/en-us/Fluid/ViewHelper/Index.html>`__
-     (manually maintained, official documentation, may partly be outdated or incomplete)
-   * `Michael Schams: TYPO3 Extbase Book, 3rd edition, for TYPO3 9.5 CMS <https://www.extbase-book.org/>`__ (**not** official documentation, but up-to-date, costs money, available as `ebook <https://leanpub.com/typo3extbase-3rd-edition-en>`__)
-   * `Extbase / Fluid book <https://docs.typo3.org/m/typo3/book-extbasefluid/master/en-us/Index.html>`__ (official documentation, online, **partly outdated**)
-
-   Contact: https://typo3.org/community/teams/documentation/#c9886
-
+===============================
+A TYPO3 Extbase and Fluid Guide
+===============================
 
 :Author:
       Originally by Stefan Frömken, translated and updated
@@ -42,8 +19,7 @@ A TYPO3 Extbase and Fluid Guide (deprecated)
       <http://www.opencontent.org/opl.shtml>`_
 
 :Status:
-      To be deleted. Currently still online with branch 8.7 and 6.2 to provide ViewHelper reference for
-      older versions.
+      Outdated
 
 
 
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
index 993c0db..8f989e9 100644
--- a/Documentation/Settings.cfg
+++ b/Documentation/Settings.cfg
@@ -18,9 +18,9 @@
 ; endless list of all of the general simple settings
 ; you can use in 'conf.py'
 
-project     = A TYPO3 Extbase and Fluid Guide (deprecated)
-version     = master
-release     = master
+project     = A TYPO3 Extbase and Fluid Guide
+version     = master (10.x)
+release     = master (10.x)
 t3author    = Stefan Frömken & TYPO3 Community
 copyright   = by the authors since ever