diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/md/Backup,-restore,-import-and-export.md | 4 | ||||
-rw-r--r-- | doc/md/docker/shaarli-images.md | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/md/Backup,-restore,-import-and-export.md b/doc/md/Backup,-restore,-import-and-export.md index 89724857..bb790074 100644 --- 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 | |||
45 | However, you can use the third-party [scuttle-to-shaarli](https://github.com/q2apro/scuttle-to-shaarli) | 45 | However, you can use the third-party [scuttle-to-shaarli](https://github.com/q2apro/scuttle-to-shaarli) |
46 | tool to export the Scuttle database to the Netscape HTML format compatible with the Shaarli importer. | 46 | tool to export the Scuttle database to the Netscape HTML format compatible with the Shaarli importer. |
47 | 47 | ||
48 | ### Refind | ||
49 | |||
50 | 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. | ||
51 | |||
48 | ## Import Shaarli links to Firefox | 52 | ## Import Shaarli links to Firefox |
49 | 53 | ||
50 | - Export your Shaarli links as described above. | 54 | - Export your Shaarli links as described above. |
diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md index 5491ee76..12f7b5d1 100644 --- a/doc/md/docker/shaarli-images.md +++ b/doc/md/docker/shaarli-images.md | |||
@@ -24,6 +24,7 @@ The `stable` image relies on: | |||
24 | - [PHP5-FPM](http://php-fpm.org/) | 24 | - [PHP5-FPM](http://php-fpm.org/) |
25 | - [Nginx](http://nginx.org/) | 25 | - [Nginx](http://nginx.org/) |
26 | 26 | ||
27 | 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/). | ||
27 | 28 | ||
28 | ### Download from DockerHub | 29 | ### Download from DockerHub |
29 | ```bash | 30 | ```bash |