diff --git a/config/en.toml b/config/en.toml index 36ef3e6..4acfdfb 100644 --- a/config/en.toml +++ b/config/en.toml @@ -32,4 +32,4 @@ url = "https://peertube.frama.wiki" name = "Source code" weight = 5 identifier = "" -url = "https://github.com/Chocobozzz/PeerTube" +url = "https://github.com/Chocobozzz/PeerTube" \ No newline at end of file diff --git a/config/fr.toml b/config/fr.toml index d1d3307..fe731c4 100644 --- a/config/fr.toml +++ b/config/fr.toml @@ -32,4 +32,4 @@ url = "https://peertube.frama.wiki" name = "Code source" weight = 5 identifier = "" -url = "https://github.com/Chocobozzz/PeerTube" +url = "https://github.com/Chocobozzz/PeerTube" \ No newline at end of file diff --git a/content/faq.en.md b/content/faq.en.md index 9b00f98..67c9954 100644 --- a/content/faq.en.md +++ b/content/faq.en.md @@ -9,8 +9,8 @@ type = "page" {{% grid class="row faq" %}} {{% grid class="container" %}} -{{% grid class="col-sm-12" %}} -

10 questions to discover Framatube...

+{{< grid class="col-sm-12" >}} +

A few questions to discover PeerTube…

@@ -18,14 +18,30 @@ type = "page"
-

PeerTube is a software that you install on a server. It allows you to create a website for hosting and broadcasting videos, like your own YouTube.

-

The difference with YouTube is that it is not designed to create a huge platform centralizing videos from all over the world on a server farm (which is horribly expensive).

-

On the contrary, PeerTube's concept is to create a network of many small, interconnected video hosts.

+

+ +PeerTube is a software that you install on a web server. It allows creating an video hosting website, a bit like YouTube. + +

+

+ +The difference with YouTube is that it's not thought to create a huge plateform centralizing videos from the whole world on a single server farm (which is horribly expensive). + +

+

+ +On the contrary, PeerTube's concept is to create a network of multiple small interconnected video hosting providers. + +

@@ -33,18 +49,42 @@ type = "page"
-

PeerTube is unique because (to our knowledge) it's the only web-based video hosting application that combines three advantages:

+

+ +PeerTube is unique because (as far as we know) it's the only video hosting web application which combines three advantages: + +

    -
  1. An open code (transparency) under a free-libre license (ethics, respect & community development);
  2. -
  3. A federation of interconnected video web-hosts (each host present a bigger choice of videos than just its own);
  4. -
  5. Broadcasting -and therefore peer-to-peer viewing (so no slowing down when a video becomes viral).
  6. +
  7. + +An open code (transparency) under a free/libre licence (ethic, respect and community development) ; + +
  8. +
  9. + +A federation of interconnected hosting providers (so more video choices wherever you go to see them) ; + +
  10. +
  11. + +Broadcasting - and therefore viewing - peer-to-peer (so no slowing down when a video becomes viral). + +
-

Linked together, these three features make it easy to host videos on the server side, while still being convenient and fun for the audience.

+

+ +Linked together, these three features makes it easy to host videos on the server side, while remaining practical, ethical and fun for the internet users. + +

@@ -52,17 +92,42 @@ type = "page"
-

Because it is a software that respects our fundamental freedoms, and guarantees them by a license, therefore a legally enforceable contract.

-

Concretely, here, it means that:

+

+ +Because it's software that respects our fundamental freedoms, and guarantees them by a license, so a legally enforceable contract. + +

+

+ +Concretely here, it mean that: + +

    -
  • PeerTube is distributed free of charge, no need to pay to install it on one's server;
  • -
  • You can look under the PeerTube hood (his source code): it is auditable, transparent;
  • -
  • Its development is community-based, it can be enriched by the contributions of each individual.
  • +
  • + +PeerTube is freely provided, no need to pay to install it on your server ; + +
  • +
  • + +On peut regarder sous le capot de PeerTube (son code source) : il est auditable, transparent ; +We can look under the hood of PeerTube (it's source code): it's auditable, transparent; + +
  • +
  • + +It's development is community-based, it can be enhanced by everyone's contributions. + +
@@ -71,15 +136,35 @@ type = "page"
-

The advantage of YouTube (and other platforms) is its video catalog: from knitting tutorials to minecraft let's play and videos of kittens or holidays... you can find everything!

-

The more varied is the video catalog, the wider is the audience, the more videos are posted... but hosting everyone's videos is (very, very) expensive!

-

If video-host Knit-PeerTube sucribes to Kittens-Tube and to Framatube, it will display the videos of these tubes on its website: we dilute hosting costs while remaining convenient and complete for Internet users.

-

The PeerTube federation protocol will be fluid (each video-host can choose to which other hosts he wants to suscribe), and based on ActivityPub: this will open up the possibility of connecting with tools like Mastodon or MediaGoblin.

+

+ +The advantage of YouTube (and other platforms) is its video catalog: from knitting tutorials to minecraft constructions through videos of kittens or holidays... you can find everything! + +

+

+ +The more the video catalogue is varied, the more people are interested, the more videos are posted... but hosting videos from all over the world is (very, very) expensive! + +

+

+ +If the hosting provider Knitting-PeerTube becomes friends with Kittens-Tube and Framatube, it will display the videos of others on its site: thus diluting hosting costs while remaining practical and complete for Internet users. + +

+

+ +PeerTube's federation protocol will be fluid (everyone can choose their "friends" hosts), and based on ActivityPub: this will open the possibility to connect with tools like Mastodon or MediaGoblin. + +

@@ -87,14 +172,30 @@ type = "page"
-

When you host a heavy file such as a video, your biggest threat is success: if a video becomes viral and lots of people are watching it at the same time, the server might shut down!

-

Using the WebRTC protocol, Peer-to-peer streaming means that users who watch the same video at the same time to exchange bits of files, which relieves the server.

-

There's nothing to do: your web browser does it automatically. If your network doesn't allow it (routers, firewalls, etc.), this function is disabled to switch back to an “old fashioned” video streaming ;).

