diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-08-28 16:11:12 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-08-28 16:11:12 +0000 |
| commit | 52af2694ff5442230ff742a3b19c67a59eb01fe9 (patch) | |
| tree | 3aecb3a8e63db49cb66bcdc97503d66e5815ed1b /doc | |
| parent | codespell: selection: faild -> failed (diff) | |
| parent | doc: meson: @01@ -> @1@ (diff) | |
Merge branch 'config-file-location' into master
Closes #110.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/foot.1.scd | 9 | ||||
| -rw-r--r-- | doc/foot.ini.5.scd (renamed from doc/footrc.5.scd) | 11 | ||||
| -rw-r--r-- | doc/meson.build | 11 |
3 files changed, 18 insertions, 13 deletions
diff --git a/doc/foot.1.scd b/doc/foot.1.scd index eb2213d6..19e1b0ee 100644 --- a/doc/foot.1.scd +++ b/doc/foot.1.scd @@ -23,7 +23,8 @@ the foot command line # OPTIONS *-c*,*--config*=_PATH_ - Path to configuration file. Default: *$XDG_CONFIG_HOME/footrc*. + Path to configuration file. Default: + *$XDG_CONFIG_HOME/foot/foot.ini*. *--check-config* Verify configuration and then exit with 0 if ok, otherwise exit @@ -131,7 +132,7 @@ The following keyboard shortcuts are available. ## NORMAL MODE Note that these are just the defaults; they can be changed in -*footrc*, see *footrc*(5). +*foot.ini*, see *foot.ini*(5). *shift*+*page up*/*page down* Scroll up/down in history @@ -253,7 +254,7 @@ Finally, pressing *alt* will prefix the transmitted byte with ESC. # CONFIGURATION -See *footrc*(5) +See *foot.ini*(5) # BUGS @@ -270,4 +271,4 @@ The report should contain the following: # SEE ALSO -*footrc*(5), *footclient*(1) +*foot.ini*(5), *footclient*(1) diff --git a/doc/footrc.5.scd b/doc/foot.ini.5.scd index 1c974d41..9f8c6cbb 100644 --- a/doc/footrc.5.scd +++ b/doc/foot.ini.5.scd @@ -1,7 +1,7 @@ -footrc(5) +foot.ini(5) # NAME -footrc - configuration file +foot.ini - configuration file # DESCRIPTION @@ -12,8 +12,11 @@ with a _[section]_). foot will search for a configuration file in the following locations, in this order: -- _XDG_CONFIG_HOME/footrc_ -- _~/.config/footrc_ +- *XDG_CONFIG_HOME/foot/foot.ini* +- *~/.config/foot/foot.ini* +- *XDG_CONFIG_HOME/footrc* +- *~/.config/footrc* +- *XDG_CONFIG_DIRS/foot/foot.init* # SECTION: default diff --git a/doc/meson.build b/doc/meson.build index 39697496..1f017db4 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -3,16 +3,17 @@ sh = find_program('sh', native: true) scdoc = dependency('scdoc', native: true) scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true) -foreach man_src : ['foot.1.scd', 'footrc.5.scd', 'footclient.1.scd'] - parts = man_src.split('.') - name = parts[-3] - section = parts[-2] +foreach man_src : [{'name': 'foot', 'section' : 1}, + {'name': 'foot.ini', 'section': 5}, + {'name': 'footclient', 'section': 1}] + name = man_src['name'] + section = man_src['section'] out = '@0@.@1@'.format(name, section) custom_target( out, output: out, - input: man_src, + input: '@0@.@1@.scd'.format(name, section), command: [sh, '-c', '@0@ < @INPUT@'.format(scdoc_prog.path())], capture: true, install: true, |
