MAGEDOC-3966 PHP version update

_data/toc/installation-guide.yml

@@ -72,29 +72,8 @@ pages:
               url: /install-gde/prereq/nginx.html
 
             - label: PHP
-              url: /install-gde/prereq/php-centos-ubuntu.html
-              include_versions: ["2.3"]
-              children:
-
-                - label: Required PHP settings
-                  url: /install-gde/prereq/php-settings.html
-                  include_versions: ["2.3"]
-
-            - label: PHP
-              include_versions: ["2.1", "2.2"]
-              children:
-
-                - label: PHP for Centos
-                  url: /install-gde/prereq/php-centos.html
-                  include_versions: ["2.1", "2.2"]
-
-                - label: PHP for Ubuntu
-                  url: /install-gde/prereq/php-ubuntu.html
-                  include_versions: ["2.1", "2.2"]
-
-                - label: Required PHP settings
-                  url: /install-gde/prereq/php-settings.html
-                  include_versions: ["2.1", "2.2"]
+              url: /install-gde/prereq/php-settings.html
+              include_versions: ["2.2", "2.3"]
 
             - label: MySQL
               url: /install-gde/prereq/mysql.html

_includes/install/trouble/rc_php-version.md

@@ -25,13 +25,13 @@ We assume that if you have this issue, you're an advanced user who has likely in
 
 To resolve the issue, try the following:
 
