diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-66861-DoNotAutomaticallyAppendAToTheIdentifierOfAFolder.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-66861-DoNotAutomaticallyAppendAToTheIdentifierOfAFolder.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-66861-DoNotAutomaticallyAppendAToTheIdentifierOfAFolder.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-66861-DoNotAutomaticallyAppendAToTheIdentifierOfAFolder.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-70056-CurlAndHttpRequestRemoved.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-70056-CurlAndHttpRequestRemoved.rst
similarity index 85%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-70056-CurlAndHttpRequestRemoved.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-70056-CurlAndHttpRequestRemoved.rst
index b52121b16a507153c71e35063354b321d3549b08..0c79a2ec4448f3270de42c49c7facc9ee19cbc92 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-70056-CurlAndHttpRequestRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-70056-CurlAndHttpRequestRemoved.rst
@@ -54,9 +54,9 @@ Impact
 
 Calling the mentioned classes above will result in a fatal PHP error.
 
-Using the options in custom PHP code will result in unexpected behaviour as the options are non-existent and empty.
+Using the options in custom PHP code will result in unexpected behavior as the options are non-existent and empty.
 
-PHP code depending on the removed PEAR library "Http_Request2" will result in unexpected behaviour and possibly in a
+Using PHP code that depends on the removed PEAR library "Http_Request2" will result in unexpected behaviour and possibly a
 fatal PHP error.
 
 
@@ -64,18 +64,18 @@ Affected Installations
 ======================
 
 All 3rd party extensions calling the mentioned classes directly or using the configuration options directly, as well
-as installations depending on the PEAR libary "Http_Request2".
+as installations depending on the PEAR library "Http_Request2".
 
 
 Migration
 =========
 
-For PHP code previously using the HttpRequest and Download classes a new object-oriented PSR-7-based approach is
+For PHP code previously using the ``HttpRequest`` and ``Download`` classes a new object-oriented PSR-7-based approach is
 introduced, see the Guzzle Feature integration documentation for more details. A new PHP class
-``TYPO3\CMS\Core\Http\RequestFactory`` which generates PSR-7 compliant request objects, helps in simplifying the
+``TYPO3\CMS\Core\Http\RequestFactory`` which generates PSR-7 compliant request objects helps in simplifying the
 migration process.
 
-All still necessary options are migrated to new options within ``$TYPO3_CONF_VARS[HTTP]`` when the install tool is run.
+All still necessary options will be migrated to new options within ``$TYPO3_CONF_VARS[HTTP]`` when the install tool is run.
 
 In special cases, the options ``$TYPO3_CONF_VARS[HTTP][ssl_verify_host]``, ``$TYPO3_CONF_VARS[HTTP][proxy_auth_scheme]``
 and ``$TYPO3_CONF_VARS[HTTP][proxy_host]`` need to migrated manually to the newly available options.
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72931-SearchFormControllerpi_list_browseresultsHasBeenRenamed.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-72931-SearchFormControllerpi_list_browseresultsHasBeenRenamed.rst
similarity index 75%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-72931-SearchFormControllerpi_list_browseresultsHasBeenRenamed.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-72931-SearchFormControllerpi_list_browseresultsHasBeenRenamed.rst
index e03e6cf3e85329f03131a5d35cf424b580859c91..026f2c9da5b75bd94a2fc0b3b4555faf90d05f29 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72931-SearchFormControllerpi_list_browseresultsHasBeenRenamed.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-72931-SearchFormControllerpi_list_browseresultsHasBeenRenamed.rst
@@ -6,7 +6,7 @@ Description
 ===========
 
 In order to make Indexed Search pi-based plugin PHP7 compatible, the ``SearchFormController::pi_list_browseresults()`` method has been renamed to ``SearchFormController::renderPagination()``.
-Parameter types, order and count has been preserved. However the methods visibility has been changed to protected.
+Parameter types, order and count have been preserved. However the methods visibility has been changed to protected.
 
 
 Impact
@@ -18,7 +18,7 @@ Call to old method name will result in fatal error "Call to undefined method".
 Affected Installations
 ======================
 
-Any installation of TYPO3 7.6 or TYPO3 8 where SearchFormController is overloaded (XCLASSed) and new class contains call to old method name and
+Any installation of TYPO3 7.6 or TYPO3 8 where ``SearchFormController`` is overloaded (XCLASSed) and the new class contains a call to the old method name and
 any code that called the public method from outside the class.
 
 
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75237-RemovalOfDivCe-bodytextMightCauseLayoutIssues.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75237-RemovalOfDivCe-bodytextMightCauseLayoutIssues.rst
similarity index 97%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75237-RemovalOfDivCe-bodytextMightCauseLayoutIssues.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75237-RemovalOfDivCe-bodytextMightCauseLayoutIssues.rst
index 1589ba31635942bb65feba74057bcac5025a9581..6ecf05892b0bd5f841e46e32bff4591defdc0d6e 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75237-RemovalOfDivCe-bodytextMightCauseLayoutIssues.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75237-RemovalOfDivCe-bodytextMightCauseLayoutIssues.rst
@@ -11,7 +11,7 @@ If neither bodytext nor header were entered in the TextMedia element, the div el
 Impact
 ======
 
