From 3e9861eecf11885283d68a8a87d7cfc7677d9b2c Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 25 Sep 2017 17:55:19 +0100 Subject: [PATCH] docs: improve links to cloud providers --- README.md | 4 +-- bin/make_manual.py | 3 ++ docs/content/about.md | 46 ++++++++++++++++----------- docs/content/s3.md | 2 +- docs/content/swift.md | 2 ++ docs/layouts/shortcodes/provider.html | 1 + 6 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 docs/layouts/shortcodes/provider.html diff --git a/README.md b/README.md index 1544d0db1..d885fe5b6 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Rclone is a command line program to sync files and directories to and from * Amazon Drive - * Amazon S3 + * Amazon S3 / Dreamhost / Ceph / Minio / Wasabi * Backblaze B2 * Box * Dropbox @@ -27,7 +27,7 @@ Rclone is a command line program to sync files and directories to and from * Hubic * Microsoft Azure Blob Storage * Microsoft OneDrive - * Openstack Swift / Rackspace cloud files / Memset Memstore + * Openstack Swift / Rackspace cloud files / Memset Memstore / OVH / Oracle Cloud Storage * QingStor * SFTP * Yandex Disk diff --git a/bin/make_manual.py b/bin/make_manual.py index 9435bfed0..adcabf446 100755 --- a/bin/make_manual.py +++ b/bin/make_manual.py @@ -90,6 +90,9 @@ def read_doc(doc): contents = re.sub(r'}} + contents = re.sub(r'\{\{<\s+provider.*?name="(.*?)".*?>\}\}', r"\1", contents) return contents def check_docs(docpath): diff --git a/docs/content/about.md b/docs/content/about.md index 545a76494..3d2402faa 100644 --- a/docs/content/about.md +++ b/docs/content/about.md @@ -2,7 +2,7 @@ title: "Rclone" description: "rclone syncs files to and from Google Drive, S3, Swift, Cloudfiles, Dropbox, Google Cloud Storage and Amazon Drive." type: page -date: "2015-09-06" +date: "2017-09-25" groups: ["about"] --- @@ -11,25 +11,33 @@ Rclone [![Logo](/img/rclone-120x120.png)](https://rclone.org/) -Rclone is a command line program to sync files and directories to and from +Rclone is a command line program to sync files and directories to and from: - * Amazon Drive - * Amazon S3 - * Backblaze B2 - * Box - * Dropbox - * FTP - * Google Cloud Storage - * Google Drive - * HTTP - * Hubic - * Microsoft Azure Blob Storage - * Microsoft OneDrive - * Openstack Swift / Rackspace cloud files / Memset Memstore - * QingStor - * SFTP - * Yandex Disk - * The local filesystem +* {{< provider name="Amazon Drive" home="https://www.amazon.com/clouddrive" config="/amazonclouddrive/" >}} +* {{< provider name="Amazon S3" home="https://aws.amazon.com/s3/" config="/s3/" >}} +* {{< provider name="Backblaze B2" home="https://www.backblaze.com/b2/cloud-storage.html" config="/b2/" >}} +* {{< provider name="Box" home="https://www.box.com/" config="/box/" >}} +* {{< provider name="Ceph" home="http://ceph.com/" config="/s3/#ceph" >}} +* {{< provider name="Dreamhost" home="https://www.dreamhost.com/cloud/storage/" config="/s3/" >}} +* {{< provider name="Dropbox" home="https://www.dropbox.com/" config="/dropbox/" >}} +* {{< provider name="FTP" home="https://en.wikipedia.org/wiki/File_Transfer_Protocol" config="/ftp/" >}} +* {{< provider name="Google Cloud Storage" home="https://cloud.google.com/storage/" config="/googlecloudstorage/" >}} +* {{< provider name="Google Drive" home="https://www.google.com/drive/" config="/drive/" >}} +* {{< provider name="HTTP" home="https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol" config="/http/" >}} +* {{< provider name="Hubic" home="https://hubic.com/" config="/hubic/" >}} +* {{< provider name="Memset Memstore" home="https://www.memset.com/cloud/storage/" config="/swift/" >}} +* {{< provider name="Microsoft Azure Blob Storage" home="https://azure.microsoft.com/en-us/services/storage/blobs/" config="/azureblob/" >}} +* {{< provider name="Microsoft OneDrive" home="https://onedrive.live.com/" config="/onedrive/" >}} +* {{< provider name="Minio" home="https://www.minio.io/" config="/s3/#minio" >}} +* {{< provider name="OVH" home="https://www.ovh.co.uk/public-cloud/storage/object-storage/" config="/swift/" >}} +* {{< provider name="Openstack Swift" home="https://docs.openstack.org/swift/latest/" config="/swift/" >}} +* {{< provider name="Oracle Cloud Storage" home="https://cloud.oracle.com/storage-opc" config="/swift/" >}} +* {{< provider name="QingStor" home="https://www.qingcloud.com/products/storage" config="/qingstor/" >}} +* {{< provider name="Rackspace Cloud Files" home="https://www.rackspace.com/cloud/files" config="/swift/" >}} +* {{< provider name="SFTP" home="https://en.wikipedia.org/wiki/SFTP" config="/sftp/" >}} +* {{< provider name="Wasabi" home="https://wasabi.com/" config="/s3/#wasabi" >}} +* {{< provider name="Yandex Disk" home="https://disk.yandex.com/" config="/yandex/" >}} +* {{< provider name="The local filesystem" home="/local/" config="/local/" >}} Features diff --git a/docs/content/s3.md b/docs/content/s3.md index cd0447e09..130cc22c3 100644 --- a/docs/content/s3.md +++ b/docs/content/s3.md @@ -484,7 +484,7 @@ rclone copy /path/to/files minio:bucket ### Wasabi ### -[Wasabi](wasabi.com) is a cloud-based object storage service for a +[Wasabi](https://wasabi.com) is a cloud-based object storage service for a broad range of applications and use cases. Wasabi is designed for individuals and organizations that require a high-performance, reliable, and secure data storage infrastructure at minimal cost. diff --git a/docs/content/swift.md b/docs/content/swift.md index 2b68bf02d..04890b780 100644 --- a/docs/content/swift.md +++ b/docs/content/swift.md @@ -12,6 +12,8 @@ Commercial implementations of that being: * [Rackspace Cloud Files](https://www.rackspace.com/cloud/files/) * [Memset Memstore](https://www.memset.com/cloud/storage/) + * [OVH Object Storage](https://www.ovh.co.uk/public-cloud/storage/object-storage/) + * [Oracle Cloud Storage](https://cloud.oracle.com/storage-opc) Paths are specified as `remote:container` (or `remote:` for the `lsd` command.) You may put subdirectories in too, eg `remote:container/path/to/dir`. diff --git a/docs/layouts/shortcodes/provider.html b/docs/layouts/shortcodes/provider.html new file mode 100644 index 000000000..8933f3dc0 --- /dev/null +++ b/docs/layouts/shortcodes/provider.html @@ -0,0 +1 @@ +{{ .Get "name" }}