2 files changed, 36 insertions, 12 deletions
diff --git a/doc/api.md b/doc/api.md
index ac928baf..0480e901 100644
--- a/doc/api.md
+++ b/doc/api.md
@@ -110,9 +110,12 @@ Same as `pager.load(url + "\n")`.</td>
 </tr>
 
 <tr>
-<td>`gotoURL(url)`</td>
+<td>`gotoURL(url, options = {replace: null, contentType: null})`</td>
 <td>Go to the specified URL immediately (without a prompt). This differs from
 `load` and `loadSubmit` in that it *does not* try to correct the URL.<br>
+When `replace` is set, the new buffer may replace the old one if it loads
+successfully. When `contentType` is set, the new buffer's content type is
+forcefully set to that string.<br>
 Use this for loading automatically retrieved (i.e. non-user-provided) URLs.</td>
 </tr>
 
diff --git a/doc/config.md b/doc/config.md
index 9b9bcae1..3ccb70f4 100644
--- a/doc/config.md
+++ b/doc/config.md
@@ -144,10 +144,10 @@ Defaults to false.</td>
 <td>boolean</td>
 <td>Enable/disable cookies on sites.<br>
 Defaults to false.<br>
-Note that in Chawan, each website gets a separate cookie jar, so some websites
-relying on cross-site cookies may not work as expected. You may use the
-`[[siteconf]]` "cookie-jar" and "third-party-cookie" settings to adjust this
-behavior for specific sites.</td>
+Note: in Chawan, each website gets a separate cookie jar, so websites relying on
+cross-site cookies may not work as expected. You may use the `[[siteconf]]`
+"cookie-jar" and "third-party-cookie" settings to adjust this behavior for
+specific sites.</td>
 </tr>
 
 <tr>
@@ -167,6 +167,16 @@ automatically after the buffer is loaded.<br>
 Defaults to false</td>
 </tr>
 
+<tr>
+<td>meta-refresh</td>
+<td>"never" / "always" / "ask"</td>
+<td>Whether or not `http-equiv=refresh` meta tags should be respected. "never"
+completely disables them, "always" automatically accepts all of them, "ask"
+brings up a pop-up menu.<br>
+Defaults to "ask".
+</td>
+</tr>
+
 </table>
 
 ## Search
@@ -702,7 +712,8 @@ returned, it will replace the old one.</td>
 <td>cookie</td>
 <td>boolean</td>
 <td>Whether loading cookies should be allowed for this URL. By default, this is
-false for all websites.</td>
+false for all websites.<br>
+Overrides `buffer.cookie`.</td>
 </tr>
 
 <tr>
@@ -728,7 +739,7 @@ subdomains.</td>
 originating from this domain. Simplified example: if you click a link on a.com
 that refers to b.com, and referer-from is true, b.com is sent "a.com" as the
 Referer header.<br>
-Overrides `buffer.referer-from`. Defaults to false.
+Overrides `buffer.referer-from`.
 </td>
 </tr>
 
@@ -755,8 +766,8 @@ Overrides `buffer.referer-from`. Defaults to false.
 <tr>
 <td>document-charset</td>
 <td>charset label string</td>
-<td>Specify the default encoding for this site. Overrides `document-charset`
-in `[encoding]`.</td>
+<td>Specify the default encoding for this site. Overrides
+`encoding.document-charset`. </td>
 </tr>
 
 <tr>
@@ -772,14 +783,14 @@ with this stylesheet to get the final user stylesheet.)</td>
 <td>proxy</td>
 <td>URL</td>
 <td>Specify a proxy for network requests fetching contents of this buffer.
-Overrides `proxy` in `[network]`.</td>
+Overrides `network.proxy`.</td>
 </tr>
 
 <tr>
 <td>default-headers</td>
 <td>table</td>
 <td>Specify a list of default headers for HTTP(S) network requests to this
-buffer. Overrides `default-headers` in `[network]`.</td>
+buffer. Overrides `network.default-headers`.</td>
 </tr>
 
 <tr>
@@ -796,7 +807,17 @@ are doing.</td>
 <td>autofocus</td>
 <td>boolean</td>
 <td>When set to true, elements with an "autofocus" attribute are focused on
-automatically after the buffer is loaded. Overrides buffer.autofocus.</td>
+automatically after the buffer is loaded. Overrides `buffer.autofocus`.</td>
+</tr>
+
+<tr>
+<td>meta-refresh</td>
+<td>"never" / "always" / "ask"</td>
+<td>Whether or not `http-equiv=refresh` meta tags should be respected. "never"
+completely disables them, "always" automatically accepts all of them, "ask"
+brings up a pop-up menu.<br>
+Overrides `buffer.meta-refresh`.
+</td>
 </tr>
 
 </table>