aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/md/FAQ.md
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2017-08-06 16:15:32 +0200
committerGitHub <noreply@github.com>2017-08-06 16:15:32 +0200
commitc7fcea1347e81072c5b77c1b3c2c6fb13f02c16f (patch)
tree03e4d7bbdcfebdb704266caf4b5c0d87e90c02ce /doc/md/FAQ.md
parent4758c18164f8168be0b3e422c4af86827c913390 (diff)
parentf320efd689f17737ccbdef46cdc430d9e637b807 (diff)
downloadShaarli-c7fcea1347e81072c5b77c1b3c2c6fb13f02c16f.tar.gz
Shaarli-c7fcea1347e81072c5b77c1b3c2c6fb13f02c16f.tar.zst
Shaarli-c7fcea1347e81072c5b77c1b3c2c6fb13f02c16f.zip
Merge pull request #917 from virtualtam/documentation/fixes+improvements
Documentation fixes, improvements and additions
Diffstat (limited to 'doc/md/FAQ.md')
-rw-r--r--doc/md/FAQ.md19
1 files changed, 10 insertions, 9 deletions
diff --git a/doc/md/FAQ.md b/doc/md/FAQ.md
index 151dcef5..77faf117 100644
--- a/doc/md/FAQ.md
+++ b/doc/md/FAQ.md
@@ -8,23 +8,24 @@ Enough is enough. Saving simple links should not be a complicated heavy thing. I
8 8
9With Shaarli: 9With Shaarli:
10 10
11* The data is yours: It's hosted on your server. 11- The data is yours: It's hosted on your server.
12* Never fear of having your data locked-in. 12- Never fear of having your data locked-in.
13* Never fear to have your data sold to third party. 13- Never fear to have your data sold to third party.
14* Your private links are not hosted on a third party server. 14- Your private links are not hosted on a third party server.
15* You are not tracked by browser addons (like Diigo does) 15- You are not tracked by browser addons (like Diigo does)
16* You can change the look and feel of the pages if you want. 16- You can change the look and feel of the pages if you want.
17* You can change the behaviour of the program. 17- You can change the behaviour of the program.
18* It's magnitude faster than most bookmarking services. 18- It's magnitude faster than most bookmarking services.
19 19
20### What does Shaarli mean? 20### What does Shaarli mean?
21 21
22Shaarli is for shaaring your links. 22Shaarli stands for _shaaring_ your _links_.
23 23
24### My Shaarli is broken! 24### My Shaarli is broken!
25First of all, ensure that both the [web server](Server-configuration) and [Shaarli](Shaarli-configuration) are correctly configured, and that your installation is [supported](Server-requirements). 25First of all, ensure that both the [web server](Server-configuration) and [Shaarli](Shaarli-configuration) are correctly configured, and that your installation is [supported](Server-requirements).
26 26
27If everything looks right but the issue(s) remain(s), please: 27If everything looks right but the issue(s) remain(s), please:
28
28- take a look at the [troubleshooting](Troubleshooting) section 29- take a look at the [troubleshooting](Troubleshooting) section
29- come [chat with us](https://gitter.im/shaarli/Shaarli) on Gitter, we'll be happy to help ;-) 30- come [chat with us](https://gitter.im/shaarli/Shaarli) on Gitter, we'll be happy to help ;-)
30- browse active [issues](https://github.com/shaarli/Shaarli/issues) and [Pull Requests](https://github.com/shaarli/Shaarli/pulls) 31- browse active [issues](https://github.com/shaarli/Shaarli/issues) and [Pull Requests](https://github.com/shaarli/Shaarli/pulls)