From f6777841f293bd851fa701155cae89d9be08a83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9Fberndt?= <stephan.grossberndt@typo3.org>
Date: Mon, 5 Sep 2022 16:43:28 +0200
Subject: [PATCH] [TASK] Use current git repository links

README.md and CONTRIBUTING.md use the current repository links with this change.
The change also includes several minor edits.

Resolves: #98260
Releases: main, 11.5, 10.4
Change-Id: I77d4741df4134ae0babec2415cd8f5345592e29e
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75607
Tested-by: core-ci <typo3@b13.com>
Tested-by: Torben Hansen <derhansen@gmail.com>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Torben Hansen <derhansen@gmail.com>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
---
 CONTRIBUTING.md |  4 ++--
 README.md       | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6bfeef02af98..8182a4f4569d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,8 +14,8 @@ If you like to contribute to our [documentation][5], use the "Edit me on GitHub"
  that can be found in the TYPO3 [documentation team GitHub organisation][6].
 
 [1]: https://docs.typo3.org/core-contribution
-[2]: https://git.typo3.org/Packages/TYPO3.CMS.git
-[3]: https://review.typo3.org/#/q/project:Packages/TYPO3.CMS,n,z
+[2]: https://git.typo3.org/typo3/typo3
+[3]: https://review.typo3.org/q/project:Packages/TYPO3.CMS
 [4]: https://github.com/typo3/typo3
 [5]: https://docs.typo3.org
 [6]: https://github.com/TYPO3-Documentation
diff --git a/README.md b/README.md
index 623a8e233743..36f8d67440d7 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ TYPO3 CMS
 =========
 
 TYPO3 is an open source PHP based web content management system released
-under the GNU GPL. TYPO3 is copyright © 1999-2022 by Kasper Skaarhoj.
+under the GNU GPL. TYPO3 is copyright © 1999-2022 by Kasper Skårhøj.
 
 This document provides a basic introduction to TYPO3.
 
@@ -10,7 +10,7 @@ Getting Started
 ---------------
 
 TYPO3 requires a web server with PHP and a database (e.g. MySQL).
-Accessing the backend through a supported browser.
+The backend is accessed via a supported browser.
 
 Please see the [Installation Guide](https://docs.typo3.org/installation)
 in order to set up a basic TYPO3 installation on your web server.
@@ -21,7 +21,7 @@ What is TYPO3?
 TYPO3 is a free and open source Content Management Framework. It is
 released under the GNU General Public License. It can run on several web
 servers, such as Apache, nginx or IIS, on top of many operating systems,
-among them Linux, Microsoft Windows, FreeBSD or MacOS.
+among them Linux, Microsoft Windows, FreeBSD or macOS.
 
 TYPO3 was initially authored by Kasper Skårhøj and is now further
 developed by a community of contributors and the [TYPO3 Core Development
@@ -36,7 +36,7 @@ What is a Content Management Framework?
 A Content Management Framework is more than just a content management
 system, due to the separation of the streamlined core and optional
 plugins (extensions). TYPO3 has an open API that allows you to extend
-the frontend (web site) and/or backend (administration) functionality.
+the frontend (website) and/or backend (administration) functionality.
 
 The concept of extensions makes TYPO3 capable of being developed and
 used in almost any way you can imagine, either by using any of the many
@@ -48,8 +48,8 @@ TYPO3 System requirements
 TYPO3 is based upon PHP and uses a database management system like
 MySQL.
 
-For more specific information regarding requirements see the
-[INSTALL.md](INSTALL.md#server-system-requirements) file in this folder.
+For more specific information regarding requirements see the file
+[INSTALL.md](INSTALL.md#server-system-requirements) in this folder.
 
 TYPO3 resources
 ---------------
@@ -59,7 +59,7 @@ get started:
 
 ### Get more information
 
-* https://typo3.org is the main project website. It provides up to date
+* https://typo3.org/ is the main project website. It provides up-to-date
   official news, information about events and the TYPO3 community.
 
 * https://docs.typo3.org/: TYPO3 is one of the most thoroughly
@@ -120,7 +120,7 @@ Contributors Walkthrough and Review System:
 The [repository at GitHub](https://github.com/typo3/typo3) is a
 synchronized mirror of the primary TYPO3 core git repository:
 
-* https://git.typo3.org/Packages/TYPO3.CMS.git
+* https://git.typo3.org/typo3/typo3
 
 If you want to file a bug report, take a look at:
 
-- 
GitLab