-The missing div could cause layout problems, if the layout and CSS depends on it.
+The missing div could cause layout problems, if the layout and CSS depend on it.
 
 
 Affected Installations
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75323-RemovedParameterEntryPointPathFromMainApplications.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75323-RemovedParameterEntryPointPathFromMainApplications.rst
similarity index 91%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75323-RemovedParameterEntryPointPathFromMainApplications.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75323-RemovedParameterEntryPointPathFromMainApplications.rst
index 6f53850eb1ccd504a22b7854448587c597b13323..7d871082d7d1469a40b02a24ea10e55b64f3418a 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75323-RemovedParameterEntryPointPathFromMainApplications.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75323-RemovedParameterEntryPointPathFromMainApplications.rst
@@ -5,7 +5,7 @@ Breaking: #75323 - Removed parameter entryPointPath from main applications
 Description
 ===========
 
-The entry point ``PHP`` classes for ``index.php``, ``typo3/index.php`` and so for forth (called "Application classes")
+The entry point ``PHP`` classes for ``index.php``, ``typo3/index.php`` and so forth (called "Application classes")
 now have a parameter not to define the path to the entry point but the number of subdirectories under the main
 installation path, allowing to not specify the name of the path, but just the levels of subdirectories.
 
@@ -16,7 +16,7 @@ Subsequently, the methods ``Bootstrap->baseSetup()``, ``Bootstrap->redirectToIns
 Impact
 ======
 
-Calling one of the methods above with a string as parameter instead of an integer the calculation for PATH_site
+Calling one of the methods above with a string as parameter instead of an integer will fail because the calculation for PATH_site
 which is the base for the whole installation will fail.
 
 
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75324-ReferenceIndexCLICommandChanged.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75324-ReferenceIndexCLICommandChanged.rst
similarity index 76%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75324-ReferenceIndexCLICommandChanged.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75324-ReferenceIndexCLICommandChanged.rst
index d002b6f8c14987dac4bfcdbd9279b9966d243130..b2712e5357158156681166b5d95ffa26e45a4236 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75324-ReferenceIndexCLICommandChanged.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75324-ReferenceIndexCLICommandChanged.rst
@@ -7,8 +7,10 @@ Description
 
 The Reference Index Updater Command Line command has been changed to use a Symfony Command.
 
-To update the reference index on non-composer-mode installations is now called on the command line via
-``typo3/sysext/core/bin/typo3 referenceindex:update``. To just check the reference index, the option ``-c``(alternatively the property "check" can be used) is used like this ``typo3/sysext/core/bin/typo3 referenceindex:update -c``
+The command to update the reference index on non-composer-mode installations is now called on the command line via
+``typo3/sysext/core/bin/typo3 referenceindex:update``.
+
+To just check the reference index, the option ``-c`` (alternatively the property "check" can be used) is used like this ``typo3/sysext/core/bin/typo3 referenceindex:update -c``
 
 For installations set up via composer, the typo3 CLI binary is available in the "bin/" directory directly inside the
 project root.
diff --git a/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75349-MoveIndexedSearchPi-basedPluginToCompatibility7.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75349-MoveIndexedSearchPi-basedPluginToCompatibility7.rst
new file mode 100644
index 0000000000000000000000000000000000000000..6ff89775ce578cc7de540ee1f40d21f9f8c87d49
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75349-MoveIndexedSearchPi-basedPluginToCompatibility7.rst
@@ -0,0 +1,29 @@
+========================================================================
+Breaking: #75349 - Move Indexed Search pi-based plugin to compatibility7
+========================================================================
+
+Description
+===========
+
+Indexed Search pi1 plugin (based on AbstractPlugin) has been moved to EXT:compatibility7 and will not be developed further. EXT:compatibility7 will be moved to TER before the release of 8 LTS.
+The Extbase plugin (pi2) stays in Indexed Search as before.
+
+
+Impact
+======
+
+Installation of EXT:compatibility7 is required to continue using the pi1 plugin. In the longer run migrating to the Extbase plugin is required.
+
+
+Affected Installations
+======================
+
+All installations using the pi-based indexed search plugin.
+
+
+Migration
+=========
+
+Installations using pi1 should migrate to the Extbase plugin or install EXT:compatibility7.
+
+.. index:: php
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75355-FlexForm-relatedOptionsRemoved.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75355-FlexForm-relatedOptionsRemoved.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75355-FlexForm-relatedOptionsRemoved.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75355-FlexForm-relatedOptionsRemoved.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75357-TYPO3_CONF_VARSBElockSSLOptionIsBoolean.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75357-TYPO3_CONF_VARSBElockSSLOptionIsBoolean.rst
similarity index 96%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75357-TYPO3_CONF_VARSBElockSSLOptionIsBoolean.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75357-TYPO3_CONF_VARSBElockSSLOptionIsBoolean.rst
index 4261109744082865dad0d724cc84847f847994fc..d835cb421b95b2a5b343b964ddae26d6ebaa5bdf 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75357-TYPO3_CONF_VARSBElockSSLOptionIsBoolean.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75357-TYPO3_CONF_VARSBElockSSLOptionIsBoolean.rst
@@ -22,7 +22,7 @@ Impact
 ======
 
 If the option was set previously to "1", the exception is not thrown but a redirect will now happen.
-The same behaviour as the existing option "2".
+The same behavior as the existing option "2".
 
 
 Affected Installations
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75454-LocalConfigurationDBConfigStructureHasChanged.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75454-LocalConfigurationDBConfigStructureHasChanged.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75454-LocalConfigurationDBConfigStructureHasChanged.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75454-LocalConfigurationDBConfigStructureHasChanged.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75454-TYPO3_dbConstantsRemoved.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75454-TYPO3_dbConstantsRemoved.rst
similarity index 85%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75454-TYPO3_dbConstantsRemoved.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75454-TYPO3_dbConstantsRemoved.rst
index 776eec0ea6b05c50b731dacc5b5191e884d31637..7e31a0ff454fa7400b7f5cc3735884dc8fe211f5 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75454-TYPO3_dbConstantsRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75454-TYPO3_dbConstantsRemoved.rst
@@ -5,8 +5,8 @@ Breaking: #75454 - TYPO3_db Constants removed
 Description
 ===========
 
