Merge pull request #1058 from FranckKe/patch-1

doc: bookmarklet: fix link to issue 196

diff --git a/doc/md/Backup,-restore,-import-and-export.md b/doc/md/Backup,-restore,-import-and-export.md
index 897248576b678c95f45e4021e4c250f6697897a9..bb790074c9973dfe45a9c8b9e0a1d3c29aa628fa 100644 (file)
--- a/doc/md/Backup,-restore,-import-and-export.md
+++ b/doc/md/Backup,-restore,-import-and-export.md
@@ -45,6 +45,10 @@ Shaarli cannot import data directly from [Scuttle](https://github.com/scronide/s
 However, you can use the third-party [scuttle-to-shaarli](https://github.com/q2apro/scuttle-to-shaarli)
 tool to export the Scuttle database to the Netscape HTML format compatible with the Shaarli importer.
 
+### Refind
+
+You can use the third-party tool [Derefind](https://github.com/ShawnPConroy/Derefind) to convert refind.com bookmark exports to a format that can be imported into Shaarli.
+
 ## Import Shaarli links to Firefox
 
 - Export your Shaarli links as described above.

diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md
index 5491ee7684f6fc1f1d5bf1cc516fc53372bda89f..12f7b5d1ffaf8672acd7b0e5c58f45c44f5132ca 100644 (file)
--- a/doc/md/docker/shaarli-images.md
+++ b/doc/md/docker/shaarli-images.md
@@ -24,6 +24,7 @@ The `stable` image relies on:
 - [PHP5-FPM](http://php-fpm.org/)
 - [Nginx](http://nginx.org/)
 
+Additional [Dockerfiles](https://github.com/shaarli/Shaarli/tree/master/docker) are provided for the `arm32v7` platform, relying on [Linuxserver.io Alpine armhf images](https://hub.docker.com/r/lsiobase/alpine.armhf/). These images must be built using [`docker build`](https://docs.docker.com/engine/reference/commandline/build/) on an `arm32v7` machine or using an emulator such as [qemu](https://resin.io/blog/building-arm-containers-on-any-x86-machine-even-dockerhub/).
 
 ### Download from DockerHub
 ```bash