aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2015-09-04 21:25:47 +0200
committerVirtualTam <virtualtam@flibidi.net>2015-09-04 21:32:25 +0200
commitf8b936e7e75601b5d96525f25d5b52dbabd909b4 (patch)
tree8a6fcc4cd511aad9b1f24df32bdcfe810419172f /doc
parentce8c4a84ba180802ca6e5f00f60353ad71d3fcc8 (diff)
downloadShaarli-f8b936e7e75601b5d96525f25d5b52dbabd909b4.tar.gz
Shaarli-f8b936e7e75601b5d96525f25d5b52dbabd909b4.tar.zst
Shaarli-f8b936e7e75601b5d96525f25d5b52dbabd909b4.zip
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>
Diffstat (limited to 'doc')
-rw-r--r--doc/3rd-party-libraries.html1
-rw-r--r--doc/Backup,-restore,-import-and-export.html1
-rw-r--r--doc/Coding-guidelines.html1
-rw-r--r--doc/Community-&-Related-software.html7
-rw-r--r--doc/Community-&-Related-software.md54
-rw-r--r--doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html1
-rw-r--r--doc/Datastore-hacks.html1
-rw-r--r--doc/Development.html1
-rw-r--r--doc/Directory-structure.html1
-rw-r--r--doc/Download-CSS-styles-from-an-OPML-list.html1
-rw-r--r--doc/Download.html97
-rw-r--r--doc/Download.md31
-rw-r--r--doc/Example-patch---add-new-via-field-for-links.html1
-rw-r--r--doc/FAQ.html1
-rw-r--r--doc/Firefox-share.html1
-rw-r--r--doc/GnuPG-signature.html1
-rw-r--r--doc/Home.html1
-rw-r--r--doc/Plugin-System.html1
-rw-r--r--doc/RSS-feeds.html1
-rw-r--r--doc/Security.html1
-rw-r--r--doc/Server-configuration.html8
-rw-r--r--doc/Server-configuration.md7
-rw-r--r--doc/Server-requirements.html18
-rw-r--r--doc/Server-requirements.md7
-rw-r--r--doc/Shaarli-configuration.html1
-rw-r--r--doc/Sharing-button.html1
-rw-r--r--doc/Static-analysis.html1
-rw-r--r--doc/TODO.html1
-rw-r--r--doc/Theming.html1
-rw-r--r--doc/Troubleshooting.html8
-rw-r--r--doc/Troubleshooting.md7
-rw-r--r--doc/Unit-tests.html1
-rw-r--r--doc/Usage.html1
-rw-r--r--doc/_Footer.html61
-rw-r--r--doc/_Footer.md2
-rw-r--r--doc/_Sidebar.html2
-rw-r--r--doc/_Sidebar.md1
-rw-r--r--doc/sidebar.html1
38 files changed, 289 insertions, 45 deletions
diff --git a/doc/3rd-party-libraries.html b/doc/3rd-party-libraries.html
index 86f670ae..21fa20aa 100644
--- a/doc/3rd-party-libraries.html
+++ b/doc/3rd-party-libraries.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Backup,-restore,-import-and-export.html b/doc/Backup,-restore,-import-and-export.html
index 40c7a852..5724b689 100644
--- a/doc/Backup,-restore,-import-and-export.html
+++ b/doc/Backup,-restore,-import-and-export.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Coding-guidelines.html b/doc/Coding-guidelines.html
index fd6fa571..40d17912 100644
--- a/doc/Coding-guidelines.html
+++ b/doc/Coding-guidelines.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html
index 25ef0f88..34bc6157 100644
--- a/doc/Community-&-Related-software.html
+++ b/doc/Community-&-Related-software.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
@@ -82,21 +83,23 @@
82<li><a href="https://github.com/mknexen/shaarli-api">mknexen/shaarli-api</a> - A REST API for Shaarli<a href=".html"></a></li> 83<li><a href="https://github.com/mknexen/shaarli-api">mknexen/shaarli-api</a> - A REST API for Shaarli<a href=".html"></a></li>
83<li><a href="https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php">Self dead link</a> - Detect dead links on shaarli. This version use the database of shaarli. An <a href="https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php">another version</a>, can be used for others shaarli (but use most ressources).<a href=".html"></a></li> 84<li><a href="https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php">Self dead link</a> - Detect dead links on shaarli. This version use the database of shaarli. An <a href="https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php">another version</a>, can be used for others shaarli (but use most ressources).<a href=".html"></a></li>
84</ul> 85</ul>
85<h3 id="android-apps">Android apps</h3> 86<h3 id="mobile-apps">Mobile Apps</h3>
86<ul> 87<ul>
88<li><a href="https://github.com/mro/ShaarliOS#the-missing-ios-8-share-extension-to-shaarli">github.com/mro/ShaarliOS</a> iOS share extension - see <a href="https://github.com/shaarli/Shaarli/issues/308#issuecomment-132303709">#308</a> for some promo codes,<a href=".html"></a></li>
87<li><a href="http://sebsauvage.net/links/?ZAyDzg">Shaarli for Android</a> - Android application that adds Shaarli as a sharing provider<a href=".html"></a></li> 89<li><a href="http://sebsauvage.net/links/?ZAyDzg">Shaarli for Android</a> - Android application that adds Shaarli as a sharing provider<a href=".html"></a></li>
88<li><a href="https://github.com/dimtion/Shaarlier">Shaarlier for Android</a> - Android application to simply add links directly into your Shaarli<a href=".html"></a></li> 90<li><a href="https://github.com/dimtion/Shaarlier">Shaarlier for Android</a> - Android application to simply add links directly into your Shaarli<a href=".html"></a></li>
89</ul> 91</ul>
90<h2 id="integration-with-other-platforms">Integration with other platforms</h2> 92<h2 id="integration-with-other-platforms">Integration with other platforms</h2>
91<ul> 93<ul>
92<li><a href="https://github.com/jcsaaddupuy/tt-rss-shaarli">tt-rss-shaarli</a> - <a href="http://tt-rss.org/">TinyTiny RSS</a> plugin that adds support for sharing articles with Shaarli<a href=".html"></a></li> 94<li><a href="https://github.com/jcsaaddupuy/tt-rss-shaarli">tt-rss-shaarli</a> - <a href="http://tt-rss.org/">TinyTiny RSS</a> plugin that adds support for sharing articles with Shaarli<a href=".html"></a></li>
93<li><a href="https://github.com/ahmet2mir/octopress-shaarli">octopress-shaarli</a> - Octopress plugin to retrieve Shaarli links on the sidebara<a href=".html"></a></li> 95<li><a href="https://github.com/ahmet2mir/octopress-shaarli">octopress-shaarli</a> - Octopress plugin to retrieve Shaarli links on the sidebar<a href=".html"></a></li>
94</ul> 96</ul>
95<h2 id="alternatives-to-shaarli">Alternatives to Shaarli</h2> 97<h2 id="alternatives-to-shaarli">Alternatives to Shaarli</h2>
96<ul> 98<ul>
97<li><a href="http://alternativeto.net/software/shaarli/">Shaarli alternatives</a> (alternativeto.net)<a href=".html"></a></li> 99<li><a href="http://alternativeto.net/software/shaarli/">Shaarli alternatives</a> (alternativeto.net)<a href=".html"></a></li>
98<li><a href="https://github.com/bookieio/bookie">Bookie</a> - Another self-hostable, free bookmark sharing software, written in Python<a href=".html"></a></li> 100<li><a href="https://github.com/bookieio/bookie">Bookie</a> - Another self-hostable, free bookmark sharing software, written in Python<a href=".html"></a></li>
99<li><a href="https://github.com/plainmade/unmark">Unmark</a> - An open source todo app for bookmarks (<a href="https://unmark.it/">Homepage</a>)<a href=".html"></a></li> 101<li><a href="https://github.com/plainmade/unmark">Unmark</a> - An open source todo app for bookmarks (<a href="https://unmark.it/">Homepage</a>)<a href=".html"></a></li>
102<li><a href="https://wordpress.org/plugins/wp-bookmarks/">Wordpress bookmarks</a><a href=".html"></a></li>
100</ul> 103</ul>
101</body> 104</body>
102</html> 105</html>
diff --git a/doc/Community-&-Related-software.md b/doc/Community-&-Related-software.md
index 9cf47935..77ea2420 100644
--- a/doc/Community-&-Related-software.md
+++ b/doc/Community-&-Related-software.md
@@ -1,40 +1,42 @@
1#Community & Related software 1#Community & Related software
2*Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork.* 2_Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork._
3 3
4*TODO: contact repos owners to see if they'd like to standardize their work with the community fork.* 4_TODO: contact repos owners to see if they'd like to standardize their work with the community fork._
5 5
6## Community 6## Community
7* [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli[](.html) 7- [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli[](.html)
8* [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html)[](.html) 8- [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html)[](.html)
9* [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json)[](.html) 9- [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json)[](.html)
10* [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list)[](.html) 10- [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list)[](.html)
11* [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_[](.html) 11- [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_[](.html)
12* [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas)[](.html) 12- [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas)[](.html)
13* [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr)[](.html) 13- [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr)[](.html)
14* [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)[](.html) 14- [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)[](.html)
15* [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html) 15- [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html)
16* [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html) 16- [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html)
17 17
18### Themes 18### Themes
19See [Theming](Theming.html) for the list of community-contributed themes, and an installation guide. 19See [Theming](Theming.html) for the list of community-contributed themes, and an installation guide.
20 20
21### Server apps 21### Server apps
22 * [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content[](.html) 22- [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content[](.html)
23 * [shaarli-river](https://github.com/mknexen/shaarli-river) - An aggregator for shaarlis with many features [](.html) 23- [shaarli-river](https://github.com/mknexen/shaarli-river) - An aggregator for shaarlis with many features [](.html)
24 * [Shaarlo](https://github.com/DMeloni/shaarlo) - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: [shaarli.fr](http://shaarli.fr/))[](.html) 24- [Shaarlo](https://github.com/DMeloni/shaarlo) - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: [shaarli.fr](http://shaarli.fr/))[](.html)
25 * [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis[](.html) 25- [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis[](.html)
26 * [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli[](.html) 26- [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli[](.html)
27 * [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. An [another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for others shaarli (but use most ressources).[](.html) 27- [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. An [another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for others shaarli (but use most ressources).[](.html)
28 28
29### Android apps 29### Mobile Apps
30 * [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider[](.html) 30- [github.com/mro/ShaarliOS](https://github.com/mro/ShaarliOS#the-missing-ios-8-share-extension-to-shaarli) iOS share extension - see [#308](https://github.com/shaarli/Shaarli/issues/308#issuecomment-132303709) for some promo codes,[](.html)
31 * [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli[](.html) 31- [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider[](.html)
32- [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli[](.html)
32 33
33## Integration with other platforms 34## Integration with other platforms
34 * [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [TinyTiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli[](.html) 35- [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [TinyTiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli[](.html)
35 * [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebara[](.html) 36- [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebar[](.html)
36 37
37## Alternatives to Shaarli 38## Alternatives to Shaarli
38* [Shaarli alternatives](http://alternativeto.net/software/shaarli/) (alternativeto.net)[](.html) 39- [Shaarli alternatives](http://alternativeto.net/software/shaarli/) (alternativeto.net)[](.html)
39* [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, free bookmark sharing software, written in Python[](.html) 40- [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, free bookmark sharing software, written in Python[](.html)
40* [Unmark](https://github.com/plainmade/unmark) - An open source todo app for bookmarks ([Homepage](https://unmark.it/))[](.html) 41- [Unmark](https://github.com/plainmade/unmark) - An open source todo app for bookmarks ([Homepage](https://unmark.it/))[](.html)
42- [Wordpress bookmarks](https://wordpress.org/plugins/wp-bookmarks/)[](.html)
diff --git a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
index 1e81b735..e27b1134 100644
--- a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
+++ b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Datastore-hacks.html b/doc/Datastore-hacks.html
index e3adee19..0bf2a493 100644
--- a/doc/Datastore-hacks.html
+++ b/doc/Datastore-hacks.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Development.html b/doc/Development.html
index 6e222573..88cf5854 100644
--- a/doc/Development.html
+++ b/doc/Development.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Directory-structure.html b/doc/Directory-structure.html
index ae0458f3..7015923c 100644
--- a/doc/Directory-structure.html
+++ b/doc/Directory-structure.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Download-CSS-styles-from-an-OPML-list.html b/doc/Download-CSS-styles-from-an-OPML-list.html
index 033dd18c..7d7fe968 100644
--- a/doc/Download-CSS-styles-from-an-OPML-list.html
+++ b/doc/Download-CSS-styles-from-an-OPML-list.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Download.html b/doc/Download.html
new file mode 100644
index 00000000..5f39c70f
--- /dev/null
+++ b/doc/Download.html
@@ -0,0 +1,97 @@
1<!DOCTYPE html>
2<html>
3<head>
4 <meta charset="utf-8">
5 <meta name="generator" content="pandoc">
6 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
7 <title>Shaarli - Download</title>
8 <style type="text/css">code{white-space: pre;}</style>
9 <!--[if lt IE 9]>
10 <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
11 <![endif]-->
12 <style type="text/css">
13table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
14 margin: 0; padding: 0; vertical-align: baseline; border: none; }
15table.sourceCode { width: 100%; line-height: 100%; }
16td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
17td.sourceCode { padding-left: 5px; }
18code > span.kw { color: #007020; font-weight: bold; }
19code > span.dt { color: #902000; }
20code > span.dv { color: #40a070; }
21code > span.bn { color: #40a070; }
22code > span.fl { color: #40a070; }
23code > span.ch { color: #4070a0; }
24code > span.st { color: #4070a0; }
25code > span.co { color: #60a0b0; font-style: italic; }
26code > span.ot { color: #007020; }
27code > span.al { color: #ff0000; font-weight: bold; }
28code > span.fu { color: #06287e; }
29code > span.er { color: #ff0000; font-weight: bold; }
30 </style>
31 <link rel="stylesheet" href="github-markdown.css">
32</head>
33<body>
34<div id="local-sidebar">
35<ul>
36<li><a href="Home.html">Home</a></li>
37<li>Installation
38<ul>
39<li><a href="Download.html">Download</a></li>
40<li><a href="Server-requirements.html">Server requirements</a></li>
41<li><a href="Server-configuration.html">Server configuration</a></li>
42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
43</ul></li>
44<li><a href="Usage.html">Usage</a>
45<ul>
46<li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
47<li><a href="Firefox-share.html">Firefox share</a></li>
48<li><a href="RSS-feeds.html">RSS feeds</a></li>
49</ul></li>
50<li>How To
51<ul>
52<li><a href="Backup,-restore,-import-and-export.html">Backup, restore, import and export</a></li>
53<li><a href="Copy-an-existing-installation-over-SSH-and-serve-it-locally.html">Copy an existing installation over SSH and serve it locally</a></li>
54<li><a href="Download-CSS-styles-from-an-OPML-list.html">Download CSS styles from an OPML list</a></li>
55<li><a href="Datastore-hacks.html">Datastore hacks</a></li>
56</ul></li>
57<li><a href="Troubleshooting.html">Troubleshooting</a></li>
58<li><a href="Development.html">Development</a>
59<ul>
60<li><a href="GnuPG-signature.html">GnuPG signature</a></li>
61<li><a href="Coding-guidelines.html">Coding guidelines</a></li>
62<li><a href="Directory-structure.html">Directory structure</a></li>
63<li><a href="3rd-party-libraries.html">3rd party libraries</a></li>
64<li><a href="Plugin-System.html">Plugin System</a></li>
65<li><a href="Security.html">Security</a></li>
66<li><a href="Static-analysis.html">Static analysis</a></li>
67<li><a href="Theming.html">Theming</a></li>
68<li><a href="Unit-tests.html">Unit tests</a></li>
69</ul></li>
70<li>About
71<ul>
72<li><a href="FAQ.html">FAQ</a></li>
73<li><a href="Community-&amp;-Related-software.html">Community &amp; Related software</a></li>
74<li><a href="TODO.html">TODO</a></li>
75</ul></li>
76</ul>
77</div>
78<h1 id="download">Download</h1>
79<h2 id="get-shaarli">Get Shaarli!</h2>
80<h3 id="latest-stable-revision">Latest stable revision</h3>
81<p>This revision has been <a href="https://github.com/shaarli/Shaarli/releases">released</a> and tested.<a href=".html"></a></p>
82<h4 id="clone-with-git-recommended">Clone with Git (recommended)</h4>
83<pre class="sourceCode bash"><code class="sourceCode bash">$ <span class="kw">git</span> clone https://github.com/shaarli/Shaarli.git -b stable shaarli</code></pre>
84<h4 id="download-as-an-archive">Download as an archive</h4>
85<pre class="sourceCode bash"><code class="sourceCode bash">$ <span class="kw">wget</span> https://github.com/shaarli/Shaarli/archive/stable.zip
86$ <span class="kw">unzip</span> stable.zip
87$ <span class="kw">mv</span> Shaarli-stable shaarli</code></pre>
88<p>Tarballs are also available:</p>
89<pre class="sourceCode bash"><code class="sourceCode bash">$ <span class="kw">wget</span> https://github.com/shaarli/Shaarli/archive/stable.tar.gz
90$ <span class="kw">tar</span> xvf stable.tar.gz
91$ <span class="kw">mv</span> Shaarli-stable shaarli</code></pre>
92<h3 id="development-mainline">Development (mainline)</h3>
93<p><em>Use at your own risk!</em></p>
94<p>To get the latest changes:</p>
95<pre class="sourceCode bash"><code class="sourceCode bash">$ <span class="kw">git</span> clone https://github.com/shaarli/Shaarli.git shaarli</code></pre>
96</body>
97</html>
diff --git a/doc/Download.md b/doc/Download.md
new file mode 100644
index 00000000..7930f541
--- /dev/null
+++ b/doc/Download.md
@@ -0,0 +1,31 @@
1#Download
2## Get Shaarli!
3### Latest stable revision
4This revision has been [released](https://github.com/shaarli/Shaarli/releases) and tested.[](.html)
5
6#### Clone with Git (recommended)
7```bash
8$ git clone https://github.com/shaarli/Shaarli.git -b stable shaarli
9```
10
11#### Download as an archive
12```bash
13$ wget https://github.com/shaarli/Shaarli/archive/stable.zip
14$ unzip stable.zip
15$ mv Shaarli-stable shaarli
16```
17
18Tarballs are also available:
19```bash
20$ wget https://github.com/shaarli/Shaarli/archive/stable.tar.gz
21$ tar xvf stable.tar.gz
22$ mv Shaarli-stable shaarli
23```
24
25### Development (mainline)
26_Use at your own risk!_
27
28To get the latest changes:
29```bash
30$ git clone https://github.com/shaarli/Shaarli.git shaarli
31```
diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html
index ff73ec0f..388ff963 100644
--- a/doc/Example-patch---add-new-via-field-for-links.html
+++ b/doc/Example-patch---add-new-via-field-for-links.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/FAQ.html b/doc/FAQ.html
index b26b6355..33eb7c60 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Firefox-share.html b/doc/Firefox-share.html
index d666ac7b..2943a86d 100644
--- a/doc/Firefox-share.html
+++ b/doc/Firefox-share.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/GnuPG-signature.html b/doc/GnuPG-signature.html
index b7dc1083..a1210b75 100644
--- a/doc/GnuPG-signature.html
+++ b/doc/GnuPG-signature.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Home.html b/doc/Home.html
index 90372a40..39d951c8 100644
--- a/doc/Home.html
+++ b/doc/Home.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Plugin-System.html b/doc/Plugin-System.html
index 719b76fe..cb1cb746 100644
--- a/doc/Plugin-System.html
+++ b/doc/Plugin-System.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/RSS-feeds.html b/doc/RSS-feeds.html
index 7d1de078..859869bf 100644
--- a/doc/RSS-feeds.html
+++ b/doc/RSS-feeds.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Security.html b/doc/Security.html
index db44da2c..914fa507 100644
--- a/doc/Security.html
+++ b/doc/Security.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html
index e4e383a3..3aa89722 100644
--- a/doc/Server-configuration.html
+++ b/doc/Server-configuration.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
@@ -279,10 +280,15 @@ location ~ ~$ {
279}</code></pre> 280}</code></pre>
280<pre class="nginx"><code># /etc/nginx/php.conf 281<pre class="nginx"><code># /etc/nginx/php.conf
281location ~ (index)\.php$ { 282location ~ (index)\.php$ {
282 # proxy PHP requests to PHP-FPM 283 # filter and proxy PHP requests to PHP-FPM
283 fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; 284 fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock;
284 fastcgi_index index.php; 285 fastcgi_index index.php;
285 include fastcgi.conf; 286 include fastcgi.conf;
287}
288
289location ~ \.php$ {
290 # deny access to all other PHP scripts
291 deny all;
286}</code></pre> 292}</code></pre>
287<pre class="nginx"><code># /etc/nginx/static_assets.conf 293<pre class="nginx"><code># /etc/nginx/static_assets.conf
288location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { 294location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
diff --git a/doc/Server-configuration.md b/doc/Server-configuration.md
index c9ec4e13..c7b17c5a 100644
--- a/doc/Server-configuration.md
+++ b/doc/Server-configuration.md
@@ -219,11 +219,16 @@ location ~ ~$ {
219```nginx 219```nginx
220# /etc/nginx/php.conf 220# /etc/nginx/php.conf
221location ~ (index)\.php$ { 221location ~ (index)\.php$ {
222 # proxy PHP requests to PHP-FPM 222 # filter and proxy PHP requests to PHP-FPM
223 fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; 223 fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock;
224 fastcgi_index index.php; 224 fastcgi_index index.php;
225 include fastcgi.conf; 225 include fastcgi.conf;
226} 226}
227
228location ~ \.php$ {
229 # deny access to all other PHP scripts
230 deny all;
231}
227``` 232```
228 233
229```nginx 234```nginx
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 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
@@ -75,21 +76,26 @@
75</thead> 76</thead>
76<tbody> 77<tbody>
77<tr class="odd"> 78<tr class="odd">
79<td style="text-align: center;">7</td>
80<td style="text-align: center;">RC2</td>
81<td style="text-align: center;">planned</td>
82</tr>
83<tr class="even">
78<td style="text-align: center;">5.6</td> 84<td style="text-align: center;">5.6</td>
79<td style="text-align: center;">Supported</td> 85<td style="text-align: center;">Supported</td>
80<td style="text-align: center;">:white_check_mark:</td> 86<td style="text-align: center;">:white_check_mark:</td>
81</tr> 87</tr>
82<tr class="even"> 88<tr class="odd">
83<td style="text-align: center;">5.5</td> 89<td style="text-align: center;">5.5</td>
84<td style="text-align: center;">Supported</td> 90<td style="text-align: center;">Supported</td>
85<td style="text-align: center;">:white_check_mark:</td> 91<td style="text-align: center;">:white_check_mark:</td>
86</tr> 92</tr>
87<tr class="odd"> 93<tr class="even">
88<td style="text-align: center;">5.4</td> 94<td style="text-align: center;">5.4</td>
89<td style="text-align: center;">Supported</td> 95<td style="text-align: center;">EOL: 2015-09-14</td>
90<td style="text-align: center;">:white_check_mark:</td> 96<td style="text-align: center;">:white_check_mark:</td>
91</tr> 97</tr>
92<tr class="even"> 98<tr class="odd">
93<td style="text-align: center;">5.3</td> 99<td style="text-align: center;">5.3</td>
94<td style="text-align: center;">EOL: 2014-08-14</td> 100<td style="text-align: center;">EOL: 2014-08-14</td>
95<td style="text-align: center;">:white_check_mark:</td> 101<td style="text-align: center;">:white_check_mark:</td>
@@ -100,9 +106,9 @@
100<ul> 106<ul>
101<li><a href="https://github.com/shaarli/Shaarli/blob/master/.travis.yml">Travis configuration</a><a href=".html"></a></li> 107<li><a href="https://github.com/shaarli/Shaarli/blob/master/.travis.yml">Travis configuration</a><a href=".html"></a></li>
102</ul> 108</ul>
103<p>PHP 7.0 information:</p> 109<p>PHP 7 information:</p>
104<ul> 110<ul>
105<li><a href="http://php.net/archive/2015.php#id2015-07-10-4">Beta1 announcement</a><a href=".html"></a></li> 111<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>
106<li><a href="https://wiki.php.net/todo/php70">TODOLIST</a><a href=".html"></a></li> 112<li><a href="https://wiki.php.net/todo/php70">TODOLIST</a><a href=".html"></a></li>
107<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> 113<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>
108<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> 114<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>
diff --git a/doc/Server-requirements.md b/doc/Server-requirements.md
index 6ccccaca..8f44d606 100644
--- a/doc/Server-requirements.md
+++ b/doc/Server-requirements.md
@@ -9,16 +9,17 @@
9### Supported versions 9### Supported versions
10Version | Status | Shaarli compatibility 10Version | Status | Shaarli compatibility
11:---:|:---:|:---: 11:---:|:---:|:---:
127 | RC2 | planned
125.6 | Supported | :white_check_mark: 135.6 | Supported | :white_check_mark:
135.5 | Supported | :white_check_mark: 145.5 | Supported | :white_check_mark:
145.4 | Supported | :white_check_mark: 155.4 | EOL: 2015-09-14 | :white_check_mark:
155.3 | EOL: 2014-08-14 | :white_check_mark: 165.3 | EOL: 2014-08-14 | :white_check_mark:
16 17
17See also: 18See also:
18- [Travis configuration](https://github.com/shaarli/Shaarli/blob/master/.travis.yml)[](.html) 19- [Travis configuration](https://github.com/shaarli/Shaarli/blob/master/.travis.yml)[](.html)
19 20
20PHP 7.0 information: 21PHP 7 information:
21- [Beta1 announcement](http://php.net/archive/2015.php#id2015-07-10-4)[](.html) 22- Announcements: [Beta1](http://php.net/archive/2015.php#id2015-07-10-4), [RC1](http://php.net/archive/2015.php#id2015-08-21-1), [RC2](http://php.net/archive/2015.php#id2015-09-04-1)[](.html)
22- [TODOLIST](https://wiki.php.net/todo/php70)[](.html) 23- [TODOLIST](https://wiki.php.net/todo/php70)[](.html)
23- [Recent bugs](https://bugs.php.net/search.php?limit=30&order_by=id&direction=DESC&cmd=display&status=Open&bug_type=All&phpver=7.0)[](.html) 24- [Recent bugs](https://bugs.php.net/search.php?limit=30&order_by=id&direction=DESC&cmd=display&status=Open&bug_type=All&phpver=7.0)[](.html)
24- [Git repository](http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-7.0.0)[](.html) 25- [Git repository](http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-7.0.0)[](.html)
diff --git a/doc/Shaarli-configuration.html b/doc/Shaarli-configuration.html
index 663b43e5..b7e29cb3 100644
--- a/doc/Shaarli-configuration.html
+++ b/doc/Shaarli-configuration.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Sharing-button.html b/doc/Sharing-button.html
index d3f36253..6fa5e77a 100644
--- a/doc/Sharing-button.html
+++ b/doc/Sharing-button.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Static-analysis.html b/doc/Static-analysis.html
index dd1dd223..e95893a8 100644
--- a/doc/Static-analysis.html
+++ b/doc/Static-analysis.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/TODO.html b/doc/TODO.html
index c25775cc..7a6a4bf6 100644
--- a/doc/TODO.html
+++ b/doc/TODO.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Theming.html b/doc/Theming.html
index b5d214e5..a751eb98 100644
--- a/doc/Theming.html
+++ b/doc/Theming.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Troubleshooting.html b/doc/Troubleshooting.html
index 00cfdff8..98fd5354 100644
--- a/doc/Troubleshooting.html
+++ b/doc/Troubleshooting.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
@@ -134,10 +135,11 @@ code > span.er { color: #ff0000; font-weight: bold; }
134<h2 id="hosting-problems">Hosting problems</h2> 135<h2 id="hosting-problems">Hosting problems</h2>
135<h3 id="old-php-versions">Old PHP versions</h3> 136<h3 id="old-php-versions">Old PHP versions</h3>
136<ul> 137<ul>
137<li>On <strong>free.fr</strong> : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a <code>sessions</code> directory at the root of your webspace. Change the file extension to <code>.php5</code> or create a <code>.htaccess</code> file in the directory where Shaarli is located containing:</li> 138<li>On <strong>free.fr</strong> : free.fr now support php 5.6.x(<a href="http://les.pages.perso.chez.free.fr/migrations/php5v6.io">link</a>)and so support now the tag autocompletion but you have to do the following : At the root of your webspace create a <code>sessions</code> directory and a <code>.htaccess</code> file containing:<a href=".html"></a></li>
138</ul> 139</ul>
139<pre class="sourceCode ini"><code class="sourceCode ini"><span class="dt">php 1</span> 140<pre class="sourceCode ini"><code class="sourceCode ini"><span class="dt">&lt;IfDefine Free&gt;</span>
140<span class="dt">SetEnv PHP_VER 5</span></code></pre> 141<span class="dt">php56 1</span>
142<span class="dt">&lt;/IfDefine&gt;</span></code></pre>
141<ul> 143<ul>
142<li>If you have an error such as: <code>Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx</code>, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to <code>.php5</code></li> 144<li>If you have an error such as: <code>Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx</code>, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to <code>.php5</code></li>
143<li>On <strong>1and1</strong> : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).</li> 145<li>On <strong>1and1</strong> : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).</li>
diff --git a/doc/Troubleshooting.md b/doc/Troubleshooting.md
index 4e6cdb06..e91fe846 100644
--- a/doc/Troubleshooting.md
+++ b/doc/Troubleshooting.md
@@ -61,11 +61,12 @@ Search for `failed` in this file to look for unauthorized login attempts.
61 61
62## Hosting problems 62## Hosting problems
63### Old PHP versions 63### Old PHP versions
64 * On **free.fr** : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a `sessions` directory at the root of your webspace. Change the file extension to `.php5` or create a `.htaccess` file in the directory where Shaarli is located containing: 64 * On **free.fr** : free.fr now support php 5.6.x([link](http://les.pages.perso.chez.free.fr/migrations/php5v6.io))and so support now the tag autocompletion but you have to do the following : At the root of your webspace create a `sessions` directory and a `.htaccess` file containing:[](.html)
65 65
66```ini 66```ini
67php 1 67<IfDefine Free>
68SetEnv PHP_VER 5 68php56 1
69</IfDefine>
69``` 70```
70 71
71 * If you have an error such as: `Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx`, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to `.php5` 72 * If you have an error such as: `Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx`, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to `.php5`
diff --git a/doc/Unit-tests.html b/doc/Unit-tests.html
index f4b42bdf..6d760771 100644
--- a/doc/Unit-tests.html
+++ b/doc/Unit-tests.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
36<li><a href="Home.html">Home</a></li> 36<li><a href="Home.html">Home</a></li>
37<li>Installation 37<li>Installation
38<ul> 38<ul>
39<li><a href="Download.html">Download</a></li>
39<li><a href="Server-requirements.html">Server requirements</a></li> 40<li><a href="Server-requirements.html">Server requirements</a></li>
40<li><a href="Server-configuration.html">Server configuration</a></li> 41<li><a href="Server-configuration.html">Server configuration</a></li>
41<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 42<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/Usage.html b/doc/Usage.html
index ad5b7965..0ba457f6 100644
--- a/doc/Usage.html
+++ b/doc/Usage.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/_Footer.html b/doc/_Footer.html
new file mode 100644
index 00000000..98032386
--- /dev/null
+++ b/doc/_Footer.html
@@ -0,0 +1,61 @@
1<!DOCTYPE html>
2<html>
3<head>
4 <meta charset="utf-8">
5 <meta name="generator" content="pandoc">
6 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
7 <title>Shaarli - _Footer</title>
8 <style type="text/css">code{white-space: pre;}</style>
9 <!--[if lt IE 9]>
10 <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
11 <![endif]-->
12 <link rel="stylesheet" href="github-markdown.css">
13</head>
14<body>
15<div id="local-sidebar">
16<ul>
17<li><a href="Home.html">Home</a></li>
18<li>Installation
19<ul>
20<li><a href="Download.html">Download</a></li>
21<li><a href="Server-requirements.html">Server requirements</a></li>
22<li><a href="Server-configuration.html">Server configuration</a></li>
23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
24</ul></li>
25<li><a href="Usage.html">Usage</a>
26<ul>
27<li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
28<li><a href="Firefox-share.html">Firefox share</a></li>
29<li><a href="RSS-feeds.html">RSS feeds</a></li>
30</ul></li>
31<li>How To
32<ul>
33<li><a href="Backup,-restore,-import-and-export.html">Backup, restore, import and export</a></li>
34<li><a href="Copy-an-existing-installation-over-SSH-and-serve-it-locally.html">Copy an existing installation over SSH and serve it locally</a></li>
35<li><a href="Download-CSS-styles-from-an-OPML-list.html">Download CSS styles from an OPML list</a></li>
36<li><a href="Datastore-hacks.html">Datastore hacks</a></li>
37</ul></li>
38<li><a href="Troubleshooting.html">Troubleshooting</a></li>
39<li><a href="Development.html">Development</a>
40<ul>
41<li><a href="GnuPG-signature.html">GnuPG signature</a></li>
42<li><a href="Coding-guidelines.html">Coding guidelines</a></li>
43<li><a href="Directory-structure.html">Directory structure</a></li>
44<li><a href="3rd-party-libraries.html">3rd party libraries</a></li>
45<li><a href="Plugin-System.html">Plugin System</a></li>
46<li><a href="Security.html">Security</a></li>
47<li><a href="Static-analysis.html">Static analysis</a></li>
48<li><a href="Theming.html">Theming</a></li>
49<li><a href="Unit-tests.html">Unit tests</a></li>
50</ul></li>
51<li>About
52<ul>
53<li><a href="FAQ.html">FAQ</a></li>
54<li><a href="Community-&amp;-Related-software.html">Community &amp; Related software</a></li>
55<li><a href="TODO.html">TODO</a></li>
56</ul></li>
57</ul>
58</div>
59<h1 id="footer-shaarli-the-personal-minimalist-super-fast-no-database-delicious-clone">_Footer<br /><em>Shaarli, the personal, minimalist, super-fast, no-database delicious clone</em></h1>
60</body>
61</html>
diff --git a/doc/_Footer.md b/doc/_Footer.md
new file mode 100644
index 00000000..29c39bb6
--- /dev/null
+++ b/doc/_Footer.md
@@ -0,0 +1,2 @@
1#_Footer
2_Shaarli, the personal, minimalist, super-fast, no-database delicious clone_
diff --git a/doc/_Sidebar.html b/doc/_Sidebar.html
index 0f9d546e..fbf6dffd 100644
--- a/doc/_Sidebar.html
+++ b/doc/_Sidebar.html
@@ -17,6 +17,7 @@
17<li><a href="Home.html">Home</a></li> 17<li><a href="Home.html">Home</a></li>
18<li>Installation 18<li>Installation
19<ul> 19<ul>
20<li><a href="Download.html">Download</a></li>
20<li><a href="Server-requirements.html">Server requirements</a></li> 21<li><a href="Server-requirements.html">Server requirements</a></li>
21<li><a href="Server-configuration.html">Server configuration</a></li> 22<li><a href="Server-configuration.html">Server configuration</a></li>
22<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 23<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
@@ -60,6 +61,7 @@
60<li><a href="Home.html">Home</a></li> 61<li><a href="Home.html">Home</a></li>
61<li>Installation 62<li>Installation
62<ul> 63<ul>
64<li><a href="Download.html">Download</a></li>
63<li><a href="Server-requirements.html">Server requirements</a></li> 65<li><a href="Server-requirements.html">Server requirements</a></li>
64<li><a href="Server-configuration.html">Server configuration</a></li> 66<li><a href="Server-configuration.html">Server configuration</a></li>
65<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 67<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md
index db75943a..68e3b9f3 100644
--- a/doc/_Sidebar.md
+++ b/doc/_Sidebar.md
@@ -1,6 +1,7 @@
1#_Sidebar 1#_Sidebar
2- [Home](Home.html) 2- [Home](Home.html)
3- Installation 3- Installation
4 - [Download](Download.html)
4 - [Server requirements](Server-requirements.html) 5 - [Server requirements](Server-requirements.html)
5 - [Server configuration](Server-configuration.html) 6 - [Server configuration](Server-configuration.html)
6 - [Shaarli configuration](Shaarli-configuration.html) 7 - [Shaarli configuration](Shaarli-configuration.html)
diff --git a/doc/sidebar.html b/doc/sidebar.html
index e8bc5932..826e4cb2 100644
--- a/doc/sidebar.html
+++ b/doc/sidebar.html
@@ -3,6 +3,7 @@
3<li><a href="Home.html">Home</a></li> 3<li><a href="Home.html">Home</a></li>
4<li>Installation 4<li>Installation
5<ul> 5<ul>
6<li><a href="Download.html">Download</a></li>
6<li><a href="Server-requirements.html">Server requirements</a></li> 7<li><a href="Server-requirements.html">Server requirements</a></li>
7<li><a href="Server-configuration.html">Server configuration</a></li> 8<li><a href="Server-configuration.html">Server configuration</a></li>
8<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li> 9<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>