-The PHP constants ``TYPO3_db``, ``TYPO3_db_username``, ``TYPO3_db_password`` and ``TYPO3_db_host`` have been
-removed which were used when a TYPO3 initialized the database connection have been removed.
+The PHP constants ``TYPO3_db``, ``TYPO3_db_username``, ``TYPO3_db_password`` and ``TYPO3_db_host``
+which were used when TYPO3 initialized the database connection have been removed.
 
 
 Impact
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75497-InlineBackendLayoutWizard.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75497-InlineBackendLayoutWizard.rst
similarity index 71%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75497-InlineBackendLayoutWizard.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75497-InlineBackendLayoutWizard.rst
index ab562ec1589a494d94063db5c2edb1bd7107c6bd..6b6c3e872b830ccae14de96b074fa557490dede7 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75497-InlineBackendLayoutWizard.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75497-InlineBackendLayoutWizard.rst
@@ -13,16 +13,16 @@ Also the backend route ``wizard_backend_layout`` has been removed.
 Impact
 ======
 
-Extending or using the ``BackendLayoutWizardController`` will break your installation.
+Extending or using the ``BackendLayoutWizardController`` will break installations.
 
 
 Affected Installations
 ======================
 
-An installation which uses an extension which make use of ``BackendLayoutWizardController``
+Any installation which uses an extension which makes use of ``BackendLayoutWizardController``
 
 
 Migration
 =========
 
-Use the renderType "belayoutwizard", which renders the backend layout wizard inline in FormEngine.
+Use the renderType ``belayoutwizard``, which renders the backend layout wizard inline in FormEngine.
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75708-AlwaysStorePTagsInDBFromRTE.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75708-AlwaysStorePTagsInDBFromRTE.rst
similarity index 78%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75708-AlwaysStorePTagsInDBFromRTE.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75708-AlwaysStorePTagsInDBFromRTE.rst
index 0a8f55394068a9610ef03a725a494745a6a2e4ba..25e67f931d226c1c16388c2f5f3d091fcd250ee2 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75708-AlwaysStorePTagsInDBFromRTE.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75708-AlwaysStorePTagsInDBFromRTE.rst
@@ -6,7 +6,7 @@ Description
 ===========
 
 When transforming HTML data from the Rich Text Editor to the database, the RteHtmlParser removed <p> tags from
-lines where there were no attributes for the <p> tags, otherwise they were kept as <p> tags with
+lines when there were no attributes for the <p> tags, otherwise they were kept as <p> tags with
 their attributes.
 
 The transformation now always keeps <p> tags within the content in order to minimize the transformation overhead
@@ -16,7 +16,7 @@ between the RTE and the database.
 Impact
 ======
 
-Every time an RTE field is edited, the <p> are now stored inside the database when saving the content.
+Every time an RTE field is edited, the <p> tags are now stored inside the database when saving the content.
 
 
 Affected Installations
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75711-RemovedDB-relatedMethodsAndTCA-relatedOptionsFromCObj.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75711-RemovedDB-relatedMethodsAndTCA-relatedOptionsFromCObj.rst
similarity index 84%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75711-RemovedDB-relatedMethodsAndTCA-relatedOptionsFromCObj.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75711-RemovedDB-relatedMethodsAndTCA-relatedOptionsFromCObj.rst
index 267d07d3c12126be5bacf64275c2d26e2e6e90a8..a078a7ec2c9c879ee3d988019593ae4495179f49 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75711-RemovedDB-relatedMethodsAndTCA-relatedOptionsFromCObj.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75711-RemovedDB-relatedMethodsAndTCA-relatedOptionsFromCObj.rst
@@ -17,9 +17,9 @@ The following methods have been removed from ``ContentObjectRenderer`` without s
 
 The following TCA options have no effect anymore throughout the TYPO3 Core:
 
