]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Doc: sync from Wiki, generate HTML 340/head
authorVirtualTam <virtualtam@flibidi.net>
Fri, 4 Sep 2015 19:25:47 +0000 (21:25 +0200)
committerVirtualTam <virtualtam@flibidi.net>
Fri, 4 Sep 2015 19:32:25 +0000 (21:32 +0200)
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>
38 files changed:
doc/3rd-party-libraries.html
doc/Backup,-restore,-import-and-export.html
doc/Coding-guidelines.html
doc/Community-&-Related-software.html
doc/Community-&-Related-software.md
doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
doc/Datastore-hacks.html
doc/Development.html
doc/Directory-structure.html
doc/Download-CSS-styles-from-an-OPML-list.html
doc/Download.html [new file with mode: 0644]
doc/Download.md [new file with mode: 0644]
doc/Example-patch---add-new-via-field-for-links.html
doc/FAQ.html
doc/Firefox-share.html
doc/GnuPG-signature.html
doc/Home.html
doc/Plugin-System.html
doc/RSS-feeds.html
doc/Security.html
doc/Server-configuration.html
doc/Server-configuration.md
doc/Server-requirements.html
doc/Server-requirements.md
doc/Shaarli-configuration.html
doc/Sharing-button.html
doc/Static-analysis.html
doc/TODO.html
doc/Theming.html
doc/Troubleshooting.html
doc/Troubleshooting.md
doc/Unit-tests.html
doc/Usage.html
doc/_Footer.html [new file with mode: 0644]
doc/_Footer.md [new file with mode: 0644]
doc/_Sidebar.html
doc/_Sidebar.md
doc/sidebar.html

index 86f670aefabac96c0ce70a3c84320cb163cca02f..21fa20aa9b42808cab962a8124ec5b87f255eedf 100644 (file)
@@ -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>
index 40c7a852b6a339f0e7ade55a026bef4bec718aa0..5724b689269e44ea5cc0cab81ecca5d9a37c5007 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index fd6fa57159abe07b62110a476ca9cb485b6ddbb2..40d179122e703ee18b01fda05b05cf066dc3e36a 100644 (file)
@@ -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>
index 25ef0f883130e05964e92f74e2f35ec78e4aeb8d..34bc615790adb32c79c40bb635b3be224523d1e1 100644 (file)
@@ -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>
 <li><a href="https://github.com/mknexen/shaarli-api">mknexen/shaarli-api</a> - A REST API for Shaarli<a href=".html"></a></li>
 <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>
 </ul>
-<h3 id="android-apps">Android apps</h3>
+<h3 id="mobile-apps">Mobile Apps</h3>
 <ul>
+<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>
 <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>
 <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>
 </ul>
 <h2 id="integration-with-other-platforms">Integration with other platforms</h2>
 <ul>
 <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>
-<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>
+<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>
 </ul>
 <h2 id="alternatives-to-shaarli">Alternatives to Shaarli</h2>
 <ul>
 <li><a href="http://alternativeto.net/software/shaarli/">Shaarli alternatives</a> (alternativeto.net)<a href=".html"></a></li>
 <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>
 <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>
+<li><a href="https://wordpress.org/plugins/wp-bookmarks/">Wordpress bookmarks</a><a href=".html"></a></li>
 </ul>
 </body>
 </html>
index 9cf479355bba79399194a462d8c2c547d93e6b6d..77ea24203293f9b3ae74ca247bbb2108255d1b5e 100644 (file)
@@ -1,40 +1,42 @@
 #Community & Related software
-*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.*
+_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._
 
-*TODO: contact repos owners to see if they'd like to standardize their work with the community fork.*
+_TODO: contact repos owners to see if they'd like to standardize their work with the community fork._
 
 ## Community
