aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+about/about-peertube/about-peertube.component.html7
-rw-r--r--client/src/app/modal/instance-config-warning-modal.component.ts3
-rw-r--r--config/production.yaml.example2
-rw-r--r--package.json2
4 files changed, 6 insertions, 8 deletions
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 5a0b6f46e..9bfda58a8 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -65,7 +65,7 @@
65 <div class="privacy-contributors"> 65 <div class="privacy-contributors">
66 <my-about-peertube-contributors></my-about-peertube-contributors> 66 <my-about-peertube-contributors></my-about-peertube-contributors>
67 67
68 <div class="p2p-privacy"> 68 <div class="p2p-privacy">
69 <h2 class="section-title"> 69 <h2 class="section-title">
70 <div class="anchor" id="privacy"></div> <!-- privacy anchor --> 70 <div class="anchor" id="privacy"></div> <!-- privacy anchor -->
71 <ng-container i18n>P2P & Privacy</ng-container> 71 <ng-container i18n>P2P & Privacy</ng-container>
@@ -78,7 +78,7 @@
78 </p> 78 </p>
79 79
80 <p i18n> 80 <p i18n>
81 The main threat to your privacy induced by BitTorrent lies in your IP address being stored in the instance's BitTorrent 81 The main threat to your privacy induced by BitTorrent lies in your IP address being stored in the instance's BitTorrent
82 tracker as long as you download or watch the video. 82 tracker as long as you download or watch the video.
83 </p> 83 </p>
84 84
@@ -115,8 +115,7 @@
115 </li> 115 </li>
116 116
117 <li i18n> 117 <li i18n>
118 Web peers are not publicly accessible: because we use WebRTC inside the web browser (<a href="https://webtorrent.io/">with the 118 Web peers are not publicly accessible: because we use the websocket transport, the protocol is different from classic BitTorrent tracker.
119 WebTorrent library</a>), the protocol is different from classic BitTorrent.
120 When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers 119 When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers
121 to forward the information to. 120 to forward the information to.
122 See <a href="https://github.com/yciabaud/webtorrent/blob/beps/bep_webrtc.rst">this document</a> for more information 121 See <a href="https://github.com/yciabaud/webtorrent/blob/beps/bep_webrtc.rst">this document</a> for more information
diff --git a/client/src/app/modal/instance-config-warning-modal.component.ts b/client/src/app/modal/instance-config-warning-modal.component.ts
index 1c90f190a..c42413fc0 100644
--- a/client/src/app/modal/instance-config-warning-modal.component.ts
+++ b/client/src/app/modal/instance-config-warning-modal.component.ts
@@ -31,8 +31,7 @@ export class InstanceConfigWarningModalComponent {
31 } 31 }
32 32
33 isDefaultShortDescription (description: string) { 33 isDefaultShortDescription (description: string) {
34 return description === 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly ' + 34 return description === 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
35 'in the web browser with WebTorrent and Angular.'
36 } 35 }
37 36
38 private doNotOpenAgain () { 37 private doNotOpenAgain () {
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 8a3f26a1c..88def3ad5 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -323,7 +323,7 @@ auto_blacklist:
323# Instance settings 323# Instance settings
324instance: 324instance:
325 name: 'PeerTube' 325 name: 'PeerTube'
326 short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.' 326 short_description: 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
327 description: 'Welcome to this PeerTube instance!' # Support markdown 327 description: 'Welcome to this PeerTube instance!' # Support markdown
328 terms: 'No terms for now.' # Support markdown 328 terms: 'No terms for now.' # Support markdown
329 code_of_conduct: '' # Supports markdown 329 code_of_conduct: '' # Supports markdown
diff --git a/package.json b/package.json
index ef4b62dd9..26ed6453f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "peertube", 2 "name": "peertube",
3 "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", 3 "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.",
4 "version": "3.0.1", 4 "version": "3.0.1",
5 "private": true, 5 "private": true,
6 "licence": "AGPL-3.0", 6 "licence": "AGPL-3.0",