diff --git a/client/src/index.html b/client/src/index.html
index 1078230d3..094d52454 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -23,7 +23,7 @@
     <noscript>
       <p>You are blocking Javascript, and we totally get that. However this endpoint uses Angular, so the front end is in full JavaScript and won't work without it.
       </br></br>
-      There will be other non JS-based clients to access PeerTube, but for now none is available as this is still alpha software. Be sure we will update this page with a list once alternative clients are developped. You can certainly develop you own in the meantime as our code is open source and libre software under GNU AGPLv3.0.
+      There will be other non JS-based clients to access PeerTube, but for now none is available as this is still alpha software. Be sure we will update this page with a list once alternative clients are developed. You can certainly develop you own in the meantime as our code is open source and libre software under GNU AGPLv3.0.
       </br></br>
       There might be numerous reasons you refuse to use JavaScript. If it has just to do with security (or lack thereof) of JavaScript-based webapps, then depending on your threat menace you might want to go through the code running on the node you are trying to access, and look for security audits.
       </p>
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index 7c4dea458..46ad4879e 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -169,7 +169,7 @@ describe('Test follows', function () {
     await expectAccountFollows(servers[2].url, 'peertube@localhost:9003', 0, 0)
   })
 
-  it('Should upload a video on server 2 ans 3 and propagate only the video of server 2', async function () {
+  it('Should upload a video on server 2 and 3 and propagate only the video of server 2', async function () {
     this.timeout(10000)
 
     await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'server2' })
diff --git a/support/doc/development/server/code.md b/support/doc/development/server/code.md
index a8793e807..953ccdbfe 100644
--- a/support/doc/development/server/code.md
+++ b/support/doc/development/server/code.md
@@ -19,7 +19,7 @@ The server main file is [server.ts](/server.ts).
 The server modules description are in the [package.json](/package.json) at the project root.
 All other server files are in the [server](/server) directory:
 
-    server.ts -> app initilization, main routes configuration (static routes...)
+    server.ts -> app initialization, main routes configuration (static routes...)
     config    -> server YAML configurations (for tests, production...)
     scripts   -> Scripts files for npm run
     server