-* [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli[](.html)
-* [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html)[](.html)
-* [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json)[](.html)
-* [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list)[](.html)
-* [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)
-* [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas)[](.html)
-* [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr)[](.html)
-* [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)[](.html)
-* [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html)
-* [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html)
+- [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli[](.html)
+- [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html)[](.html)
+- [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json)[](.html)
+- [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list)[](.html)
+- [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)
+- [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas)[](.html)
+- [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr)[](.html)
+- [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)[](.html)
+- [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html)
+- [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html)
 
 ### Themes
 See [Theming](Theming.html) for the list of community-contributed themes, and an installation guide.
 
 ### Server apps
- * [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content[](.html)
- * [shaarli-river](https://github.com/mknexen/shaarli-river) - An aggregator for shaarlis with many features [](.html)
- * [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)
- * [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis[](.html)
- * [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli[](.html)
- * [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)
+- [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content[](.html)
+- [shaarli-river](https://github.com/mknexen/shaarli-river) - An aggregator for shaarlis with many features [](.html)
+- [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)
+- [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis[](.html)
+- [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli[](.html)
+- [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)
 
-### Android apps
- * [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider[](.html)
- * [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli[](.html)
+### Mobile Apps
+- [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)
+- [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider[](.html)
+- [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli[](.html)
 
 ## Integration with other platforms 
- * [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)
- * [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebara[](.html)
+- [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)
+- [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebar[](.html)
 
 ## Alternatives to Shaarli
-* [Shaarli alternatives](http://alternativeto.net/software/shaarli/) (alternativeto.net)[](.html)
-* [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, free bookmark sharing software, written in Python[](.html)
-* [Unmark](https://github.com/plainmade/unmark) - An open source todo app for bookmarks ([Homepage](https://unmark.it/))[](.html)
+- [Shaarli alternatives](http://alternativeto.net/software/shaarli/) (alternativeto.net)[](.html)
+- [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, free bookmark sharing software, written in Python[](.html)
+- [Unmark](https://github.com/plainmade/unmark) - An open source todo app for bookmarks ([Homepage](https://unmark.it/))[](.html)
+- [Wordpress bookmarks](https://wordpress.org/plugins/wp-bookmarks/)[](.html)
index 1e81b7358d7bcdf9bddc44b148f4a6477dce74d6..e27b1134660a36f7d9f2a555963aadb422e53275 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index e3adee1990b9b3de056604cb3788de7583564a55..0bf2a49373edbfbaf7327d644ea0b8746e2e54a0 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index 6e222573ae3d2bd27ab0e304ae38fcf44534c9f1..88cf58543fd13293466015dd258daabd8a123f64 100644 (file)
@@ -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>
index ae0458f3cc2070446282100dbe8026f60d6d0a71..7015923c37454208199a3f2b28435e9c590faa39 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index 033dd18cc9a1a4fe5c52fbb1b6ceef12d4997594..7d7fe968dd0d2654779c04842229744b9d214ac7 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
diff --git a/doc/Download.html b/doc/Download.html
new file mode 100644 (file)
index 0000000..5f39c70
--- /dev/null
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="generator" content="pandoc">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+  <title>Shaarli - Download</title>
+  <style type="text/css">code{white-space: pre;}</style>
+  <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+  <style type="text/css">
+table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
+  margin: 0; padding: 0; vertical-align: baseline; border: none; }
+table.sourceCode { width: 100%; line-height: 100%; }
+td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
+td.sourceCode { padding-left: 5px; }
+code > span.kw { color: #007020; font-weight: bold; }
+code > span.dt { color: #902000; }
+code > span.dv { color: #40a070; }
+code > span.bn { color: #40a070; }
+code > span.fl { color: #40a070; }
+code > span.ch { color: #4070a0; }
+code > span.st { color: #4070a0; }
+code > span.co { color: #60a0b0; font-style: italic; }
+code > span.ot { color: #007020; }
+code > span.al { color: #ff0000; font-weight: bold; }
+code > span.fu { color: #06287e; }
+code > span.er { color: #ff0000; font-weight: bold; }
+  </style>
+  <link rel="stylesheet" href="github-markdown.css">
+</head>
+<body>
+<div id="local-sidebar">
+<ul>
+<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>
+</ul></li>
+<li><a href="Usage.html">Usage</a>
+<ul>
+<li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
+<li><a href="Firefox-share.html">Firefox share</a></li>
+<li><a href="RSS-feeds.html">RSS feeds</a></li>
+</ul></li>
+<li>How To
+<ul>
+<li><a href="Backup,-restore,-import-and-export.html">Backup, restore, import and export</a></li>
+<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>
+<li><a href="Download-CSS-styles-from-an-OPML-list.html">Download CSS styles from an OPML list</a></li>
+<li><a href="Datastore-hacks.html">Datastore hacks</a></li>
+</ul></li>
+<li><a href="Troubleshooting.html">Troubleshooting</a></li>
+<li><a href="Development.html">Development</a>
+<ul>
+<li><a href="GnuPG-signature.html">GnuPG signature</a></li>
+<li><a href="Coding-guidelines.html">Coding guidelines</a></li>
+<li><a href="Directory-structure.html">Directory structure</a></li>
+<li><a href="3rd-party-libraries.html">3rd party libraries</a></li>
+<li><a href="Plugin-System.html">Plugin System</a></li>
+<li><a href="Security.html">Security</a></li>
+<li><a href="Static-analysis.html">Static analysis</a></li>
+<li><a href="Theming.html">Theming</a></li>
+<li><a href="Unit-tests.html">Unit tests</a></li>
+</ul></li>
+<li>About
+<ul>
+<li><a href="FAQ.html">FAQ</a></li>
+<li><a href="Community-&amp;-Related-software.html">Community &amp; Related software</a></li>
+<li><a href="TODO.html">TODO</a></li>
+</ul></li>
+</ul>
+</div>
+<h1 id="download">Download</h1>
+<h2 id="get-shaarli">Get Shaarli!</h2>
+<h3 id="latest-stable-revision">Latest stable revision</h3>
+<p>This revision has been <a href="https://github.com/shaarli/Shaarli/releases">released</a> and tested.<a href=".html"></a></p>
+<h4 id="clone-with-git-recommended">Clone with Git (recommended)</h4>
+<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>
+<h4 id="download-as-an-archive">Download as an archive</h4>
+<pre class="sourceCode bash"><code class="sourceCode bash">$ <span class="kw">wget</span> https://github.com/shaarli/Shaarli/archive/stable.zip
+$ <span class="kw">unzip</span> stable.zip
+$ <span class="kw">mv</span> Shaarli-stable shaarli</code></pre>
+<p>Tarballs are also available:</p>
+<pre class="sourceCode bash"><code class="sourceCode bash">$ <span class="kw">wget</span> https://github.com/shaarli/Shaarli/archive/stable.tar.gz
+$ <span class="kw">tar</span> xvf stable.tar.gz
+$ <span class="kw">mv</span> Shaarli-stable shaarli</code></pre>
+<h3 id="development-mainline">Development (mainline)</h3>
+<p><em>Use at your own risk!</em></p>
+<p>To get the latest changes:</p>
+<pre class="sourceCode bash"><code class="sourceCode bash">$ <span class="kw">git</span> clone https://github.com/shaarli/Shaarli.git shaarli</code></pre>
+</body>
+</html>
diff --git a/doc/Download.md b/doc/Download.md
new file mode 100644 (file)
index 0000000..7930f54
--- /dev/null
@@ -0,0 +1,31 @@
+#Download
+## Get Shaarli!
+### Latest stable revision
+This revision has been [released](https://github.com/shaarli/Shaarli/releases) and tested.[](.html)
+
+#### Clone with Git (recommended)
+```bash
+$ git clone https://github.com/shaarli/Shaarli.git -b stable shaarli
+```
+
+#### Download as an archive
+```bash
+$ wget https://github.com/shaarli/Shaarli/archive/stable.zip
+$ unzip stable.zip
+$ mv Shaarli-stable shaarli
+```
+
+Tarballs are also available:
+```bash
+$ wget https://github.com/shaarli/Shaarli/archive/stable.tar.gz
+$ tar xvf stable.tar.gz
+$ mv Shaarli-stable shaarli
+```
+
+### Development (mainline)
+_Use at your own risk!_
+
+To get the latest changes:
+```bash
+$ git clone https://github.com/shaarli/Shaarli.git shaarli
+```
index ff73ec0f764633ece156b56d62c8e6f97c477073..388ff963279ac8f228c9d97afdbcec5b28f80c66 100644 (file)
@@ -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>
index b26b63550c9d5f5aee967dcd8af2342d354ab1e4..33eb7c60a02a230b840f6def6af2402d139035ab 100644 (file)
@@ -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>
index d666ac7b4c11e4c176bd152a699dacc9188c0fcf..2943a86dd855c907d729b8ef07ebafcc04673a60 100644 (file)
@@ -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>
index b7dc1083fd31cd729e76f72f0ce3131db90cb351..a1210b75c29b168541703ffd4b985426cb7b342a 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index 90372a40b40a76e2ca9a128e0e00377d8640f295..39d951c8302ef7cb8cb219b1bebebbef328acacb 100644 (file)
@@ -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>
index 719b76fe4d52fe9c0219926af1ed636f2bb0863c..cb1cb7464bbd3fb4066643379be41a64a5b4379c 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index 7d1de078bc0027ce601778d11d10f80bf1219383..859869bf6010aaf281c0a8c4910c38a618e04b02 100644 (file)
@@ -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>
index db44da2ca09114f9e10e46346a7dfa2d72bb473d..914fa5074a908d34911e29e1054397036f191ca9 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index e4e383a3a2dd24ce8136d10c16533036325a25e3..3aa897225da720fc3d887b7b2b854d3c0a1d52ee 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
@@ -279,10 +280,15 @@ location ~ ~$ {
 }</code></pre>
 <pre class="nginx"><code># /etc/nginx/php.conf
 location ~ (index)\.php$ {
-    # proxy PHP requests to PHP-FPM
+    # filter and proxy PHP requests to PHP-FPM
     fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
     fastcgi_index  index.php;
     include        fastcgi.conf;
+}
+
+location ~ \.php$ {
+    # deny access to all other PHP scripts
+    deny all;
 }</code></pre>
 <pre class="nginx"><code># /etc/nginx/static_assets.conf
 location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
index c9ec4e137861839ae8415d5ec16817ec2440683a..c7b17c5aadb467c24959cb6ef2649f239f622bbb 100644 (file)
@@ -219,11 +219,16 @@ location ~ ~$ {
 ```nginx
 # /etc/nginx/php.conf
 location ~ (index)\.php$ {
-    # proxy PHP requests to PHP-FPM
+    # filter and proxy PHP requests to PHP-FPM
     fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
     fastcgi_index  index.php;
     include        fastcgi.conf;
 }
+
+location ~ \.php$ {
+    # deny access to all other PHP scripts
+    deny all;
+}
 ```
 
 ```nginx
index b0426eec67740a66b9e05652b12dcc300bd4bd13..f34f589bd09e137d085e6f6303948c5cba5d1598 100644 (file)
@@ -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>
 </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>
 <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>
index 6ccccacac87fa059e732a985ba908987c7b852ed..8f44d606fd4d63ada9fc3c50bd8c4c2b3f147e97 100644 (file)
@@ -9,16 +9,17 @@
 ### Supported versions
 Version | Status | Shaarli compatibility
 :---:|:---:|:---:
+7   | RC2 | planned
 5.6 | Supported | :white_check_mark:
 5.5 | Supported | :white_check_mark:
-5.4 | Supported | :white_check_mark:
+5.4 | EOL: 2015-09-14 | :white_check_mark:
 5.3 | EOL: 2014-08-14 | :white_check_mark:
 
 See also:
 - [Travis configuration](https://github.com/shaarli/Shaarli/blob/master/.travis.yml)[](.html)
 
-PHP 7.0 information:
-- [Beta1 announcement](http://php.net/archive/2015.php#id2015-07-10-4)[](.html)
+PHP 7 information:
+- 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)
 - [TODOLIST](https://wiki.php.net/todo/php70)[](.html)
 - [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)
 - [Git repository](http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-7.0.0)[](.html)
index 663b43e5f94aea163ad2db022190b5c94e633c87..b7e29cb3e2d73c4355fdc7dfca51b95ca64baf66 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index d3f362535a279c14d9678f7d656b339867fbebcd..6fa5e77aee3e5f6e683c5cc23b84568b8bd7fa3a 100644 (file)
@@ -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>
index dd1dd223eb95179a69da4f1638458edec233db57..e95893a86460eb7deac3a30d505475a5e3309dc4 100644 (file)
@@ -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>
index c25775ccbc84e501ac463a3ba438d0dcedfabecd..7a6a4bf6bb15f86fba5ca1059e4dbd14fa036504 100644 (file)
@@ -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>
index b5d214e58322c6431197547fffe0fcf20ce8621d..a751eb98046e14990dc84e366963c71a0889218b 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index 00cfdff825600c9b31c8977aed10f19daa769fe3..98fd53549733eac259c43c1f27ac38b4ef4d4b52 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
@@ -134,10 +135,11 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <h2 id="hosting-problems">Hosting problems</h2>
 <h3 id="old-php-versions">Old PHP versions</h3>
 <ul>
-<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>
+<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>
 </ul>
-<pre class="sourceCode ini"><code class="sourceCode ini"><span class="dt">php 1</span>
-<span class="dt">SetEnv PHP_VER 5</span></code></pre>
+<pre class="sourceCode ini"><code class="sourceCode ini"><span class="dt">&lt;IfDefine Free&gt;</span>
+<span class="dt">php56 1</span>
+<span class="dt">&lt;/IfDefine&gt;</span></code></pre>
 <ul>
 <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>
 <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>
index 4e6cdb063b458515160d1dfaccb16b231d52a6d3..e91fe846cfee8e7590fa8e91233a53392ac7bdd2 100644 (file)
@@ -61,11 +61,12 @@ Search for `failed` in this file to look for unauthorized login attempts.
 
 ## Hosting problems
 ### Old PHP versions
- * 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:
+ * 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)
 
 ```ini
-php 1
-SetEnv PHP_VER 5
+<IfDefine Free>
+php56 1
+</IfDefine>
 ```
 
  * 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`
index f4b42bdfbc70cacb2b909bee957d3f35b9f25101..6d760771241482be60f3fe31d74ab1d02be12351 100644 (file)
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 <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>
index ad5b79650f48c91e7c8f9bbf503afa5a516d7147..0ba457f6975413e2332197b4093c30e195a6c209 100644 (file)
@@ -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>
diff --git a/doc/_Footer.html b/doc/_Footer.html
new file mode 100644 (file)
index 0000000..9803238
--- /dev/null
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="generator" content="pandoc">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+  <title>Shaarli - _Footer</title>
+  <style type="text/css">code{white-space: pre;}</style>
+  <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+  <link rel="stylesheet" href="github-markdown.css">
+</head>
+<body>
+<div id="local-sidebar">
+<ul>
+<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>
+</ul></li>
+<li><a href="Usage.html">Usage</a>
+<ul>
+<li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
+<li><a href="Firefox-share.html">Firefox share</a></li>
+<li><a href="RSS-feeds.html">RSS feeds</a></li>
+</ul></li>
+<li>How To
+<ul>
+<li><a href="Backup,-restore,-import-and-export.html">Backup, restore, import and export</a></li>
+<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>
+<li><a href="Download-CSS-styles-from-an-OPML-list.html">Download CSS styles from an OPML list</a></li>
+<li><a href="Datastore-hacks.html">Datastore hacks</a></li>
+</ul></li>
+<li><a href="Troubleshooting.html">Troubleshooting</a></li>
+<li><a href="Development.html">Development</a>
+<ul>
+<li><a href="GnuPG-signature.html">GnuPG signature</a></li>
+<li><a href="Coding-guidelines.html">Coding guidelines</a></li>
+<li><a href="Directory-structure.html">Directory structure</a></li>
+<li><a href="3rd-party-libraries.html">3rd party libraries</a></li>
+<li><a href="Plugin-System.html">Plugin System</a></li>
+<li><a href="Security.html">Security</a></li>
+<li><a href="Static-analysis.html">Static analysis</a></li>
+<li><a href="Theming.html">Theming</a></li>
+<li><a href="Unit-tests.html">Unit tests</a></li>
+</ul></li>
+<li>About
+<ul>
+<li><a href="FAQ.html">FAQ</a></li>
+<li><a href="Community-&amp;-Related-software.html">Community &amp; Related software</a></li>
+<li><a href="TODO.html">TODO</a></li>
+</ul></li>
+</ul>
+</div>
+<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>
+</body>
+</html>
diff --git a/doc/_Footer.md b/doc/_Footer.md
new file mode 100644 (file)
index 0000000..29c39bb
--- /dev/null
@@ -0,0 +1,2 @@
+#_Footer
+_Shaarli, the personal, minimalist, super-fast, no-database delicious clone_
index 0f9d546e5cbdf2d75ba1cbba96c0f2396ee6f678..fbf6dffd79e0410fb63b7a13dc7a8ddef64d457f 100644 (file)
@@ -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>
@@ -60,6 +61,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>
index db75943a2bbaaf201927ccf7aa7d29df9e7954d6..68e3b9f3d10bc9b1b7bfbefb1ee230ab9bf1c89a 100644 (file)
@@ -1,6 +1,7 @@
 #_Sidebar
 - [Home](Home.html)
 - Installation
+    - [Download](Download.html)
     - [Server requirements](Server-requirements.html)
     - [Server configuration](Server-configuration.html)
     - [Shaarli configuration](Shaarli-configuration.html)
index e8bc59323ebd65022ec1b15dc9af6b4575abcaa9..826e4cb2177f6a3ad1c9070732245d7e49159e96 100644 (file)
@@ -3,6 +3,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>