Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit d7ab13c

Browse files
author
Jamie Snape
committed
Documentation fixes
1 parent 787d947 commit d7ab13c

File tree

2 files changed

+65
-12
lines changed

2 files changed

+65
-12
lines changed

docs/installation/cloud-services.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Install the PHP CLI and GD PHP extension:
5151
```bash
5252
sudo yum install php-cli php-gd
5353
```
54+
5455
The JSON PHP extension is installed along with the PHP preprocessor.
5556

5657
Install Python 2.7:
@@ -98,6 +99,7 @@ Install the Xdebug PHP extension:
9899
```bash
99100
sudo yum install php-pecl-xdebug
100101
```
102+
101103
The cURL PHP extension was previously installed along with the PHP
102104
preprocessor.
103105

@@ -108,6 +110,7 @@ sudo yum install mariadb-server
108110
sudo systemctl enable mariadb.service
109111
sudo systemctl start mariadb.service
110112
```
113+
111114
MariaDB is a fork of MySQL.
112115

113116
Install the Git distributed version control system and Subversion version
@@ -130,13 +133,15 @@ brew upgrade
130133
brew install php56
131134
echo /usr/local/opt/php56/bin | sudo tee -a /etc/paths.d/20-PHP56
132135
```
136+
133137
The GD and JSON PHP extensions are installed along with the PHP preprocessor.
134138

135139
Install the Xdebug PHP extension:
136140

137141
```bash
138142
brew install php56-xdebug
139143
```
144+
140145
The cURL PHP extension was previously installed along with the PHP
141146
preprocessor.
142147

docs/installation/linux.md

Lines changed: 60 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ superset of the requirements for production:
1616
```bash
1717
sudo apt-get update
1818
sudo apt-get dist-upgrade
19-
sudo apt-get install apache2 cmake curl git libapache2-mod-php5 memcached mysql-server nano php5 php5-curl php5-gd php5-json php5-memcached php5-xdebug postgresql python python-jinja2 python-markdown python-pip python-yaml sqlite3 subversion
19+
sudo apt-get install apache2 cmake curl git libapache2-mod-php5 memcached mysql-server nano php5 php5-curl php5-gd php5-json php5-memcached php5-mysqlnd php5-pgsql php5-sqlite php5-xdebug postgresql python python-jinja2 python-markdown python-pip python-yaml sqlite3 subversion
2020
sudo pip install mkdocs
2121
sudo a2enmod rewrite
2222
echo -e "<VirtualHost *:80>\nServerAdmin webmaster@example.org\nServerName example.org\nServerAlias www.example.org\nDocumentRoot /var/www/example.org/html\nErrorLog \${APACHE_LOG_DIR}/error.log\nCustomLog \${APACHE_LOG_DIR}/access.log combined\n</VirtualHost>" | sudo tee -a /etc/apache2/sites-available/example.org.conf
@@ -151,8 +151,20 @@ Install the MySQL 5.5 database server:
151151
```bash
152152
sudo apt-get install mysql-server
153153
```
154-
The PDO_MYSQL PHP extension was previously installed along with the PHP
155-
preprocessor.
154+
155+
Install the PDO_MYSQL PHP extension:
156+
157+
```bash
158+
sudo apt-get install php5-mysqlnd
159+
```
160+
161+
This also installs the MySQL native driver for PHP.
162+
163+
Restart the web server to load the additional PHP extensions:
164+
165+
```bash
166+
sudo service apache2 restart
167+
```
156168

157169
### PostgreSQL ###
158170

@@ -161,8 +173,20 @@ Install the PostgreSQL 9.3 database server:
161173
```bash
162174
sudo apt-get install postgresql
163175
```
164-
The PDO_PGSQL PHP extension was previously installed along with the PHP
165-
preprocessor.
176+
177+
Install the PDO_PGSQL PHP extension:
178+
179+
```bash
180+
sudo apt-get install php5-pgsql
181+
```
182+
183+
This also installs the PostgreSQL PHP extension.
184+
185+
Restart the web server to load the additional PHP extensions:
186+
187+
```bash
188+
sudo service apache2 restart
189+
```
166190

167191
### SQLite ###
168192

@@ -171,8 +195,20 @@ Install the SQLite 3.8 database program:
171195
```bash
172196
sudo apt-get install sqlite3
173197
```
174-
The PDO_SQLITE PHP extension was previously installed along with the PHP
175-
preprocessor.
198+
199+
Install the PDO_SQLITE PHP extension:
200+
201+
```bash
202+
sudo apt-get install php5-sqlite
203+
```
204+
205+
This also installs the SQLite PHP extension.
206+
207+
Restart the web server to load the additional PHP extensions:
208+
209+
```bash
210+
sudo service apache2 restart
211+
```
176212

177213
## Development Tools ##
178214

@@ -184,7 +220,6 @@ control system, and Subversion 1.8 version control system:
184220

185221
```bash
186222
sudo apt-get install cmake git subversion
187-
sudo service apache2 restart
188223
```
189224

190225
Install the cURL and Xdebug PHP extensions:
@@ -257,13 +292,15 @@ Install the Apache 2.4 web server:
257292
```bash
258293
sudo yum install httpd
259294
```
295+
260296
The mod_rewrite Apache module is enabled by default.
261297

262298
Install the PHP 5.6 preprocessor:
263299

264300
```bash
265301
sudo yum install php
266302
```
303+
267304
The mod_php5 Apache module is installed along with the PHP preprocessor.
268305

269306
Install the GD and JSON-C PHP extensions:
@@ -359,6 +396,7 @@ Install the MariaDB 10.0 database server:
359396
```bash
360397
sudo yum install mariadb-server
361398
```
399+
362400
MariaDB is a fork of MySQL.
363401

364402
Enable and start the MariaDB database server:
@@ -373,9 +411,10 @@ Install the PDO_MYSQL PHP extension:
373411
```bash
374412
sudo yum install php-mysqlnd
375413
```
414+
376415
This also installs the MySQL native driver for PHP.
377416

378-
Restart the web server to load the additional PHP extension:
417+
Restart the web server to load the additional PHP extensions:
379418

380419
```bash
381420
sudo systemctl restart httpd.service
@@ -407,9 +446,10 @@ Install the PDO_PGSQL PHP extension:
407446
```bash
408447
sudo yum install php-pgsql
409448
```
449+
410450
This also installs the PostgreSQL PHP extension.
411451

