From f8b936e7e75601b5d96525f25d5b52dbabd909b4 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 4 Sep 2015 21:25:47 +0200 Subject: Doc: sync from Wiki, generate HTML Additions: - Installation/Download: how to get Shaarli - Community software: ShaarliOS app Modifications: - Installation/Server requirements: PHP 5.4 EOL, PHP 7 announcements - Installation/Server configuration: improve Nginx security - Troubleshooting: PHP sessions on `free.fr` Signed-off-by: VirtualTam --- doc/3rd-party-libraries.html | 1 + doc/Backup,-restore,-import-and-export.html | 1 + doc/Coding-guidelines.html | 1 + doc/Community-&-Related-software.html | 7 +- doc/Community-&-Related-software.md | 54 ++++++------ ...installation-over-SSH-and-serve-it-locally.html | 1 + doc/Datastore-hacks.html | 1 + doc/Development.html | 1 + doc/Directory-structure.html | 1 + doc/Download-CSS-styles-from-an-OPML-list.html | 1 + doc/Download.html | 97 ++++++++++++++++++++++ doc/Download.md | 31 +++++++ ...xample-patch---add-new-via-field-for-links.html | 1 + doc/FAQ.html | 1 + doc/Firefox-share.html | 1 + doc/GnuPG-signature.html | 1 + doc/Home.html | 1 + doc/Plugin-System.html | 1 + doc/RSS-feeds.html | 1 + doc/Security.html | 1 + doc/Server-configuration.html | 8 +- doc/Server-configuration.md | 7 +- doc/Server-requirements.html | 18 ++-- doc/Server-requirements.md | 7 +- doc/Shaarli-configuration.html | 1 + doc/Sharing-button.html | 1 + doc/Static-analysis.html | 1 + doc/TODO.html | 1 + doc/Theming.html | 1 + doc/Troubleshooting.html | 8 +- doc/Troubleshooting.md | 7 +- doc/Unit-tests.html | 1 + doc/Usage.html | 1 + doc/_Footer.html | 61 ++++++++++++++ doc/_Footer.md | 2 + doc/_Sidebar.html | 2 + doc/_Sidebar.md | 1 + doc/sidebar.html | 1 + 38 files changed, 289 insertions(+), 45 deletions(-) create mode 100644 doc/Download.html create mode 100644 doc/Download.md create mode 100644 doc/_Footer.html create mode 100644 doc/_Footer.md (limited to 'doc') 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 @@
  • Home
  • Installation
      +
    • Download
    • Server requirements
    • Server configuration
    • Shaarli configuration
    • 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; }
    • Home
    • Installation
        +
      • Download
      • Server requirements
      • Server configuration
      • Shaarli configuration
      • 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 @@
      • Home
      • Installation
          +
        • Download
        • Server requirements
        • Server configuration
        • Shaarli configuration
        • 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 @@
        • Home
        • Installation -

          Android apps

          +

          Mobile Apps

          Integration with other platforms

          Alternatives to Shaarli

          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 @@ #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) 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; }
        • Home
        • Installation
            +
          • Download
          • Server requirements
          • Server configuration
          • Shaarli configuration
          • 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; }
          • Home
          • Installation
              +
            • Download
            • Server requirements
            • Server configuration
            • Shaarli configuration
            • 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 @@
            • Home
            • Installation
                +
              • Download
              • Server requirements
              • Server configuration
              • Shaarli configuration
              • 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; }
              • Home
              • Installation
                  +
                • Download
                • Server requirements
                • Server configuration
                • Shaarli configuration
                • 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; }
                • Home
                • Installation
                    +
                  • Download
                  • Server requirements
                  • Server configuration
                  • Shaarli configuration
                  • 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 @@ + + + + + + + Shaarli - Download + + + + + + + +

                    Download

                    +

                    Get Shaarli!

                    +

                    Latest stable revision

                    +

                    This revision has been released and tested.

                    + +
                    $ git clone https://github.com/shaarli/Shaarli.git -b stable shaarli
                    +

                    Download as an archive

                    +
                    $ wget https://github.com/shaarli/Shaarli/archive/stable.zip
                    +$ unzip stable.zip
                    +$ mv Shaarli-stable shaarli
                    +

                    Tarballs are also available:

                    +
                    $ 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:

                    +
                    $ git clone https://github.com/shaarli/Shaarli.git shaarli
                    + + 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 @@ +#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 +``` 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 @@
                  • Home
                  • Installation
                      +
                    • Download
                    • Server requirements
                    • Server configuration
                    • Shaarli configuration
                    • 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 @@
                    • Home
                    • Installation
                        +
                      • Download
                      • Server requirements
                      • Server configuration
                      • Shaarli configuration
                      • 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 @@
                      • Home
                      • Installation
                          +
                        • Download
                        • Server requirements
                        • Server configuration
                        • Shaarli configuration
                        • 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; }
                        • Home
                        • Installation
                            +
                          • Download
                          • Server requirements
                          • Server configuration
                          • Shaarli configuration
                          • 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 @@
                          • Home
                          • Installation
                              +
                            • Download
                            • Server requirements
                            • Server configuration
                            • Shaarli configuration
                            • 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; }
                            • Home
                            • Installation
                                +
                              • Download
                              • Server requirements
                              • Server configuration
                              • Shaarli configuration
                              • 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 @@
                              • Home
                              • Installation
                                  +
                                • Download
                                • Server requirements
                                • Server configuration
                                • Shaarli configuration
                                • 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; }
                                • Home
                                • Installation
                                    +
                                  • Download
                                  • Server requirements
                                  • Server configuration
                                  • Shaarli configuration
                                  • 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; }
                                  • Home
                                  • Installation
                                      +
                                    • Download
                                    • Server requirements
                                    • Server configuration
                                    • Shaarli configuration
                                    • @@ -279,10 +280,15 @@ location ~ ~$ { }
                                      # /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;
                                       }
                                      # /etc/nginx/static_assets.conf
                                       location ~* \.(?: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 ~ ~$ {
                                       ```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
                                      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 @@
                                       
                                    • Home
                                    • Installation
                                        +
                                      • Download
                                      • Server requirements
                                      • Server configuration
                                      • Shaarli configuration
                                      • @@ -75,21 +76,26 @@ +7 +RC2 +planned + + 5.6 Supported :white_check_mark: - + 5.5 Supported :white_check_mark: - + 5.4 -Supported +EOL: 2015-09-14 :white_check_mark: - + 5.3 EOL: 2014-08-14 :white_check_mark: @@ -100,9 +106,9 @@ -

                                        PHP 7.0 information:

                                        +

                                        PHP 7 information:

                                          -
                                        • Beta1 announcement
                                        • +
                                        • Announcements: Beta1, RC1, RC2
                                        • TODOLIST
                                        • Recent bugs
                                        • Git repository
                                        • 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 @@ ### 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) 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; }
                                        • Home
                                        • Installation
                                            +
                                          • Download
                                          • Server requirements
                                          • Server configuration
                                          • Shaarli configuration
                                          • 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 @@
                                          • Home
                                          • Installation
                                              +
                                            • Download
                                            • Server requirements
                                            • Server configuration
                                            • Shaarli configuration
                                            • 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 @@
                                            • Home
                                            • Installation
                                                +
                                              • Download
                                              • Server requirements
                                              • Server configuration
                                              • Shaarli configuration
                                              • 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 @@
                                              • Home
                                              • Installation
                                                  +
                                                • Download
                                                • Server requirements
                                                • Server configuration
                                                • Shaarli configuration
                                                • 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; }
                                                • Home
                                                • Installation
                                                    +
                                                  • Download
                                                  • Server requirements
                                                  • Server configuration
                                                  • Shaarli configuration
                                                  • 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; }
                                                  • Home
                                                  • Installation
                                                      +
                                                    • Download
                                                    • Server requirements
                                                    • Server configuration
                                                    • Shaarli configuration
                                                    • @@ -134,10 +135,11 @@ code > span.er { color: #ff0000; font-weight: bold; }

                                                      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)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:
                                                      -
                                                      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
                                                      • On 1and1 : 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).
                                                      • 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. ## 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 + +php56 1 + ``` * 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; }
                                                      • Home
                                                      • Installation