-* $TCA[table][ctrl][fe_cruser_id]
-* $TCA[table][ctrl][fe_crgroup_id]
-* $TCA[table][ctrl][fe_admin_lock]
+* $GLOBALS['TCA'][table]['ctrl']['fe_cruser_id']
+* $GLOBALS['TCA'][table]['ctrl']['fe_crgroup_id']
+* $GLOBALS['TCA'][table]['ctrl']['fe_admin_lock']
 
 
 Impact
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75829-RemovedImportHandlingOfPre60Files.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75829-RemovedImportHandlingOfPre60Files.rst
similarity index 89%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-75829-RemovedImportHandlingOfPre60Files.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75829-RemovedImportHandlingOfPre60Files.rst
index feaa0e34c5c0a9582286b348c32177e621ee7dd6..dea1b02d7b96bb3f187f9ffe3b7462d4d21ab279 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75829-RemovedImportHandlingOfPre60Files.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Breaking-75829-RemovedImportHandlingOfPre60Files.rst
@@ -13,7 +13,7 @@ The following public method has been removed: :php`\TYPO3\CMS\Impexp\Import::fix
 Impact
 ======
 
-Importing files into TYPO3 v8 that were created from a TYPO3 4.x installations will result in unexpected behaviour,
+Importing files into TYPO3 v8 that were created from a TYPO3 4.x installations will result in unexpected behavior,
 especially when dealing with files and relations.
 
 Calling the PHP method above will result in a fatal PHP error.
@@ -22,7 +22,7 @@ Calling the PHP method above will result in a fatal PHP error.
 Affected Installations
 ======================
 
-Any installation using the t3d import functionality for importing files that are created from a TYPO3 instance older 
+Any installation using the t3d import functionality for importing files that were created from a TYPO3 instance older
 than TYPO3 6.0.0.
 
 
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-73209-GlobalFlexPageTsConfig.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-73209-GlobalFlexPageTsConfig.rst
similarity index 70%
rename from typo3/sysext/core/Documentation/Changelog/master/Deprecation-73209-GlobalFlexPageTsConfig.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-73209-GlobalFlexPageTsConfig.rst
index 95d4fffe9b3f9cf55f8d5a878eedad8f1211de88..9fc81d9d0be7dd770282f14897839bc7e27c5962 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-73209-GlobalFlexPageTsConfig.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-73209-GlobalFlexPageTsConfig.rst
@@ -6,15 +6,15 @@ Description
 ===========
 
 Setting page TSConfig values ``PAGE_TSCONFIG_ID``, ``PAGE_TSCONFIG_IDLIST`` and
-`` PAGE_TSCONFIG_STR`` for flex form fields globally has been deprecated, specific
+`` PAGE_TSCONFIG_STR`` for flexform fields globally has been marked as deprecated, specific
 fields must be set now.
 
 Example for a now deprecated global TSConfig value:
 
 ``TCEFORM.tt_content.pi_flexform.PAGE_TSCONFIG_ID = 42``
 
-This should now be restricted to specific fields of the flex from data structure, if for example
-the flex form ``foreign_table_where`` of field ``settings.categories`` of a ``tt_content`` plugin`s
+This should now be restricted to specific fields of the flexfrom data structure, if for example
+the flexform ``foreign_table_where`` of field ``settings.categories`` of a ``tt_content`` plugin`s
 data structure should be set, the new page TSConfig option should look like:
 
 ``TCEFORM.tt_content.pi_flexform.theDataStructure.theSheet.settings\.categories.PAGE_TSCONFIG_ID = 42``
@@ -22,18 +22,20 @@ data structure should be set, the new page TSConfig option should look like:
 Note that any dots within the field name must be escaped with ``\``, this is a typical
 scenario for extbase.
 
+
 Impact
 ======
 
-This page TSConfig can not be set for section elements anymore: ``PAGE_TSCONFIG_ID``,
+This pageTSConfig cannot be set for section elements anymore: ``PAGE_TSCONFIG_ID``,
 ``PAGE_TSCONFIG_IDLIST`` and ``PAGE_TSCONFIG_STR`` do not have any effect on repeatable
 elements.
 
+
 Affected Installations
 ======================
 
 Installations that set ``PAGE_TSCONFIG_ID``, ``PAGE_TSCONFIG_IDLIST`` and ``PAGE_TSCONFIG_STR``
-for flex form fields globally should be restricted to set those values for single elements.
+for flexform fields globally should be restricted to set those values for single elements.
 
 
 Migration
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-73728-WizardTypeColorboxIsDeprecated.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-73728-WizardTypeColorboxIsDeprecated.rst
similarity index 77%
rename from typo3/sysext/core/Documentation/Changelog/master/Deprecation-73728-WizardTypeColorboxIsDeprecated.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-73728-WizardTypeColorboxIsDeprecated.rst
index 18da33768f9713da344cdce54872ad3be96743fe..e5abaf8b96c88039531696815ec3e7bc5c508f16 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-73728-WizardTypeColorboxIsDeprecated.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-73728-WizardTypeColorboxIsDeprecated.rst
@@ -7,15 +7,15 @@ Description
 
 The color-picker is now available as dedicated render-type which will integrate
 an inline color-picker widget based on bootstrap. Thus, the old wizard type
-``colorbox`` is deprecated.
+``colorbox`` has been marked as deprecated.
 
 
 Impact
 ======
 
-Using the TCA wizard type ``colorbox`` will trigger an internal deprecation
-message. The possibility to pick the color from a custom image has been removed
-without any substitution as well as the possibility to use color names like
+Using the TCA wizard type ``colorbox`` will trigger a deprecation log entry.
+The possibility to pick the color from a custom image has been removed
+without substitution together with the possibility to use color names like
 "red" or "white".
 
 
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75327-TSFE-csConvObjAndTSFE-csConv.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75327-TSFE-csConvObjAndTSFE-csConv.rst
similarity index 88%
rename from typo3/sysext/core/Documentation/Changelog/master/Deprecation-75327-TSFE-csConvObjAndTSFE-csConv.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75327-TSFE-csConvObjAndTSFE-csConv.rst
index efce7ca38e5f8928e488dde30b5dd39225b47085..41abb715a6253e2df00faf461d3fa186bd3e2809 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75327-TSFE-csConvObjAndTSFE-csConv.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75327-TSFE-csConvObjAndTSFE-csConv.rst
@@ -5,7 +5,7 @@ Deprecation: #75327 - $TSFE->csConvObj and $TSFE->csConv()
 Description
 ===========
 
-The public property "csConvObj" and the public method "csConv()" inside the TypoScriptFrontendController PHP
+The public property ``csConvObj`` and the public method ``csConv()`` inside the TypoScriptFrontendController PHP
 class have been marked as deprecated.
 
 
@@ -18,7 +18,7 @@ Calling ``$TSFE->csConv()`` will trigger a deprecation log entry.
 Affected Installations
 ======================
 
