Migrate to bull

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

diff --git a/README.md b/README.md
index 0ceee1d168a73fe80eabff7bb2cda3d0e5fa1a99..451e6612c9fe486b90ea383668b47e4314707833 100644 (file)
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ directly in the web browser with <a href="https://github.com/feross/webtorrent">
 </p>
 
 <p align="center">
-<strong>We are running <a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">a crowdfunding campaign</a> to pave the road to version 1.0 of PeerTube!</strong>
+<strong>We have run <a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">a crowdfunding campaign</a> to pave the road to version 1.0 of PeerTube. Thanks to everyone who pitched in and shared the news around. You can now check out <a href="https://github.com/Chocobozzz/PeerTube/milestone/1">the corresponding milestone</a> and help its development!</strong>
 </p>
 
 <p align="center">
@@ -49,10 +49,6 @@ directly in the web browser with <a href="https://github.com/feross/webtorrent">
   <a href="http://standardjs.com/">
     <img src="https://img.shields.io/badge/code%20style-standard-brightgreen.svg" alt="JavaScript Style Guide" />
   </a>
-
-  <a href="https://kiwiirc.com/client/irc.freenode.net/#peertube">
-    <img src="https://img.shields.io/badge/%23peertube-on%20freenode-brightgreen.svg" alt="PeerTube Freenode IRC" />
-  </a>
 </p>
 
 <br />
@@ -67,6 +63,9 @@ directly in the web browser with <a href="https://github.com/feross/webtorrent">
 
   * **[Website](https://joinpeertube.org)**
   * **[Instances list](https://instances.joinpeertube.org)**
+  * Chat:
+    * IRC : **[#peertube on chat.freenode.net:6697](https://kiwiirc.com/client/irc.freenode.net/#peertube)**
+    * Matrix (bridged on the IRC channel) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)**
 
 ## Demonstration
 
@@ -76,6 +75,7 @@ Want to see it in action?
      * [peertube.cpy.re](https://peertube.cpy.re)
      * [peertube2.cpy.re](https://peertube2.cpy.re)
      * [peertube3.cpy.re](https://peertube3.cpy.re)
+   * [Video](https://framatube.org/videos/watch/217eefeb-883d-45be-b7fc-a788ad8507d3) What is PeerTube?
    * [Video](https://peertube.cpy.re/videos/watch/f78a97f8-a142-4ce1-a5bd-154bf9386504)
      to see what the "decentralization feature" looks like
    * [Video](https://peertube.cpy.re/videos/watch/da2b08d4-a242-4170-b32a-4ec8cbdca701) to see
@@ -89,8 +89,8 @@ enough money to pay for bandwidth and video storage of its servers.
 
 So we need to have a decentralized network of servers seeding videos (as
 [Diaspora](https://github.com/diaspora/diaspora) for example).  But it's not
-enough because one video could become famous and overload the server.  It's the
-reason why we need to use a P2P protocol to limit the server load.  Thanks to
+enough because one video could become famous and overload the server.  That is 
+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.
 
@@ -104,18 +104,18 @@ BitTorrent) inside the web browser, as of today.
   * OpenSSL (cli)
   * **FFmpeg >= 3.x**
 
-## Run using Docker
+## Run in production
 
-See the [docker guide](/support/doc/docker.md)
+See the [production guide](/support/doc/production.md).
 
 ## Run on YunoHost
 [![Install Peertube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=peertube)
 
-Peertube app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/peertube_ynh)
+Peertube app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/peertube_ynh).
 
-## Production
+## Run using Docker
 
-See the [production guide](/support/doc/production.md).
+See the [docker guide](/support/doc/docker.md).
 
 ## Contribute/Translate/Test
 
@@ -137,6 +137,7 @@ Endpoints documentation:
 
  * [Import videos (YouTube, Dailymotion, Vimeo...)](/support/doc/tools.md)
  * [Upload videos from the CLI](/support/doc/tools.md)
+ * [Admin server tools (create transcoding jobs, prune storage...)](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/tools.md#server-tools)
 
 ## FAQ
 
@@ -155,7 +156,7 @@ See [ARCHITECTURE.md](/ARCHITECTURE.md) for a more detailed explanation.
     torrent URI of this specific video is...).
   * If a user uploads a video, the server seeds it and sends its followers some
     metadata (name, short description, torrent URI...).
-  * A server is a tracker responsible for all the videos uploaded in it.
+  * A server is a tracker responsible for all the videos uploaded on 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.
@@ -178,7 +179,7 @@ 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
+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,