about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKlemens Nanni <klemens@posteo.de>2021-05-27 22:35:33 +0000
committerJune McEnroe <june@causal.agency>2021-05-27 20:52:41 -0400
commit37343179a4eb27c48ad346fa6b3dccc55ae80878 (patch)
treeaaee4670d7f9abe6b857f77de42dbe1794660a0b
parentDocument channel key parameters (diff)
downloadcatgirl-37343179a4eb27c48ad346fa6b3dccc55ae80878.tar.gz
catgirl-37343179a4eb27c48ad346fa6b3dccc55ae80878.zip
Tag config options in manual
E.g. ":t debug" will now jump right to the definition just like ":t v"
already did -- at least with mandoc(1) from OpenBSD.
-rw-r--r--catgirl.150
1 files changed, 25 insertions, 25 deletions
diff --git a/catgirl.1 b/catgirl.1
index 2bf26f3..6d66cff 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -83,7 +83,7 @@ following their corresponding flags.
 .Pp
 The arguments are as follows:
 .Bl -tag -width Ds
-.It Fl C Ar util , Cm copy = Ar util
+.It Fl C Ar util | Cm copy = Ar util
 Set the utility used by
 .Ic /copy .
 Use more than once to add arguments to
@@ -94,7 +94,7 @@ The default is the first available of
 .Xr xclip 1 ,
 .Xr xsel 1 .
 .
-.It Fl H Ar seed,bound , Cm hash = Ar seed,bound
+.It Fl H Ar seed,bound | Cm hash = Ar seed,bound
 Set the initial seed
 of the nick and channel
 color hash function
@@ -107,7 +107,7 @@ use 0,15.
 To disable nick and channel colors,
 use 0,0.
 .
-.It Fl I Ar pattern , Cm highlight = Ar pattern
+.It Fl I Ar pattern | Cm highlight = Ar pattern
 Add a case-insensitive message highlight pattern,
 which may contain
 .Ql * ,
@@ -135,7 +135,7 @@ The commands which can be filtered are:
 .Sy QUIT ,
 .Sy SETNAME .
 .
-.It Fl K , Cm kiosk
+.It Fl K | Cm kiosk
 Disable the
 .Ic /copy ,
 .Ic /debug ,
@@ -151,7 +151,7 @@ commands.
 Replace the username
 with a hash of its original value.
 .
-.It Fl N Ar util , Cm notify = Ar util
+.It Fl N Ar util | Cm notify = Ar util
 Send notifications using a utility.
 Use more than once to add arguments to
 .Ar util .
@@ -161,7 +161,7 @@ a title and a description,
 appropriate for
 .Xr notify-send 1 .
 .
-.It Fl O Ar util , Cm open = Ar util
+.It Fl O Ar util | Cm open = Ar util
 Set the utility used by
 .Ic /open .
 Use more than once to add arguments to
@@ -170,7 +170,7 @@ The default is the first available of
 .Xr open 1 ,
 .Xr xdg-open 1 .
 .
-.It Fl R , Cm restrict
+.It Fl R | Cm restrict
 Disable the
 .Ic /copy ,
 .Ic /exec
@@ -183,12 +183,12 @@ option,
 and viewing this manual with
 .Ic /help .
 .
-.It Fl S Ar host , Cm bind = Ar host
+.It Fl S Ar host | Cm bind = Ar host
 Bind to source address
 .Ar host
 when connecting to the server.
 .
-.It Fl T Ar format , Cm timestamp Op = Ar format
+.It Fl T Ar format | Cm timestamp Op = Ar format
 Show timestamps by default,
 in the specified
 .Xr strftime 3
@@ -196,7 +196,7 @@ in the specified
 The default format is
 .Qq \&%X .
 .
-.It Fl a Ar user : Ns Ar pass , Cm sasl-plain = Ar user : Ns Ar pass
+.It Fl a Ar user : Ns Ar pass | Cm sasl-plain = Ar user : Ns Ar pass
 Authenticate as
 .Ar user
 with
@@ -207,7 +207,7 @@ in plain text,
 it is recommended to use SASL EXTERNAL instead with
 .Fl e .
 .
-.It Fl c Ar path , Cm cert = Ar path
+.It Fl c Ar path | Cm cert = Ar path
 Load the TLS client certificate from
 .Ar path .
 The
@@ -223,7 +223,7 @@ authenticate using SASL EXTERNAL.
 Certificates can be generated with
 .Fl g .
 .
-.It Fl e , Cm sasl-external
+.It Fl e | Cm sasl-external
 Authenticate using SASL EXTERNAL,
 also known as CertFP.
 The TLS client certificate is loaded with
@@ -237,11 +237,11 @@ Generate a TLS client certificate using
 and write it to
 .Ar path .
 .
-.It Fl h Ar host , Cm host = Ar host
+.It Fl h Ar host | Cm host = Ar host
 Connect to
 .Ar host .
 .
-.It Fl i Ar pattern , Cm ignore = Ar pattern
+.It Fl i Ar pattern | Cm ignore = Ar pattern
 Add a case-insensitive message ignore pattern,
 which may contain
 .Ql * ,
@@ -269,13 +269,13 @@ The commands which can be filtered are:
 .Sy QUIT ,
 .Sy SETNAME .
 .
-.It Fl j Ar channels Oo Ar keys Oc , Cm join = Ar channels Oo Ar keys Oc
+.It Fl j Ar channels Oo Ar keys Oc | Cm join = Ar channels Oo Ar keys Oc
 Join the comma-separated list of
 .Ar channels
 with the optional comma-separated list of channel
 .Ar keys .
 .
-.It Fl k Ar path , Cm priv = Ar priv
+.It Fl k Ar path | Cm priv = Ar priv
 Load the TLS client private key from
 .Ar path .
 The
@@ -283,11 +283,11 @@ The
 is searched for in the same manner
 as configuration files.
 .
-.It Fl l , Cm log
+.It Fl l | Cm log
 Log chat events to files in paths
 .Pa $XDG_DATA_HOME/catgirl/log/network/channel/YYYY-MM-DD.log .
 .
-.It Fl n Ar nick , Cm nick = Ar nick
+.It Fl n Ar nick | Cm nick = Ar nick
 Set nickname to
 .Ar nick .
 The default nickname is the user's name.
@@ -297,17 +297,17 @@ Print the server certificate chain
 to standard output in PEM format
 and exit.
 .
-.It Fl p Ar port , Cm port = Ar port
+.It Fl p Ar port | Cm port = Ar port
 Connect to
 .Ar port .
 The default port is 6697.
 .
-.It Fl r Ar real , Cm real = Ar real
+.It Fl r Ar real | Cm real = Ar real
 Set realname to
 .Ar real .
 The default realname is the same as the nickname.
 .
-.It Fl s Ar name , Cm save = Ar name
+.It Fl s Ar name | Cm save = Ar name
 Save and load the contents of windows from
 .Ar name
 in
@@ -320,7 +320,7 @@ starts with
 or
 .Ql \&../ .
 .
-.It Fl t Ar path , Cm trust = Ar path
+.It Fl t Ar path | Cm trust = Ar path
 Trust the self-signed certificate
 loaded from
 .Ar path
@@ -332,19 +332,19 @@ as configuration files.
 See
 .Sx Connecting to Servers with Self-signed Certificates .
 .
-.It Fl u Ar user , Cm user = Ar user
+.It Fl u Ar user | Cm user = Ar user
 Set username to
 .Ar user .
 The default username is the same as the nickname.
 .
-.It Fl v , Cm debug
+.It Fl v | Cm debug
 Log raw IRC messages to the
 .Sy <debug>
 window
 as well as standard error
 if it is not a terminal.
 .
-.It Fl w Ar pass , Cm pass = Ar pass
+.It Fl w Ar pass | Cm pass = Ar pass
 Log in with the server password
 .Ar pass .
 .El
1'>ui-log: fix double countingJohn Keeping This crept in while rebasing the previous commit onto an updated upstream. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12log: allow users to follow a fileJohn Keeping Teach the "log" UI to behave in the same way as "git log --follow", when given a suitable instruction by the user. The default behaviour remains to show the log without following renames, but the follow behaviour can be activated by following a link in the page header. Follow is not the default because outputting merges in follow mode is tricky ("git log --follow" will not show merges). We also disable the graph in follow mode because the commit graph is not simplified so we end up with frequent gaps in the graph and many lines that do not connect with any commits we're actually showing. We also teach the "diff" and "commit" UIs to respect the follow flag on URLs, causing the single-file version of these UIs to detect renames. This feature is needed only for commits that rename the path we're interested in. For commits before the file has been renamed (i.e. that appear later in the log list) we change the file path in the links from the log to point to the old name; this means that links to commits always limit by the path known to that commit. If we didn't do this we would need to walk down the log diff'ing every commit whenever we want to show a commit. The drawback is that the "Log" link in the top bar of such a page links to the log limited by the old name, so it will only show pre-rename commits. I consider this a reasonable trade-off since the "Back" button still works and the log matches the path displayed in the top bar. Since following renames requires running diff on every commit we consider, I've added a knob to the configuration file to globally enable/disable this feature. Note that we may consider a large number of commits the revision walking machinery no longer performs any path limitation so we have to examine every commit until we find a page full of commits that affect the target path or something related to it. Suggested-by: René Neumann <necoro@necoro.eu> Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12shared: make cgit_diff_tree_cb publicJohn Keeping This will allow us to use this nice wrapper function elsewhere, avoiding dealing with the diff queue when we only need to inspect a filepair. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12t0110: Chain together using &&Jason A. Donenfeld 2015-08-12about: always ensure page has a trailing slashJason A. Donenfeld Otherwise we can't easily embed links to other /about/ pages. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2015-08-12filters: apply HTML escapingLazaros Koromilas http://www.w3.org/International/questions/qa-escapes#use 2015-08-12git: update to v2.5.0Christian Hesse Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse <mail@eworm.de> 2015-08-12Fix processing of repo.hide and repo.ignoreDaniel Reichelt