-Any TYPO3 installation which uses the property or the method directly above.
+Any TYPO3 installation which uses the property or the method directly.
 
 
 Migration
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75340-MethodsRelatedToGeneratingTraditionalBackendAJAXURLs.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75340-MethodsRelatedToGeneratingTraditionalBackendAJAXURLs.rst
similarity index 85%
rename from typo3/sysext/core/Documentation/Changelog/master/Deprecation-75340-MethodsRelatedToGeneratingTraditionalBackendAJAXURLs.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75340-MethodsRelatedToGeneratingTraditionalBackendAJAXURLs.rst
index dcc5d39eee94a65a314ec12142ad48b3bba952de..f5befefa73ccbb1ecc1339565ced300773aad269 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75340-MethodsRelatedToGeneratingTraditionalBackendAJAXURLs.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75340-MethodsRelatedToGeneratingTraditionalBackendAJAXURLs.rst
@@ -29,6 +29,10 @@ Migration
 Migrate to UriBuilder routes, which can be registered via Configuration/Backend/AjaxRoutes.php,
 and can be linked to like this:
 
+.. code-block:: php
+
 	/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
 	$uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
-	$path = $uriBuilder->buildUriFromRoute('ajax_myroute');
\ No newline at end of file
+	$path = $uriBuilder->buildUriFromRoute('ajax_myroute');
+
+Keep in mind that the newly created Ajax routes need to implement PSR-7 as well.
\ No newline at end of file
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75371-Array2xml_cs.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75371-Array2xml_cs.rst
similarity index 72%
rename from typo3/sysext/core/Documentation/Changelog/master/Deprecation-75371-Array2xml_cs.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75371-Array2xml_cs.rst
index 495519ee7406e79d53994a92bca8b3fd0a5fe4e4..7ea176b65af95e484db4d9b28a62aace5963663c 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75371-Array2xml_cs.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75371-Array2xml_cs.rst
@@ -28,8 +28,8 @@ Use :php:`GeneralUtility::array2xml()` instead. The XML declaration must be writ
 Example code:
 .. code-block:: php
 
-	// Deprecated
-	$bodyText = GeneralUtility::array2xml_cs($array, 'phparray');
+   // Deprecated
+   $bodyText = GeneralUtility::array2xml_cs($array, 'phparray');
 
-	// Migrated
-	$bodyText = '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>' . LF . GeneralUtility::array2xml($array, '', 0, 'phparray');
+   // Migrated
+   $bodyText = '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>' . LF . GeneralUtility::array2xml($array, '', 0, 'phparray');
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75575-TranslateViewHelperHtmlEscapeArgumentMarkedAsDeprecated.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75575-TranslateViewHelperHtmlEscapeArgumentMarkedAsDeprecated.rst
similarity index 96%
rename from typo3/sysext/core/Documentation/Changelog/master/Deprecation-75575-TranslateViewHelperHtmlEscapeArgumentMarkedAsDeprecated.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75575-TranslateViewHelperHtmlEscapeArgumentMarkedAsDeprecated.rst
index 088d6e3f46b3512c8a83e2e2e9eda2326695003e..fd0ac8d82d1f16cc926fd58649c70956bfd8c28b 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75575-TranslateViewHelperHtmlEscapeArgumentMarkedAsDeprecated.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75575-TranslateViewHelperHtmlEscapeArgumentMarkedAsDeprecated.rst
@@ -7,7 +7,7 @@ Description
 
 The htmlEscape argument of the TranslateViewHelper has been marked as deprecated.
 
-This ViewHelper now HTML escapes the translation by default. The argument value has no effect any more.
+This ViewHelper now HTML escapes the translation by default. The argument value has no effect anymore.
 
 
 Impact
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75621-GeneralUtilityMethods.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75621-GeneralUtilityMethods.rst
similarity index 82%
rename from typo3/sysext/core/Documentation/Changelog/master/Deprecation-75621-GeneralUtilityMethods.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75621-GeneralUtilityMethods.rst
index 18559ee2b329687b6abc42e80ba94b6edd463ec8..42492e369332c20d00e8237e1cf7447f368d9804 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75621-GeneralUtilityMethods.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75621-GeneralUtilityMethods.rst
@@ -5,7 +5,7 @@ Deprecation: #75621 - GeneralUtility methods
 Description
 ===========
 
-The following methods within GeneralUtility have been marked as deprecated:
+The following methods within ``GeneralUtility`` have been marked as deprecated:
 
 * compat_version()
 * convertMicrotime()
@@ -36,7 +36,7 @@ Any installation with a third-party extension calling one of the methods in its
 Migration
 =========
 
-For the following methods, use the used PHP methods and constants directly that are used within these methods:
+For the following methods, use the native PHP methods and constants directly that are used within these methods:
 
 * compat_version()
 * convertMicrotime()
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75625-DeprecatedCacheClearingOptions.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75625-DeprecatedCacheClearingOptions.rst
similarity index 79%
rename from typo3/sysext/core/Documentation/Changelog/master/Deprecation-75625-DeprecatedCacheClearingOptions.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75625-DeprecatedCacheClearingOptions.rst
index 60df0ffcefa44498d030a2326ec7ad8a0e1d9534..fdd6c3430222100bdfc21771e22e3f8e3054581d 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-75625-DeprecatedCacheClearingOptions.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Deprecation-75625-DeprecatedCacheClearingOptions.rst
@@ -5,7 +5,7 @@ Deprecation: #75625 - Deprecated cache clearing options
 Description
 ===========
 
