Update services

2 files changed, 12 insertions, 5 deletions

diff --git a/research/computing/services.md b/research/computing/services.md
index 203bba9..3fcf154 100644
--- a/research/computing/services.md
+++ b/research/computing/services.md
@@ -197,8 +197,10 @@ Office
 * [Feng Office](http://www.fengoffice.com/).
 * [SocialCalc](https://www.socialtext.net/open/socialcalc) ([código](https://github.com/audreyt/socialcalc)).
 * [OBM - Open Business Management](http://obm.org).
-* [Etherpad](http://etherpad.org/) ([puppet-etherpad](https://git.fluxo.info/?p=puppet-etherpad.git)).
+* [Etherpad](http://etherpad.org/) ([puppet-etherpad](https://git.fluxo.info/?p=puppet-etherpad.git); [vim-etherpad](https://github.com/guyzmo/vim-etherpad) as a proof-of-concept).
 * [Ethercalc](http://www.ethercalc.org) ([código](https://github.com/audreyt/ethercalc)).
+* [HedgeDoc](https://docs.hedgedoc.org/): create real-time collaborative markdown notes.
+* [HackMD - Collaborative Markdown Knowledge Base](https://hackmd.io/#)
 * [LastCalc Is Open Sourced](http://science.slashdot.org/story/12/03/10/186201/lastcalc-is-open-sourced).
 * [COMT](http://www.co-ment.org/).
 * [UNG Project](http://www.ung-project.org).
@@ -411,8 +413,9 @@ Bookmarks
 * [SemanticScuttle](http://semanticscuttle.sourceforge.net/).
 * [QStode](https://github.com/piger/qstode).
 * [Bookie](https://github.com/bookieio/Bookie).
-* [wallabag: a self hostable application for saving web pages](https://wallabag.org/en).
+* [wallabag: a self hostable application for saving web pages](https://wallabag.org/en) with [wallabag-cli](https://github.com/Nepochal/wallabag-cli).
 * [prismo](https://gitlab.com/mbajur/prismo).
+* [linkding: Self-hosted bookmark service](https://github.com/sissbruecker/linkding)
 
 Libraries
 ---------
diff --git a/research/computing/suckless/sites.md b/research/computing/suckless/sites.md
index 5ca19d2..f93a121 100644
--- a/research/computing/suckless/sites.md
+++ b/research/computing/suckless/sites.md
@@ -72,9 +72,9 @@ Now simply run `make web_deploy` with the above mentioned `Makefile` do sync you
 
 # Alternatives
 
-* [The updated big list of static website generators for your site, blog or wiki](https://iwantmyname.com/blog/2014/05/the-updated-big-list-of-static-website-generators-for-your-site-blog-or-wiki).
-* [Top Open-Source Static Site Generators - StaticGen](https://www.staticgen.com/).
 * [Static Site Generators](https://staticsitegenerators.net/).
+* [Top Open-Source Static Site Generators - StaticGen](https://www.staticgen.com/).
+* [The updated big list of static website generators for your site, blog or wiki](https://iwantmyname.com/blog/2014/05/the-updated-big-list-of-static-website-generators-for-your-site-blog-or-wiki).
 * [Static Site Generators at GitHub](https://github.com/skx/static-site-generators).
 * [Replacing Jekyll with Pandoc and a Makefile](https://tylercipriani.com/2014/05/13/replace-jekyll-with-pandoc-makefile.html).
 * [Brane Dump: Static Comments in Jekyll](http://www.hezmatt.org/~mpalmer/blog/2011/07/19/static-comments-in-jekyll.html).
@@ -85,13 +85,17 @@ Now simply run `make web_deploy` with the above mentioned `Makefile` do sync you
 * [Grav](http://getgrav.org/).
 * [Hakyll](http://jaspervdj.be/hakyll/) ([package](https://packages.debian.org/sid/libghc-hakyll-dev)).
 * [Jekyll](http://jekyllrb.com/) ([package](https://packages.debian.org/stable/jekyll)).
+* [MkDocs](https://www.mkdocs.org/#building-the-site)
+* [Sphinx](http://sphinx-doc.org/) ([package](https://packages.debian.org/stable/python-sphinx)).
 * [Static site generators for building web sites](https://lwn.net/Articles/541299/).
 * [Pelican Static Site Generator, Powered by Python](http://blog.getpelican.com/) ([package](https://packages.debian.org/sid/python-pelican)).
 * [Middleman: Hand-crafted frontend development](https://middlemanapp.com/).
 * [Juvia: a commenting server similar to Disqus and IntenseDebate](https://github.com/phusion/juvia).
 * [gitit](https://github.com/jgm/gitit/tree/master/).
-* [Sphinx](http://sphinx-doc.org/) ([package](https://packages.debian.org/stable/python-sphinx)).
 * [Utterson: a minimal static blog generator written using old-school unix tools (make, ksh, m4, awk, procmail and a pinch of elisp)](https://github.com/stef/utterson).
 * [werc - A sane web anti-framework](http://werc.cat-v.org/).
 * [cfenollosa/bashblog: A single Bash script to create blogs. Download, run, write, done!](https://github.com/cfenollosa/bashblog).
 * [blogofile](https://packages.debian.org/stable/blogofile)
+* [tkluysk/yaml-to-html: transform a folder of markdown files with yaml frontmatter to html](https://github.com/tkluysk/yaml-to-html)
+* [maxhoffmann/yaml-markdown-to-html: transform a folder of markdown files with yaml frontmatter to html](https://github.com/maxhoffmann/yaml-markdown-to-html)
+* [brunobord/static-markdown: A static HTTP server, with markdown rendering mechanism](https://github.com/brunobord/static-markdown)