aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--config.c2
-rw-r--r--contrib/vim/syntax/gmid.vim4
-rw-r--r--gmid.conf.52
-rw-r--r--site/changelog.gmi12
-rw-r--r--titan.12
-rw-r--r--titan.c2
7 files changed, 13 insertions, 13 deletions
diff --git a/README.md b/README.md
index ee1e064..b5b3514 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ to the `contrib` directory.
## Architecture/Security considerations
gmid has a privsep design, where the operations done by the daemon are
-splitted into multiple processes:
+split into multiple processes:
- main: the main process is the only one that keeps the original
privileges. It opens the TLS certificates on the behalf of the
diff --git a/config.c b/config.c
index b100136..622c667 100644
--- a/config.c
+++ b/config.c
@@ -645,7 +645,7 @@ config_recv(struct conf *conf, struct imsg *imsg)
case IMSG_RECONF_HOST_ADDR:
log_debug("receiving host addr");
if (h == NULL)
- fatalx("recv'd host address withouth host");
+ fatalx("recv'd host address without host");
addr = xcalloc(1, sizeof(*addr));
if (imsg_get_data(imsg, addr, sizeof(*addr)) == -1)
fatalx("bad length imsg RECONF_HOST_ADDR");
diff --git a/contrib/vim/syntax/gmid.vim b/contrib/vim/syntax/gmid.vim
index 24be9a5..75f7aab 100644
--- a/contrib/vim/syntax/gmid.vim
+++ b/contrib/vim/syntax/gmid.vim
@@ -135,7 +135,7 @@ syn keyword gmidDirectiveServer cert contained
syn keyword gmidDirectiveServer key contained
syn match gmidDirectiveServer "\<listen\s\+on\>" display contained
-" Ambiguos, can be used both in `listen on` and `fastcgi socket`
+" Ambiguous, can be used both in `listen on` and `fastcgi socket`
syn keyword gmidDirectiveParamHost port contained nextgroup=gmidNumber skipwhite
" FastCGI Blocks: {{{3
@@ -174,7 +174,7 @@ syn keyword gmidDirectiveProxy sni contained
syn keyword gmidDirectiveProxy use-tls contained nextgroup=gmidBoolean skipwhite
syn keyword gmidDirectiveProxy verifyname contained nextgroup=gmidBoolean skipwhite
-" Ambiguos, can be used both in `proxy` and `relay-to`
+" Ambiguous, can be used both in `proxy` and `relay-to`
syn keyword gmidDirectiveParamProxy port contained nextgroup=gmidNumber skipwhite
" Types Blocks: {{{2
diff --git a/gmid.conf.5 b/gmid.conf.5
index 092a6c0..8622d31 100644
--- a/gmid.conf.5
+++ b/gmid.conf.5
@@ -166,7 +166,7 @@ Common Name of the client certificate
the timestamp wrapped in square brackets, the request URI wrapped in
double quotes, the response code, the size of the response, a dash
wrapped in double quotes and "".
-The strangness of these two last fields is because Gemini doesn't have
+The strangeness of these two last fields is because Gemini doesn't have
the notion of the
.Dq Referer
header nor the
diff --git a/site/changelog.gmi b/site/changelog.gmi
index 7afbf72..5822a6e 100644
--- a/site/changelog.gmi
+++ b/site/changelog.gmi
@@ -20,7 +20,7 @@
## 2024/06/11 - 2.0.5 “Lady Stardust” security release
-This release fixes a logic error that can result in a DoS; therefore is a strongly reccomended update for all users. It's safe to update to it from any version of the 2.0.x series.
+This release fixes a logic error that can result in a DoS; therefore is a strongly recommended update for all users. It's safe to update to it from any version of the 2.0.x series.
* allow again empty lines at the start of the configuration file
* change how strnvis(3) is handled: on systems with the broken interface gmid will just use its own built-in version
@@ -60,7 +60,7 @@ This release fixes a logic error that can result in a DoS; therefore is a strong
* added `listen on' to specify per-server the list of addresses from where connections are to be accepted.
* added titan(1), a simple titan client.
-* splitted the "configless" version of gmid as a standalone executable gemexp(1)
+* split the "configless" version of gmid as a standalone executable gemexp(1)
* added ability to log to files with `log access <path>`
* added ability to change the syslog(3) facility with `log syslog facility <facility>`
* added ability to change the logging style with `log style <style>`
@@ -91,7 +91,7 @@ This release fixes a logic error that can result in a DoS; therefore is a strong
* gg now warns when the server doesn't use TLS' close_notify
* deprecated the global `ipv6' and `port' settings in favour of the per-server `listen on` directive
* removed the already deprecated config options `mime' and `map'
-* droped seccomp and capsicum support
+* dropped seccomp and capsicum support
* FastCGI: set REQUEST_METHOD to "GET" instead of the empty string
@@ -194,7 +194,7 @@ All by Anna “CyberTailor”, thanks!
* refactored the internal of the server too.
* refactored the regression suite (in particular reduced the timeout for single tests from 30 to 10 seconds.)
* configure: add support for --prefix=... autoconf-style flag.
-* relax the "wont proxy" check: don't check that the port in the request is the same we're listening on. Suggested and discussed with Allen Sobot, thanks!
+* relax the "won't proxy" check: don't check that the port in the request is the same we're listening on. Suggested and discussed with Allen Sobot, thanks!
* relax the strict ordering of options, locations and proxy blocks inside a server block.
### Bug fixes
@@ -237,7 +237,7 @@ and the relative regression test.
## 2021/07/19 - 1.7.2 “Space-dye Vest” second bugfix release
-This version incudes the following bugfix:
+This version includes the following bugfix:
* an un-initialized field in the configless code path leads to a crash on the first request.
@@ -279,7 +279,7 @@ Starting from this version gmid doesn't depend on lex anymore, but yacc is still
### Bug fixes
-* correctly handle CGI scripts that replies with the maxium header length allowed.
+* correctly handle CGI scripts that replies with the maximum header length allowed.
* fixed the static target.
* fixed recursive mkdirs for configless mode (i.e. create ‘~/.local/share/gmid’)
* logs sent to syslog now have proper priority (before every message ended up as LOG_CRIT). Found by Anna “CyberTailor”, thanks!
diff --git a/titan.1 b/titan.1
index 6ff3aaa..5812c74 100644
--- a/titan.1
+++ b/titan.1
@@ -69,7 +69,7 @@ utility exits with one of the following values:
.Pp
.Bl -tag -width Ds -offset indent -compact
.It 0
-The trasaction completed successfully and the response code was in the
+The transaction completed successfully and the response code was in the
2x or 3x range.
.It 1
An error occurred.
diff --git a/titan.c b/titan.c
index 0206142..482ad8d 100644
--- a/titan.c
+++ b/titan.c
@@ -333,7 +333,7 @@ main(int argc, char **argv)
tls_config_insecure_noverifyname(config);
if (cert && tls_config_set_keypair_file(config, cert, key) == -1)
- errx(1, "cant load certificate client %s", cert);
+ errx(1, "can't load certificate client %s", cert);
if ((ctx = tls_client()) == NULL)
errx(1, "can't create tls context");