aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+about/about-peertube/about-peertube.component.html6
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html2
-rw-r--r--client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.html2
-rw-r--r--client/src/app/+signup/shared/signup-success.component.html2
-rw-r--r--client/src/app/modal/welcome-modal.component.html12
-rw-r--r--client/src/app/shared/shared-video-live/live-documentation-link.component.html2
-rw-r--r--support/doc/api/openapi.yaml12
-rw-r--r--support/nginx/peertube2
8 files changed, 20 insertions, 20 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 9bfda58a8..27dd0f609 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -25,7 +25,7 @@
25 <div class="card"> 25 <div class="card">
26 <div class="card-body"> 26 <div class="card-body">
27 <div class="card-title"> 27 <div class="card-title">
28 <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/use-setup-account">Use PeerTube 28 <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/use-setup-account">Use PeerTube
29 documentation</a> 29 documentation</a>
30 </div> 30 </div>
31 31
@@ -38,7 +38,7 @@
38 <div class="card"> 38 <div class="card">
39 <div class="card-body"> 39 <div class="card-body">
40 <div class="card-title"> 40 <div class="card-title">
41 <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/use-third-party-application">PeerTube 41 <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/use-third-party-application">PeerTube
42 Applications</a> 42 Applications</a>
43 </div> 43 </div>
44 44
@@ -51,7 +51,7 @@
51 <div class="card"> 51 <div class="card">
52 <div class="card-body"> 52 <div class="card-body">
53 <div class="card-title"> 53 <div class="card-title">
54 <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/contribute-getting-started">Contribute on 54 <a i18n target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/contribute-getting-started">Contribute on
55 PeerTube</a> 55 PeerTube</a>
56 </div> 56 </div>
57 57
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
index 5669b81ce..cf13b27bb 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
@@ -13,7 +13,7 @@
13 </span> 13 </span>
14 14
15 <div class="callout-container"> 15 <div class="callout-container">
16 <a class="callout-link" target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/admin-configuration?id=transcoding" i18n> 16 <a class="callout-link" target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/admin-configuration?id=transcoding" i18n>
17 Read guidelines 17 Read guidelines
18 </a> 18 </a>
19 </div> 19 </div>
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.html
index 09b4c8a1b..a97b2b4fb 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.html
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.html
@@ -29,7 +29,7 @@
29 </div> 29 </div>
30 30
31 <div i18n> 31 <div i18n>
32 See the <a target="_blank" href="https://docs.joinpeertube.org/#/use-library?id=playlist">documentation</a> for more information. 32 See the <a target="_blank" href="https://docs.joinpeertube.org/use-library?id=playlist">documentation</a> for more information.
33 </div> 33 </div>
34 </div> 34 </div>
35 35
diff --git a/client/src/app/+signup/shared/signup-success.component.html b/client/src/app/+signup/shared/signup-success.component.html
index 71f01897d..6ee118cd1 100644
--- a/client/src/app/+signup/shared/signup-success.component.html
+++ b/client/src/app/+signup/shared/signup-success.component.html
@@ -11,6 +11,6 @@
11 <p>{{ message }}</p> 11 <p>{{ message }}</p>
12 12
13 <p i18n> 13 <p i18n>
14 If you need help to use PeerTube, you can have a look at the <a href="https://docs.joinpeertube.org/#/use-setup-account" target="_blank" rel="noopener noreferrer">documentation</a>. 14 If you need help to use PeerTube, you can have a look at the <a href="https://docs.joinpeertube.org/use-setup-account" target="_blank" rel="noopener noreferrer">documentation</a>.
15 </p> 15 </p>
16</div> 16</div>
diff --git a/client/src/app/modal/welcome-modal.component.html b/client/src/app/modal/welcome-modal.component.html
index 66b144656..19bf3a1ea 100644
--- a/client/src/app/modal/welcome-modal.component.html
+++ b/client/src/app/modal/welcome-modal.component.html
@@ -8,22 +8,22 @@
8 8
9 <div class="block-documentation"> 9 <div class="block-documentation">
10 <div class="columns"> 10 <div class="columns">
11 <a class="link-block" href="https://docs.joinpeertube.org/#/maintain-tools" target="_blank" rel="noopener noreferrer"> 11 <a class="link-block" href="https://docs.joinpeertube.org/maintain-tools" target="_blank" rel="noopener noreferrer">
12 <a i18n class="link-title" href="https://docs.joinpeertube.org/#/maintain-tools" target="_blank" rel="noopener noreferrer">CLI 12 <a i18n class="link-title" href="https://docs.joinpeertube.org/maintain-tools" target="_blank" rel="noopener noreferrer">CLI
13 documentation</a> 13 documentation</a>
14 14
15 <div i18n>Upload or import videos, parse logs, prune storage directories, reset user password...</div> 15 <div i18n>Upload or import videos, parse logs, prune storage directories, reset user password...</div>
16 </a> 16 </a>
17 17
18 <a class="link-block" href="https://docs.joinpeertube.org/#/admin-following-instances" target="_blank" rel="noopener noreferrer"> 18 <a class="link-block" href="https://docs.joinpeertube.org/admin-following-instances" target="_blank" rel="noopener noreferrer">
19 <a i18n class="link-title" href="https://docs.joinpeertube.org/#/admin-following-instances" target="_blank" rel="noopener noreferrer">Administer 19 <a i18n class="link-title" href="https://docs.joinpeertube.org/admin-following-instances" target="_blank" rel="noopener noreferrer">Administer
20 documentation</a> 20 documentation</a>
21 21
22 <div i18n>Managing users, following other instances, dealing with spammers...</div> 22 <div i18n>Managing users, following other instances, dealing with spammers...</div>
23 </a> 23 </a>
24 24
25 <a class="link-block" href="https://docs.joinpeertube.org/#/use-setup-account" target="_blank" rel="noopener noreferrer"> 25 <a class="link-block" href="https://docs.joinpeertube.org/use-setup-account" target="_blank" rel="noopener noreferrer">
26 <a i18n class="link-title" href="https://docs.joinpeertube.org/#/use-setup-account" target="_blank" rel="noopener noreferrer">Use 26 <a i18n class="link-title" href="https://docs.joinpeertube.org/use-setup-account" target="_blank" rel="noopener noreferrer">Use
27 documentation</a> 27 documentation</a>
28 28
29 <div i18n>Setup your account, managing video playlists, discover third-party applications...</div> 29 <div i18n>Setup your account, managing video playlists, discover third-party applications...</div>
diff --git a/client/src/app/shared/shared-video-live/live-documentation-link.component.html b/client/src/app/shared/shared-video-live/live-documentation-link.component.html
index 0c54c7044..acf8a71eb 100644
--- a/client/src/app/shared/shared-video-live/live-documentation-link.component.html
+++ b/client/src/app/shared/shared-video-live/live-documentation-link.component.html
@@ -1,4 +1,4 @@
1<div i18n> 1<div i18n>
2 See <a href="https://docs.joinpeertube.org/#/use-create-upload-video?id=publish-a-live-in-peertube-gt-v3" target="_blank" rel="noopener noreferrer">the documentation</a> 2 See <a href="https://docs.joinpeertube.org/use-create-upload-video?id=publish-a-live-in-peertube-gt-v3" target="_blank" rel="noopener noreferrer">the documentation</a>
3 to learn how to use the PeerTube live streaming feature. 3 to learn how to use the PeerTube live streaming feature.
4</div> 4</div>
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 49616bcaa..cd231aa2b 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -23,7 +23,7 @@ info:
23 - [Go](https://framagit.org/framasoft/peertube/clients/go) 23 - [Go](https://framagit.org/framasoft/peertube/clients/go)
24 - [Kotlin](https://framagit.org/framasoft/peertube/clients/kotlin) 24 - [Kotlin](https://framagit.org/framasoft/peertube/clients/kotlin)
25 25
26 See the [Quick Start guide](https://docs.joinpeertube.org/#/api-rest-getting-started) so you can play with the PeerTube API. 26 See the [Quick Start guide](https://docs.joinpeertube.org/api-rest-getting-started) so you can play with the PeerTube API.
27 27
28 # Authentication 28 # Authentication
29 29
@@ -34,7 +34,7 @@ info:
34 ## Roles 34 ## Roles
35 35
36 Accounts are given permissions based on their role. There are three roles on 36 Accounts are given permissions based on their role. There are three roles on
37 PeerTube: Administrator, Moderator, and User. See the [roles guide](https://docs.joinpeertube.org/#/admin-managing-users?id=roles) for a detail of their permissions. 37 PeerTube: Administrator, Moderator, and User. See the [roles guide](https://docs.joinpeertube.org/admin-managing-users?id=roles) for a detail of their permissions.
38 38
39 # Errors 39 # Errors
40 40
@@ -95,7 +95,7 @@ tags:
95 information across its social graph by posting activities to actors' inbox 95 information across its social graph by posting activities to actors' inbox
96 endpoints. 96 endpoints.
97 externalDocs: 97 externalDocs:
98 url: https://docs.joinpeertube.org/#/admin-following-instances?id=instances-follows 98 url: https://docs.joinpeertube.org/admin-following-instances?id=instances-follows
99 - name: Instance Redundancy 99 - name: Instance Redundancy
100 description: > 100 description: >
101 Redundancy is part of the inter-server solidarity that PeerTube fosters. 101 Redundancy is part of the inter-server solidarity that PeerTube fosters.
@@ -103,12 +103,12 @@ tags:
103 to the policy of video selection of your choice. Note that you have a similar functionality 103 to the policy of video selection of your choice. Note that you have a similar functionality
104 to mirror individual videos, see `Video Mirroring`. 104 to mirror individual videos, see `Video Mirroring`.
105 externalDocs: 105 externalDocs:
106 url: https://docs.joinpeertube.org/#/admin-following-instances?id=instances-redundancy 106 url: https://docs.joinpeertube.org/admin-following-instances?id=instances-redundancy
107 - name: Plugins 107 - name: Plugins
108 description: > 108 description: >
109 Managing plugins installed from a local path or from NPM, or search for new ones. 109 Managing plugins installed from a local path or from NPM, or search for new ones.
110 externalDocs: 110 externalDocs:
111 url: https://docs.joinpeertube.org/#/api-plugins 111 url: https://docs.joinpeertube.org/api-plugins
112 - name: Abuses 112 - name: Abuses
113 description: | 113 description: |
114 Abuses deal with reports of local or remote videos/comments/accounts alike. 114 Abuses deal with reports of local or remote videos/comments/accounts alike.
@@ -3815,7 +3815,7 @@ components:
3815 3815
3816 - Have an account with sufficient authorization levels 3816 - Have an account with sufficient authorization levels
3817 3817
3818 - [Generate](https://docs.joinpeertube.org/#/api-rest-getting-started) a 3818 - [Generate](https://docs.joinpeertube.org/api-rest-getting-started) a
3819 Bearer Token 3819 Bearer Token
3820 3820
3821 - Make Authenticated Requests 3821 - Make Authenticated Requests
diff --git a/support/nginx/peertube b/support/nginx/peertube
index 0993085d5..00ce1d0dc 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -244,7 +244,7 @@ server {
244 sendfile_max_chunk 1M; # prevent one fast connection from entirely occupying the worker process. should be > 800k. 244 sendfile_max_chunk 1M; # prevent one fast connection from entirely occupying the worker process. should be > 800k.
245 aio threads; 245 aio threads;
246 246
247 # Use this in tandem with fuse-mounting i.e. https://docs.joinpeertube.org/#/admin-remote-storage 247 # Use this in tandem with fuse-mounting i.e. https://docs.joinpeertube.org/admin-remote-storage
248 # to serve files directly from a public bucket without proxying. 248 # to serve files directly from a public bucket without proxying.
249 # Assumes you have buckets named after the storage subdirectories, i.e. 'videos', 'redundancy', etc. 249 # Assumes you have buckets named after the storage subdirectories, i.e. 'videos', 'redundancy', etc.
250 #set $cdn <your S3-compatiable bucket public url mounted via fuse>; 250 #set $cdn <your S3-compatiable bucket public url mounted via fuse>;