From: nodiscc <nodiscc@gmail.com>
Date: Thu, 21 Jun 2018 17:34:11 +0000 (+0200)
Subject: Merge pull request #1155 from shaarli/doc-improvements
X-Git-Tag: v0.10.0~17
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=969ed87fb11ec3259ec435902b4be6aa3e5ffa68;hp=-c;p=github%2Fshaarli%2FShaarli.git

Merge pull request #1155 from shaarli/doc-improvements

Improve documentation (#598, #1105)
---

969ed87fb11ec3259ec435902b4be6aa3e5ffa68
diff --combined doc/md/Download-and-Installation.md
index b82590f2,ebda2e8a..14649e06
--- a/doc/md/Download-and-Installation.md
+++ b/doc/md/Download-and-Installation.md
@@@ -1,8 -1,7 +1,7 @@@
  To install Shaarli, simply place the files in a directory under your webserver's
  Document Root (or directly at the document root).
  
- Also, please make sure your server meets the [requirements](Server-requirements)
- and is properly [configured](Server-configuration).
+ Also, please make sure your server is properly [configured](Server-configuration).
  
  Multiple releases branches are available:
  
@@@ -23,13 -22,13 +22,13 @@@ Using one of the following methods
  
  ### Download as an archive
  
- In most cases, you should download the latest Shaarli release from the [releases](https://github.com/shaarli/Shaarli/releases) page. **Download our *shaarli-full* archive** to include dependencies.
+ In most cases, you should download the latest Shaarli release from the [releases](https://github.com/shaarli/Shaarli/releases) page. Download our **shaarli-full** archive to include dependencies.
  
 -The current latest released version is `v0.9.6`
 +The current latest released version is `v0.9.7`
  
  ```bash
 -$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.6/shaarli-v0.9.6-full.zip
 -$ unzip shaarli-v0.9.6-full.zip
 +$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.7/shaarli-v0.9.7-full.zip
 +$ unzip shaarli-v0.9.7-full.zip
  $ mv Shaarli /path/to/shaarli/
  ```
  
@@@ -37,7 -36,7 +36,7 @@@
  
  Cloning using `git` or downloading Github branches as zip files requires additional steps:
  
-  * Install [Composer](Unit-tests.md#install_composer) to manage Shaarli dependencies.
+  * Install [Composer](Unit-tests.md#install_composer) to manage third-party [PHP dependencies](3rd-party-libraries.md#composer).
   * Install [yarn](https://yarnpkg.com/lang/en/docs/install/) to build the frontend dependencies.
   * Install [python3-virtualenv](https://pypi.python.org/pypi/virtualenv) to build the local HTML documentation.
  
@@@ -94,7 -93,7 +93,7 @@@ $ composer install --no-dev --prefer-di
  _Use at your own risk!_
  
  Install [Composer](Unit-tests.md#install_composer) to manage Shaarli PHP dependencies,
 -and [yarn](https://yarnpkg.com/lang/en/docs/install/) 
 +and [yarn](https://yarnpkg.com/lang/en/docs/install/)
  for front-end dependencies.
  
  To get the latest changes from the `master` branch: