* [PATCH 4/4] doc: spell out "PROTOCOL" in examples
2022-08-11 20:13 7% [PATCH 0/4] doc updates and simplifications Eric Wong
@ 2022-08-11 20:13 4% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-08-11 20:13 UTC (permalink / raw)
To: meta
"PROTO" is probably ambiguous, and we'll use the same
terminology as used in curl(1) documentation.
---
Documentation/lei-blob.pod | 2 +-
Documentation/lei-convert.pod | 2 +-
Documentation/lei-import.pod | 2 +-
Documentation/lei-lcat.pod | 2 +-
Documentation/lei-q.pod | 2 +-
Documentation/lei-rediff.pod | 2 +-
Documentation/public-inbox-daemon.pod | 4 ++--
Documentation/public-inbox-imapd.pod | 6 +++---
Documentation/public-inbox-netd.pod | 4 ++--
Documentation/public-inbox-nntpd.pod | 4 ++--
Documentation/public-inbox-pop3d.pod | 6 +++---
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Documentation/lei-blob.pod b/Documentation/lei-blob.pod
index e401bb47..558fc54c 100644
--- a/Documentation/lei-blob.pod
+++ b/Documentation/lei-blob.pod
@@ -86,7 +86,7 @@ reconstructed from patch emails.
=item --no-torsocks
-=item --proxy=PROTO://HOST[:PORT]
+=item --proxy=PROTOCOL://HOST[:PORT]
=back
diff --git a/Documentation/lei-convert.pod b/Documentation/lei-convert.pod
index c113db18..b3e29824 100644
--- a/Documentation/lei-convert.pod
+++ b/Documentation/lei-convert.pod
@@ -48,7 +48,7 @@ L<lei-q(1)>.
=item --no-torsocks
-=item --proxy=PROTO://HOST[:PORT]
+=item --proxy=PROTOCOL://HOST[:PORT]
=back
diff --git a/Documentation/lei-import.pod b/Documentation/lei-import.pod
index ad769084..4ac7dccd 100644
--- a/Documentation/lei-import.pod
+++ b/Documentation/lei-import.pod
@@ -81,7 +81,7 @@ Whether to wrap L<git(1)> and L<curl(1)> commands with L<torsocks(1)>.
Default: C<auto>
-=item --proxy=PROTO://HOST[:PORT]
+=item --proxy=PROTOCOL://HOST[:PORT]
Use the specified proxy (e.g., C<socks5h://0:9050>).
diff --git a/Documentation/lei-lcat.pod b/Documentation/lei-lcat.pod
index e85e5e67..e8073862 100644
--- a/Documentation/lei-lcat.pod
+++ b/Documentation/lei-lcat.pod
@@ -52,7 +52,7 @@ which lets you pipe arbitrary lines to arbitrary commands).
=item --torsocks=auto|no|yes, --no-torsocks
-=item --proxy=PROTO://HOST[:PORT]
+=item --proxy=PROTOCOL://HOST[:PORT]
=item -o MFOLDER, --output=MFOLDER
diff --git a/Documentation/lei-q.pod b/Documentation/lei-q.pod
index 1cbffba4..2f0c3bc6 100644
--- a/Documentation/lei-q.pod
+++ b/Documentation/lei-q.pod
@@ -241,7 +241,7 @@ Whether to wrap L<git(1)> and L<curl(1)> commands with L<torsocks(1)>.
Default: C<auto>
-=item --proxy=PROTO://HOST[:PORT]
+=item --proxy=PROTOCOL://HOST[:PORT]
=back
diff --git a/Documentation/lei-rediff.pod b/Documentation/lei-rediff.pod
index 4d5e8168..f18548d3 100644
--- a/Documentation/lei-rediff.pod
+++ b/Documentation/lei-rediff.pod
@@ -104,7 +104,7 @@ The options below, described in L<lei-q(1)>, are also supported.
=item --torsocks=auto|no|yes, --no-torsocks
-=item --proxy=PROTO://HOST[:PORT]
+=item --proxy=PROTOCOL://HOST[:PORT]
=back
diff --git a/Documentation/public-inbox-daemon.pod b/Documentation/public-inbox-daemon.pod
index 5d26ce56..81a79a10 100644
--- a/Documentation/public-inbox-daemon.pod
+++ b/Documentation/public-inbox-daemon.pod
@@ -31,9 +31,9 @@ processes to take advantage of multiple CPUs.
=over
-=item -l [PROTO://]ADDRESS[?opt1=val1,opt2=val2]
+=item -l [PROTOCOL://]ADDRESS[?opt1=val1,opt2=val2]
-=item --listen [PROTO://]ADDRESS[?opt1=val1,opt2=val2]
+=item --listen [PROTOCOL://]ADDRESS[?opt1=val1,opt2=val2]
This takes an absolute path to a Unix socket or HOST:PORT
to listen on. For example, to listen to TCP connections on
diff --git a/Documentation/public-inbox-imapd.pod b/Documentation/public-inbox-imapd.pod
index 23577a69..85bf3651 100644
--- a/Documentation/public-inbox-imapd.pod
+++ b/Documentation/public-inbox-imapd.pod
@@ -27,12 +27,12 @@ are supported and documented below.
=over
-=item -l PROTO://ADDRESS/?cert=/path/to/cert,key=/path/to/key
+=item -l PROTOCOL://ADDRESS/?cert=/path/to/cert,key=/path/to/key
-=item --listen PROTO://ADDRESS/?cert=/path/to/cert,key=/path/to/key
+=item --listen PROTOCOL://ADDRESS/?cert=/path/to/cert,key=/path/to/key
In addition to the normal C<-l>/C<--listen> switch described in
-L<public-inbox-daemon(8)>, the C<PROTO> prefix (e.g. C<imap://> or
+L<public-inbox-daemon(8)>, the C<PROTOCOL> prefix (e.g. C<imap://> or
C<imaps://>) may be specified to force a given protocol.
For STARTTLS and IMAPS support, the C<cert> and C<key> may be specified
diff --git a/Documentation/public-inbox-netd.pod b/Documentation/public-inbox-netd.pod
index 4dc27749..71425e3c 100644
--- a/Documentation/public-inbox-netd.pod
+++ b/Documentation/public-inbox-netd.pod
@@ -25,9 +25,9 @@ See common options in L<public-inbox-daemon(8)/OPTIONS>.
=over
-=item -l PROTO://ADDRESS/?cert=/path/to/cert,key=/path/to/key
+=item -l PROTOCOL://ADDRESS/?cert=/path/to/cert,key=/path/to/key
-=item --listen PROTO://ADDRESS/?cert=/path/to/cert,key=/path/to/key
+=item --listen PROTOCOL://ADDRESS/?cert=/path/to/cert,key=/path/to/key
=item -l http://ADDRESS/?env.PI_CONFIG=/path/to/cfg,psgi=/path/to/app.psgi
diff --git a/Documentation/public-inbox-nntpd.pod b/Documentation/public-inbox-nntpd.pod
index cf53da59..59111f92 100644
--- a/Documentation/public-inbox-nntpd.pod
+++ b/Documentation/public-inbox-nntpd.pod
@@ -26,9 +26,9 @@ are supported and documented below.
=over
-=item -l PROTO://ADDRESS/?cert=/path/to/cert,key=/path/to/key
+=item -l PROTOCOL://ADDRESS/?cert=/path/to/cert,key=/path/to/key
-=item --listen PROTO://ADDRESS/?cert=/path/to/cert,key=/path/to/key
+=item --listen PROTOCOL://ADDRESS/?cert=/path/to/cert,key=/path/to/key
In addition to the normal C<-l>/C<--listen> switch described in
L<public-inbox-daemon(8)>, the protocol prefix (e.g. C<nntp://> or
diff --git a/Documentation/public-inbox-pop3d.pod b/Documentation/public-inbox-pop3d.pod
index 0404c2a7..fb16fb96 100644
--- a/Documentation/public-inbox-pop3d.pod
+++ b/Documentation/public-inbox-pop3d.pod
@@ -50,12 +50,12 @@ See common options in L<public-inbox-daemon(8)/OPTIONS>.
=over
-=item -l PROTO://ADDRESS/?cert=/path/to/cert,key=/path/to/key
+=item -l PROTOCOL://ADDRESS/?cert=/path/to/cert,key=/path/to/key
-=item --listen PROTO://ADDRESS/?cert=/path/to/cert,key=/path/to/key
+=item --listen PROTOCOL://ADDRESS/?cert=/path/to/cert,key=/path/to/key
In addition to the normal C<-l>/C<--listen> switch described in
-L<public-inbox-daemon(8)>, the C<PROTO> prefix (e.g. C<pop3://> or
+L<public-inbox-daemon(8)>, the C<PROTOCOL> prefix (e.g. C<pop3://> or
C<pop3s://>) may be specified to force a given protocol.
For STARTTLS and POP3S support, the C<cert> and C<key> may be specified
^ permalink raw reply related [relevance 4%]
* [PATCH 0/4] doc updates and simplifications
@ 2022-08-11 20:13 7% Eric Wong
2022-08-11 20:13 4% ` [PATCH 4/4] doc: spell out "PROTOCOL" in examples Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2022-08-11 20:13 UTC (permalink / raw)
To: meta
I should've done -netd in 2016 when I did -httpd :x
Eric Wong (4):
doc: drop ancient Apache and WEBrick examples
examples: consolidate systemd socket examples
examples: add systemd files for -netd
doc: spell out "PROTOCOL" in examples
Documentation/lei-blob.pod | 2 +-
Documentation/lei-convert.pod | 2 +-
Documentation/lei-import.pod | 2 +-
Documentation/lei-lcat.pod | 2 +-
Documentation/lei-q.pod | 2 +-
Documentation/lei-rediff.pod | 2 +-
Documentation/public-inbox-daemon.pod | 4 +-
Documentation/public-inbox-imapd.pod | 6 +--
Documentation/public-inbox-netd.pod | 4 +-
Documentation/public-inbox-nntpd.pod | 4 +-
Documentation/public-inbox-pop3d.pod | 6 +--
MANIFEST | 9 +---
examples/README | 4 --
examples/apache2_cgi.conf | 34 --------------
examples/apache2_perl.conf | 25 -----------
examples/apache2_perl_old.conf | 38 ----------------
examples/cgi-webrick.rb | 25 -----------
examples/public-inbox-httpd.socket | 3 ++
examples/public-inbox-httpd@.service | 3 ++
examples/public-inbox-imap-onion.socket | 12 -----
examples/public-inbox-imapd.socket | 17 ++++++-
examples/public-inbox-imapd@.service | 12 ++---
examples/public-inbox-imaps.socket | 12 -----
examples/public-inbox-netd.socket | 45 +++++++++++++++++++
examples/public-inbox-netd@.service | 60 +++++++++++++++++++++++++
examples/public-inbox-nntpd.socket | 21 ++++++++-
examples/public-inbox-nntpd@.service | 9 ++--
examples/public-inbox-nntps.socket | 12 -----
28 files changed, 178 insertions(+), 199 deletions(-)
delete mode 100644 examples/apache2_cgi.conf
delete mode 100644 examples/apache2_perl.conf
delete mode 100644 examples/apache2_perl_old.conf
delete mode 100644 examples/cgi-webrick.rb
delete mode 100644 examples/public-inbox-imap-onion.socket
delete mode 100644 examples/public-inbox-imaps.socket
create mode 100644 examples/public-inbox-netd.socket
create mode 100644 examples/public-inbox-netd@.service
delete mode 100644 examples/public-inbox-nntps.socket
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-08-11 20:13 7% [PATCH 0/4] doc updates and simplifications Eric Wong
2022-08-11 20:13 4% ` [PATCH 4/4] doc: spell out "PROTOCOL" in examples Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).