nextcloud · nickvergessen · Aug 31, 2023 · Aug 31, 2023
diff --git a/admin_manual/maintenance/migrating_owncloud.rst b/admin_manual/maintenance/migrating_owncloud.rst
@@ -23,7 +23,7 @@ See the table below for a version map, where migrating is easily possible:
 .. note:: Since ownCloud does not and will not support PHP 8.0 or higher, you
           need to migrate from ownCloud 10.11.x to Nextcloud 25 and then
           further upgrade from there. We urge you to migrate to Nextcloud
-          since PHP versions prior PHP8 are end of life, see
+          since PHP versions prior PHP 8 are end of life, see
           `<https://www.php.net/supported-versions.php>`_.
 
 1. First download the correct version of Nextcloud from our `older releases page <https://nextcloud.com/changelog/>`_,

diff --git a/admin_manual/release_notes/upgrade_to_26.rst b/admin_manual/release_notes/upgrade_to_26.rst
@@ -6,7 +6,7 @@ System requirements
 -------------------
 
 * PHP 8.2 is now supported, but 8.1 is recommended.
-* PHP7.4 is no longer supported.
+* PHP 7.4 is no longer supported.
 
 System email
 ------------

diff --git a/admin_manual/release_notes/upgrade_to_27.rst b/admin_manual/release_notes/upgrade_to_27.rst
@@ -5,8 +5,8 @@ Upgrade to Nextcloud 27
 System requirements
 -------------------
 
-* PHP8.2 is recommended over PHP8.1.
-* PHP8.0 is deprecated and will be removed in Nextcloud 28.
+* PHP 8.2 is recommended over PHP 8.1.
+* PHP 8.0 is deprecated and will be removed in Nextcloud 28.
 
 Exposed system address book
 ---------------------------

diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_14.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_14.rst
@@ -7,7 +7,7 @@ Upgrade to Nextcloud 14
 General
 -------
 
-* php7.0 and php7.1 support added.
+* PHP 7.0 and PHP 7.1 support added.
 * Introduction of type hints for scalar types in public APIs according to existing PHPDoc.
 
 Front-end changes

diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_15.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_15.rst
@@ -25,7 +25,7 @@ Removed APIs
 Back-end changes
 ----------------
 
-* Removed php7.0 support
+* Removed PHP 7.0 support
 
 Deprecated APIs
 ^^^^^^^^^^^^^^^

diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_16.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_16.rst
@@ -28,7 +28,7 @@ The following libraries are considered as deprecated from Nextcloud 16 on. If yo
 Back-end changes
 ----------------
 
-* Php7.0 support removed. Php7.1 or higher required.
+* PHP 7.0 support removed. PHP 7.1 or higher required.
 * PostgreSQL 9.5+ required.
 * Autoloading: In the past it was also possible to autoload PHP classes in apps by specify a list of classes and filenames in `appinfo/classpath.php`. This should not be used anymore and also isn't used by any app that is publicly available.
 

diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_21.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_21.rst
@@ -7,7 +7,7 @@ Upgrade to Nextcloud 21
 Back-end changes
 ----------------
 
-The biggest change in Nextcloud 21 is the initial support for PHP8 and the corresponding updates of many core dependencies, which could have direct and indirect consequences for apps.
+The biggest change in Nextcloud 21 is the initial support for PHP 8 and the corresponding updates of many core dependencies, which could have direct and indirect consequences for apps.
 
 PHP 8 support
 ^^^^^^^^^^^^^

diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_24.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_24.rst
@@ -21,10 +21,10 @@ Make sure your ``appinfo/info.xml`` allows for Nextcloud 24.
 Back-end changes
 ----------------
 
-PHP8.1
-^^^^^^
+PHP 8.1
+^^^^^^^
 
-Nextcloud 24 is the first major Nextcloud release to work with PHP8.1. In this release support for PHP7.3 was dropped. Follow the steps below to make your app compatible.
+Nextcloud 24 is the first major Nextcloud release to work with PHP 8.1. In this release support for PHP 7.3 was dropped. Follow the steps below to make your app compatible.
 
 1. If ``appinfo/info.xml`` has a dependency specification for PHP, increase the ``max-version`` to 8.1.
 
