From e9233a820c74f7a609b15aa2430e1c5c3c272edd Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sat, 16 Dec 2017 18:33:36 +0100
Subject: [PATCH] [TASK] v7 Changelog: Further fixes and alignments with master
Two fixes in specific .rst files and syncing main Index.rst
and other files on this level with master.
Change-Id: Ibe3221e455bd05fe4417aafab4afeb4c2ba409e4
Resolves: #83362
Releases: 7.6
Reviewed-on: https://review.typo3.org/55126
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../sysext/core/Documentation/Changelog-7.rst | 21 +++++++++++++++++++
...reaking-42543-DefaultTypoScriptRemoved.rst | 11 ++--------
...6-SelectOptionIconsInOptionTagsRemoved.rst | 6 +++---
typo3/sysext/core/Documentation/Includes.txt | 5 +++++
typo3/sysext/core/Documentation/Index.rst | 11 ++--------
typo3/sysext/core/Documentation/Settings.cfg | 2 +-
6 files changed, 34 insertions(+), 22 deletions(-)
create mode 100644 typo3/sysext/core/Documentation/Changelog-7.rst
diff --git a/typo3/sysext/core/Documentation/Changelog-7.rst b/typo3/sysext/core/Documentation/Changelog-7.rst
new file mode 100644
index 000000000000..bb5058378e8c
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog-7.rst
@@ -0,0 +1,21 @@
+:orphan:
+
+.. include:: Includes.txt
+
+============
+ChangeLog v7
+============
+
+Every change to the TYPO3 Core which might affect your site is documented here.
+
+.. toctree::
+ :titlesonly:
+
+ Changelog/7.6.x/Index
+ Changelog/7.6/Index
+ Changelog/7.5/Index
+ Changelog/7.4/Index
+ Changelog/7.3/Index
+ Changelog/7.2/Index
+ Changelog/7.1/Index
+ Changelog/7.0/Index
diff --git a/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-42543-DefaultTypoScriptRemoved.rst b/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-42543-DefaultTypoScriptRemoved.rst
index 5c2d101b2b8d..8ddb34589f18 100644
--- a/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-42543-DefaultTypoScriptRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-42543-DefaultTypoScriptRemoved.rst
@@ -1,14 +1,9 @@
.. include:: ../../Includes.txt
-.. role:: typoscript(code)
-.. role:: ts(typoscript)
-
- :class: typoscript
-
-============================================================
+=============================================
Breaking: #42543 - Default TypoScript Removed
-============================================================
+=============================================
See :issue:`42543`
@@ -46,5 +41,3 @@ Either remove usage of :code:`styles.insertContent` or add a snippet at an early
languageField = sys_language_uid
}
}
-
-..
diff --git a/typo3/sysext/core/Documentation/Changelog/7.5/Deprecation-69736-SelectOptionIconsInOptionTagsRemoved.rst b/typo3/sysext/core/Documentation/Changelog/7.5/Deprecation-69736-SelectOptionIconsInOptionTagsRemoved.rst
index 4a247d2945a0..7f0a12a28d75 100644
--- a/typo3/sysext/core/Documentation/Changelog/7.5/Deprecation-69736-SelectOptionIconsInOptionTagsRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/7.5/Deprecation-69736-SelectOptionIconsInOptionTagsRemoved.rst
@@ -1,9 +1,9 @@
.. include:: ../../Includes.txt
-===========================================================
-Important: #69736 - Select option iconsInOptionTags removed
-===========================================================
+=============================================================
+Deprecation: #69736 - Select option iconsInOptionTags removed
+=============================================================
See :issue:`69736`
diff --git a/typo3/sysext/core/Documentation/Includes.txt b/typo3/sysext/core/Documentation/Includes.txt
index 90b452184d5a..fded53037192 100644
--- a/typo3/sysext/core/Documentation/Includes.txt
+++ b/typo3/sysext/core/Documentation/Includes.txt
@@ -6,9 +6,14 @@
.. role:: js(code)
.. role:: php(code)
.. role:: typoscript(code)
+.. role:: typescript(code)
+.. role:: shell(code)
+.. role:: sql(code)
.. role:: ts(typoscript)
:class: typoscript
+.. role:: javascript(js)
+ :class: js
.. default-role:: code
.. highlight:: php
diff --git a/typo3/sysext/core/Documentation/Index.rst b/typo3/sysext/core/Documentation/Index.rst
index b48efa7e90ff..7d93b5ef4682 100644
--- a/typo3/sysext/core/Documentation/Index.rst
+++ b/typo3/sysext/core/Documentation/Index.rst
@@ -10,15 +10,8 @@ TYPO3 CMS Core ChangeLog v7
Every change to the TYPO3 Core which might affect your site is documented here.
.. toctree::
- :hidden:
+ :titlesonly:
Sitemap/Index
- Changelog/7.6.x/Index
- Changelog/7.6/Index
- Changelog/7.5/Index
- Changelog/7.4/Index
- Changelog/7.3/Index
- Changelog/7.2/Index
- Changelog/7.1/Index
- Changelog/7.0/Index
+ Changelog-7
Changelog/Howto
diff --git a/typo3/sysext/core/Documentation/Settings.cfg b/typo3/sysext/core/Documentation/Settings.cfg
index 3a5f63b716ed..5db0c1d13115 100644
--- a/typo3/sysext/core/Documentation/Settings.cfg
+++ b/typo3/sysext/core/Documentation/Settings.cfg
@@ -17,7 +17,7 @@ description = This documentation contains the changelog
; uncomment only what you actually use, as on each build an extra
; inventory file is downloaded for each mapping used.
-t3api = https://typo3.org/api/typo3cms/
+# t3api = https://typo3.org/api/typo3cms/
# t3cgl = https://docs.typo3.org/typo3cms/CodingGuidelinesReference/
t3coreapi = https://docs.typo3.org/typo3cms/CoreApiReference/
# t3editors = https://docs.typo3.org/typo3cms/EditorsTutorial/
--
GitLab