Merge branch 'develop'

1 files changed, 34 insertions, 19 deletions

diff --git a/index.md b/index.md
index 8984ac1..645acdb 100644
--- a/index.md
+++ b/index.md
@@ -3,14 +3,17 @@
 Keyringer lets you manage and share secrets using GnuPG and Git with custom
 commands to encrypt, decrypt, recrypt, create key pairs, etc.
 
-- Project page: [https://keyringer.pw](https://keyringer.pw)
-- Manpage: [keyringer.1](share/man/keyringer.1)
-- License: [GPLv3+](LICENSE)
-- Current issue tracker: [see tasks](/tasks).
-- Archived issue tracker: [https://keyringer.pw/trac](https://keyringer.pw/trac)
-- Tor hidden service: [http://4qt45wbulqipigwa.onion](http://4qt45wbulqipigwa.onion)
-- Releases: [https://keyringer.pw/releases](releases)
-- Contact: rhatto at riseup.net
+* Project page: [https://keyringer.fluxo.info](https://keyringer.fluxo.info)
+* Repository and issue tracker: [https://0xacab.org/rhatto/keyringer](https://0xacab.org/rhatto/keyringer)
+* Repository mirror: [https://git.fluxo.info/keyringer](https://git.fluxo.info/keyringer)
+* Archived issue trackers:
+  * [Built-in Taskwarrior database](/tasks).
+  * [Trac](https://keyringer.fluxo.info/trac)
+* Manpage: [keyringer.1](share/man/keyringer.1)
+* License: [GPLv3+](LICENSE)
+* Tor Onion Service: [http://fpwwehb7ngvmxwl5ahtubh5gs5i4olmrubx73zlnzheubhjweik5irid.onion](http://fpwwehb7ngvmxwl5ahtubh5gs5i4olmrubx73zlnzheubhjweik5irid.onion)
+* Releases: [https://keyringer.fluxo.info/releases](releases)
+* Contact: rhatto at riseup.net
 
 Index
 -----
@@ -22,7 +25,7 @@ Installation
 
 Just clone
 
-    git clone https://git.fluxo.info/keyringer
+    git clone https://0xacab.org/rhatto/keyringer.git
 
 You can also verify the latest commit's OpenPGP signature:
 
@@ -224,8 +227,8 @@ Keyringer's basic concepts are as follows:
     one encrypted file that contains one line for each secret, e.g. a single file called
     secrets with lines such as:
 
-		emma : root : secret1
-		emma - /dev/hda : : secret2
+        emma : root : secret1
+        emma - /dev/hda : : secret2
 
     Or you may also have a different encrypted file for each secret, e.g. a file called
     `emma.root` that contains the root passphrase for the server named `emma` and
@@ -257,24 +260,36 @@ and its the only VCS known to make easier repository history manipulation.
 Limitations
 -----------
 
-  - See the [manpage](share/man/keyringer.1) for details.
+See the [manpage](share/man/keyringer.1) for details.
 
-  - Check [this page](https://wiki.koumbit.net/PasswordManagementService/SoftwareComparison)
-    a comparison on different password management tools.
+Alternatives
+------------
+
+There are many alternatives do collaborative secret management. Here are some:
+
+* [Pass: The Standard Unix Password Manager](https://www.passwordstore.org/)
+* [SOPS: Secret OPerationS: Simple and flexible tool for managing secrets](https://github.com/mozilla/sops)
+
+Also check
+
+* [This page](https://wiki.koumbit.net/PasswordManagementService/SoftwareComparison)
+  a comparison on different password management tools.
+* [This issue](https://gitlab.torproject.org/tpo/tpa/team/-/issues/29677) for an
+  additional discussion.
 
 Requirements
 ------------
 
 Keyringer needs:
 
-  - [Bash](http://tiswww.case.edu/php/chet/bash/bashtop.html)
-  - [Git](http://git-scm.com)
-  - [GNU Privacy Guard](http://gnupg.org)
-  - Grep, awk, tail, cut, sed and other GNU tools
+* [Bash](http://tiswww.case.edu/php/chet/bash/bashtop.html)
+* [Git](http://git-scm.com)
+* [GNU Privacy Guard](http://gnupg.org)
+* Grep, awk, tail, cut, sed and other GNU tools
 
 Optional dependencies if you want to manage ssl keys:
 
-  - [OpenSSL](http://www.openssl.org)
+* [OpenSSL](http://www.openssl.org)
 
 Development guidelines
 ----------------------