summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorViktor Szépe <[email protected]>2024-05-10 16:08:54 +0200
committerGitHub <[email protected]>2024-05-10 08:08:54 -0600
commitd7e3a1974ba968afd84faad207b8717f5faf6ad6 (patch)
treed2a4a3976571e2aca697ad38b32801086b68b347 /modules
parente60148ecc39f78214f8fc47d3d94f7099b655f56 (diff)
downloadcaddy-d7e3a1974ba968afd84faad207b8717f5faf6ad6.tar.gz
caddy-d7e3a1974ba968afd84faad207b8717f5faf6ad6.zip
Fix typos (#6311)
* Fix typos * Revert * Revert to "htlm" * fix indentations
Diffstat (limited to 'modules')
-rw-r--r--modules/caddyhttp/fileserver/browsetplcontext.go2
-rw-r--r--modules/caddyhttp/headers/headers.go2
-rw-r--r--modules/caddyhttp/ip_matchers.go2
-rw-r--r--modules/caddyhttp/templates/templates.go2
-rw-r--r--modules/caddytls/automation.go2
-rw-r--r--modules/caddytls/capools_test.go6
-rw-r--r--modules/caddytls/connpolicy.go2
-rw-r--r--modules/caddytls/internalissuer.go2
-rw-r--r--modules/caddytls/matchers.go4
9 files changed, 12 insertions, 12 deletions
diff --git a/modules/caddyhttp/fileserver/browsetplcontext.go b/modules/caddyhttp/fileserver/browsetplcontext.go
index 307cb9a49..74c14608f 100644
--- a/modules/caddyhttp/fileserver/browsetplcontext.go
+++ b/modules/caddyhttp/fileserver/browsetplcontext.go
@@ -132,7 +132,7 @@ type browseTemplateContext struct {
// The full path of the request.
Path string `json:"path"`
- // Whether the parent directory is browseable.
+ // Whether the parent directory is browsable.
CanGoUp bool `json:"can_go_up"`
// The items (files and folders) in the path.
diff --git a/modules/caddyhttp/headers/headers.go b/modules/caddyhttp/headers/headers.go
index ed503ef56..bdb185f46 100644
--- a/modules/caddyhttp/headers/headers.go
+++ b/modules/caddyhttp/headers/headers.go
@@ -184,7 +184,7 @@ type RespHeaderOps struct {
Require *caddyhttp.ResponseMatcher `json:"require,omitempty"`
// If true, header operations will be deferred until
- // they are written out. Superceded if Require is set.
+ // they are written out. Superseded if Require is set.
// Usually you will need to set this to true if any
// fields are being deleted.
Deferred bool `json:"deferred,omitempty"`
diff --git a/modules/caddyhttp/ip_matchers.go b/modules/caddyhttp/ip_matchers.go
index d5571802d..00d17487c 100644
--- a/modules/caddyhttp/ip_matchers.go
+++ b/modules/caddyhttp/ip_matchers.go
@@ -274,7 +274,7 @@ func parseIPZoneFromString(address string) (netip.Addr, string, error) {
ipStr = address // OK; probably didn't have a port
}
- // Some IPv6-Adresses can contain zone identifiers at the end,
+ // Some IPv6-Addresses can contain zone identifiers at the end,
// which are separated with "%"
zoneID := ""
if strings.Contains(ipStr, "%") {
diff --git a/modules/caddyhttp/templates/templates.go b/modules/caddyhttp/templates/templates.go
index b97093b6f..539666076 100644
--- a/modules/caddyhttp/templates/templates.go
+++ b/modules/caddyhttp/templates/templates.go
@@ -161,7 +161,7 @@ func init() {
// Renders the given Markdown text as HTML and returns it. This uses the
// [Goldmark](https://github.com/yuin/goldmark) library,
// which is CommonMark compliant. It also has these extensions
-// enabled: Github Flavored Markdown, Footnote, and syntax
+// enabled: GitHub Flavored Markdown, Footnote, and syntax
// highlighting provided by [Chroma](https://github.com/alecthomas/chroma).
//
// ```
diff --git a/modules/caddytls/automation.go b/modules/caddytls/automation.go
index 803cb174e..3f98125d8 100644
--- a/modules/caddytls/automation.go
+++ b/modules/caddytls/automation.go
@@ -97,7 +97,7 @@ type AutomationPolicy struct {
SubjectsRaw []string `json:"subjects,omitempty"`
// The modules that may issue certificates. Default: internal if all
- // subjects do not qualify for public certificates; othewise acme and
+ // subjects do not qualify for public certificates; otherwise acme and
// zerossl.
IssuersRaw []json.RawMessage `json:"issuers,omitempty" caddy:"namespace=tls.issuance inline_key=module"`
diff --git a/modules/caddytls/capools_test.go b/modules/caddytls/capools_test.go
index 67244b59a..b355792d1 100644
--- a/modules/caddytls/capools_test.go
+++ b/modules/caddytls/capools_test.go
@@ -547,7 +547,7 @@ func TestTLSConfig_unmarshalCaddyfile(t *testing.T) {
wantErr: true,
},
{
- name: "setting 'ca' without arguemnt is an error",
+ name: "setting 'ca' without argument is an error",
args: args{
d: caddyfile.NewTestDispenser(`{
ca
@@ -710,7 +710,7 @@ func TestHTTPCertPoolUnmarshalCaddyfile(t *testing.T) {
wantErr: false,
},
{
- name: "endpoints defiend inline and in block are merged",
+ name: "endpoints defined inline and in block are merged",
args: args{
d: caddyfile.NewTestDispenser(`http http://localhost/ca-certs {
endpoints http://remotehost/ca-certs
@@ -722,7 +722,7 @@ func TestHTTPCertPoolUnmarshalCaddyfile(t *testing.T) {
wantErr: false,
},
{
- name: "multiple endpoints defiend in block on the same line",
+ name: "multiple endpoints defined in block on the same line",
args: args{
d: caddyfile.NewTestDispenser(`http {
endpoints http://remotehost/ca-certs http://localhost/ca-certs
diff --git a/modules/caddytls/connpolicy.go b/modules/caddytls/connpolicy.go
index 38a01f3e4..c9705ffdc 100644
--- a/modules/caddytls/connpolicy.go
+++ b/modules/caddytls/connpolicy.go
@@ -517,7 +517,7 @@ func (ca *ClientAuthentication) UnmarshalCaddyfile(d *caddyfile.Dispenser) error
_, ok := unm.(ClientCertificateVerifier)
if !ok {
- return d.Errf("module '%s' is not a caddytls.ClientCertificatVerifier", modID)
+ return d.Errf("module '%s' is not a caddytls.ClientCertificateVerifier", modID)
}
ca.VerifiersRaw = append(ca.VerifiersRaw, caddyconfig.JSONModuleObject(unm, "verifier", vType, nil))
default:
diff --git a/modules/caddytls/internalissuer.go b/modules/caddytls/internalissuer.go
index 0d7f4157e..f8dbc6f8c 100644
--- a/modules/caddytls/internalissuer.go
+++ b/modules/caddytls/internalissuer.go
@@ -94,7 +94,7 @@ func (iss *InternalIssuer) Provision(ctx caddy.Context) error {
}
// IssuerKey returns the unique issuer key for the
-// confgured CA endpoint.
+// configured CA endpoint.
func (iss InternalIssuer) IssuerKey() string {
return iss.ca.ID
}
diff --git a/modules/caddytls/matchers.go b/modules/caddytls/matchers.go
index 17bfe2e4c..b01fb8334 100644
--- a/modules/caddytls/matchers.go
+++ b/modules/caddytls/matchers.go
@@ -110,7 +110,7 @@ func (m MatchRemoteIP) Match(hello *tls.ClientHelloInfo) bool {
}
ipAddr, err := netip.ParseAddr(ipStr)
if err != nil {
- m.logger.Error("invalid client IP addresss", zap.String("ip", ipStr))
+ m.logger.Error("invalid client IP address", zap.String("ip", ipStr))
return false
}
return (len(m.cidrs) == 0 || m.matches(ipAddr, m.cidrs)) &&
@@ -185,7 +185,7 @@ func (m MatchLocalIP) Match(hello *tls.ClientHelloInfo) bool {
}
ipAddr, err := netip.ParseAddr(ipStr)
if err != nil {
- m.logger.Error("invalid local IP addresss", zap.String("ip", ipStr))
+ m.logger.Error("invalid local IP address", zap.String("ip", ipStr))
return false
}
return (len(m.cidrs) == 0 || m.matches(ipAddr, m.cidrs))