412-
Restart the web server to load the additional PHP extension:
452+
Restart the web server to load the additional PHP extensions:
413453

414454
```bash
415455
sudo systemctl restart httpd.service
@@ -452,6 +492,7 @@ Install the Xdebug PHP extension:
452492
```bash
453493
sudo yum install php-pecl-xdebug
454494
```
495+
455496
The cURL PHP extension was previously installed along with the PHP
456497
preprocessor.
457498

@@ -530,20 +571,23 @@ Install the Apache 2.4 web server:
530571
```bash
531572
sudo yum install httpd
532573
```
574+
533575
The mod_rewrite Apache module is enabled by default.
534576

535577
Install the PHP 5.4 preprocessor:
536578

537579
```bash
538580
sudo yum install php
539581
```
582+
540583
The mod_php5 Apache module is installed along with the PHP preprocessor.
541584

542585
Install the GD PHP extension:
543586

544587
```bash
545588
sudo yum install php-gd
546589
```
590+
547591
The JSON PHP extension was previously installed along with the PHP
548592
preprocessor.
549593

@@ -634,6 +678,7 @@ Install the MariaDB 5.5 database server:
634678
```bash
635679
sudo yum install mariadb-server
636680
```
681+
637682
MariaDB is a fork of MySQL.
638683

639684
Enable and start the MariaDB database server:
@@ -648,9 +693,10 @@ Install the PDO_MYSQL PHP extension:
648693
```bash
649694
sudo yum install php-mysqlnd
650695
```
696+
651697
This also installs the MySQL native driver for PHP.
652698

653-
Restart the web server to load the additional PHP extension:
699+
Restart the web server to load the additional PHP extensions:
654700

655701
```bash
656702
sudo systemctl restart httpd.service
@@ -682,9 +728,10 @@ Install the PDO_PGSQL PHP extension:
682728
```bash
683729
sudo yum install php-pgsql
684730
```
731+
685732
This also installs the PostgreSQL PHP extension.
686733

687-
Restart the web server to load the additional PHP extension:
734+
Restart the web server to load the additional PHP extensions:
688735

689736
```bash
690737
sudo systemctl restart httpd.service
@@ -727,6 +774,7 @@ Install the Xdebug PHP extension:
727774
```bash
728775
sudo yum install php-pecl-xdebug
729776
```
777+
730778
The cURL PHP extension was previously installed along with the PHP
731779
preprocessor.
732780

0 commit comments

Comments
 (0)