+

+ +When you host a large file like a video, the biggest thing to fear is success: if a video becomes viral and many people watch it at the same time, the server has a big risk of falling! + +

+

+ +Peer-to-peer broadcasting allows, thanks to the WebRTC protocol, that Internet users who watch the same video at the same time exchange bits of files, which relieves the server. + +

+

+ +There is nothing to do: your web browser does it automatically. If you are on a mobile phone or if your network does not allow it (router, firewall, etc.), this function is disabled to switch back to an "old-style" video broadcast ;). + +

@@ -102,15 +203,35 @@ type = "page"
-

We can answer with certainty: no!

-

In March 2018, PeerTube will release its publicly usable beta version. We are already working with several collectives so that the first federated video-hosting websites will be opened on this date, including ours.

-

But PeerTube won't be perfect yet, and many features will be missing: if we exceed our fundraising targets, our priority will be to invest even more in its development.

-

March 2018 will represent the birth of the PeerTube federations: the more this software will be used and supported, the more people will use it and contribute to it, and the sooner it will evolve towards a concrete alternative to platforms such as YouTube.

+

+ +We can answer with certainty: no! + +

+

+ +In March 2018, PeerTube released its publicly usable beta version. Several collectives set up the first instances, thus creating the bases of the federation. + +

+

+ +But PeerTube is not (yet) perfect, and many features are missing. We intend to continue to improve it to release a version 1 by the end of 2018. + +

+

+ +March 2018 thus represents the birth of the PeerTube federations: the more this software will be used and supported, the more people will use it and contribute to it, and the faster it will evolve towards a concrete alternative to platforms such as YouTube. + +

@@ -118,46 +239,82 @@ type = "page"
-

To be free does not mean to be above the law! Each PeerTube hosting provider will be able to decide on its own terms and conditions of use, within the framework of the law on which they depend.

-

For example, in France, discriminatory content are prohibited and may be reported to the authorities [fr]. PeerTube will allow Internet users to report problematic video, and each host will have to apply its moderation in accordance with its terms and conditions and with the law.

-

The federation system, on the other hand, will allow video-hosts to decide with whom they want to network, or not, depending on the types of content or moderation policies of others.

+

+ +Being free doesn't mean being above the law! Each PeerTube hosting provider can decide its own general conditions of use, within the law on which they depend. + +

+

+ +For example, in France, discriminatory content is prohibited and may be reported to the authorities. PeerTube allows users to report a problematic video, and each administrator must then apply its moderation in accordance with its terms and conditions and the law. + +

+

+ +The federation system, for its part, allows hosts to decide with whom they want to connect with, or not, depending on the types of content or the moderation policies of others. +

- +
-

Framasoft is a small non-profit based in France, and exists since 2004. Our goal is to promote digital freedoms to the general public through pratical projects.

-

From October 2014 to October 2017, we campaigned to De-googl-ify Internet, in order to demonstrate that free software can be an ethical alternative to the services of the Big Data companies.

-

We now host more than 30 alternative services that allow hundreds of thousands of people to change their digital habits, and we're funded mainly though donations.

-

We have invested in the financing of PeerTube development as part of our new campaign Contributopia, which aims to make the digital tools of a contribution society a reality.

+

+ +Framasoft is a small association based in France, which exists since 2004. Our aim is to promote digital freedoms to the general public through concrete projects. + +

+

+ +From October 2014 to October 2017, we campaigned for "De-google-ify Internet", to demonstrate that free software can be an ethical alternative to the services of web giants. + +

+