@@ -46,7 +46,7 @@ Nextcloud 24 is the first major Nextcloud release to work with PHP8.1. In this r
     }
   }
 
-3. If you have :ref:`continuous integration <app-ci>` set up, extend your test matrix with PHP8.1 tests and linters and drop any jobs for PHP7.3.
+3. If you have :ref:`continuous integration <app-ci>` set up, extend your test matrix with PHP 8.1 tests and linters and drop any jobs for PHP 7.3.
 
 Information about code changes can be found on `php.net <https://www.php.net/migration81>`__ and `stitcher.io <https://stitcher.io/blog/new-in-php-81#breaking-changes>`__.
 

diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_26.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_26.rst
@@ -39,20 +39,20 @@ Removed APIs
 Back-end changes
 ----------------
 
-PHP7.4
-^^^^^^
+PHP 7.4
+^^^^^^^
 
-In this release support for PHP7.4 was dropped. Make sure your app compatible with PHP8.0 or higher.
+In this release support for PHP 7.4 was dropped. Make sure your app compatible with PHP 8.0 or higher.
 
-PHP8.2
-^^^^^^
+PHP 8.2
+^^^^^^^
 
-In this release support for PHP8.2 was added. See release notes from PHP about new deprecations.
+In this release support for PHP 8.2 was added. See release notes from PHP about new deprecations.
 
 Migration from PHPDoc annotations to native PHP attributes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Nextcloud 26 supports PHP8.0 and later. This allows the migration from PHPDoc annotations to native attributes.
+Nextcloud 26 supports PHP 8.0 and later. This allows the migration from PHPDoc annotations to native attributes.
 
 * ``@UseSession`` should be replaced with ``#[UseSession]``. ``@UseSession`` will be removed in a future release. See :ref:`controller-use-session`.
 

diff --git a/developer_manual/app_publishing_maintenance/release_process.rst b/developer_manual/app_publishing_maintenance/release_process.rst
@@ -56,7 +56,7 @@ Increment the minor version number when
 * A new major or minor version of PHP will be supported
 * An additional database type is supported
 * A Nextcloud version that has reached EOL is dropped, e.g. when Nextcloud 19 is removed
-* A PHP version that has reached EOL is dropped, e.g. when PHP7.3 is removed
+* A PHP version that has reached EOL is dropped, e.g. when PHP 7.3 is removed
 * Any other change that keeps the app compatible with previously compatible environments (forward compatibility)
 
 .. tip:: Example: the app is at version 3.7.2. The next minor version will be 3.8.0.
@@ -67,7 +67,7 @@ Major update
 Increment the major version number when
 
 * The app drops support for a major version of Nextcloud that hasn't reached EOL, e.g. when Nextcloud 23 support is removed and the app now requires Nextcloud 24 or newer
-* The app drops support for a major or minor version of PHP that hasn't rached EOL, e.g. when PHP8.0 is removed and the app now requires PHP8.1 or newer
+* The app drops support for a major or minor version of PHP that hasn't rached EOL, e.g. when PHP 8.0 is removed and the app now requires PHP 8.1 or newer
 * A database type is no longer supported, e.g. when the maintainer decides to stop SQLite support
 * Any other change that makes the app incompatible with a previously compatible environment (breaking change)
 

diff --git a/developer_manual/basics/controllers.rst b/developer_manual/basics/controllers.rst
@@ -241,7 +241,7 @@ Alternatively, you can use the ``#[UseSession]`` attribute to automatically open
 
     }
 
-.. note:: The ``#[UseSession]`` was added in Nextcloud 26 and requires PHP8.0 or later. If your app targets older releases and PHP7.x then use the deprecated ``@UseSession`` annotation.
+.. note:: The ``#[UseSession]`` was added in Nextcloud 26 and requires PHP 8.0 or later. If your app targets older releases and PHP 7.x then use the deprecated ``@UseSession`` annotation.
 
     .. code-block:: php
         :emphasize-lines: 2