X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=5e6a680de2348a1dc97b572a89e52bfa81b2e845;hb=5a2d456d457c1514ea4a02c2717d822f8fdcf0c3;hp=77a2e6346e7711a615b2ff45b442e77fc3fc0847;hpb=53a6d0a348162fdc712835e1c2b03186a90da188;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/README.md b/README.md
index 77a2e6346..5e6a680de 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,18 @@
Be part of a network of multiple small federated, interoperable video hosting providers. Follow video creators and create videos. No vendor lock-in. All on a platform that is community-owned and ad-free.
+
+:rocket::rocket::rocket:
+
+
+
+Check, share and support PeerTube's v3 roadmap on https://joinpeertube.org/roadmap
+
+
+
+:rocket: :rocket: :rocket:
+
+
Developed with ❤ by Framasoft
@@ -34,9 +46,9 @@ Be part of a network of multiple small federated, interoperable video hosting pr
-
-
-
+
+
+
@@ -45,8 +57,8 @@ Be part of a network of multiple small federated, interoperable video hosting pr
-
-
+
+
@@ -66,14 +78,19 @@ Be part of a network of multiple small federated, interoperable video hosting pr
-
+
Introduction
----------------------------------------------------------------
-PeerTube is a free, decentralized and federated video platform developed as an alternative to other platforms that centralize our data and attention, such as YouTube, Dailymotion or Vimeo. :clapper: But one organization hosting PeerTube alone may not have enough money to pay for bandwidth and video storage of its servers, all servers of PeerTube are interoperable as a federated network, and non-PeerTube servers can be part of the larger Vidiverse (federated video network) by talking our implementation of ActivityPub. Video load is reduced thanks to P2P (BitTorrent) in the web browser via WebTorrent.
+PeerTube is a free, decentralized and federated video platform developed as an alternative to other platforms that centralize our data and attention, such as YouTube, Dailymotion or Vimeo. :clapper:
+
+But one organization hosting PeerTube alone may not have enough money to pay for bandwidth and video storage of its servers,
+all servers of PeerTube are interoperable as a federated network, and non-PeerTube servers can be part of the larger Vidiverse
+(federated video network) by talking our implementation of ActivityPub.
+Video load is reduced thanks to P2P in the web browser using WebTorrent or p2p-media-loader.
To learn more, see:
* This [two-minute video](https://framatube.org/videos/watch/217eefeb-883d-45be-b7fc-a788ad8507d3) (hosted on PeerTube) explaining what PeerTube is and how it works
@@ -136,7 +153,7 @@ You can also join the cheerful bunch that makes our community:
* Matrix (bridged on IRC and [Discord](https://discord.gg/wj8DDUT)) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)**
* Forum:
* Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube)
-
+
Feel free to reach out if you have any questions or ideas! :speech_balloon:
:package: Create your own instance
@@ -149,7 +166,7 @@ Feel free to reach out if you have any questions or ideas! :speech_balloon:
* **Redis >= 2.8.18**
* **NodeJS >= 10.x**
* **yarn >= 1.x**
- * **FFmpeg >= 3.x**
+ * **FFmpeg >= 4.1**
See the [production guide](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md), which is the recommended way to install or upgrade PeerTube. For hardware requirements, see [Should I have a big server to run PeerTube?](https://github.com/Chocobozzz/PeerTube/blob/develop/FAQ.md#should-i-have-a-big-server-to-run-peertube) in the FAQ.
@@ -166,22 +183,20 @@ See the [user documentation](https://docs.joinpeertube.org/#/use-setup-account).
### Admin documentation
-See [how to create your own instance](#package-create-your-own-instance).
+See [how to create your own instance](https://github.com/Chocobozzz/PeerTube/blob/develop/README.md#package-create-your-own-instance).
See the more general [admin documentation](https://docs.joinpeertube.org/#/admin-following-instances).
-#### Tools
+### Tools documentation
- * [Import videos (YouTube, Dailymotion, Vimeo...)](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/tools.md)
- * [Upload videos from the CLI](https://github.com/Chocobozzz/PeerTube/blob/support/doc/tools.md)
- * [Admin server tools (create transcoding jobs, prune storage...)](https://github.com/Chocobozzz/PeerTube/blob/support/doc/tools.md#server-tools)
+Learn how to import/upload videos from CLI or admin your PeerTube instance with the [tools documentation](https://docs.joinpeertube.org/#/maintain-tools).
### Technical documentation
See the [architecture blueprint](https://docs.joinpeertube.org/#/contribute-architecture) for a more detailed explanation of the architectural choices.
See our REST API documentation:
- * OpenAPI 3.0.0 schema: [/support/doc/api/openapi.yaml](https://github.com/Chocobozzz/PeerTube/blob/support/doc/api/openapi.yaml)
+ * OpenAPI 3.0.0 schema: [/support/doc/api/openapi.yaml](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/api/openapi.yaml)
* Spec explorer: [docs.joinpeertube.org/api-rest-reference.html](https://docs.joinpeertube.org/api-rest-reference.html)
See our [ActivityPub documentation](https://docs.joinpeertube.org/#/api-activitypub).
@@ -196,11 +211,11 @@ Quonfucius, IP Solution, \_Laure\_, @lex666, 0x010C, 3dsman, 3rw4n-G3D, aallrd,
## License
-Copyright (C) 2015-2019 PeerTube Contributors
+Copyright (C) 2015-2020 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,