diff --git a/general/introduction.rst b/general/introduction.rst
index fb67cfe9945a0f64a90bb74ea76822037912226d..2fb962615fc2c3625d6e4910700bed097982c052 100644
--- a/general/introduction.rst
+++ b/general/introduction.rst
@@ -20,20 +20,20 @@ How does Jami work?
 -------------------
 
 Jami uses a `distributed hash table
-<https://en.wikipedia.org/wiki/Distributed_hash_table>`__ (DHT) to
+<https://en.wikipedia.org/wiki/Distributed_hash_table>`_ (DHT) to
 connect peers.  Jami accounts are asymmetric `X.509 certificates
-<https://en.wikipedia.org/wiki/X.509>`__ generated by the GnuTLS
+<https://en.wikipedia.org/wiki/X.509>`_ generated by the GnuTLS
 library.  Calls are made over the `Session Initiation Protocol
-<https://en.wikipedia.org/wiki/Session_Initiation_Protocol>`__ (SIP)
+<https://en.wikipedia.org/wiki/Session_Initiation_Protocol>`_ (SIP)
 after negotiating a `TLS
-<https://en.wikipedia.org/wiki/Transport_Layer_Security>`__-encrypted
+<https://en.wikipedia.org/wiki/Transport_Layer_Security>`_-encrypted
 secure connection, performing `Secure Real-time Transport Protocol
-<https://en.wikipedia.org/wiki/Secure_Real-time_Transport_Protocol>`__
+<https://en.wikipedia.org/wiki/Secure_Real-time_Transport_Protocol>`_
 (SRTP) communication which carries the media streams.
 
 For more on how Jami works, see the `Jami and how it empowers users
-<https://kelar.org/~bandali/talks/libreplanet-2021-jami.html>`__ talk
-by `Amin Bandali <https://kelar.org/~bandali/>`__, as well as the
+<https://kelar.org/~bandali/talks/libreplanet-2021-jami.html>`_ talk
+by `Amin Bandali <https://kelar.org/~bandali/>`_, as well as the
 :doc:`Technical Overview <technical-overview>` for more in-depth
 information.
 
@@ -41,11 +41,10 @@ Who makes Jami?
 ---------------
 
 The Jami project is led by `Savoir-faire Linux
-<https://www.savoirfairelinux.com/en/>`__ -- a Canadian/Québécois
+<https://www.savoirfairelinux.com/en/>`_ -- a Canadian/Québécois
 GNU/Linux consulting company -- and is supported by a global community
 of free software enthusiasts, users, and contributors.
 
-Jami is `free software
-<https://www.gnu.org/philosophy/free-sw.html>`__ and an official
-GNU package, developed and distributed under the `GNU GPLv3+
-<https://www.gnu.org/licenses/gpl-3.0.html>`__ license.
+Jami is `free software <https://www.gnu.org/philosophy/free-sw.html>`_
+and an official GNU package, developed and distributed under the
+`GNU GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>`_ license.
diff --git a/index.rst b/index.rst
index f05a99421749a0489ca5407fc43a9f08c6903686..dec0855ff65fdbd1218c0322fa0807abbc56a125 100644
--- a/index.rst
+++ b/index.rst
@@ -4,8 +4,9 @@ Home
 .. image:: _static/logo-jami.svg
    :alt: Jami logo
 
-This is the documentation for Jami, free software for universal
-communication that respects the freedom and privacy of its users.
+This is the documentation for `Jami <https://jami.net>`_, free/libre
+software for universal communication that respects the freedom and
+privacy of its users.
 
 This documentation is community-driven and :doc:`anyone can
 contribute<guides/how-to-contribute-to-this-documentation>`!