Skip to content
Snippets Groups Projects
Commit c8235a29 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

misc: fix FAQ 

Change-Id: Ie367872e0375a6b4f45cfafc76d0eb33b8fd3810
GitLab: #11
parent ff466eba
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 7 additions and 9 deletions
user/faq.rst
+ 7
− 9
View file @ c8235a29
...@@ -203,15 +203,15 @@ Jami also uses an algorithm to change the consumption depending of the ...@@ -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 quality of the link. So, the bitrate can have a minimum of 200 Kbit/s
and maximum of 6 Mbit/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 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 for several fields of expertise (hosting, developing websites and applications, embedded
software, etc). Jami is financed several ways: 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 + Customization contracts
+ Services for other projects + Services for other projects
+ Visibility + Visibility
...@@ -219,9 +219,7 @@ software, etc). Jami is financed several ways: ...@@ -219,9 +219,7 @@ software, etc). Jami is financed several ways:
+ https://jami.biz + https://jami.biz
+ As a distributed system, Jami incurs very low costs by design + 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 + Opt-in collection of anonymized statistics might be added in the future to better understand Jami usage; however, no personal data will be collected.
Jami usage; however, no personal data will be collected.
Account management Account management
------------------ ------------------
...@@ -405,8 +403,8 @@ What data passes through my machine when I participate in the Jami network? ...@@ -405,8 +403,8 @@ What data passes through my machine when I participate in the Jami network?
**All these data are encrypted**. There is: **All these data are encrypted**. There is:
- ICE descriptors of other Jami users (ICE is a protocol that helps - ICE descriptors of other Jami users (ICE is a protocol that helps
establishing communication between two computers); establishing communication between two computers)
- certain text messages; and - certain text messages
- accounts currently being linked to a new device, as explained above. - accounts currently being linked to a new device, as explained above.
Audio/video streams and some text messages pass through the VOIP Audio/video streams and some text messages pass through the VOIP
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment