Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +about / about-peertube / about-peertube.component.html

diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
index e5a8b2097ab2a9e077dbca37db82eb64e2cae86f..f8700d9b621a0818c1fca9d74cd85c517155eb34 100644 (file)
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -1,22 +1,22 @@
 <div class="root">
   <h1 i18n class="about-peertube-title">
 <div class="root">
   <h1 i18n class="about-peertube-title">

-    What is PeerTube?
+    This website is powered by PeerTube

   </h1>
 
   </h1>
 

-  <img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.png" alt="mascot"/>
+  <img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.svg" alt="mascot"/>

 
   <div class="description">
     <p i18n>
 
   <div class="description">
     <p i18n>

-      PeerTube is a self hosted federated (ActivityPub) video streaming platform using P2P directly in the web browser.
+      PeerTube is a self-hosted ActivityPub-federated video streaming platform using P2P directly in your web browser.

     </p>
 
     <p i18n>
     </p>
 
     <p i18n>

-      It is a free and open-source software, under the <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3
+      It is free and open-source software, under <a class="link-orange" href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3

       licence</a>.
     </p>
 
     <p i18n>
       licence</a>.
     </p>
 
     <p i18n>

-      For more information, please visit <a target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">joinpeertube.org</a>.
+      For more information, please visit <a class="link-orange" target="_blank" rel="noopener noreferrer" href="https://joinpeertube.org">joinpeertube.org</a>.

     </p>
   </div>
 
     </p>
   </div>
 


@@ -24,10 +24,9 @@
 
     <div class="card">
       <div class="card-body">
 
     <div class="card">
       <div class="card-body">

-        <h5 class="card-title">
-          <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/use-setup-account">Use PeerTube
-            documentation</a>
-        </h5>
+        <div class="card-title">
+          <a i18n class="link-orange" target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/use-setup-account">Use PeerTube documentation</a>
+        </div>

 
         <div i18n class="card-text">
           Discover how to setup your account, what is a channel, how to create a playlist and more!
 
         <div i18n class="card-text">
           Discover how to setup your account, what is a channel, how to create a playlist and more!


@@ -37,10 +36,9 @@
 
     <div class="card">
       <div class="card-body">
 
     <div class="card">
       <div class="card-body">

-        <h5 class="card-title">
-          <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/use-third-party-application">PeerTube
-            Applications</a>
-        </h5>
+        <div class="card-title">
+          <a i18n class="link-orange" target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/use-third-party-application">PeerTube Applications</a>
+        </div>

 
         <div i18n class="card-text">
           Discover unofficial Android applications or browser addons!
 
         <div i18n class="card-text">
           Discover unofficial Android applications or browser addons!


@@ -50,10 +48,9 @@
 
     <div class="card">
       <div class="card-body">
 
     <div class="card">
       <div class="card-body">

-        <h5 class="card-title">
-          <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/contribute-getting-started">Contribute on
-            PeerTube</a>
-        </h5>
+        <div class="card-title">
+          <a i18n class="link-orange" target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/contribute-getting-started">Contribute on PeerTube</a>
+        </div>

 
         <div i18n class="card-text">
           Want to help to improve PeerTube? You can translate the web interface, give your feedback or directly contribute to the code!
 
         <div i18n class="card-text">
           Want to help to improve PeerTube? You can translate the web interface, give your feedback or directly contribute to the code!


@@ -63,13 +60,11 @@
   </div>
 
   <div class="privacy-contributors">
   </div>
 
   <div class="privacy-contributors">

-    <my-about-peertube-contributors></my-about-peertube-contributors>
-
-    <div class="p2p-privacy">     
-      <h3 class="section-title">
+    <div class="p2p-privacy">
+      <h2 class="section-title">

         <div class="anchor" id="privacy"></div> <!-- privacy anchor -->
         <ng-container i18n>P2P & Privacy</ng-container>
         <div class="anchor" id="privacy"></div> <!-- privacy anchor -->
         <ng-container i18n>P2P & Privacy</ng-container>

-      </h3>
+      </h2>

 
       <p i18n>
         PeerTube uses the BitTorrent protocol to share bandwidth between users by default to help lower the load on the server,
 
       <p i18n>
         PeerTube uses the BitTorrent protocol to share bandwidth between users by default to help lower the load on the server,


@@ -77,12 +72,12 @@
         follows applies only if you want to keep using the P2P mode of PeerTube.
       </p>
 
         follows applies only if you want to keep using the P2P mode of PeerTube.
       </p>
 

-      <p>
-        The main threat to your privacy induced by BitTorrent lies in your IP address being stored in the instance's BitTorrent 
+      <p i18n>
+        The main threat to your privacy induced by BitTorrent lies in your IP address being stored in the instance's BitTorrent

         tracker as long as you download or watch the video.
       </p>
 
         tracker as long as you download or watch the video.
       </p>
 

-      <h6 i18n class="p2p-privacy-title">What are the consequences?</h6>
+      <h3 i18n class="p2p-privacy-title">What are the consequences?</h3>

 
       <p i18n>
         In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
 
       <p i18n>
         In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.


@@ -115,11 +110,10 @@
         </li>
 
         <li i18n>
         </li>
 
         <li i18n>

-          Web peers are not publicly accessible: because we use WebRTC inside the web browser (<a href="https://webtorrent.io/">with the
-          WebTorrent library</a>), the protocol is different from classic BitTorrent.
+          Web peers are not publicly accessible: because we use the websocket transport, the protocol is different from classic BitTorrent tracker.

           When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers
           to forward the information to.
           When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers
           to forward the information to.

-          See <a href="https://github.com/yciabaud/webtorrent/blob/beps/bep_webrtc.rst">this document</a> for more information
+          See <a class="link-orange" href="https://github.com/yciabaud/webtorrent/blob/beps/bep_webrtc.rst">this document</a> for more information

         </li>
       </ul>
 
         </li>
       </ul>
 


@@ -128,7 +122,7 @@
         There are much more effective ways to get that kind of information.
       </p>
 
         There are much more effective ways to get that kind of information.
       </p>
 

-      <h6 i18n class="p2p-privacy-title">How does PeerTube compare with YouTube?</h6>
+      <h3 i18n class="p2p-privacy-title">How does PeerTube compare with YouTube?</h3>

 
       <p i18n>
         The threats to privacy with YouTube are different from PeerTube's.
 
       <p i18n>
         The threats to privacy with YouTube are different from PeerTube's.


@@ -136,7 +130,7 @@
         Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
       </p>
 
         Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
       </p>
 

-      <h6 i18n class="p2p-privacy-title">What can I do to limit the exposure of my IP address?</h6>
+      <h3 i18n class="p2p-privacy-title">What can I do to limit the exposure of my IP address?</h3>

 
       <p i18n>
         Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing
 
       <p i18n>
         Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing


@@ -145,7 +139,7 @@
         Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
       </p>
 
         Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
       </p>
 

-      <h6 i18n class="p2p-privacy-title">What will be done to mitigate this problem?</h6>
+      <h3 i18n class="p2p-privacy-title">What will be done to mitigate this problem?</h3>

 
       <p i18n>
         PeerTube wants to deliver the best countermeasures possible, to give you more choice
 
       <p i18n>
         PeerTube wants to deliver the best countermeasures possible, to give you more choice


@@ -156,7 +150,6 @@
         <li i18n>We set a limit to the number of peers sent by the tracker</li>
         <li i18n>We set a limit on the request frequency received by the tracker</li>
         <li i18n>Allow instance admins to disable P2P from the administration interface</li>
         <li i18n>We set a limit to the number of peers sent by the tracker</li>
         <li i18n>We set a limit on the request frequency received by the tracker</li>
         <li i18n>Allow instance admins to disable P2P from the administration interface</li>

-        <li i18n>Automatic video redundancy from some instances: one doesn't know if the IP downloaded the video on purpose or if it a server</li>

       </ul>
 
       <p i18n>
       </ul>
 
       <p i18n>