-*	Restart your web server or php-fm.
-*	Check the `$PATH` environment variable for multiple paths to PHP
-*	Use the `which php` command to locate the first PHP executable in your path; if it's not correct, remove it or create a symlink to the correct PHP version
-*	Use a [`phpinfo.php`]({{ page.baseurl }}/install-gde/prereq/optional.html#install-optional-phpinfo) page to collect more information
-*	Make sure you're running a supported PHP version according to our System Requirements:
-
-	*	[Version 2.2]({{ site.gdeurl22 }}install-gde/system-requirements.html)
-	*	[Version 2.3]({{ site.gdeurl23 }}install-gde/system-requirements.html)
-	
-*	Set the same PHP settings for both the PHP command line and the PHP web server plug-in as discussed in [PHP configuration options]({{ page.baseurl }}/install-gde/prereq/php-centos.html)
+* Restart your web server or php-fm.
+* Check the `$PATH` environment variable for multiple paths to PHP
+* Use the `which php` command to locate the first PHP executable in your path; if it's not correct, remove it or create a symlink to the correct PHP version
+* Use a [`phpinfo.php`]({{ page.baseurl }}/install-gde/prereq/optional.html#install-optional-phpinfo) page to collect more information
+* Make sure you are running a supported PHP version according to our System Requirements:
+
+  * [Version 2.2]({{ site.gdeurl22 }}install-gde/system-requirements.html)
+  * [Version 2.3]({{ site.gdeurl23 }}install-gde/system-requirements.html)
+
+* Set the same PHP settings for both the PHP command line and the PHP web server plug-in as discussed in [PHP configuration options]({{ page.baseurl }}/install-gde/prereq/php-settings.html)

guides/v2.2/cloud/before/before-workspace-magento-prereqs.md

@@ -46,7 +46,7 @@ Although {{ site.data.var.ee }} supports the Apache web server, {{ site.data.var
 
 ## PHP (local) {#php}
 
-Install [PHP](https://glossary.magento.com/php) on your local. We recommend PHP 7.0. For information on installing PHP, see these instructions for [CentOS]({{ page.baseurl }}/install-gde/prereq/php-centos.html) and [Ubuntu]({{ page.baseurl }}/install-gde/prereq/php-ubuntu.html). For instructions for another OS, see the [PHP documentation](http://php.net/manual/en/install.php).
+Install [PHP](https://glossary.magento.com/php) on your local workstation. For information on installing PHP, see [PHP Settings]({{ page.baseurl }}/install-gde/prereq/php-settings.html). For instructions for another OS, see the [PHP documentation](http://php.net/manual/en/install.php).
 
 The following packages may also be helpful for your PHP installation:
 

guides/v2.2/comp-mgr/trouble/cman/out-of-memory.md

@@ -15,9 +15,11 @@ You may encounter an error, caused by your system running out of physical memory
 
 When installing or updating the Magento application or components like extensions, themes, or language packages, an error similar to the following displays:
 
-	Could not complete update {"components":[
-	{"name":"magento/module-bundle-sample-data","version":"100.1.0"}
-	]} successfully: proc_open(): fork failed - Cannot allocate memory
+```terminal
+Could not complete update {"components":[
+{"name":"magento/module-bundle-sample-data","version":"100.1.0"}
+]} successfully: proc_open(): fork failed - Cannot allocate memory
+```
 
 The error `proc_open(): fork failed - Cannot allocate memory` can also display on the command line.
 
@@ -29,22 +31,22 @@ We recommend you allocate 2GB of memory to [PHP](https://glossary.magento.com/ph
 
 First, make sure you allocated [2GB of memory to PHP]({{ page.baseurl }}/install-gde/prereq/php-settings.html); otherwise, your installation or upgrade might still run out of memory.
 
-If you've already done that, create a swap file on your machine. A Linux machine uses *swap space* if it needs more memory resources and the RAM is full. The swap space is used for inactive pages in memory.
+If you have already done that, create a swap file on your machine. A Linux machine uses *swap space* if it needs more memory resources and the RAM is full. The swap space is used for inactive pages in memory.
 
 The following are suggestions only; other options might be available. Consult a network administrator or another knowledgeable resource before you continue. You must run the commands to create a swap file as a user with `root` privileges.
 
 #### Swap file on Ubuntu
 
 Use the `fallocate` command as discussed in these references:
 
-*	[How To Add Swap on Ubuntu 14.04 (Digitalocean)](https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-ubuntu-14-04){:target="_blank"}
-*	[How To Add Swap Space on Ubuntu 16.04 (Digitalocean)](https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04){:target="_blank"}
-*	[SwapFaq (help.ubuntu.com)](https://help.ubuntu.com/community/SwapFaq){:target="_blank"}
+* [How To Add Swap on Ubuntu 14.04 (Digitalocean)](https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-ubuntu-14-04){:target="_blank"}
+* [How To Add Swap Space on Ubuntu 16.04 (Digitalocean)](https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04){:target="_blank"}
+* [SwapFaq (help.ubuntu.com)](https://help.ubuntu.com/community/SwapFaq){:target="_blank"}
 
 #### Swap file on CentOS
 
 Use the `mkswap` command as discussed in these references:
 
-*	[How To Add Swap on CentOS 6 (Digitalocean)](https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-centos-6){:target="_blank"}
-*	[How To Add Swap on CentOS 7 (Digitalocean)](https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-centos-7){:target="_blank"}
-*	[Swap Space (RedHat customer portal)](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/ch-swapspace.html){:target="_blank"}
+* [How To Add Swap on CentOS 6 (Digitalocean)](https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-centos-6){:target="_blank"}
+* [How To Add Swap on CentOS 7 (Digitalocean)](https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-centos-7){:target="_blank"}
+* [Swap Space (RedHat customer portal)](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/ch-swapspace.html){:target="_blank"}

guides/v2.2/config-guide/deployment/pipeline/build-system.md

@@ -10,22 +10,22 @@ functional_areas:
 
 You can have one build system that meets the following requirements:
 
-*	All Magento code is under source control in the same repository as the development and production systems
-*	Make sure all of the following are _included_ in source control:
-
-	*	`app/etc/config.php`
-	*	`generated` directory (and subdirectories)
-	*	`pub/media` directory
-	*	`pub/media/wysiwyg` directory (and subdirectories)
-	*	`pub/static` directory (and subdirectories)
-*	Must have a compatible PHP version installed
-*	Must have Composer installed
-*	It has Magento file system ownership and permissions set as discussed in [Prerequisite for your development, build, and production systems]({{ page.baseurl }}/config-guide/deployment/pipeline/technical-details.html#config-deploy-prereq).
+* All Magento code is under source control in the same repository as the development and production systems
+* Make sure all of the following are _included_ in source control:
+
+  * `app/etc/config.php`
+  * `generated` directory (and subdirectories)
+  * `pub/media` directory
+  * `pub/media/wysiwyg` directory (and subdirectories)
+  * `pub/static` directory (and subdirectories)
+* Must have a compatible PHP version installed
+* Must have Composer installed
+* It has Magento file system ownership and permissions set as discussed in [Prerequisite for your development, build, and production systems]({{ page.baseurl }}/config-guide/deployment/pipeline/technical-details.html#config-deploy-prereq).
 
 The build system does _not_ need any of the following:
 
-*	Magento database connection
-*	Magento software installed (only the code must be present)
+* Magento database connection
+* Magento software installed (only the code must be present)
 
 {:.bs-callout .bs-callout-info}
 The build machine can be on its own host or on the same host as an installed Magento system.
@@ -42,47 +42,62 @@ The following sections discuss how to configure the build machine.
 
 To install PHP, see one of the following topics:
 
-*	[CentOS]({{ page.baseurl }}/install-gde/prereq/php-centos.html)
-*	[Ubuntu]({{ page.baseurl }}/install-gde/prereq/php-ubuntu.html)
+* [PHP]({{ page.baseurl }}/install-gde/prereq/php-settings.html)
 
 ### Set up the build system
 
 To set up the build system:
 
-1.	Log in to the build system as, or switch to, the Magento file system owner.
-2.	Retrieve the Magento code from source control.
+1. Log in to the build system as, or switch to, the Magento file system owner.
+1. Retrieve the Magento code from source control.
 
-	If you use Git, use the following command:
+  If you use Git, use the following command:
 
-		git clone [-b <branch name>] <repository URL>
-2.	Change to the Magento root directory and enter:
+   ```bash
+  git clone [-b <branch name>] <repository URL>
+  ```
 
-		composer install
-3.	Wait for Magento dependencies to update.
-4.	Set ownership:
+1. Change to the Magento root directory and enter:
 
-		chown -R <magento file system owner name>:<web server username> .
+    ```bash
+    composer install
+    ```
 
-	For example,
+1. Wait for Magento dependencies to update.
+1. Set ownership:
 
-		chown -R magento_user:apache .
-4.	If you use Git, open `.gitignore` in a text editor.
-5.	Start each of the following lines with a `#` character to comment them out:
+    ```bash
+    chown -R <magento file system owner name>:<web server username> .
+    ```
 
-		# app/etc/config.php
-		# pub/media/*
-		# generated/*
-		# pub/media/*.*
-		# pub/media/wysiwyg/*
-		# pub/static/*
-6.	Save your changes to `.gitignore` and exit the text editor.
-7.	If you use Git, use the following commands to commit the change:
+  For example,
 
-		git add .gitignore && git commit -m "Modify .gitignore for build and production"
+    ```bash
+    chown -R magento_user:apache .
+    ```
 
-	See the [`.gitignore` reference]({{ page.baseurl }}/config-guide/prod/config-reference-gitignore.html) for more information.
+1. If you use Git, open `.gitignore` in a text editor.
+1. Start each of the following lines with a `#` character to comment them out:
+
+   ```text
+    # app/etc/config.php
+    # pub/media/*
+    # generated/*
+    # pub/media/*.*
+    # pub/media/wysiwyg/*
+    # pub/static/*
+   ```
+
+1. Save your changes to `.gitignore` and exit the text editor.
+1. If you use Git, use the following commands to commit the change:
+
+    ```bash
+    git add .gitignore && git commit -m "Modify .gitignore for build and production"
+    ```
+
+  See the [`.gitignore` reference]({{ page.baseurl }}/config-guide/prod/config-reference-gitignore.html) for more information.
 
 #### Related topics
 
-*	[Set up your development systems]({{ page.baseurl }}/config-guide/deployment/pipeline/development-system.html)
-*	[Set up your production system]({{ page.baseurl }}/config-guide/deployment/pipeline/production-system.html)
+* [Set up your development systems]({{ page.baseurl }}/config-guide/deployment/pipeline/development-system.html)
+* [Set up your production system]({{ page.baseurl }}/config-guide/deployment/pipeline/production-system.html)

guides/v2.2/install-gde/install-quick-ref.md

@@ -44,9 +44,8 @@ If not, see the [Installation overview]({{ page.baseurl }}/install-gde/bk-instal
 2. If your system lacks any requirements, see the prerequisites documentation:
 
    * [Apache]({{ page.baseurl }}/install-gde/prereq/apache.html)
-   * [PHP (Ubuntu)]({{ page.baseurl }}/install-gde/prereq/php-ubuntu.html)
-   * [PHP (CentOS)]({{ page.baseurl }}/install-gde/prereq/php-centos.html)
-   * MySQL]({{ page.baseurl }}/install-gde/prereq/mysql.html)
+   * [PHP]({{ page.baseurl }}/install-gde/prereq/php-settings.html)
+   * [MySQL]({{ page.baseurl }}/install-gde/prereq/mysql.html)
 
 3. ust as importantly, set up the [Magento file system owner]({{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html) on the server.
 4. Switch to the [Magento file system owner](https://glossary.magento.com/magento-file-system-owner).
@@ -55,8 +54,10 @@ If not, see the [Installation overview]({{ page.baseurl }}/install-gde/bk-instal
 
 When all prerequisites have been met, get the Magento software using [Composer](https://glossary.magento.com/composer) as follows:
 
-    cd <web server docroot directory>
-    composer create-project --repository=https://repo.magento.com/ magento/project-community-edition magento2
+```bash
+cd <web server docroot directory>
+composer create-project --repository=https://repo.magento.com/ magento/project-community-edition magento2
+```
 
 You are required to authenticate; see [Get your authentication keys]({{ page.baseurl }}/install-gde/prereq/connect-auth.html) for details. This downloads Magento code only; it doesn't install the software for you.
 
@@ -93,16 +94,20 @@ The following example shows how to install using the command line with the follo
 * Default currency is U.S. dollars
 * Default time zone is U.S. Central (America/Chicago)
 
-      php /var/www/html/magento2/bin/magento setup:install --base-url=http://192.0.2.5/magento2/ \
-      --db-host=localhost --db-name=magento --db-user=magento --db-password=magento \
-      --admin-firstname=Magento --admin-lastname=User --admin-email=user@example.com \
-      --admin-user=admin --admin-password=admin123 --language=en_US \
-      --currency=USD --timezone=America/Chicago --use-rewrites=1
+    ```bash
+    php /var/www/html/magento2/bin/magento setup:install --base-url=http://192.0.2.5/magento2/ \
+    --db-host=localhost --db-name=magento --db-user=magento --db-password=magento \
+    --admin-firstname=Magento --admin-lastname=User --admin-email=user@example.com \
+    --admin-user=admin --admin-password=admin123 --language=en_US \
+    --currency=USD --timezone=America/Chicago --use-rewrites=1
+    ```
 
 Optionally switch to [developer mode]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-mode.html).
 
-    cd <magento_root>/bin
-    php magento deploy:mode:set developer
+```bash
+cd <magento_root>/bin
+php magento deploy:mode:set developer
+```
 
 {% endcollapsible %}
 
@@ -131,7 +136,9 @@ To run the Web Setup Wizard:
 
 1. Enter the following URL in your browser's address or location field:
 
-       http://192.0.2.5/magento2/setup
+    ```bash
+    http://192.0.2.5/magento2/setup
+    ``
 
 1. At the welcome page, click **Agree and Setup Magento**.