Fix travis regex

[github/Chocobozzz/PeerTube.git] / FAQ.md

diff --git a/FAQ.md b/FAQ.md
index 1e586161c8f86f9b4dd6943b20bde94db18e8032..1a3b1847b0cd171d47ba3740a06819485ca0ed44 100644 (file)
--- a/FAQ.md
+++ b/FAQ.md
@@ -13,6 +13,8 @@
 - [Will an index of all the videos of servers you follow be too large for small servers?](#will-an-index-of-all-the-videos-of-servers-you-follow-be-too-large-for-small-servers)
 - [Which container formats can I use for the videos I want to upload?](#which-container-formats-can-i-use-for-the-videos-i-want-to-upload)
 - [I want to change my domain name, how can I do that?](#i-want-to-change-my-domain-name-how-can-i-do-that)
+- [Why do we have to put our Twitter username in PeerTube configuration?](#why-do-we-have-to-put-our-twitter-username-in-peertube-configuration)
+- [How video views are calculated?](#how-video-views-are-calculated)
 - [Should I have a big server to run PeerTube?](#should-i-have-a-big-server-to-run-peertube)
 - [Can I seed videos with my classic BitTorrent client (Transmission, rTorrent...)?](#can-i-seed-videos-with-my-classic-bittorrent-client-transmission-rtorrent)
 - [Why host on GitHub and Framagit?](#why-host-on-github-and-framagit)
@@ -56,7 +58,7 @@ is named "Framatube".
 
 Yes, the origin server always seeds videos uploaded on it thanks to
 [Webseed](http://www.bittorrent.org/beps/bep_0019.html).
-It can also be helped by other servers using [redundancy](https://docs.joinpeertube.org/lang/en/devdocs/architecture.html#redundancy-between-instances).
+It can also be helped by other servers using [redundancy](https://docs.joinpeertube.org/#/contribute-architecture?id=redundancy-between-instances).
 
 
 ## What is WebSeed?
@@ -81,7 +83,9 @@ We think it is acceptable for a video platform.
 
 ## Which container formats can I use for the videos I want to upload?
 
-WEBM, MP4 or OGV videos.
+WEBM, MP4 or OGV videos are supported by default (they are streamable formats),
+but instance administrators can additionally enable support for MKV, MOV, AVI
+and FLV formats when transcoding is enabled on their instance.
 
 
 ## I want to change my domain name, how can I do that?
@@ -89,6 +93,18 @@ WEBM, MP4 or OGV videos.
 You can't. You'll need to reinstall an instance and reupload your videos.
 
 
+## Why do we have to put our Twitter username in PeerTube configuration?
+
+You don't have to: we set a default value if you don't have a Twitter account.
+We need this information because Twitter requires an account for links share/videos embed on their platform.
+
+
+## How video views are calculated?
+
+Your web browser sends a view to the server after 30 seconds of playback. Then, the IP cannot send another view in the next hour.
+Views are buffered, so don't panic if the view counter stays the same after you watched a video.
+
+
 ## Should I have a big server to run PeerTube?
 
 Not really. For instance, the demonstration server [https://peertube.cpy.re](https://peertube.cpy.re) has 2 vCore and 2GB of RAM and consumes on average:
@@ -104,7 +120,7 @@ So you would need:
 ## Can I seed videos with my classic BitTorrent client (Transmission, rTorrent...)?
 
 Yes you can, but you won't be able to send data to users that watch the video in their web browser.
-The reason is they connects to peers through WebRTC whereas your BitTorrent client uses classic TCP/UDP.
+The reason is they connect to peers through WebRTC whereas your BitTorrent client uses classic TCP/UDP.
 To check if your BitTorrent client supports WebTorrent you can see this issue: https://github.com/webtorrent/webtorrent/issues/369