diff --git a/bin/check_autogenerated_edits.py b/bin/check_autogenerated_edits.py
index 816e17d21..c536c8fbe 100755
--- a/bin/check_autogenerated_edits.py
+++ b/bin/check_autogenerated_edits.py
@@ -51,9 +51,9 @@ def find_regions(lines):
     regions = []
     start = None
     for i, line in enumerate(lines, 1):
-        if "rem autogenerated options start" in line:
+        if line.lstrip().startswith("<!-- autogenerated options start "):
             start = i
-        elif "rem autogenerated options stop" in line and start is not None:
+        elif start is not None and line.rstrip().endswith(" autogenerated options stop -->"):
             regions.append((start, i))
             start = None
     return regions
diff --git a/bin/make_backend_docs.py b/bin/make_backend_docs.py
index c600469c0..5e6622d89 100755
--- a/bin/make_backend_docs.py
+++ b/bin/make_backend_docs.py
@@ -9,10 +9,12 @@ import io
 import subprocess
 from pathlib import Path
 
-marker = "{{< rem autogenerated options"
-start = marker + " start"
-stop = marker + " stop"
-end = ">}}"
+begin = "<!-- "
+end = " -->"
+marker = "autogenerated options"
+line_marker_start_prefix = begin + marker + " start "
+line_marker_stop = begin + marker + " stop" + end
+markdownlint_disable = begin + "markdownlint-disable-line line-length" + end
 
 def find_backends():
     """Return a list of all backends"""
@@ -27,7 +29,7 @@ def output_backend_tool_docs(backend, out, cwd):
     """Output documentation for backend tool to out"""
     out.flush()
     subprocess.call(["./rclone", "--config=/notfound", "backend", "help", backend], stdout=out, stderr=subprocess.DEVNULL)
-    
+
 def alter_doc(backend):
     """Alter the documentation for backend"""
     rclone_bin_dir = Path(sys.path[0]).parent.absolute()
@@ -43,23 +45,23 @@ def alter_doc(backend):
         in_docs = False
         for line in in_file:
             if not in_docs:
-                if start in line:
+                if line.lstrip().startswith(line_marker_start_prefix):
                     in_docs = True
-                    start_full = (start + "\" - DO NOT EDIT - instead edit fs.RegInfo in backend/%s/%s.go then run make backenddocs\" " + end + "\n") % (backend, backend)
-                    out_file.write(start_full)
+                    line_marker_start = (line_marker_start_prefix + "- DO NOT EDIT - instead edit fs.RegInfo in backend/%s/%s.go and run make backenddocs to verify" + end) % (backend, backend)
+                    out_file.write(line_marker_start + " " + markdownlint_disable + "\n")
                     output_docs(backend, out_file, rclone_bin_dir)
                     output_backend_tool_docs(backend, out_file, rclone_bin_dir)
-                    out_file.write(stop+" "+end+"\n")
+                    out_file.write(line_marker_stop + "\n")
                     altered = True
             if not in_docs:
                 out_file.write(line)
             if in_docs:
-                if stop in line:
+                if line.strip() == line_marker_stop:
                     in_docs = False
     os.rename(doc_file, doc_file+"~")
     os.rename(new_file, doc_file)
     if not altered:
-        raise ValueError("Didn't find '%s' markers for in %s" % (start, doc_file))
+        raise ValueError("Didn't find '%s' markers in %s" % (line_marker_start_prefix, doc_file))
 
 
 def main(args):
diff --git a/bin/make_manual.py b/bin/make_manual.py
index 4f100ef10..6519e27e3 100755
--- a/bin/make_manual.py
+++ b/bin/make_manual.py
@@ -152,7 +152,7 @@ def read_doc(doc):
     # Make [...](/links/) absolute
     contents = re.sub(r'\]\((\/.*?\/(#.*)?)\)', r"](https://rclone.org\1)", contents)
     # Add additional links on the front page
-    contents = re.sub(r'\{\{< rem MAINPAGELINK >\}\}', "- [Donate.](https://rclone.org/donate/)", contents)
+    contents = re.sub(r'<!-- MAINPAGELINK -->', "- [Donate.](https://rclone.org/donate/)", contents)
     # Interpret provider shortcode
     # {{< provider name="Amazon S3" home="https://aws.amazon.com/s3/" config="/s3/" >}}
     contents = re.sub(r'\{\{<\s*provider.*?name="(.*?)".*?>\}\}', r"- \1", contents)
diff --git a/bin/make_rc_docs.sh b/bin/make_rc_docs.sh
index 44e9ddd02..4016fc1f6 100755
--- a/bin/make_rc_docs.sh
+++ b/bin/make_rc_docs.sh
@@ -15,8 +15,8 @@ fusermount -u -z /tmp/rclone/rc_mount > /dev/null 2>&1 || umount /tmp/rclone/rc_
 
 awk '
     BEGIN       {p=1}