-The following commands have been deprecated and should not be used anymore:
+The following commands have been marked as deprecated and should not be used anymore:
 
 * Method :php:`DataHandler->clear_cacheCmd()` with arguments `system` and `temp_cached`
 * ``userTSconfig`` setting ``options.clearCache.system``
@@ -27,5 +27,5 @@ All installations with third party extensions using this method are affected.
 Migration
 =========
 
-If the group of system caches needs to be deleted explicitely, use :php:`flushCachesInGroup('system')`
+If the group of system caches needs to be deleted explicitly, use :php:``flushCachesInGroup('system')``
 of ``CacheManager`` directly.
\ No newline at end of file
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-27471-AllowAsteriskForHideTables.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-27471-AllowAsteriskForHideTables.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-27471-AllowAsteriskForHideTables.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-27471-AllowAsteriskForHideTables.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-39597-MultipleLocaleNamesForTypoScriptConfiglocale_all.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-39597-MultipleLocaleNamesForTypoScriptConfiglocale_all.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-39597-MultipleLocaleNamesForTypoScriptConfiglocale_all.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-39597-MultipleLocaleNamesForTypoScriptConfiglocale_all.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-69439-EnhanceSQLQueryReductionInPageTreeInWorkspaces.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-69439-EnhanceSQLQueryReductionInPageTreeInWorkspaces.rst
similarity index 95%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-69439-EnhanceSQLQueryReductionInPageTreeInWorkspaces.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-69439-EnhanceSQLQueryReductionInPageTreeInWorkspaces.rst
index 4f8739249191b1fe286a34984213f03527e0962a..fbdd6f0a2fec53277dd28a9be405ae2679ba8634 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Feature-69439-EnhanceSQLQueryReductionInPageTreeInWorkspaces.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-69439-EnhanceSQLQueryReductionInPageTreeInWorkspaces.rst
@@ -7,7 +7,7 @@ Description
 
 The process of determining whether a page has workspace versions can be
 extended by custom application code utilizing hooks. This way, the meaning
-of having versions can be modified by hooks further. For instance the
+of having versions can be further modified by hooks. For instance the
 default behavior of the TYPO3 core is to create a workspace version
 record on persisting the same record in the backend - without any
 actual changes to the data model.
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-70056-GuzzleForHttpRequests.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-70056-GuzzleForHttpRequests.rst
similarity index 80%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-70056-GuzzleForHttpRequests.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-70056-GuzzleForHttpRequests.rst
index 46fe1d9c9db58fb5a18489681e0896564d19bd24..f2462e29a1a5b35612adc559ea5c6dc997949a6a 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Feature-70056-GuzzleForHttpRequests.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-70056-GuzzleForHttpRequests.rst
@@ -5,20 +5,20 @@ Feature: #70056 - Added PHP library "Guzzle" for HTTP Requests within TYPO3
 Description
 ===========
 
-The PHP library ``Guzzle`` is added as a composer dependency as a feature rich solution for creating HTTP requests
+The PHP library ``Guzzle`` has been added via composer dependency to work as a feature rich solution for creating HTTP requests
 based on the PSR-7 interfaces already used within TYPO3.
 
 Guzzle auto-detects available underlying adapters available on the system, like cURL or stream wrappers and chooses
 the best solution for the system.
 
-A TYPO3-specific PHP class called ``TYPO3\CMS\Core\Http\RequestFactory`` is added as a simplified wrapper to access
+A TYPO3-specific PHP class called ``TYPO3\CMS\Core\Http\RequestFactory`` has been added as a simplified wrapper to access
 Guzzle clients.
 
 All options available under ``$TYPO3_CONF_VARS[HTTP]`` are automatically applied to the Guzzle clients when using the
-RequestFactory class. The options are a subset to the available options on Guzzle (http://docs.guzzlephp.org/en/latest/request-options.html)
+``RequestFactory`` class. The options are a subset to the available options on Guzzle (http://docs.guzzlephp.org/en/latest/request-options.html)
 but can further be extended.
 
-Existing ``$TYPO3_CONF_VARS[HTTP]`` options are removed and/or migrated to the new Guzzle-compliant options.
+Existing ``$TYPO3_CONF_VARS[HTTP]`` options have been removed and/or migrated to the new Guzzle-compliant options.
 
 A full documentation for Guzzle can be found at http://docs.guzzlephp.org/en/latest/.
 
@@ -57,5 +57,5 @@ The ``RequestFactory`` class can be used like this:
       }
    }
 
-Extension authors are advised to use the Request Factory instead of using the Guzzle API directly in order to ensure
+Extension authors are advised to use the ``RequestFactory`` class instead of using the Guzzle API directly in order to ensure
 a clear upgrade path when updates to the underlying API need to be done.
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-72923-ConfigurableFileListSize.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-72923-ConfigurableFileListSize.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-72923-ConfigurableFileListSize.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-72923-ConfigurableFileListSize.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-75386-GetIdentifierInSlideCallback.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75386-GetIdentifierInSlideCallback.rst
similarity index 88%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-75386-GetIdentifierInSlideCallback.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-75386-GetIdentifierInSlideCallback.rst
index bd743849867245376037ba3718633aac63c7c502..c8022e31da221f4b663258d0170c4c974520e391 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Feature-75386-GetIdentifierInSlideCallback.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75386-GetIdentifierInSlideCallback.rst
@@ -5,7 +5,7 @@ Feature: #75386 - Get identifier in slide callback
 Description
 ===========
 
