diff options
| author | Stuart Rackham <srackham@methods.co.nz> | 2010-08-15 09:12:51 +1200 |
|---|---|---|
| committer | Stuart Rackham <srackham@methods.co.nz> | 2010-08-15 09:12:51 +1200 |
| commit | d0b216ee883f5aab0f8b857d1987279c49f7f3fb (patch) | |
| tree | c536556979fcef1d8732f8a8412aba59ef7d83fd /doc/a2x.1.txt | |
| parent | 1d59a9debc5ebc12e57afdfa97638d2b1168a2c6 (diff) | |
| download | asciidoc-git-d0b216ee883f5aab0f8b857d1987279c49f7f3fb.tar.gz | |
- The global configuration files directory is not used if AsciiDoc
configuration files are installed in the same directory as the asciidoc
executable. This change allows both a system wide copy and multiple local
copies of AsciiDoc to coexist on the same host PC.
- Build script: Don't spellcheck via symlinks.
Diffstat (limited to 'doc/a2x.1.txt')
| -rw-r--r-- | doc/a2x.1.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/a2x.1.txt b/doc/a2x.1.txt index a0f1199..8096677 100644 --- a/doc/a2x.1.txt +++ b/doc/a2x.1.txt @@ -203,10 +203,12 @@ A configuration file contains executable Python code that overrides the global configuration parameters in `a2x.py`. Optional configuration files are loaded in the following order: -. `a2x.conf` from the AsciiDoc global configuration directory. +. `a2x.conf` from the directory containing the 'a2x.py' executable. +. `a2x.conf` from the AsciiDoc global configuration directory. Skip + this step if we are executing a locally installed (non system wide) + copy. . `a2x.conf` from the AsciiDoc `$HOME/.asciidoc` configuration directory. -. `a2x.conf` from the directory containing 'a2x.py'. . The 'CONF_FILE' specified in the '--conf-file' option. Here are the default configuration file option values: |