From f8b936e7e75601b5d96525f25d5b52dbabd909b4 Mon Sep 17 00:00:00 2001
From: VirtualTam <virtualtam@flibidi.net>
Date: Fri, 4 Sep 2015 21:25:47 +0200
Subject: Doc: sync from Wiki, generate HTML

Additions:
 - Installation/Download: how to get Shaarli
 - Community software: ShaarliOS app

Modifications:
 - Installation/Server requirements: PHP 5.4 EOL, PHP 7 announcements
 - Installation/Server configuration: improve Nginx security
 - Troubleshooting: PHP sessions on `free.fr`

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
---
 doc/Server-requirements.html | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'doc/Server-requirements.html')

diff --git a/doc/Server-requirements.html b/doc/Server-requirements.html
index b0426eec..f34f589b 100644
--- a/doc/Server-requirements.html
+++ b/doc/Server-requirements.html
@@ -17,6 +17,7 @@
 <li><a href="Home.html">Home</a></li>
 <li>Installation
 <ul>
+<li><a href="Download.html">Download</a></li>
 <li><a href="Server-requirements.html">Server requirements</a></li>
 <li><a href="Server-configuration.html">Server configuration</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
@@ -75,21 +76,26 @@
 </thead>
 <tbody>
 <tr class="odd">
+<td style="text-align: center;">7</td>
+<td style="text-align: center;">RC2</td>
+<td style="text-align: center;">planned</td>
+</tr>
+<tr class="even">
 <td style="text-align: center;">5.6</td>
 <td style="text-align: center;">Supported</td>
 <td style="text-align: center;">:white_check_mark:</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: center;">5.5</td>
 <td style="text-align: center;">Supported</td>
 <td style="text-align: center;">:white_check_mark:</td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td style="text-align: center;">5.4</td>
-<td style="text-align: center;">Supported</td>
+<td style="text-align: center;">EOL: 2015-09-14</td>
 <td style="text-align: center;">:white_check_mark:</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: center;">5.3</td>
 <td style="text-align: center;">EOL: 2014-08-14</td>
 <td style="text-align: center;">:white_check_mark:</td>
@@ -100,9 +106,9 @@
 <ul>
 <li><a href="https://github.com/shaarli/Shaarli/blob/master/.travis.yml">Travis configuration</a><a href=".html"></a></li>
 </ul>
-<p>PHP 7.0 information:</p>
+<p>PHP 7 information:</p>
 <ul>
-<li><a href="http://php.net/archive/2015.php#id2015-07-10-4">Beta1 announcement</a><a href=".html"></a></li>
+<li>Announcements: <a href="http://php.net/archive/2015.php#id2015-07-10-4">Beta1</a>, <a href="http://php.net/archive/2015.php#id2015-08-21-1">RC1</a>, <a href="http://php.net/archive/2015.php#id2015-09-04-1">RC2</a><a href=".html"></a></li>
 <li><a href="https://wiki.php.net/todo/php70">TODOLIST</a><a href=".html"></a></li>
 <li><a href="https://bugs.php.net/search.php?limit=30&amp;order_by=id&amp;direction=DESC&amp;cmd=display&amp;status=Open&amp;bug_type=All&amp;phpver=7.0">Recent bugs</a><a href=".html"></a></li>
 <li><a href="http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-7.0.0">Git repository</a><a href=".html"></a></li>
-- 
cgit v1.2.3