diff --git a/docs/global.rst.inc b/docs/global.rst.inc
index 14725f731..4184c203e 100644
--- a/docs/global.rst.inc
+++ b/docs/global.rst.inc
@@ -10,6 +10,7 @@
 .. _HMAC-SHA256: https://en.wikipedia.org/wiki/HMAC
 .. _SHA256: https://en.wikipedia.org/wiki/SHA-256
 .. _PBKDF2: https://en.wikipedia.org/wiki/PBKDF2
+.. _argon2: https://en.wikipedia.org/wiki/Argon2
 .. _ACL: https://en.wikipedia.org/wiki/Access_control_list
 .. _libacl: https://savannah.nongnu.org/projects/acl/
 .. _libattr: https://savannah.nongnu.org/projects/attr/
diff --git a/docs/internals/security.rst b/docs/internals/security.rst
index 6dcebf42a..b719ffba0 100644
--- a/docs/internals/security.rst
+++ b/docs/internals/security.rst
@@ -1,3 +1,5 @@
+.. include:: ../global.rst.inc
+
 .. somewhat surprisingly the "bash" highlighter gives nice results with
    the pseudo-code notation used in the "Encryption" section.
 
diff --git a/docs/misc/asciinema/README.rst b/docs/misc/asciinema/README
similarity index 100%
rename from docs/misc/asciinema/README.rst
rename to docs/misc/asciinema/README