-    /^\{\{< rem autogenerated start/  {print;system("cat /tmp/rclone/z.md");p=0}
-    /^\{\{< rem autogenerated stop/   {p=1}
+    /^<!-- autogenerated start/  {print;system("cat /tmp/rclone/z.md");p=0}
+    /^<!-- autogenerated stop/   {p=1}
     p' docs/content/rc.md > /tmp/rclone/rc.md
 
 mv /tmp/rclone/rc.md docs/content/rc.md
diff --git a/docs/content/_index.md b/docs/content/_index.md
index 18c6c8d83..35442096a 100644
--- a/docs/content/_index.md
+++ b/docs/content/_index.md
@@ -15,7 +15,7 @@ notoc: true
 - [What providers does rclone support?](#providers)
 - [Download](/downloads/)
 - [Install](/install/)
-{{< rem MAINPAGELINK >}}
+<!-- MAINPAGELINK -->
 
 ## About rclone {#about}
 
diff --git a/docs/content/alias.md b/docs/content/alias.md
index 281882365..6eaaf0a76 100644
--- a/docs/content/alias.md
+++ b/docs/content/alias.md
@@ -104,7 +104,7 @@ Copy another local directory to the alias directory called source
 rclone copy /home/source remote:source
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/alias/alias.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/alias/alias.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to alias (Alias for an existing remote).
@@ -137,4 +137,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/archive.md b/docs/content/archive.md
index e12ec2c03..f4fbff892 100644
--- a/docs/content/archive.md
+++ b/docs/content/archive.md
@@ -236,7 +236,8 @@ It would be possible to add ISO support fairly easily as the library we use ([go
 
 It would be possible to add write support, but this would only be for creating new archives, not for updating existing archives.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/archive/archive.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/archive/archive.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
+
 ### Standard options
 
 Here are the Standard options specific to archive (Read archives).
@@ -283,4 +284,4 @@ Any metadata supported by the underlying remote is read and written.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/authors.md b/docs/content/authors.md
index a5f824034..475c4428b 100644
--- a/docs/content/authors.md
+++ b/docs/content/authors.md
@@ -12,9 +12,9 @@ description: "Rclone Authors and Contributors"
 
 ## Contributors
 
-{{< rem `email addresses removed from here need to be added to
+<!-- email addresses removed from here need to be added to
 bin/.ignore-emails to make sure update-authors.py doesn't immediately
-put them back in again.` >}}
+put them back in again. -->
 
 - Alex Couper <amcouper@gmail.com>
 - Leonid Shalupov <leonid@shalupov.com> <shalupov@diverse.org.ru>
diff --git a/docs/content/azureblob.md b/docs/content/azureblob.md
index 26b79c8b5..05192b311 100644
--- a/docs/content/azureblob.md
+++ b/docs/content/azureblob.md
@@ -368,7 +368,7 @@ If you want to access resources with public anonymous access then set
 rclone lsf :azureblob,account=ACCOUNT:CONTAINER
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/azureblob/azureblob.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/azureblob/azureblob.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to azureblob (Microsoft Azure Blob Storage).
@@ -1040,7 +1040,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ### Custom upload headers
 
diff --git a/docs/content/azurefiles.md b/docs/content/azurefiles.md
index 0af5a908f..2c4680f7a 100644
--- a/docs/content/azurefiles.md
+++ b/docs/content/azurefiles.md
@@ -348,7 +348,7 @@ Setting this can be useful if you wish to use the `az` CLI on a host with
 a System Managed Identity that you do not want to use.
 Don't set `env_auth` at the same time.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/azurefiles/azurefiles.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/azurefiles/azurefiles.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to azurefiles (Microsoft Azure Files).
@@ -793,7 +793,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ### Custom upload headers
 
diff --git a/docs/content/b2.md b/docs/content/b2.md
index 993f7b5d5..982310ea2 100644
--- a/docs/content/b2.md
+++ b/docs/content/b2.md
@@ -371,7 +371,7 @@ https://f002.backblazeb2.com/file/bucket/path/folder/file3?Authorization=xxxxxxx
 
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/b2/b2.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/b2/b2.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to b2 (Backblaze B2).
@@ -783,7 +783,7 @@ it would do.
     rclone backend cleanup-hidden b2:bucket/path/to/dir
 
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/box.md b/docs/content/box.md
index 491849d2d..0d1e2f190 100644
--- a/docs/content/box.md
+++ b/docs/content/box.md
@@ -277,7 +277,7 @@ So if the folder you want rclone to use has a URL which looks like
 in the browser, then you use `11xxxxxxxxx8` as
 the `root_folder_id` in the config.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/box/box.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/box/box.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to box (Box).
@@ -509,7 +509,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/cache.md b/docs/content/cache.md
index 780c2094d..f5a61563d 100644
--- a/docs/content/cache.md
+++ b/docs/content/cache.md
@@ -325,7 +325,7 @@ Params:
 - **withData** = true/false to delete cached data (chunks) as
   well *(optional, false by default)*
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/cache/cache.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/cache/cache.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to cache (Cache a remote).
@@ -716,4 +716,4 @@ Print stats on the cache backend in JSON format.
 
     rclone backend stats remote: [options] [<arguments>+]
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/chunker.md b/docs/content/chunker.md
index c36071da3..1e291a96d 100644
--- a/docs/content/chunker.md
+++ b/docs/content/chunker.md
@@ -313,7 +313,7 @@ to keep rclone up-to-date to avoid data corruption.
 
 Changing `transactions` is dangerous and requires explicit migration.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/chunker/chunker.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/chunker/chunker.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to chunker (Transparently chunk/split large files).
@@ -481,4 +481,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/cloudinary.md b/docs/content/cloudinary.md
index bae3ece9e..72980e316 100644
--- a/docs/content/cloudinary.md
+++ b/docs/content/cloudinary.md
@@ -133,7 +133,7 @@ rclone ls cloudinary-media-library:directory
 
 Cloudinary stores md5 and timestamps for any successful Put automatically and read-only.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/cloudinary/cloudinary.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/cloudinary/cloudinary.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to cloudinary (Cloudinary).
@@ -254,4 +254,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/combine.md b/docs/content/combine.md
index 6816c31b8..e249b7cb8 100644
--- a/docs/content/combine.md
+++ b/docs/content/combine.md
@@ -133,7 +133,7 @@ with the `AllDrives:` remote.
 
 See [the Google Drive docs](/drive/#drives) for full info.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/combine/combine.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/combine/combine.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to combine (Combine several remotes into one).
@@ -183,4 +183,4 @@ Any metadata supported by the underlying remote is read and written.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/compress.md b/docs/content/compress.md
index e4c090eec..c09ce2579 100644
--- a/docs/content/compress.md
+++ b/docs/content/compress.md
@@ -124,7 +124,7 @@ The compressed files will be named `*.###########.gz` where `*` is the base
 file and the `#` part is base64 encoded size of the uncompressed file. The file
 names should not be changed by anything other than the rclone compression backend.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/compress/compress.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/compress/compress.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to compress (Compress a remote).
@@ -219,4 +219,4 @@ Any metadata supported by the underlying remote is read and written.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/crypt.md b/docs/content/crypt.md
index b9acc1a5a..83be38303 100644
--- a/docs/content/crypt.md
+++ b/docs/content/crypt.md
@@ -418,7 +418,7 @@ Use the `rclone cryptcheck` command to check the
 integrity of an encrypted remote instead of `rclone check` which can't
 check the checksums properly.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/crypt/crypt.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/crypt/crypt.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to crypt (Encrypt/Decrypt a remote).
@@ -697,7 +697,7 @@ Usage Example:
     rclone rc backend/command command=decode fs=crypt: encryptedfile1 [encryptedfile2...]
 
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Backing up an encrypted remote
 
diff --git a/docs/content/doi.md b/docs/content/doi.md
index b4318f085..49ce6ceca 100644
--- a/docs/content/doi.md
+++ b/docs/content/doi.md
@@ -67,7 +67,7 @@ d) Delete this remote
 y/e/d> y
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/doi/doi.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/doi/doi.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to doi (DOI datasets).
@@ -188,4 +188,4 @@ will default to those currently in use.
 It doesn't return anything.
 
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/drive.md b/docs/content/drive.md
index b11a30049..8de9d6858 100644
--- a/docs/content/drive.md
+++ b/docs/content/drive.md
@@ -598,7 +598,7 @@ Google Documents.
 | url | INI style link file | macOS, Windows |
 | webloc | macOS specific XML format | macOS |
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/drive/drive.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/drive/drive.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to drive (Google Drive).
@@ -1792,7 +1792,7 @@ Third delete all orphaned files to the trash
     rclone backend rescue drive: -o delete
 
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/dropbox.md b/docs/content/dropbox.md
index 9c671e578..2a889ab4b 100644
--- a/docs/content/dropbox.md
+++ b/docs/content/dropbox.md
@@ -237,7 +237,7 @@ of supported formats at any time.
 | html      | HTML     | HTML document        |
 | md        | Markdown | Markdown text format |
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/dropbox/dropbox.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/dropbox/dropbox.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to dropbox (Dropbox).
@@ -590,7 +590,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/fichier.md b/docs/content/fichier.md
index d6ff62df6..29c62a7f6 100644
--- a/docs/content/fichier.md
+++ b/docs/content/fichier.md
@@ -124,7 +124,7 @@ name:
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/fichier/fichier.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/fichier/fichier.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to fichier (1Fichier).
@@ -216,7 +216,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/filefabric.md b/docs/content/filefabric.md
index 154c1a8c2..7e28c6c31 100644
--- a/docs/content/filefabric.md
+++ b/docs/content/filefabric.md
@@ -161,7 +161,7 @@ $ rclone lsf --dirs-only -Fip --csv filefabric:
 
 The ID for "S3 Storage" would be `120673761`.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/filefabric/filefabric.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/filefabric/filefabric.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to filefabric (Enterprise File Fabric).
@@ -294,4 +294,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/filelu.md b/docs/content/filelu.md
index 4482d3296..fe90c6e39 100644
--- a/docs/content/filelu.md
+++ b/docs/content/filelu.md
@@ -196,7 +196,7 @@ significant memory usage during list/sync operations. Ensure the
 system running `rclone` has sufficient memory and CPU to handle these
 operations.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/filelu/filelu.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/filelu/filelu.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to filelu (FileLu Cloud Storage).
@@ -240,7 +240,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/filescom.md b/docs/content/filescom.md
index ca3eabea6..baa003125 100644
--- a/docs/content/filescom.md
+++ b/docs/content/filescom.md
@@ -126,7 +126,7 @@ selecting more checksums will not affect rclone's operations.
 For use with rclone, selecting at least MD5 is recommended so rclone
 can do an end to end integrity check.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/filescom/filescom.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/filescom/filescom.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to filescom (Files.com).
@@ -205,4 +205,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/ftp.md b/docs/content/ftp.md
index 0c894481e..0de99cc93 100644
--- a/docs/content/ftp.md
+++ b/docs/content/ftp.md
@@ -200,7 +200,7 @@ This backend's interactive configuration wizard provides a selection of
 sensible encoding settings for major FTP servers: ProFTPd, PureFTPd, VsFTPd.
 Just hit a selection number when prompted.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/ftp/ftp.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/ftp/ftp.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to ftp (FTP).
@@ -559,7 +559,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/gofile.md b/docs/content/gofile.md
index 40a766f0b..c365325cc 100644
--- a/docs/content/gofile.md
+++ b/docs/content/gofile.md
@@ -155,7 +155,7 @@ root_folder_id = d6341f53-ee65-4f29-9f59-d11e8070b2a0
 
 To restrict rclone to the `Files` directory.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/gofile/gofile.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/gofile/gofile.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to gofile (Gofile).
@@ -243,7 +243,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/googlecloudstorage.md b/docs/content/googlecloudstorage.md
index a27e4bb65..8f869ef0f 100644
--- a/docs/content/googlecloudstorage.md
+++ b/docs/content/googlecloudstorage.md
@@ -355,7 +355,7 @@ To avoid these possibly unnecessary updates, use `--modify-window 1s`.
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/googlecloudstorage/googlecloudstorage.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/googlecloudstorage/googlecloudstorage.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to google cloud storage (Google Cloud Storage (this is not Google Drive)).
@@ -818,7 +818,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/googlephotos.md b/docs/content/googlephotos.md
index 55adba75b..5affdf660 100644
--- a/docs/content/googlephotos.md
+++ b/docs/content/googlephotos.md
@@ -244,7 +244,7 @@ filesystem and it is a good target for repeated syncing.
 The `shared-album` directory shows albums shared with you or by you.
 This is similar to the Sharing tab in the Google Photos web interface.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/googlephotos/googlephotos.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/googlephotos/googlephotos.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to google photos (Google Photos).
@@ -538,7 +538,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/hasher.md b/docs/content/hasher.md
index ccfc141e1..d1448fa41 100644
--- a/docs/content/hasher.md
+++ b/docs/content/hasher.md
@@ -175,7 +175,7 @@ or by full re-read/re-write of the files.
 
 ## Configuration reference
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/hasher/hasher.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/hasher/hasher.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to hasher (Better checksums for other remotes).
@@ -310,7 +310,7 @@ Usage Example:
     rclone backend stickyimport hasher:subdir md5 remote:path/to/sum.md5
 
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Implementation details (advanced)
 
diff --git a/docs/content/hdfs.md b/docs/content/hdfs.md
index 70c4d505e..1ef43c2bd 100644
--- a/docs/content/hdfs.md
+++ b/docs/content/hdfs.md
@@ -159,7 +159,7 @@ the following characters are also replaced:
 
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8).
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/hdfs/hdfs.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/hdfs/hdfs.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to hdfs (Hadoop distributed file system).
@@ -253,7 +253,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/hidrive.md b/docs/content/hidrive.md
index c52dd9fdc..02c4ea207 100644
--- a/docs/content/hidrive.md
+++ b/docs/content/hidrive.md
@@ -208,7 +208,7 @@ explicitly needed. For this, the `disable_fetching_member_count` option can be u
 
 See the below section about configuration options for more details.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/hidrive/hidrive.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/hidrive/hidrive.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to hidrive (HiDrive).
@@ -458,7 +458,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/http.md b/docs/content/http.md
index b28edc659..f80f04fad 100644
--- a/docs/content/http.md
+++ b/docs/content/http.md
@@ -137,7 +137,7 @@ or:
 rclone lsd :http,url='https://beta.rclone.org':
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/http/http.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/http/http.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to http (HTTP).
@@ -287,7 +287,7 @@ will default to those currently in use.
 It doesn't return anything.
 
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/iclouddrive.md b/docs/content/iclouddrive.md
index 18cfebf12..3ec62ede0 100644
--- a/docs/content/iclouddrive.md
+++ b/docs/content/iclouddrive.md
@@ -105,7 +105,7 @@ need to wait a few hours or a day before you can get rclone to work - keep
 clearing the config entry and running `rclone reconnect remote:` until rclone
 functions properly.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/iclouddrive/iclouddrive.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/iclouddrive/iclouddrive.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to iclouddrive (iCloud Drive).
@@ -195,4 +195,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/imagekit.md b/docs/content/imagekit.md
index 7792ace58..086d87ade 100644
--- a/docs/content/imagekit.md
+++ b/docs/content/imagekit.md
@@ -112,7 +112,7 @@ ImageKit does not support modification times or hashes yet.
 
 No checksums are supported.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/imagekit/imagekit.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/imagekit/imagekit.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to imagekit (ImageKit.io).
@@ -233,4 +233,4 @@ Here are the possible system metadata items for the imagekit backend.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/internetarchive.md b/docs/content/internetarchive.md
index 119878de1..a170dbe53 100644
--- a/docs/content/internetarchive.md
+++ b/docs/content/internetarchive.md
@@ -183,7 +183,7 @@ d) Delete this remote
 y/e/d> y
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/internetarchive/internetarchive.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/internetarchive/internetarchive.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to internetarchive (Internet Archive).
@@ -351,4 +351,4 @@ Here are the possible system metadata items for the internetarchive backend.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/jottacloud.md b/docs/content/jottacloud.md
index b8d15e88c..07e92c5e1 100644
--- a/docs/content/jottacloud.md
+++ b/docs/content/jottacloud.md
@@ -399,7 +399,7 @@ To view your current quota you can use the `rclone about remote:`
 command which will display your usage limit (unless it is unlimited)
 and the current usage.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/jottacloud/jottacloud.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/jottacloud/jottacloud.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to jottacloud (Jottacloud).
@@ -582,7 +582,7 @@ Here are the possible system metadata items for the jottacloud backend.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/koofr.md b/docs/content/koofr.md
index 93f6b53f2..cb506188b 100644
--- a/docs/content/koofr.md
+++ b/docs/content/koofr.md
@@ -119,7 +119,7 @@ the following characters are also replaced:
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in XML strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/koofr/koofr.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/koofr/koofr.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to koofr (Koofr, Digi Storage and other Koofr-compatible storage providers).
@@ -233,7 +233,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/linkbox.md b/docs/content/linkbox.md
index 5a2076071..14d92ce9b 100644
--- a/docs/content/linkbox.md
+++ b/docs/content/linkbox.md
@@ -54,7 +54,7 @@ y/e/d> y
 
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/linkbox/linkbox.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/linkbox/linkbox.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to linkbox (Linkbox).
@@ -85,7 +85,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/local.md b/docs/content/local.md
index 83d5ecc82..9a35f3e34 100644
--- a/docs/content/local.md
+++ b/docs/content/local.md
@@ -340,7 +340,7 @@ filesystem.
 **NB** This flag is only available on Unix based systems.  On systems
 where it isn't supported (e.g. Windows) it will be ignored.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/local/local.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/local/local.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Advanced options
 
 Here are the Advanced options specific to local (Local Disk).
@@ -727,4 +727,4 @@ Options:
 - "echo": echo the input arguments
 - "error": return an error based on option value
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/mailru.md b/docs/content/mailru.md
index 8390204e4..6af9c4b4d 100644
--- a/docs/content/mailru.md
+++ b/docs/content/mailru.md
@@ -186,7 +186,7 @@ the following characters are also replaced:
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/mailru/mailru.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/mailru/mailru.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to mailru (Mail.ru Cloud).
@@ -457,7 +457,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/mega.md b/docs/content/mega.md
index 1a7efff58..b18902569 100644
--- a/docs/content/mega.md
+++ b/docs/content/mega.md
@@ -203,7 +203,7 @@ So, if rclone was working nicely and suddenly you are unable to log-in
 and you are sure the user and the password are correct, likely you
 have got the remote blocked for a while.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/mega/mega.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/mega/mega.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to mega (Mega).
@@ -306,7 +306,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ### Process `killed`
 
diff --git a/docs/content/memory.md b/docs/content/memory.md
index e1c2a21d1..059848796 100644
--- a/docs/content/memory.md
+++ b/docs/content/memory.md
@@ -65,7 +65,7 @@ The memory backend supports MD5 hashes and modification times accurate to 1 nS.
 The memory backend replaces the [default restricted characters
 set](/overview/#restricted-characters).
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/memory/memory.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/memory/memory.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Advanced options
 
 Here are the Advanced options specific to memory (In memory object storage system.).
@@ -81,4 +81,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/netstorage.md b/docs/content/netstorage.md
index ded4a14b1..51a79e685 100644
--- a/docs/content/netstorage.md
+++ b/docs/content/netstorage.md
@@ -242,7 +242,7 @@ for considerations when using "quick-delete". In general, using quick-delete
 method will not delete the tree immediately and objects targeted for
 quick-delete may still be accessible.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/netstorage/netstorage.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/netstorage/netstorage.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to netstorage (Akamai NetStorage).
@@ -356,4 +356,4 @@ the object that will be the target of the symlink (for example, /links/mylink).
 Include the file extension for the object, if applicable.
 `rclone backend symlink <src> <path>`
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/onedrive.md b/docs/content/onedrive.md
index f129e7c4c..18debb789 100644
--- a/docs/content/onedrive.md
+++ b/docs/content/onedrive.md
@@ -314,7 +314,7 @@ doesn't provide an API to permanently delete files, nor to empty the
 trash, so you will have to do that with one of Microsoft's apps or via
 the OneDrive website.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/onedrive/onedrive.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/onedrive/onedrive.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to onedrive (Microsoft OneDrive).
@@ -999,7 +999,7 @@ Here are the possible system metadata items for the onedrive backend.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ### Impersonate other users as Admin
 
diff --git a/docs/content/opendrive.md b/docs/content/opendrive.md
index 5e9f2127c..5ffea7dd6 100644
--- a/docs/content/opendrive.md
+++ b/docs/content/opendrive.md
@@ -110,7 +110,7 @@ These only get replaced if they are the first or last character in the name:
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/opendrive/opendrive.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/opendrive/opendrive.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to opendrive (OpenDrive).
@@ -199,7 +199,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/oracleobjectstorage/_index.md b/docs/content/oracleobjectstorage/_index.md
index 1b8cba0a5..71a7a1879 100644
--- a/docs/content/oracleobjectstorage/_index.md
+++ b/docs/content/oracleobjectstorage/_index.md
@@ -332,7 +332,7 @@ throughput (16M would be sensible).  Increasing either of these will
 use more memory.  The default values are high enough to gain most of
 the possible performance without using too much memory.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/oracleobjectstorage/oracleobjectstorage.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/oracleobjectstorage/oracleobjectstorage.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to oracleobjectstorage (Oracle Cloud Infrastructure Object Storage).
@@ -897,7 +897,7 @@ Options:
 
 - "hours": The number of hours for which this object will be restored. Default is 24 hrs.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Tutorials
 
diff --git a/docs/content/pcloud.md b/docs/content/pcloud.md
index 904bf81aa..7902fda8a 100644
--- a/docs/content/pcloud.md
+++ b/docs/content/pcloud.md
@@ -173,7 +173,7 @@ So if the folder you want rclone to use your is "My Music/", then use the return
 id from ```rclone lsf``` command (ex. `dxxxxxxxx2`) as the `root_folder_id` variable
 value in the config file.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/pcloud/pcloud.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/pcloud/pcloud.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to pcloud (Pcloud).
@@ -344,4 +344,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/pikpak.md b/docs/content/pikpak.md
index 38477cab7..b21b0dc02 100644
--- a/docs/content/pikpak.md
+++ b/docs/content/pikpak.md
@@ -80,7 +80,7 @@ but it does not support changing only the modification time
 
 The MD5 hash algorithm is supported.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/pikpak/pikpak.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/pikpak/pikpak.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to pikpak (PikPak).
@@ -348,7 +348,7 @@ Result:
     }
 
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/pixeldrain.md b/docs/content/pixeldrain.md
index 2cdf257ef..957be1030 100644
--- a/docs/content/pixeldrain.md
+++ b/docs/content/pixeldrain.md
@@ -107,7 +107,7 @@ IDs.
 Enter this directory ID in the rclone config and you will be able to access the
 directory.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/pixeldrain/pixeldrain.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/pixeldrain/pixeldrain.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to pixeldrain (Pixeldrain Filesystem).
@@ -178,4 +178,4 @@ Here are the possible system metadata items for the pixeldrain backend.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/premiumizeme.md b/docs/content/premiumizeme.md
index 61603a473..c630b9aac 100644
--- a/docs/content/premiumizeme.md
+++ b/docs/content/premiumizeme.md
@@ -113,7 +113,7 @@ the following characters are also replaced:
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/premiumizeme/premiumizeme.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/premiumizeme/premiumizeme.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to premiumizeme (premiumize.me).
@@ -238,7 +238,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/protondrive.md b/docs/content/protondrive.md
index 1ee237fd7..de66b9c03 100644
--- a/docs/content/protondrive.md
+++ b/docs/content/protondrive.md
@@ -134,7 +134,7 @@ to be implemented, so updates from other clients won’t be reflected in the
 cache. Thus, if there are concurrent clients accessing the same mount point,
 then we might have a problem with caching the stale data.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/protondrive/protondrive.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/protondrive/protondrive.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to protondrive (Proton Drive).
@@ -351,7 +351,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/putio.md b/docs/content/putio.md
index ba89f30f3..f1bace8e1 100644
--- a/docs/content/putio.md
+++ b/docs/content/putio.md
@@ -122,7 +122,7 @@ the following characters are also replaced:
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/putio/putio.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/putio/putio.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to putio (Put.io).
@@ -233,7 +233,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/qingstor.md b/docs/content/qingstor.md
index f523b6827..ad798f83e 100644
--- a/docs/content/qingstor.md
+++ b/docs/content/qingstor.md
@@ -153,7 +153,7 @@ that 0x7F is not replaced.
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/qingstor/qingstor.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/qingstor/qingstor.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to qingstor (QingCloud Object Storage).
@@ -332,7 +332,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/quatrix.md b/docs/content/quatrix.md
index 33157fded..e5585ffd5 100644
--- a/docs/content/quatrix.md
+++ b/docs/content/quatrix.md
@@ -168,7 +168,7 @@ Files you delete with rclone will end up in Trash and be stored there for 30 day
 Quatrix also provides an API to permanently delete files and an API to empty the
 Trash so that you can remove files permanently from your account.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/quatrix/quatrix.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/quatrix/quatrix.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to quatrix (Quatrix by Maytech).
@@ -278,7 +278,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Storage usage
 
diff --git a/docs/content/rc.md b/docs/content/rc.md
index 74e0dc31f..b057b2c65 100644
--- a/docs/content/rc.md
+++ b/docs/content/rc.md
@@ -577,7 +577,7 @@ And this is equivalent to `/tmp/dir`
 ```
 
 ## Supported commands
-{{< rem autogenerated start "- run make rcdocs - don't edit here" >}}
+<!-- autogenerated start "- run make rcdocs - don't edit here" -->
 ### backend/command: Runs a backend command. {#backend-command}
 
 This takes the following parameters:
@@ -2363,7 +2363,7 @@ supplied and if there is only one VFS in use then that VFS will be
 used. If there is more than one VFS in use then the "fs" parameter
 must be supplied.
 
-{{< rem autogenerated stop >}}
+<!-- autogenerated stop -->
 
 ## Accessing the remote control via HTTP {#api-http}
 
diff --git a/docs/content/s3.md b/docs/content/s3.md
index b5f73ebbf..136718b21 100644
--- a/docs/content/s3.md
+++ b/docs/content/s3.md
@@ -840,7 +840,7 @@ section, small files that are not uploaded as multipart, use a different tag, ca
 the upload to fail. A simple solution is to set the `--s3-upload-cutoff 0` and force
 all the files to be uploaded as multipart.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/s3/s3.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/s3/s3.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to s3 (Amazon S3 Compliant Storage Providers including AWS, Alibaba, ArvanCloud, Ceph, ChinaMobile, Cloudflare, DigitalOcean, Dreamhost, Exaba, FlashBlade, GCS, HuaweiOBS, IBMCOS, IDrive, IONOS, LyveCloud, Leviia, Liara, Linode, Magalu, Mega, Minio, Netease, Outscale, OVHcloud, Petabox, RackCorp, Rclone, Scaleway, SeaweedFS, Selectel, StackPath, Storj, Synology, TencentCOS, Wasabi, Qiniu, Zata and others).
@@ -2522,7 +2522,7 @@ will default to those currently in use.
 It doesn't return anything.
 
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ### Anonymous access to public buckets {#anonymous-access}
 
diff --git a/docs/content/seafile.md b/docs/content/seafile.md
index b15044b04..2c5777adf 100644
--- a/docs/content/seafile.md
+++ b/docs/content/seafile.md
@@ -296,7 +296,7 @@ Versions between 6.0 and 6.3 haven't been tested and might not work properly.
 Each new version of `rclone` is automatically tested against the [latest docker image](https://hub.docker.com/r/seafileltd/seafile-mc/)
 of the seafile community server.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/seafile/seafile.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/seafile/seafile.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to seafile (seafile).
@@ -428,5 +428,5 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
diff --git a/docs/content/sftp.md b/docs/content/sftp.md
index f53541892..58e155296 100644
--- a/docs/content/sftp.md
+++ b/docs/content/sftp.md
@@ -428,7 +428,7 @@ with a Windows OpenSSH server, rclone will use a built-in shell command
 (see [shell access](#shell-access)). If none of the above is applicable,
 `about` will fail.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/sftp/sftp.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/sftp/sftp.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to sftp (SSH/SFTP).
@@ -1231,7 +1231,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/sharefile.md b/docs/content/sharefile.md
index 9f0d6b2cb..60658c5d6 100644
--- a/docs/content/sharefile.md
+++ b/docs/content/sharefile.md
@@ -159,7 +159,7 @@ name:
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/sharefile/sharefile.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/sharefile/sharefile.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to sharefile (Citrix Sharefile).
@@ -339,7 +339,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 ## Limitations
 
 Note that ShareFile is case insensitive so you can't have a file called
diff --git a/docs/content/sia.md b/docs/content/sia.md
index 35b11d290..1f8b3ce2a 100644
--- a/docs/content/sia.md
+++ b/docs/content/sia.md
@@ -133,7 +133,7 @@ Once configured, you can then use `rclone` like this:
   rclone copy /home/source mySia:backup
   ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/sia/sia.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/sia/sia.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to sia (Sia Decentralized Cloud).
@@ -208,7 +208,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/smb.md b/docs/content/smb.md
index 1ef15a7eb..48e9cd815 100644
--- a/docs/content/smb.md
+++ b/docs/content/smb.md
@@ -115,7 +115,7 @@ d) Delete this remote
 y/e/d> d
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/smb/smb.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/smb/smb.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to smb (SMB / CIFS).
@@ -305,4 +305,4 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/storj.md b/docs/content/storj.md
index 07b0f5210..b8c590034 100644
--- a/docs/content/storj.md
+++ b/docs/content/storj.md
@@ -225,7 +225,7 @@ d) Delete this remote
 y/e/d> y
 ```
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/storj/storj.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/storj/storj.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to storj (Storj Decentralized Cloud Storage).
@@ -320,7 +320,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Usage
 
diff --git a/docs/content/sugarsync.md b/docs/content/sugarsync.md
index 37f69fab0..2779f9c4f 100644
--- a/docs/content/sugarsync.md
+++ b/docs/content/sugarsync.md
@@ -129,7 +129,7 @@ However you can supply the flag `--sugarsync-hard-delete` or set the
 config parameter `hard_delete = true` if you would like files to be
 deleted straight away.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/sugarsync/sugarsync.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/sugarsync/sugarsync.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to sugarsync (Sugarsync).
@@ -291,7 +291,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/swift.md b/docs/content/swift.md
index 8011e5878..a5e5b3103 100644
--- a/docs/content/swift.md
+++ b/docs/content/swift.md
@@ -258,7 +258,7 @@ The MD5 hash algorithm is supported.
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/swift/swift.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/swift/swift.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to swift (OpenStack Swift (Rackspace Cloud Files, Blomp Cloud Storage, Memset Memstore, OVH)).
@@ -692,7 +692,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/ulozto.md b/docs/content/ulozto.md
index c57827c93..cd66b185e 100644
--- a/docs/content/ulozto.md
+++ b/docs/content/ulozto.md
@@ -164,7 +164,7 @@ root slug.
 path. For example, if your remote's `root_folder_slug` corresponds to `/foo/bar`,
 `remote:baz/qux` will refer to `ABSOLUTE_ULOZTO_ROOT/foo/bar/baz/qux`.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/ulozto/ulozto.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/ulozto/ulozto.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to ulozto (Uloz.to).
@@ -257,7 +257,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/union.md b/docs/content/union.md
index ae4ffcaf0..512132527 100644
--- a/docs/content/union.md
+++ b/docs/content/union.md
@@ -233,7 +233,7 @@ Rclone does not manage the `:writeback` remote in any way other than writing
 files back to it. So if you need to expire old files or manage the size then you
 will have to do this yourself.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/union/union.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/union/union.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to union (Union merges the contents of several upstream fs).
@@ -332,4 +332,4 @@ Any metadata supported by the underlying remote is read and written.
 
 See the [metadata](/docs/#metadata) docs for more info.
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
diff --git a/docs/content/uptobox.md b/docs/content/uptobox.md
index 4d89f727b..deb08d13d 100644
--- a/docs/content/uptobox.md
+++ b/docs/content/uptobox.md
@@ -112,7 +112,7 @@ the following characters are also replaced:
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in XML strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/uptobox/uptobox.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/uptobox/uptobox.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to uptobox (Uptobox).
@@ -169,7 +169,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/webdav.md b/docs/content/webdav.md
index a8a692ed8..e30ef76cb 100644
--- a/docs/content/webdav.md
+++ b/docs/content/webdav.md
@@ -121,7 +121,7 @@ Depending on the exact version of ownCloud or Nextcloud hashes may
 appear on all objects, or only on objects which had a hash uploaded
 with them.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/webdav/webdav.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/webdav/webdav.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to webdav (WebDAV).
@@ -350,7 +350,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Provider notes
 
diff --git a/docs/content/yandex.md b/docs/content/yandex.md
index b181c2fa7..682415ee9 100644
--- a/docs/content/yandex.md
+++ b/docs/content/yandex.md
@@ -125,7 +125,7 @@ are replaced.
 Invalid UTF-8 bytes will also be [replaced](/overview/#invalid-utf8),
 as they can't be used in JSON strings.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/yandex/yandex.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/yandex/yandex.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to yandex (Yandex Disk).
@@ -258,7 +258,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Limitations
 
diff --git a/docs/content/zoho.md b/docs/content/zoho.md
index 225849019..575ac3bda 100644
--- a/docs/content/zoho.md
+++ b/docs/content/zoho.md
@@ -136,7 +136,7 @@ Only control characters and invalid UTF-8 are replaced. In addition most
 Unicode full-width characters are not supported at all and will be removed
 from filenames during upload.
 
-{{< rem autogenerated options start" - DO NOT EDIT - instead edit fs.RegInfo in backend/zoho/zoho.go then run make backenddocs" >}}
+<!-- autogenerated options start - DO NOT EDIT - instead edit fs.RegInfo in backend/zoho/zoho.go and run make backenddocs to verify --> <!-- markdownlint-disable-line line-length -->
 ### Standard options
 
 Here are the Standard options specific to zoho (Zoho).
@@ -286,7 +286,7 @@ Properties:
 - Type:        string
 - Required:    false
 
-{{< rem autogenerated options stop >}}
+<!-- autogenerated options stop -->
 
 ## Setting up your own client_id
 
diff --git a/docs/layouts/shortcodes/rem.html b/docs/layouts/shortcodes/rem.html
deleted file mode 100644
index e69de29bb..000000000