aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2024-12-27 19:10:26 +0100
committerbptato <nincsnevem662@gmail.com>2024-12-27 19:10:26 +0100
commitdff94db8a286d6b863305f84ace65e9806313331 (patch)
treefcd187af4693088a9d6fd692da50467adcab984f /doc
parentabd58fa6ea7271021acb620056516e9129c5ee97 (diff)
downloadchawan-dff94db8a286d6b863305f84ace65e9806313331.tar.gz
CHA_CONFIG_DIR -> CHA_DIR
It isn't really limited to config. It just happens to be in XDG_CONFIG_HOME because XDG basedirs suck. (W3M_DIR works similarly.)
Diffstat (limited to 'doc')
-rw-r--r--doc/cha.12
-rw-r--r--doc/config.md12
-rw-r--r--doc/localcgi.md2
3 files changed, 9 insertions, 7 deletions
diff --git a/doc/cha.1 b/doc/cha.1
index 141d45ee..6f506bf5 100644
--- a/doc/cha.1
+++ b/doc/cha.1
@@ -114,7 +114,7 @@ When set, Chawan starts in visual mode by default and opens the page specified
by one of these variables. (\fBHTTP_HOME\fR takes precedence over
\fBWWW_HOME\fR.)
.TP
-\fBCHA_CONFIG_DIR\fR
+\fBCHA_DIR\fR
When set, it switches the configuration directory to the path specified.
.TP
\fBCOLORTERM\fR
diff --git a/doc/config.md b/doc/config.md
index 57815eee..d3da51aa 100644
--- a/doc/config.md
+++ b/doc/config.md
@@ -23,8 +23,9 @@ The canonical configuration file path is ~/.chawan/config.toml, but
the search path accomodates XDG basedirs as well:
1. config file specified through -C switch -> use that
-2. $CHA_CONFIG_DIR is set -> use $CHA_CONFIG_DIR/config.toml
-3. $XDG_CONFIG_HOME is set -> use $XDG_CONFIG_HOME/chawan/config.toml
+2. `$CHA_DIR` is set -> use `$CHA_DIR`/config.toml
+ (`$CHA_CONFIG_DIR` is a deprecated alias for `$CHA_DIR`.)
+3. `$XDG_CONFIG_HOME` is set -> use `$XDG_CONFIG_HOME`/chawan/config.toml
4. ~/.config/chawan/config.toml exists -> use that
5. ~/.chawan/config.toml exists -> use that
@@ -349,7 +350,7 @@ the line number.</td>
<tr>
<td>auto-mailcap</td>
<td>path</td>
-<td>"$CHA_CONFIG_DIR/auto.mailcap"</td>
+<td>"$CHA_DIR/auto.mailcap"</td>
<td>Mailcap file for entries that are automatically executed.<br>
The "Open as" prompt also saves entries in this file.</td>
</tr>
@@ -1643,8 +1644,9 @@ Some environment variables are also exported by Chawan:
Symbolic links are automatically resolved to determine this path.
* `$CHA_LIBEXEC_DIR`: the directory for all executables Chawan uses
for operation. By default, this is `$CHA_BIN_DIR/../libexec/chawan`.
-* `$CHA_CONFIG_DIR`: the configuration directory. (This can also be set
- by the user; see the top section for details.)
+* `$CHA_DIR`: the configuration directory. (This can also be set
+ by the user; see the top section for details. `$CHA_CONFIG_DIR` is a
+ deprecated alias for this.)
### Word types
diff --git a/doc/localcgi.md b/doc/localcgi.md
index e526ce35..2d302313 100644
--- a/doc/localcgi.md
+++ b/doc/localcgi.md
@@ -136,7 +136,7 @@ Chawan sets the following environment variables:
* `HTTP_COOKIE=` if set, the Cookie header.
* `HTTP_REFERER=` if set, the Referer header.
* `CHA_TMP_DIR=` directory used for storing temporary files.
-* `CHA_CONFIG_DIR=` location of the config file.
+* `CHA_DIR=` location of the config file.
For requests originating from a urimethodmap rewrite, Chawan will also set
the parsed URL's parts as environment variables. Use of these is highly