1 files changed, 14 insertions, 46 deletions

diff --git a/README.md b/README.md
index 35d53ee09..68b5dc519 100644
--- a/README.md
+++ b/README.md
@@ -77,30 +77,17 @@ Thanks to [WebTorrent](https://github.com/feross/webtorrent), we can make P2P (t
 
 - [X] Frontend
   - [X] Angular frontend
-- [X] Join a network
-  - [X] Generate a RSA key
-  - [X] Ask for the friend list of other pods and make friend with them
-  - [X] Get the list of the videos owned by a pod when making friend with it
-  - [X] Post the list of its own videos when making friend with another pod
-- [X] Quit a network
+- [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 to all other friends
+  - [X] Send the meta data with ActivityPub to followers
 - [X] Remove the video
 - [X] List the videos
-- [X] Search a video name (local index)
-- [X] View the video in an HTML5 page with WebTorrent
-- [X] Manage admin account
-  - [X] Connection
-  - [X] Account rights (upload...)
-- [X] Make the network auto sufficient (eject bad pods etc)
-- [X] Validate the prototype (test PeerTube in a real world)
-- [ ] Manage inter pod API breaks
-- [ ] Add "DDOS" security (check if a pod don't send too many requests for example)
+- [X] View the video in an HTML5 player with WebTorrent
 - [X] Admin panel
-  - [X] Stats
-  - [X] Friends list
-  - [X] Manage users (create/remove)
 - [X] OpenGraph tags
 - [X] OEmbed
 - [X] Update video
@@ -109,16 +96,17 @@ Thanks to [WebTorrent](https://github.com/feross/webtorrent), we can make P2P (t
 - [X] Transcoding to different definitions
 - [X] Download file/torrent
 - [X] User video bytes quota
-- [X] User channels
+- [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 pod
+- [X] Signaling a video to the admin origin PeerTube instance
 - [ ] Videos comments
 - [ ] User playlist
 - [ ] User subscriptions (by tags, author...)
+- [ ] Add "DDOS" security
 
 
 ## Installation
@@ -194,7 +182,7 @@ The following commands will upgrade the source (according to your current branch
 
 ### Development
 
-In this mode, the server will run requests between pods more quickly, the video durations are limited to a few seconds.
+In this mode, the server will run requests between instances more quickly, the video durations are limited to a few seconds.
 
 To develop on the server-side (server files are automatically compiled when we modify them and the server restarts automatically too):
 
@@ -217,7 +205,7 @@ The API will listen on `localhost:9000` and the frontend on `localhost:3000` (wi
     $ npm run clean:server:test
     $ npm run play
 
-Then you will get access to the three nodes at `http://localhost:900{1,2,3}` with the `root` as username and `test{1,2,3}` for the password. If you call "make friends" on `http://localhost:9002`, the pod 2 and 3 will become friends. Then if you call "make friends" on `http://localhost:9001` it will become friend with the pod 2 and 3 (check the configuration files). Then the pod will communicate with each others. If you add a video on the pod 3 you'll can see it on the pod 1 and 2 :)
+Then you will get access to the three nodes at `http://localhost:900{1,2,3}` with the `root` as username and `test{1,2,3}` for the password.
 
 ### Other commands
 
@@ -225,10 +213,6 @@ To print all available command run:
 
     $ npm run help
 
-## Dockerfile
-
-You can test it inside Docker with the [PeerTube-Docker repository](https://github.com/Chocobozzz/PeerTube-Docker). Moreover it can help you to check how to create an environment with the required dependencies for PeerTube on a GNU/Linux distribution.
-
 ## Contributing
 
 See the [contributing guide](https://github.com/Chocobozzz/PeerTube/blob/master/.github/CONTRIBUTING.md).
@@ -245,18 +229,11 @@ See [ARCHITECTURE.md](https://github.com/Chocobozzz/PeerTube/blob/master/ARCHITE
 ### Backend
 
   * The backend is a REST API
-  * Servers communicate with each others through it
-    * A network is composed by servers that communicate between them
-    * Each server of a network has a list of all other servers of this network
-    * When a new installed server wants to join a network, it just has to get the servers list through a server that is already in the network and tell "Hi I'm new in the network, communicate with me and share me your servers list please". Then the server will "make friend" with each server of this list
-    * Each server has its own users who query it (search videos, where the torrent URI of this specific video is...)
-    * If a user upload a video, the server seeds it and sends the video information (name, short description, torrent URI...) to each server of the network
-    * Each server has a RSA key to encrypt and sign communications with other servers
+  * Servers communicate with each others with [Activity Pub](https://www.w3.org/TR/activitypub/)
+  * Each server has its own users who query it (search videos, where the torrent URI of this specific video is...)
+  * If a user upload a video, the server seeds it and sends the video information (name, short description, torrent URI...) its followers
   * A server is a tracker responsible for all the videos uploaded in it
   * Even if nobody watches a video, it is seeded by the server (through [WebSeed protocol](http://www.bittorrent.org/beps/bep_0019.html)) where the video was uploaded
-  * A network can live and evolve by expelling bad pod (with too many downtime for example)
-
-See the ARCHITECTURE.md for more information. Do not hesitate to give your opinion :)
 
 Here are some simple schemes:
 
@@ -268,13 +245,4 @@ Here are some simple schemes:
 
 <img src="https://lutim.cpy.re/pqKm3Q5S.png" alt="Watch a P2P video" />
 
-<img src="https://lutim.cpy.re/wWVuczBz.png" alt="Join a network" />
-
-<img src="https://lutim.cpy.re/AMo3uP0D.png" alt="Many networks" />
-
 </p>
-
-### Frontend
-
-There already is a frontend (Angular) but the backend is a REST API so anybody can build a frontend (Web application, desktop application...).
-The backend uses BitTorrent protocol, so users could use their favorite BitTorrent client to download/play the video with its torrent URI.