diff --git a/README.md b/README.md
index cbcfe0149..534ca56e2 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
| [Nicholas Head](https://github.com/nicholashead) | [Frank Bloise](https://github.com/fbloise) | [Thomas Broussard](https://github.com/thomasbroussard)
| [Brandon Johnson](https://github.com/dbrandonjohnson) | [@cnagy](https://github.com/c-nagy) | [clmntsl](https://github.com/clmntsl)
| [mcejp](https://github.com/mcejp) | [joesfer](https://github.com/joesfer) | [chr15m](https://github.com/chr15m)
-| [piccobit](https://github.com/piccobit)
+| [piccobit](https://github.com/piccobit) | [Jess Sullivan](https://github.com/jesssullivan)
# Table of contents
@@ -265,6 +265,44 @@ In the **desktop application** or **mobile application**, select "OneDrive" as t
In the **terminal application**, to initiate the synchronisation process, type `:sync`. You will be asked to follow a link to authorise the application (simply input your Microsoft credentials - you do not need to register with OneDrive).
+## AWS S3 synchronisation
+
+In the **desktop application** or **mobile application**, select "AWS S3 (Beta)" as the synchronisation target in the Configuration screen.
+
+- **AWS S3 Bucket:** The name of your Bucket, such as `joplin-bucket`
+- **AWS S3 URL:** Fully qualified URL; By default this should be `https://s3.amazonaws.com/`
+- **AWS key & AWS secret:** IAM user's programmatic access key. To create a new key & secret, visit [IAM Security Credentials](https://console.aws.amazon.com/iam/home#/security_credentials).
+
+
+While creating a new Bucket for Joplin, disable **Bucket Versioning**, enable **Block all public access** and enable **Default encryption** with `Amazon S3 key (SSE-S3)`.
+
+To add a **Bucket Policy** from the AWS S3 Web Console, navigate to the **Permissions** tab. Temporarily disable **Block all public access** to edit the Bucket policy, something along the lines of:
+```
+{
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Sid": "VisualEditor0",
+ "Effect": "Allow",
+ "Principal": "*",
+ "Action": [
+ "s3:ListBucket",
+ "s3:GetBucketLocation",
+ "s3:DeleteObject",
+ "s3:DeleteObjectVersion",
+ "s3:PutObject"
+ ]
+ "Resource": [
+ "arn:aws:s3:::joplin-bucket",
+ "arn:aws:s3:::joplin-bucket/*"
+ ]
+ }
+ ]
+}
+```
+
+
+
# Encryption
Joplin supports end-to-end encryption (E2EE) on all the applications. E2EE is a system where only the owner of the notes, notebooks, tags or resources can read them. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data. Please see the [End-To-End Encryption Tutorial](https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md) for more information about this feature and how to enable it.
diff --git a/readme/gsoc2021/ideas.md b/readme/gsoc2021/ideas.md
index 90b3b4f3a..e2a149fe5 100644
--- a/readme/gsoc2021/ideas.md
+++ b/readme/gsoc2021/ideas.md
@@ -66,7 +66,7 @@ Potential Mentor(s): [PackElend](https://discourse.joplinapp.org/u/PackElend), [
## 5. Paste special
-A plugin that will allow pasting special text into Joplin and have it converted to Markdown. For example, paste an Excel or CSV table, and have it converted to a Markdown table. Paste some HTML or PDF text and again have it converted to formatted Markdown. This could be one plugin, or a collection of plugins, one for eadch "paste special" operation.
+A plugin that will allow pasting special text into Joplin and have it converted to Markdown. For example, paste an Excel or CSV table, and have it converted to a Markdown table. Paste some HTML or PDF text and again have it converted to formatted Markdown. This could be one plugin, or a collection of plugins, one for each "paste special" operation.
Expected Outcome: One or more plugins that allow pasting special text.