diff options
author | nodiscc <nodiscc@gmail.com> | 2015-03-05 13:44:40 +0100 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2015-03-05 13:44:40 +0100 |
commit | e894673c3698cc9d6af70c1f8cb497a51f5b0c25 (patch) | |
tree | 8faa01612b06f42b539cc0df6c117d011432543f /README.md | |
parent | 01b8f52718f5136fb7de54e09b47ae4523aec9e8 (diff) | |
parent | 9811b3efbca58bf464752e401d278fe677089a9c (diff) | |
download | Shaarli-e894673c3698cc9d6af70c1f8cb497a51f5b0c25.tar.gz Shaarli-e894673c3698cc9d6af70c1f8cb497a51f5b0c25.tar.zst Shaarli-e894673c3698cc9d6af70c1f8cb497a51f5b0c25.zip |
Merge pull request #140 from nodiscc/master
Various fixes
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -5,7 +5,7 @@ Shaarli, the personal, minimalist, super-fast, no-database delicious clone. | |||
5 | You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. | 5 | You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. |
6 | It is designed to be personal (single-user), fast and handy. | 6 | It is designed to be personal (single-user), fast and handy. |
7 | 7 | ||
8 | [![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | 8 | [![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli) [![Bountysource](https://www.bountysource.com/badge/team?team_id=19583&style=bounties_received)](https://www.bountysource.com/teams/shaarli/issues) |
9 | 9 | ||
10 | ## Features: | 10 | ## Features: |
11 | 11 | ||
@@ -51,7 +51,7 @@ It is designed to be personal (single-user), fast and handy. | |||
51 | 51 | ||
52 | ## Installing | 52 | ## Installing |
53 | 53 | ||
54 | Shaarli requires php 5.1 | 54 | Shaarli requires php 5.1. `php-gd` is optional and provides thumbnail resizing. |
55 | 55 | ||
56 | * Download the latest stable release from https://github.com/shaarli/Shaarli/releases | 56 | * Download the latest stable release from https://github.com/shaarli/Shaarli/releases |
57 | * Unpack the archive in a directory on your web server | 57 | * Unpack the archive in a directory on your web server |
@@ -63,9 +63,8 @@ _To get the development version, download https://github.com/shaarli/Shaarli/arc | |||
63 | 63 | ||
64 | ## Upgrading | 64 | ## Upgrading |
65 | 65 | ||
66 | Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. | 66 | * **If you installed from the zip:** Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. You will not lose your links and you will not have to reconfigure it. |
67 | You will not lose your links and you will not have to reconfigure it. | 67 | * **If you installed using `git clone`**: run `git pull` in your Shaarli directory. |
68 | |||
69 | 68 | ||
70 | 69 | ||
71 | ## About | 70 | ## About |