diff --git a/README b/README
index ce5e0c15a..a81e40724 100644
--- a/README
+++ b/README
@@ -464,7 +464,12 @@ document.  To see the default template that is used, just type
     pandoc --print-default-template=FORMAT
 
 where `FORMAT` is the name of the output format. A custom template
-can be specified using the `--template` option.
+can be specified using the `--template` option.  You can also override
+the system default templates for a given output format `FORMAT`
+by putting a file `FORMAT.template` in `$HOME/.pandoc/templates`
+(on unix) or
+`C:\Documents And Settings\USERNAME\Application Data\pandoc\templates`
+(on Windows).
 
 Templates may contain *variables*.  Variable names are sequences of
 alphanumerics, `-`, and `_`, starting with a letter.  A variable name
@@ -483,7 +488,8 @@ depending on the output format, but include:
 `legacy-header`
 :   contents specified by `-C/--custom-header`
 `header-includes`
-:   contents specified by `-H/--include-in-header`
+:   contents specified by `-H/--include-in-header` (may have multiple
+    values)
 `toc`
 :   non-null value if `--toc/--table-of-contents` was specified
 `body`
@@ -491,7 +497,8 @@ depending on the output format, but include:
 `title`
 :   title of document, as specified in title block
 `author`
-:   author of document, as specified in title block
+:   author of document, as specified in title block (may have
+    multiple values)
 `date`
 :   date of document, as specified in title block
 
diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md
index 57bb3e17a..692f502d0 100644
--- a/man/man1/pandoc.1.md
+++ b/man/man1/pandoc.1.md
@@ -245,7 +245,12 @@ document.  To see the default template that is used, just type
     pandoc --print-default-template=FORMAT
 
 where `FORMAT` is the name of the output format. A custom template
-can be specified using the `--template` option.
+can be specified using the `--template` option.  You can also override
+the system default templates for a given output format `FORMAT`
+by putting a file `FORMAT.template` in `$HOME/.pandoc/templates`
+(on unix) or
+`C:\Documents And Settings\USERNAME\Application Data\pandoc\templates`
+(on Windows).
 
 Templates may contain *variables*.  Variable names are sequences of
 alphanumerics, `-`, and `_`, starting with a letter.  A variable name
@@ -264,7 +269,8 @@ depending on the output format, but include:
 `legacy-header`
 :   contents specified by `-C/--custom-header`
 `header-includes`
-:   contents specified by `-H/--include-in-header`
+:   contents specified by `-H/--include-in-header` (may have multiple
+    values)
 `toc`
 :   non-null value if `--toc/--table-of-contents` was specified
 `body`
@@ -272,7 +278,8 @@ depending on the output format, but include:
 `title`
 :   title of document, as specified in title block
 `author`
-:   author of document, as specified in title block
+:   author of document, as specified in title block (may have
+    multiple values)
 `date`
 :   date of document, as specified in title block