X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=4d83ea8469e39e3792cc402798f112cec32a8a97;hb=63ac2857aa6550232a1727a395c40e722c32710d;hp=efe94b15ad668f384dc1bd11356920d77c82a3c5;hpb=358770dbbd88136b211090832b24cf3d5b648234;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/README.md b/README.md
index efe94b15a..4d83ea846 100644
--- a/README.md
+++ b/README.md
@@ -71,8 +71,6 @@ Want to see it in action?
    * [Video](https://peertube.cpy.re/videos/watch/f78a97f8-a142-4ce1-a5bd-154bf9386504)
      to see what the "decentralization feature" looks like
 
-*Currently PeerTube is still in alpha (we plan to release a beta in march). Demonstration servers do not support public registration. If you really want to test PeerTube before the public release, here is a list of PeerTube servers: https://github.com/Chocobozzz/PeerTube/wiki#other-peertube-servers.*
-
 ## Why
 
 We can't build a FOSS video streaming alternatives to YouTube, Dailymotion,
@@ -86,51 +84,6 @@ reason why we need to use a P2P protocol to limit the server load.  Thanks to
 [WebTorrent](https://github.com/feross/webtorrent), we can make P2P (thus
 BitTorrent) inside the web browser, as of today.
 
-## Features
-
-- [X] Angular frontend
-- [X] Join the fediverse
-  - [X] Follow other instances
-  - [X] Unfollow an instance
-  - [X] Get for the followers/following list
-- [X] Upload a video
-  - [X] Seed the video
-  - [X] Send the meta data with ActivityPub to followers
-- [X] Remove the video
-- [X] List the videos
-- [X] View the video in an HTML5 player with WebTorrent
-- [X] Admin panel
-- [X] OpenGraph tags
-- [X] OEmbed
-- [X] Update video
-- [X] Federated videos view counter
-- [X] Federated videos likes/dislikes
-- [X] Transcoding to different definitions
-- [X] Download file/torrent
-- [X] User video bytes quota
-- [X] User video channels
-- [X] NSFW warnings/settings
-- [X] Video description in markdown
-- [X] User roles (administrator, moderator)
-- [X] User registration
-- [X] Video privacy settings (public, unlisted or private)
-- [X] Signaling a video to the admin origin PeerTube instance
-- [X] Federated videos comments
-- [X] Update video thumbnails
-- [X] Support video uploader button
-- [ ] Video imports (URL, Torrent, YouTube...)
-- [ ] Advanced search
-- [ ] Subtitles
-- [ ] User playlist
-- [ ] User subscriptions (by tags, author...)
-- [ ] Add "DDOS" security
-
-
-## Front compatibility
-
-  * Firefox
-  * Chrome/Chromium
-
 ## Dependencies
 
   * nginx
@@ -139,7 +92,7 @@ BitTorrent) inside the web browser, as of today.
   * **NodeJS >= 8.x**
   * yarn
   * OpenSSL (cli)
-  * FFmpeg
+  * **FFmpeg >= 3.x**
 
 ## Run using Docker
 
@@ -168,6 +121,10 @@ For now only on Github:
  * [Import videos (YouTube, Dailymotion, Vimeo...)](/support/doc/tools.md)
  * [Upload videos from the CLI](/support/doc/tools.md)
 
+## FAQ
+
+If you have a question, please try to find the answer in the [FAQ](/FAQ.md) first.
+
 ## Architecture
 
 See [ARCHITECTURE.md](/ARCHITECTURE.md) for a more detailed explanation.
@@ -197,3 +154,20 @@ Here are some simple schemes:
 <img src="https://lutim.cpy.re/pqKm3Q5S.png" alt="Watch a P2P video" />
 
 </p>
+
+## License
+
+Copyright (C) 2018 PeerTube Contributors
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.