-The callback of :js:`Wizard.addSlide()` has now a new parameter ``identifier``.
+The callback of :js:`Wizard.addSlide()` now has a new parameter ``identifier``.
 
 
 Impact
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-75454-DoctrineDBALForDatabaseConnections.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75454-DoctrineDBALForDatabaseConnections.rst
similarity index 79%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-75454-DoctrineDBALForDatabaseConnections.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-75454-DoctrineDBALForDatabaseConnections.rst
index 6156acb37df6a5a599888642963c3076fd69a755..d2eab26756829991343e895d0fe97e5c62664976 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Feature-75454-DoctrineDBALForDatabaseConnections.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75454-DoctrineDBALForDatabaseConnections.rst
@@ -5,11 +5,11 @@ Feature: #75454 - Added PHP library "Doctrine DBAL" for Database Connections wit
 Description
 ===========
 
-The PHP library ``Doctrine DBAL`` is added as a composer dependency as a powerful database
+The PHP library ``Doctrine DBAL`` has been added via composer dependency to work as a powerful database
 abstraction layer with many features for database abstraction, schema introspection and
 schema management within TYPO3.
 
-A TYPO3-specific PHP class called ``TYPO3\CMS\Core\Database\ConnectionPool`` is added as a
+A TYPO3-specific PHP class called ``TYPO3\CMS\Core\Database\ConnectionPool`` has been added as a
 manager for database connections.
 
 All connections configured below ``$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']`` are
@@ -19,14 +19,14 @@ By using the database abstraction options and the QueryBuilder provided SQL stat
 built will be properly quoted and compatible with different DBMS out of the box as far as
 possible.
 
-Existing ``$GLOBALS['TYPO3_CONF_VARS']['DB']`` options are removed and/or migrated to the
+Existing ``$GLOBALS['TYPO3_CONF_VARS']['DB']`` options have been removed and/or migrated to the
 new Doctrine-compliant options.
 
 Documentation for Doctrine DBAL can be found at http://www.doctrine-project.org/projects/dbal.html.
 
-The :php:``Connection`` provides convenience methods for ``insert``, ``select``, ``update``,
+The :php:``Connection`` class provides convenience methods for ``insert``, ``select``, ``update``,
 ``delete``and ``truncate`` statements. For ``select``, ``update`` an ``delete`` only simple
-equality comparisons (``WHERE "aField" = 'aValue') are supported. For complex statements its
+equality comparisons (``WHERE "aField" = 'aValue') are supported. For complex statements it's
 required to use the :php:``QueryBuilder``.
 
 
@@ -36,7 +36,7 @@ Impact
 Currently the :php:``DatabaseConnection`` class only uses Doctrine to establish the database
 connection to MySQL, no advanced options are being used yet.
 
-Connections will always need to be requested with a table name so that the abstraction of
+Connections always need to be requested with a table name so that the abstraction of
 table names to database connections stays intact.
 
 The :php:``ConnectionPool`` class can be used like this:
@@ -48,7 +48,7 @@ The :php:``ConnectionPool`` class can be used like this:
    $conn = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('aTable');
    $affectedRows = $conn->insert(
       'aTable',
-      $fields, // Assocative array of column/value pairs, automatically quoted & escaped
+      $fields, // Associative array of column/value pairs, automatically quoted & escaped
    );
 
 .. code-block:: php
@@ -66,7 +66,7 @@ The :php:``ConnectionPool`` class can be used like this:
       )
    $rows = $query->execute()->fetchAll();
 
-Extension authors are advised to use the ConnectionPool and Connections classes instead of using
+Extension authors are advised to use the ``ConnectionPool`` and ``Connection`` classes instead of using
 the Doctrine DBAL directly in order to ensure a clear upgrade path when updates to the underlying
 API need to be done.
 
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-75497-InlineBackendLayoutWizard.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75497-InlineBackendLayoutWizard.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-75497-InlineBackendLayoutWizard.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-75497-InlineBackendLayoutWizard.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-75579-AddMarkupIdentifierSupportToJavaScriptIconAPI.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75579-AddMarkupIdentifierSupportToJavaScriptIconAPI.rst
similarity index 90%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-75579-AddMarkupIdentifierSupportToJavaScriptIconAPI.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-75579-AddMarkupIdentifierSupportToJavaScriptIconAPI.rst
index ef04c9f8d1a8e39f7cd5fd54fd7020e0594d9be8..4eb9148e80b3b40f4eb575cfa8e4ef85ab0ba385 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Feature-75579-AddMarkupIdentifierSupportToJavaScriptIconAPI.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75579-AddMarkupIdentifierSupportToJavaScriptIconAPI.rst
@@ -8,9 +8,9 @@ Description
 It is now possible to request alternative rendering methods also through the
 JavaScript IconAPI for the backend. A new parameter has been added to the ``getIcon``
 function that now accepts the ``markupIdentifier`` for alternative rendering output,
-as its also possible within PHP.
+as it's also possible within PHP.
 
