From 6a3c57992d9f7690977cb4c1b3c2c51e9ec1834a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 23 Dec 2015 15:39:30 +0100 Subject: [PATCH 1/3] =?UTF-8?q?doc/Installation:=20Fix=20wording=20to=20*T?= =?UTF-8?q?he=20following=20steps=20apply=20=E2=80=A6*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/Installation.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Installation.adoc b/doc/Installation.adoc index fc13a16..bba8565 100644 --- a/doc/Installation.adoc +++ b/doc/Installation.adoc @@ -44,7 +44,7 @@ though. == Installation -This following steps applies to any GNU/Linux-like system, although it +The following steps apply to any GNU/Linux-like system, although it was written for Debian GNU/Linux. If you do not know which OS to use, we recommend a default choice of Ubuntu 12.04 LTS since it is a well-known distribution that comes with 5 years of security support. From 249ae1609416b7694f1f106b0639e6f50318e645 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 23 Dec 2015 15:54:02 +0100 Subject: [PATCH 2/3] doc/Installation: Update Ubuntu recommendation to 14.04 LTS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ubuntu 12.04 LTS will be supported until April 2017, but Ubuntu 14.04 LTS has been around long enough, so it’s well tested and probably more common to install than 12.04 LTS. It’s supported until April 2019 [1]. [1] https://wiki.ubuntu.com/Releases --- doc/Installation.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Installation.adoc b/doc/Installation.adoc index bba8565..7b4bc87 100644 --- a/doc/Installation.adoc +++ b/doc/Installation.adoc @@ -46,7 +46,7 @@ though. The following steps apply to any GNU/Linux-like system, although it was written for Debian GNU/Linux. If you do not know which OS to use, -we recommend a default choice of Ubuntu 12.04 LTS since it is a +we recommend a default choice of Ubuntu 14.04 LTS since it is a well-known distribution that comes with 5 years of security support. Install the OS following its manual and enable automatic security upgrades if prompted. From 26de7d6c66967fbd71d4c43686d666013240153e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 23 Dec 2015 16:03:17 +0100 Subject: [PATCH 3/3] doc/Installation: Mark up file names [1] [1] http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#source-code --- doc/Installation.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Installation.adoc b/doc/Installation.adoc index 7b4bc87..971acdd 100644 --- a/doc/Installation.adoc +++ b/doc/Installation.adoc @@ -93,8 +93,8 @@ user@val:~$ sudo apt-get install mysql-server php5-mysql The installation asks you for a MySQL "root" password, and I recommend to specify one. To avoid having to specify a password when using the -'mysql' tool interactively, you can store the password in ~/.my.cnf, -see /usr/share/doc/mysql-server-5.0/README.Debian.gz. For example: +'mysql' tool interactively, you can store the password in `~/.my.cnf`, +see `/usr/share/doc/mysql-server-5.0/README.Debian.gz`. For example: [source, sh] ----