From 5e28a9e1e188547ddc4d2a1c01b7adc177c20664 Mon Sep 17 00:00:00 2001
From: Yunohost Admin <webmaster@yunohost.org>
Date: Thu, 31 Jul 2014 13:28:10 +0200
Subject: [PATCH] Local modifications

---
 apps_fr.md             | 8 ++++----
 install_manually.md    | 6 ++++++
 install_manually_fr.md | 6 ++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps_fr.md b/apps_fr.md
index 711d04f1..811c27ca 100644
--- a/apps_fr.md
+++ b/apps_fr.md
@@ -76,9 +76,9 @@ $(document).ready(function () {
 | Strut | zamentur | En test | https://github.com/zamentur/strut_ynh |
 | MyCryptoChat | mrtino | En test | https://github.com/mrtino/mycryptochat_ynh |
 | MediaWiki | kload | En test | https://github.com/kloadut/mediawiki_ynh |
-| Linux Dash | opi | en test | https://github.com/opi/linuxdash_ynh |
-| Ampache | beudbeud | en test | https://github.com/abeudin/ampache_ynh |
-| Piwigo | monsieur-a | en test | https://github.com/monsieur-a/piwigo_ynh |
+| Linux Dash | opi | En test | https://github.com/opi/linuxdash_ynh |
+| Ampache | beudbeud | En test | https://github.com/abeudin/ampache_ynh |
+| Piwigo | monsieur-a | En test | https://github.com/monsieur-a/piwigo_ynh |
 | Etherpad-Lite | beudbeud | En test | https://github.com/abeudin/etherpadlite_ynh |
 
 ### À intégrer
@@ -94,7 +94,7 @@ $(document).ready(function () {
 * [Movim](http://www.movim.eu/)
 * [KiwiIRC](http://kiwiirc.com/)
 * [Piwik](http://piwik.org/)
-* [Gitlab](http://gitlab.org/)
+* [GitLab](http://gitlab.org/)
 * [FileTea](https://filetea.me)
 * [10er10](https://github.com/dready92/10er10)
 * [Subsonic](http://www.subsonic.org)
diff --git a/install_manually.md b/install_manually.md
index ac393c75..5577ea66 100644
--- a/install_manually.md
+++ b/install_manually.md
@@ -27,6 +27,12 @@ cd /tmp/install_script && sudo ./install_yunohostv2
 <img src="https://yunohost.org/images/install_script.png">
 </p>
 
+<br>
+
+<div class="alert alert-warning">
+<b>Warning:</b> Apache could already be installed by default on your dedicated server. If it's the case the installation script will fail since YunoHost is using Nginx. You will have to remove *apache2.2* package with the command: ``sudo apt-get autoremove apache2.2`` and execute the script again.
+</div>
+
 ---
 
 *Once the installation is finished, you may want to proceed to post-installation: **[yunohost.org/postinstall](/postinstall)** *
\ No newline at end of file
diff --git a/install_manually_fr.md b/install_manually_fr.md
index 869e3d5d..731bfbc9 100644
--- a/install_manually_fr.md
+++ b/install_manually_fr.md
@@ -27,6 +27,12 @@ cd /tmp/install_script && sudo ./install_yunohostv2
 <img src="https://yunohost.org/images/install_script.png">
 </p>
 
+<br>
+
+<div class="alert alert-warning">
+<b>Attention :</b> il se peut qu'Apache soit déjà installé par défaut sur votre serveur dédié. Si c'est le cas, le script d'installation échouera vu que YunoHost utilise Nginx. Vous aurez à désinstaller le paquet *apache2.2* avec la commande : ``sudo apt-get autoremove apache2.2`` et relancer le script.
+</div>
+
 ---
 
 *Une fois l'installation terminée, vous pouvez procéder à la post-installation : **[yunohost.org/postinstall](/postinstall_fr)** *
\ No newline at end of file