+ +We now host over 30 alternative services that enable hundreds of thousands of people to change their digital habits, all funded primarily by donations. + +

+

+ +We have invested in the financing of PeerTube as part of our new campaign Contributopia, which aims to concretize the digital tools of a society's contribution. + +

@@ -165,25 +322,43 @@ type = "page"
-

It will go into the Framasoft 2018 budget, as will all the donations we receive.

-

According to French law, on which Framasoft depends, a donation cannot be attributed to a specific item of an non-profit's expenses.

-

So we decided to be transparent:

-
    -
  • Framasoft commits €30,000 to the development of PeerTube;
  • -
  • We are 90,000 € short of our budget for 2018 (which includes PeerTube, maintaining the De-Google-ify Internet services, and future projects of the Contributopia campaign)
  • -
  • If we exceed this target by 31/12/2017, our priority will be to invest in the development of PeerTube after the release of the beta (with additional features).
  • -
-

Our accounting records are audited and validated by an independent auditor whose annual reports we publish on this page [fr] (see report 2016 [fr]).

+

+ +It will go into the association Framasoft's budget, like all the donations we receive. + +

+

+ +According to the French law to which Framasoft is subject, a donation cannot commit a counterpart or be allocated to a specific item of an association's expenses. + +

+

+ +We seek to be transparent and regularly report on all the actions we take, whether in our blog, our newsletter, or on our social media accounts. + +

+

+ +Our accounts are audited and validated by an independent auditor whose annual reports we publish on this page (see the 2016 report). + +

+ +Exchange on our forum + +{{< /grid >}} {{% /grid %}} -{{% /grid %}} -{{% /grid %}} +{{% /grid %}} \ No newline at end of file diff --git a/content/faq.fr.md b/content/faq.fr.md index 5eb477a..488ab37 100644 --- a/content/faq.fr.md +++ b/content/faq.fr.md @@ -360,4 +360,4 @@ Notre comptabilité est vérifiée et validée par un commissaire aux comptes in {{< /grid >}} {{% /grid %}} -{{% /grid %}} +{{% /grid %}} \ No newline at end of file diff --git a/content/home.en.md b/content/home.en.md index a22b9a9..6f891b6 100644 --- a/content/home.en.md +++ b/content/home.en.md @@ -11,8 +11,8 @@ type = "page" {{% grid class="container" %}} {{% grid class="col-sm-12 text-center" %}} -# Video streaming, back in your hands -## A federated video streaming platform using P2P directly in the web browser +# Take back the control on your videos +## A decentralized video hosting network, based on free/libre software [Get started](#getting-started) [How it works ](#how-it-works) @@ -38,19 +38,18 @@ type = "page" {{% /grid %}} --> - {{% /grid %}} {{% grid class="row why" %}} {{% grid class="container" %}} {{% grid class="col-sm-8" %}} -### Find your perfect community +### Take the power back... and the responsibilities! -Mastodon isn’t one place and one set of rules: it’s thousands of unique, -interconnected communities to choose from, filled with different people, -interests, languages, and needs. Don’t like the rules? -You’re free to join any community you like, or better yet: -you can host your own, on your own terms! +Peertube isn't a single video hosting platform with a single group of rules: +it's a network of dozens of interconnected hosting providers, and each provider is composed +of different people and administrators. You don't like some of the rules ? +You're free to join the hosting provider of your choice, or even better, +be your own hosting provider with your own rules! {{% /grid %}} {{% grid class="col-sm-4 text-center" %}} @@ -62,12 +61,9 @@ you can host your own, on your own terms! ### Take control of your content -With powerful tools to control who sees your posts and a 500-character limit, -Mastodon empowers you to share your ideas, unabridged. -The best part? All posts are in chronological order, not “optimized” -to push ads into your timeline. -With apps for iOS, Android, and every other platform imaginable, -Mastodon is always at your fingertips. +PeerTube allows you to share all your videos. Being in direct contact with a human hosting provider (or becoming your own) allows you to choose how their diffusion is done. +Your videos will benefit from tools to fill description, categorization, choosing a preview image and marking videos as not safe for work. +Tweaking the **Support** button will allow you to show your audience how you want them to support your work. {{% /grid %}} {{% grid class="col-sm-4 col-sm-pull-8 text-center" %}} @@ -77,13 +73,14 @@ Mastodon is always at your fingertips. {{% /grid %}} {{% grid class="col-sm-8" %}} -### Putting the user first +### Putting the users first -You’re a person, not a product. Mastodon is a free, open-source development -that has been crowdfunded, not financed. -All instances are independently owned, operated, and moderated. -There is no monopoly by a single commercial company, no ads, and no tracking. -Mastodon works for you, and not the other way around. +You're a person, not a product. PeerTube is a free/libre software +financed by a French non-profit organization: [Framasoft](https://soutenir.framasoft.org/association). +All instances are created, animated, moderated and maintained independently. +PeerTube isn't submitted by any company monopole, doesn't depend on ads and doesn't tracks you. +With PeerTube you're not a product: +Peertube is at your service, not the other way around. {{% /grid %}} {{% grid class="col-sm-4" %}} @@ -93,14 +90,13 @@ Mastodon works for you, and not the other way around. {{% /grid %}} {{% grid class="col-sm-8 col-sm-push-4" %}} -### Feel safe in your community +### Become an actor of your videos broadcasting -Mastodon comes with effective anti-abuse tools to help protect yourself -from online abuse. -With small, interconnected communities, it means that there are more -moderators you can approach to help with a situation. -This also means you can choose who sees your posts: friends, your community, -or the entire fediverse. +When you watch a video with PeerTube, the WebTorrent technology +allows you to be part of the broadcast from this video with the viewers who +watch it at the same time. +This video stream sharing allows a healthier distribution of exchanges on the network. +Moreover, the federation protocol (ActivityPub) allows to publish the videos and comments on other platforms using it, such as [Mastodon](https://joinmastodon.org)! (experimental) {{% /grid %}} {{% grid class="col-sm-4 col-sm-pull-8 text-center" %}} @@ -116,15 +112,14 @@ or the entire fediverse. ## Sign up {#getting-started} -Instances' list +List of instances on which you can register:

