diff --git a/user/faq.rst b/user/faq.rst
index 638446baaf5102fe24b176ac5299423a48cab589..dee8c4a05c2a8b6d2421a72cad785d49e4bea588 100644
--- a/user/faq.rst
+++ b/user/faq.rst
@@ -203,15 +203,15 @@ Jami also uses an algorithm to change the consumption depending of the
 quality of the link. So, the bitrate can have a minimum of 200 Kbit/s
 and maximum of 6 Mbit/s.
 
-How can Savoir-Faire Linux (SFL) afford to give Jami away for free?  How does/will SFL make money off Jami?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+How can Savoir-Faire Linux (SFL) afford to give Jami away for free? How does SFL make money with Jami?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-[Savoir-Faire Linux](https://savoirfairelinux.com/) (SFL) is a consulting company with some R&D projects.
+`Savoir-Faire Linux <https://savoirfairelinux.com/>`_ (SFL) is a consulting company with some R&D projects.
 Jami is a GPLv3+ project and this will not change. Savoir-Faire Linux already sells services
 for several fields of expertise (hosting, developing websites and applications, embedded
 software, etc). Jami is financed several ways:
 
-+ [Donations](https://www.paypal.com/donate?hosted_button_id=MGUDJLQZ4TP5W)
++ `Donations <https://www.paypal.com/donate?hosted_button_id=MGUDJLQZ4TP5W>`_
 + Customization contracts
 + Services for other projects
 + Visibility
@@ -219,9 +219,7 @@ software, etc). Jami is financed several ways:
 + https://jami.biz
 
 + As a distributed system, Jami incurs very low costs by design
-+ Opt-in collection of anonymized statistics might be added in the future to better understand
-Jami usage; however, no personal data will be collected.
-
++ Opt-in collection of anonymized statistics might be added in the future to better understand Jami usage; however, no personal data will be collected.
 
 Account management
 ------------------
@@ -405,8 +403,8 @@ What data passes through my machine when I participate in the Jami network?
 **All these data are encrypted**.  There is:
 
 - ICE descriptors of other Jami users (ICE is a protocol that helps
-  establishing communication between two computers);
-- certain text messages; and
+  establishing communication between two computers)
+- certain text messages
 - accounts currently being linked to a new device, as explained above.
 
 Audio/video streams and some text messages pass through the VOIP