-Currently this is only used from the ``SvgIconProvider`` to deliver inlined SVG`s
+Currently this is only used by the ``SvgIconProvider`` to deliver inline-SVGs
 instead of linking them in an ``img`` tag.
 
 Example 1: default, without alternativeMarkup
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-75581-SimplifyCacheClearing.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75581-SimplifyCacheClearing.rst
similarity index 85%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-75581-SimplifyCacheClearing.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-75581-SimplifyCacheClearing.rst
index 85f9167a95acc39df4c444ff9ee122661dc987af..40eb22a45b97101030f5a5978cd832f4a00d5701 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Feature-75581-SimplifyCacheClearing.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75581-SimplifyCacheClearing.rst
@@ -15,4 +15,4 @@ The cache clear menu in the backend contains now only two options:
 * Flush all caches
   Clear all system-related caches, including the class loader, localization, extension configuration file caches and opcode caches. Rebuilding this cache may take some time.
 
-Within the install tool the "Clear all cache" button will clear now also the opcode caches if possible.
+Within the install tool the "Clear all cache" button will now also clear the opcode caches if possible.
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-75827-AddConfigurationOptionsToFloatConverter.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75827-AddConfigurationOptionsToFloatConverter.rst
similarity index 92%
rename from typo3/sysext/core/Documentation/Changelog/master/Feature-75827-AddConfigurationOptionsToFloatConverter.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Feature-75827-AddConfigurationOptionsToFloatConverter.rst
index bb5f8a45dd481fdc00dcf18205c70edb16021dfb..fcf4f34a9964e97a3cad7ff08a400c04fcf2c3ab 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Feature-75827-AddConfigurationOptionsToFloatConverter.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Feature-75827-AddConfigurationOptionsToFloatConverter.rst
@@ -5,7 +5,7 @@ Feature: #75827 - Add configuration options to \TYPO3\CMS\Extbase\Property\TypeC
 Description
 ===========
 
-It is now possible to define thousand separator and decimal point for FloatConverter.
+It is now possible to define the thousands separator and decimal point for ``FloatConverter``.
 This can be used to ensure proper sanitation before converting a string to a float.
 
 You can define the configuration for every property like this:
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Important-73041-PackageStatesIncludesOnlyActivePackages.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Important-73041-PackageStatesIncludesOnlyActivePackages.rst
similarity index 74%
rename from typo3/sysext/core/Documentation/Changelog/master/Important-73041-PackageStatesIncludesOnlyActivePackages.rst
rename to typo3/sysext/core/Documentation/Changelog/8.1/Important-73041-PackageStatesIncludesOnlyActivePackages.rst
index 7d619fb528a3f87cafa3a3cd3b53a220bfc57707..6571532372758b5346d6e56bf244353870930f76 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Important-73041-PackageStatesIncludesOnlyActivePackages.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Important-73041-PackageStatesIncludesOnlyActivePackages.rst
@@ -5,5 +5,5 @@ Important: #73041 - PackageStates Includes Only Active Packages
 Description
 ===========
 
-The information about the packages available in the system located in typo3conf/PackageStates.php was
+The information about available packages in the system located in typo3conf/PackageStates.php was
 thinned out to only include the extension keys of the active (= installed) extensions.
\ No newline at end of file
diff --git a/typo3/sysext/core/Documentation/Changelog/8.1/Index.rst b/typo3/sysext/core/Documentation/Changelog/8.1/Index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..8823cd02dc583ae02a5d15a2ac1fce1c2ddda224
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/8.1/Index.rst
@@ -0,0 +1,48 @@
+8.1 Changes
+===========
+
+**Table of contents**
+
+.. contents::
+	:local:
+	:depth: 1
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+
+.. toctree::
+	:maxdepth: 1
+	:titlesonly:
+   	:glob:
+
+   	Breaking-*
+
+Features
+^^^^^^^^
+
+.. toctree::
+	:maxdepth: 1
+	:titlesonly:
+   	:glob:
+
+   	Feature-*
+
+Deprecation
+^^^^^^^^^^^
+
+.. toctree::
+	:maxdepth: 1
+	:titlesonly:
+   	:glob:
+
+   	Deprecation-*
+
+Important
+^^^^^^^^^
+
+.. toctree::
+	:maxdepth: 1
+	:titlesonly:
+   	:glob:
+
+   	Important-*
\ No newline at end of file
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75349-MoveIndexedSearchPi-basedPluginToCompatibility7.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-75349-MoveIndexedSearchPi-basedPluginToCompatibility7.rst
deleted file mode 100644
index 9b6044ef3bf3eae9276dbf738f8386d2f6724820..0000000000000000000000000000000000000000
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-75349-MoveIndexedSearchPi-basedPluginToCompatibility7.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-========================================================================
-Breaking: #75349 - Move Indexed Search pi-based plugin to compatibility7
-========================================================================
-
-Description
-===========
-
-Indexed Search pi1 plugin (based on AbstractPlugin) has been moved to compatibility7 extension and will not be developed further. The compatibility7 extension will be moved to TER before the release of 8 LTS.
-Extbase plugin (pi2) stays in Indexed Search as before.
-
-
-Impact
-======
-
-Installation of the compatibility7 extension is required to continue using pi1 plugin. In the longer run migration to Extbase plugin is required.
-
-
-Affected Installations
-======================
-
-All installations using pi-based indexed search plugin.
-
-
-Migration
-=========
-
-Installations using pi1 should migrate to Extbase plugin or install compatibility7 extension.
-
-.. index:: php
diff --git a/typo3/sysext/core/Documentation/Index.rst b/typo3/sysext/core/Documentation/Index.rst
index 6bfe9e59396d8501549f1821fb7e06635ed1029d..e8c3385503fa8d885fa99f14401d5bde25e1394d 100644
--- a/typo3/sysext/core/Documentation/Index.rst
+++ b/typo3/sysext/core/Documentation/Index.rst
@@ -58,6 +58,7 @@ Old changes
 	:maxdepth: 1
 	:titlesonly:
 
+   	Changelog/8.1/Index
    	Changelog/8.0/Index
 
 How to contribute