- +
This is like picking an e-mail hosting provider: the domain will be part of your username!
- {{% /grid %}} {{% /grid %}} {{% /grid %}} @@ -135,15 +130,16 @@ Instances' list ## Install your own If you are interested in running your own instance — for your friends, -family or organization — you can get started by reading the installation -documentation. -You only host your own users and the content that they subscribe to. +family or organization — you can get started by [reading the installation +documentation](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md). + +You'll only host your own users and their own videos. +Your can define the number of available registrations and a disk quota per user. Only videos from instances you **have chosen** to follow will show up on your homepage. Read the docs {{% /grid %}} {{% /grid %}} - {{% /grid %}} {{% grid class="row how-it-works" %}} {{% grid class="container" %}} @@ -151,34 +147,38 @@ You only host your own users and the content that they subscribe to. ## How it works {#how-it-works} -Anyone can run a server of Mastodon. Each server hosts individual user accounts, -the content they produce, and the content they subscribe to. +Everybody can host a PeerTube server named **instance**. +Every instance hosts it's own users and their videos. +It also keeps a list of the videos available on the instances +the administrator choose to follow in order to propose them to it's users. -Each user account has a globally unique name (e.g. @user@example.com), -consisting of the local username (@user), and the domain name of -the server it is on (example.com). +Every account has a globally unique (e.g. @chocobozzz@framatube.org) consisting of the local username (@chocobozzz) and the domain name of the server it is on (framatube.org). -Users can follow each other, regardless of where they’re hosted — when a -local user follows a user from a different server, the server subscribes -to that user’s updates for the first time. +The administrators of a PeerTube instance can follow each other. +When your PeerTube instance follows another PeerTube instance, you receive +the videos preview informations from this instance. This way, you can display +the videos available on your instance and on the instance you decided to follow. +So you keep control of the videos displayed on your PeerTube instance! + +[Questions?](/en/faq) {{% /grid %}} {{% grid class="col-sm-7 text-center" %}} -![](/pt-p2p.png) +![peertube federation schema](/pt-p2p.png) {{% /grid %}} {{% grid class="col-sm-12" %}} ### Why is that cool? -Servers are run independently by different people and organizations. -They can apply wildly different moderation policies, so you can find or -make one that fits your taste perfectly. -A decentralized network is harder for governments to censor. -If one server goes bankrupt or starts acting unethically, the network -persists so you never have to worry about migrating your friends and -audience to a yet another platform again. +Each server operates independently and is managed by a different person +or organization, who can therefore apply various moderation and conduct rules, +allowing you to find the instance who will suit you best. + +By watching a video, you help the hosting provider broadcasting it by becoming yourself +a broadcaster of this video. Each instance doesn't need much money to broadcast +the videos of its users. [Get started](#getting-started) @@ -194,4 +194,4 @@ Built on top of joinmastodon. {{% /grid %}} {{% /grid %}} {{% /grid %}} -

+

\ No newline at end of file diff --git a/content/home.fr.md b/content/home.fr.md index 3ae38db..b03aeab 100644 --- a/content/home.fr.md +++ b/content/home.fr.md @@ -165,7 +165,6 @@ Vous gardez donc le contrôle des vidéos affichées sur votre serveur PeerTube [Des questions ?](/fr/faq/) - {{% /grid %}} {{% grid class="col-sm-7 text-center" %}} @@ -199,4 +198,4 @@ Ce site web a été construit sur la base de +

\ No newline at end of file