commit e2efd4e70b150c3c05c9479ef6155c24b42493fb
parent ca635931d0ce8870722a4ccda0ad32e847f84daa
Author: Andreas Gruhler <agruhl@gmx.ch>
Date: Sat, 8 Jan 2022 23:01:06 +0100
fix(man): overflow auto and small fixes
Diffstat:
5 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/README.md b/README.md
@@ -136,10 +136,8 @@ The file `${XDG_CONFIG_HOME:-~/.config}/diary/diary.cfg` should adhere to a basi
<a name="precedence_rules"></a>
The default variables, for instance, for the configuration variables `editor`, `dir` and `weekday`, are populated with values in the following order, where earlier entries are overwritten by subsequent ones if they exist:
-1. No default for `DIARY_DIR`. Defaults for `range`, `weekday`, `fmt` and `editor` are provided in [diary.h](diary.h)
-* If `EDITOR` is unset and no editor is provided in the config file or via the `-e` option, the diary works read-only. Journal files cannot be opened.
-* If `DIARY_DIR` is not provided, the diary won't open.
-2. **Config file** (empty default for `editor`, no default for `dir`)
+1. No default for `DIARY_DIR`. Defaults for `range`, `weekday`, `fmt` and `editor` are provided in [diary.h](diary.h). If `EDITOR` is unset and no editor is provided in the config file or via the `-e` option, the diary works read-only. Journal files cannot be opened. If `DIARY_DIR` is not provided, the diary won't open.
+2. **Configuration file** (empty default for `editor`, no default for `dir`)
3. **Environment** variables `$DIARY_DIR`, `$EDITOR` and `$LANG` for locale (`weekday`)
4. **Option arguments** `-d` / `-e` / `-w`
5. First non-option argument is interpreted as `DIARY_DIR`
diff --git a/man1/diary.1 b/man1/diary.1
@@ -345,7 +345,8 @@ text selection and right-click in the preview window.
.SH PRECEDENCE RULES
.P
The default variables, for instance, for the configuration variables "editor",
-"dir" and "weekday", are populated with values in the following order:
+"dir" and "weekday", are populated with values in the following order, where
+earlier entries are overwritten by subsequent ones if they exist:
.P
.TS
allbox;l lx
@@ -355,7 +356,7 @@ l lx
l lx
l lx.
T{
-\fBPriority\fR
+
T} T{
\fBDescription\fR
T}
@@ -457,7 +458,7 @@ For question and support visit https://web.libera.chat/gamja/#diary.
.el \{\
.IP \(bu 4
.\}
-Andreas Gruhler (https://codeberg.org/in0rdr/diary)
+Andreas Gruhler
.RE
.RS 4
.ie n \{\
@@ -466,7 +467,7 @@ Andreas Gruhler (https://codeberg.org/in0rdr/diary)
.el \{\
.IP \(bu 4
.\}
-Matthias Beyer (https://github.com/matthiasbeyer)
+Matthias Beyer
.RE
.RS 4
.ie n \{\
@@ -475,7 +476,7 @@ Matthias Beyer (https://github.com/matthiasbeyer)
.el \{\
.IP \(bu 4
.\}
-Johnathan Jenkins (https://github.com/shaggytwodope)
+Johnathan Jenkins
.RE
.RS 4
.ie n \{\
@@ -484,7 +485,7 @@ Johnathan Jenkins (https://github.com/shaggytwodope)
.el \{\
.IP \(bu 4
.\}
-Yu-Jie Lin (https://github.com/livibetter)
+Yu-Jie Lin
.RE
.RS 4
.ie n \{\
@@ -493,7 +494,7 @@ Yu-Jie Lin (https://github.com/livibetter)
.el \{\
.IP \(bu 4
.\}
-Balduin Dettling (https://github.com/mbjd)
+Balduin Dettling
.RE
.RS 4
.ie n \{\
@@ -502,7 +503,7 @@ Balduin Dettling (https://github.com/mbjd)
.el \{\
.IP \(bu 4
.\}
-Avindra Goolcharan (https://github.com/avindra)
+Avindra Goolcharan
.RE
.RS 4
.ie n \{\
@@ -511,7 +512,7 @@ Avindra Goolcharan (https://github.com/avindra)
.el \{\
.IP \(bu 4
.\}
-Oliver Blanthorn (https://github.com/bovine3dom)
+Oliver Blanthorn
.RE
.RS 4
.ie n \{\
@@ -520,5 +521,5 @@ Oliver Blanthorn (https://github.com/bovine3dom)
.el \{\
.IP \(bu 4
.\}
-Jonny Burger (https://github.com/JonnyBurger)
+Jonny Burger
.RE
diff --git a/man1/diary.1.html b/man1/diary.1.html
@@ -279,11 +279,12 @@ EOF</pre>
RULES</a></h1>
<p class="Pp">The default variables, for instance, for the configuration
variables "editor", "dir" and "weekday", are
- populated with values in the following order:</p>
+ populated with values in the following order, where earlier entries are
+ overwritten by subsequent ones if they exist:</p>
<p class="Pp"></p>
<table class="tbl" border="1" style="border-style: solid;">
<tr>
- <td><b>Priority</b></td>
+ <td></td>
<td><b>Description</b></td>
</tr>
<tr>
@@ -365,20 +366,14 @@ EOF</pre>
</section>
<section class="Sh">
<h1 class="Sh" id="AUTHORS"><a class="permalink" href="#AUTHORS">AUTHORS</a></h1>
-<div class="Bd-indent">•Andreas Gruhler
- (https://codeberg.org/in0rdr/diary)</div>
-<div class="Bd-indent">•Matthias Beyer
- (https://github.com/matthiasbeyer)</div>
-<div class="Bd-indent">•Johnathan Jenkins
- (https://github.com/shaggytwodope)</div>
-<div class="Bd-indent">•Yu-Jie Lin (https://github.com/livibetter)</div>
-<div class="Bd-indent">•Balduin Dettling (https://github.com/mbjd)</div>
-<div class="Bd-indent">•Avindra Goolcharan
- (https://github.com/avindra)</div>
-<div class="Bd-indent">•Oliver Blanthorn
- (https://github.com/bovine3dom)</div>
-<div class="Bd-indent">•Jonny Burger
- (https://github.com/JonnyBurger)</div>
+<div class="Bd-indent">•Andreas Gruhler</div>
+<div class="Bd-indent">•Matthias Beyer</div>
+<div class="Bd-indent">•Johnathan Jenkins</div>
+<div class="Bd-indent">•Yu-Jie Lin</div>
+<div class="Bd-indent">•Balduin Dettling</div>
+<div class="Bd-indent">•Avindra Goolcharan</div>
+<div class="Bd-indent">•Oliver Blanthorn</div>
+<div class="Bd-indent">•Jonny Burger</div>
</section>
</div>
<table class="foot">
diff --git a/man1/diary.1.scd b/man1/diary.1.scd
@@ -220,9 +220,10 @@ text selection and right-click in the preview window.
# PRECEDENCE RULES
The default variables, for instance, for the configuration variables "editor",
-"dir" and "weekday", are populated with values in the following order:
+"dir" and "weekday", are populated with values in the following order, where
+earlier entries are overwritten by subsequent ones if they exist:
-[[ *Priority*
+[[
:< *Description*
| 1
: No default for *DIARY_DIR*. Defaults for "range", "weekday", "fmt" and
@@ -289,11 +290,11 @@ For question and support visit https://web.libera.chat/gamja/#diary.
# AUTHORS
-- Andreas Gruhler (https://codeberg.org/in0rdr/diary)
-- Matthias Beyer (https://github.com/matthiasbeyer)
-- Johnathan Jenkins (https://github.com/shaggytwodope)
-- Yu-Jie Lin (https://github.com/livibetter)
-- Balduin Dettling (https://github.com/mbjd)
-- Avindra Goolcharan (https://github.com/avindra)
-- Oliver Blanthorn (https://github.com/bovine3dom)
-- Jonny Burger (https://github.com/JonnyBurger)
+- Andreas Gruhler
+- Matthias Beyer
+- Johnathan Jenkins
+- Yu-Jie Lin
+- Balduin Dettling
+- Avindra Goolcharan
+- Oliver Blanthorn
+- Jonny Burger
diff --git a/man1/style.css b/man1/style.css
@@ -44,4 +44,5 @@ pre {
padding: 10px;
background: #434241;
color: #efefef;
+ overflow: auto;
}
