diff options
author | nodiscc <nodiscc@gmail.com> | 2017-12-17 23:43:03 +0100 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2017-12-17 23:43:03 +0100 |
commit | 5faa0697dd080acba0604adc57127674382f1ac7 (patch) | |
tree | be6d39e1d7e14d732638fe3c1b5f0e9fd442827e | |
parent | 236a8e48b640140f8976c3ffb9b8d807fa6d726d (diff) | |
parent | f6f8b2563c36d360d0374cba7e60616693aed907 (diff) | |
download | Shaarli-5faa0697dd080acba0604adc57127674382f1ac7.tar.gz Shaarli-5faa0697dd080acba0604adc57127674382f1ac7.tar.zst Shaarli-5faa0697dd080acba0604adc57127674382f1ac7.zip |
Merge remote-tracking branch 'nerostie/patch-2' into doc-overhaul
-rw-r--r-- | doc/md/Community-&-Related-software.md | 1 | ||||
-rw-r--r-- | doc/md/Features.md | 25 |
2 files changed, 1 insertions, 25 deletions
diff --git a/doc/md/Community-&-Related-software.md b/doc/md/Community-&-Related-software.md index 3c55e935..086af7c1 100644 --- a/doc/md/Community-&-Related-software.md +++ b/doc/md/Community-&-Related-software.md | |||
@@ -29,6 +29,7 @@ See [REST API](REST-API) for a list of official and community clients. | |||
29 | - [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter. | 29 | - [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter. |
30 | - [Disqus](https://github.com/kalvn/shaarli-plugin-disqus) by [@kalvn](https://github.com/kalvn): Adds Disqus comment system to your Shaarli. | 30 | - [Disqus](https://github.com/kalvn/shaarli-plugin-disqus) by [@kalvn](https://github.com/kalvn): Adds Disqus comment system to your Shaarli. |
31 | - [emojione](https://github.com/NerosTie/emojione) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli. | 31 | - [emojione](https://github.com/NerosTie/emojione) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli. |
32 | - [twemoji](https://github.com/NerosTie/twemoji) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli (Twemoji version) | ||
32 | - [google analytics](https://github.com/ericjuden/Shaarli-Google-Analytics-Plugin) by [@ericjuden](http://github.com/ericjuden): Adds Google Analytics tracking support | 33 | - [google analytics](https://github.com/ericjuden/Shaarli-Google-Analytics-Plugin) by [@ericjuden](http://github.com/ericjuden): Adds Google Analytics tracking support |
33 | - [launch](https://github.com/ArthurHoaro/launch-plugin) - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli. | 34 | - [launch](https://github.com/ArthurHoaro/launch-plugin) - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli. |
34 | - [related](https://github.com/ilesinge/shaarli-related) by [@ilesinge](https://github.com/ilesinge) - Show related links based on the number of identical tags. | 35 | - [related](https://github.com/ilesinge/shaarli-related) by [@ilesinge](https://github.com/ilesinge) - Show related links based on the number of identical tags. |
diff --git a/doc/md/Features.md b/doc/md/Features.md deleted file mode 100644 index eef88d03..00000000 --- a/doc/md/Features.md +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | ### Main features | ||
2 | Shaarli is intended: | ||
3 | |||
4 | - to share, comment and save interesting links and news | ||
5 | - to bookmark useful/frequent personal links (as private links) and share them between computers | ||
6 | - as a minimal blog/microblog/writing platform (no character limit) | ||
7 | - as a read-it-later list (for example items tagged `readlater`) | ||
8 | - to draft and save articles/ideas | ||
9 | - to keep code snippets | ||
10 | - to keep notes and documentation | ||
11 | - as a shared clipboard between machines | ||
12 | - as a todo list | ||
13 | - to store playlists (e.g. with the `music` or `video` tags) | ||
14 | - to keep extracts/comments from webpages that may disappear | ||
15 | - to keep track of ongoing discussions (for example items tagged `discussion`) | ||
16 | - [to feed RSS aggregators](http://shaarli.chassegnouf.net/?9Efeiw) (planets) with specific tags | ||
17 | - to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...) | ||
18 | |||
19 | ### Using Shaarli as a blog, notepad, pastebin... | ||
20 | |||
21 | - Go to your Shaarli setup and log in | ||
22 | - Click the `Add Link` button | ||
23 | - To share text only, do not enter any URL in the corresponding input field and click `Add Link` | ||
24 | - Pick a title and enter your article, or note, in the description field; add a few tags; optionally check `Private` then click `Save` | ||
25 | - VoilĂ ! Your article is now published (privately if you selected that option) and accessible using its permalink. | ||