diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst
index 6e5b5addf..2f7ed64d0 100644
--- a/admin_manual/configuration_database/linux_database_configuration.rst
+++ b/admin_manual/configuration_database/linux_database_configuration.rst
@@ -175,7 +175,7 @@ You can quit the prompt by entering::
   \q
 
 An Nextcloud instance configured with PostgreSQL would contain the path to the socket on
-which the database is running as the hostname, the system username the php process is using,
+which the database is running as the hostname, the system username the PHP process is using,
 and an empty password to access it, and the name of the database. The :file:`config/config.php` as 
 created by the :doc:`../installation/installation_wizard` would therefore contain entries like
 this:
diff --git a/admin_manual/configuration_files/external_storage/smb.rst b/admin_manual/configuration_files/external_storage/smb.rst
index 41ffaf686..708206260 100644
--- a/admin_manual/configuration_files/external_storage/smb.rst
+++ b/admin_manual/configuration_files/external_storage/smb.rst
@@ -58,8 +58,8 @@ changes made to the storage in near real-time.
    reliably on Windows SMB servers.
 
 .. note:: Using update notifications requires ``smbclient`` 4.x or newer.
-   Due to limitations with the smbclient php module, the ``smbclient`` binary
-   is required even when using the php module.
+   Due to limitations with the smbclient PHP module, the ``smbclient`` binary
+   is required even when using the PHP module.
 
 To start listening to update notifications, start the ``occ`` command like this::
 
diff --git a/admin_manual/configuration_server/caching_configuration.rst b/admin_manual/configuration_server/caching_configuration.rst
index c2c2b6454..9a708e81e 100644
--- a/admin_manual/configuration_server/caching_configuration.rst
+++ b/admin_manual/configuration_server/caching_configuration.rst
@@ -27,7 +27,7 @@ of memcache that best fits your needs. The supported caching backends are:
    A local cache for systems.
 * `Memcached <http://www.memcached.org/>`_ 
    Distributed cache for multi-server Nextcloud installations.
-* `Redis <http://redis.io/>`_, PHP module 2.2.5 and up required.
+* `Redis <http://redis.io/>`_, PHP module 2.2.6 and up required.
    For distributed caching.
    
 Memcaches must be explicitly configured in Nextcloud by installing
@@ -109,7 +109,7 @@ as a local cache for :doc:`Transactional File Locking
 <../configuration_files/files_locking_transactional>` because it guarantees 
 that cached objects are available for as long as they are needed.
 
-The Redis PHP module must be version 2.2.5+. If you are running a Linux 
+The Redis PHP module must be version 2.2.6+. If you are running a Linux
 distribution that does not package the supported versions of this module, or 
 does not package Redis at all, see :ref:`install_redis_label`.
 
@@ -214,7 +214,7 @@ These instructions are adaptable for any distro that does not package the
 supported version, or that does not package Redis at all, such as SUSE Linux 
 Enterprise Server and Red Hat Enterprise Linux.
 
-The Redis PHP module must be at least version 2.2.5. Please note that 
+The Redis PHP module must be at least version 2.2.6. Please note that
 the Redis PHP module versions 2.2.x will only work for PHP 5.6.x.
 
 For PHP 7.0 and PHP 7.1 use Redis PHP module 3.1.x or later.
diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst
index f9cf7fb9b..21ed26808 100644
--- a/admin_manual/configuration_server/config_sample_php_parameters.rst
+++ b/admin_manual/configuration_server/config_sample_php_parameters.rst
@@ -1466,7 +1466,7 @@ Set the time-to-live for locks in secconds.
 
 Any lock older than this will be automatically cleaned up.
 
-If not set this defaults to either 1 hour or the php max_execution_time, whichever is higher.
+If not set this defaults to either 1 hour or the PHP max_execution_time, whichever is higher.
 
 ::
 
diff --git a/admin_manual/configuration_server/security_setup_warnings.rst b/admin_manual/configuration_server/security_setup_warnings.rst
index 9f39429fd..51873b9af 100644
--- a/admin_manual/configuration_server/security_setup_warnings.rst
+++ b/admin_manual/configuration_server/security_setup_warnings.rst
@@ -17,7 +17,7 @@ extensions:
 
 * APCu (minimum required PHP extension version 4.0.6)
 * Memcached
-* Redis (minimum required PHP extension version: 2.2.5)
+* Redis (minimum required PHP extension version: 2.2.6)
 
 You will see this warning if you have no caches installed and enabled, or if 
 your cache does not have the required minimum version installed; older versions 
diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst
index 03672d087..aa59d13d4 100644
--- a/admin_manual/installation/source_installation.rst
+++ b/admin_manual/installation/source_installation.rst
@@ -40,7 +40,7 @@ If you get a result, the module is present.
 
 Required:
 
-* php (>= 5.6, 7.0 or 7.1)
+* PHP (>= 5.6, 7.0 or 7.1)
 * PHP module ctype
 * PHP module dom
 * PHP module GD
@@ -89,7 +89,7 @@ memcaches:
 
 * PHP module apcu (>= 4.0.6)
 * PHP module memcached
-* PHP module redis (>= 2.2.5, required for Transactional File Locking)
+* PHP module redis (>= 2.2.6, required for Transactional File Locking)
 
 See :doc:`../configuration_server/caching_configuration` to learn how to select 
 and configure a memcache.
diff --git a/developer_manual/app/info.rst b/developer_manual/app/info.rst
index f2d8489dc..88946275c 100644
--- a/developer_manual/app/info.rst
+++ b/developer_manual/app/info.rst
@@ -159,7 +159,7 @@ properly. As soon as one of these requirements is not met the app cannot be inst
 
 php
 ===
-Defines the minimum and the maximum version of php which is required to run this app.
+Defines the minimum and the maximum version of PHP which is required to run this app.
 
 database
 ========
@@ -170,16 +170,16 @@ In case no database is specified it is assumed that all databases are supported.
 command
 =======
 Defines a command line tool to be available. With the attribute 'os' the required operating system for this tool can be
-specified. Valid values for the 'os' attribute are as returned by the php function `php_uname <http://php.net/manual/en/function.php-uname.php>`_.
+specified. Valid values for the 'os' attribute are as returned by the PHP function `php_uname <http://php.net/manual/en/function.php-uname.php>`_.
 
 lib
 ===
-Defines a required php extension with required minimum and/or maximum version. The names for the libraries have to match the result as returned by the php function  `get_loaded_extensions <http://php.net/manual/en/function.get-loaded-extensions.php>`_.
+Defines a required PHP extension with required minimum and/or maximum version. The names for the libraries have to match the result as returned by the PHP function  `get_loaded_extensions <http://php.net/manual/en/function.get-loaded-extensions.php>`_.
 The explicit version of an extension is read from `phpversion <http://php.net/manual/de/function.phpversion.php>`_ - with some exception as to be read up in the `code base <https://github.com/nextcloud/server/blob/master/lib/private/App/PlatformRepository.php>`_
 
 os
 ==
-Defines the required target operating system the app can run on. Valid values are as returned by the php function `php_uname <http://php.net/manual/en/function.php-uname.php>`_.
+Defines the required target operating system the app can run on. Valid values are as returned by the PHP function `php_uname <http://php.net/manual/en/function.php-uname.php>`_.
 
 owncloud
 ========