commit 6a4dd614cfd30b0134ae29da386c8473226db862
Author: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
Date: Mon Jan 10 18:49:12 2022 +0100
doc: Various typos spotted by lintian
Brought to my attention by @asadsa92.
diff --git a/bin/varnishtest/tests/r01688.vtc b/bin/varnishtest/tests/r01688.vtc
index bb4c92da3..ff10e0005 100644
--- a/bin/varnishtest/tests/r01688.vtc
+++ b/bin/varnishtest/tests/r01688.vtc
@@ -12,7 +12,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
if (req.url == "/foo" || req.url == "/quux") {
- return(synth(998, "included synthetic reponse"));
+ return(synth(998, "included synthetic response"));
}
}
diff --git a/bin/varnishtest/tests/s00010.vtc b/bin/varnishtest/tests/s00010.vtc
index f9e0bbb15..65db8d577 100644
--- a/bin/varnishtest/tests/s00010.vtc
+++ b/bin/varnishtest/tests/s00010.vtc
@@ -65,7 +65,7 @@ logexpect l1 -wait
barrier b2 sync
client c1 -wait
-# case 2: send_timeout overriden in VCL
+# case 2: send_timeout overridden in VCL
varnish v1 -cliok "param.reset send_timeout"
@@ -111,7 +111,7 @@ logexpect l3 -wait
barrier b2 sync
client c3 -wait
-# case 4: idle_send_timeout overriden in VCL
+# case 4: idle_send_timeout overridden in VCL
varnish v1 -cliok "param.reset idle_send_timeout"
diff --git a/doc/sphinx/reference/index.rst b/doc/sphinx/reference/index.rst
index 3ce03678a..09ae6342d 100644
--- a/doc/sphinx/reference/index.rst
+++ b/doc/sphinx/reference/index.rst
@@ -59,7 +59,7 @@ Logging and monitoring
VSLQ - Filter/Query expressions for VSL <vsl-query>
VarnishLog - Logging raw VSL <varnishlog>
VarnishNCSA - Logging in NCSA format <varnishncsa>
- VarnishHist - Realtime reponse histogram display <varnishhist>
+ VarnishHist - Realtime response histogram display <varnishhist>
VarnishTop - Realtime activity display <varnishtop>
Counters and statistics
diff --git a/doc/sphinx/reference/vcl-backend.rst b/doc/sphinx/reference/vcl-backend.rst
index fa8c0cfe9..148172295 100644
--- a/doc/sphinx/reference/vcl-backend.rst
+++ b/doc/sphinx/reference/vcl-backend.rst
@@ -57,7 +57,7 @@ one IPv4 and one IPv6 address::
.host = "example.com:8081";
-The TCP port number can be specied as part of ``.host`` as a bove
+The TCP port number can be specified as part of ``.host`` as above
or separately using the ``.port`` attribute::
.port = 8081;
diff --git a/doc/sphinx/reference/vcl-var.rst b/doc/sphinx/reference/vcl-var.rst
index 286d9bf9d..b8278b57a 100644
--- a/doc/sphinx/reference/vcl-var.rst
+++ b/doc/sphinx/reference/vcl-var.rst
@@ -67,7 +67,7 @@ in ``resp.status`` and ``beresp.status`` to ``return(synth(...))`` and
}
The ``obj.status`` variable will inherit the VWXYZ form, but in a ban
-expresion only the XYZ part will be available. The VWXYZ form is strictly
+expression only the XYZ part will be available. The VWXYZ form is strictly
limited to VCL execution.
Assigning an HTTP standardized code to ``resp.status`` or ``beresp.status``
diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index b309a737c..3770dc626 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -91,7 +91,7 @@ variables::
There are obvious limitations to what can be done, for instance it
makes no sense to ``unset req.url;`` - a request must have some kind
-of URL to be valid, and likewise trying to manipulate a backend reponse
+of URL to be valid, and likewise trying to manipulate a backend response
when there is none (yet) makes no sense.
The VCL compiler will detect such errors.
diff --git a/doc/sphinx/whats-new/changes-6.3.rst b/doc/sphinx/whats-new/changes-6.3.rst
index 4dadc44e8..b42376462 100644
--- a/doc/sphinx/whats-new/changes-6.3.rst
+++ b/doc/sphinx/whats-new/changes-6.3.rst
@@ -55,7 +55,7 @@ Changes to VCL
VCL variables
~~~~~~~~~~~~~
-The :ref:`ref_param_timeout_idle` parameter can be overriden in VCL using the
+The :ref:`ref_param_timeout_idle` parameter can be overridden in VCL using the
``sess.timeout_idle`` variable.
Other changes to VCL
diff --git a/doc/sphinx/whats-new/upgrading-6.1.rst b/doc/sphinx/whats-new/upgrading-6.1.rst
index 28003fb1c..fe2672d7e 100644
--- a/doc/sphinx/whats-new/upgrading-6.1.rst
+++ b/doc/sphinx/whats-new/upgrading-6.1.rst
@@ -219,7 +219,7 @@ Other changes
A JSON response in the CLI always includes a timestamp (epoch time
in seconds with millisecond precision), indicating the time at
- which the reponse was generated.
+ which the response was generated.
* The ``backend.list`` command now lists both directors and
backends, with their health status. The command now has a ``-v``
diff --git a/include/tbl/params.h b/include/tbl/params.h
index a96b5225f..bb2574ee2 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -325,7 +325,7 @@ PARAM_SIMPLE(
/* def */ "60.000",
/* units */ "seconds",
/* descr */
- "Timeout for the childs replies to CLI requests from the "
+ "Timeout for the child's replies to CLI requests from the "
"mgt_param."
)
diff --git a/include/vcli.h b/include/vcli.h
index 51e1e55f7..16705d71d 100644
--- a/include/vcli.h
+++ b/include/vcli.h
@@ -65,5 +65,5 @@ enum VCLI_status_e {
int VCLI_WriteResult(int fd, unsigned status, const char *result);
int VCLI_ReadResult(int fd, unsigned *status, char **ptr, double tmo);
void VCLI_AuthResponse(int S_fd, const char *challenge,
- char reponse[CLI_AUTH_RESPONSE_LEN + 1]);
+ char response[CLI_AUTH_RESPONSE_LEN + 1]);
#endif
diff --git a/vmod/vmod_std.vcc b/vmod/vmod_std.vcc
index c01b29cc2..acd273c88 100644
--- a/vmod/vmod_std.vcc
+++ b/vmod/vmod_std.vcc
@@ -48,7 +48,7 @@ $Function REAL random(REAL lo, REAL hi)
Returns a random real number between *lo* and *hi*.
This function uses the "testable" random generator in varnishd which
-enables determinstic tests to be run (See ``m00002.vtc``). This
+enables deterministic tests to be run (See ``m00002.vtc``). This
function should not be used for cryptographic applications.
Example::
@@ -354,7 +354,7 @@ be returned or VCL failure will happen.
The IP address includes a port number that can be found with ``std.port()``
that defaults to 80. The default port can be set to a different value with
-the *p* argument. It will be overriden if *s* contains both an IP address
+the *p* argument. It will be overridden if *s* contains both an IP address
and a port number or service name.
When *s* contains both, the syntax is either ``address:port`` or
diff --git a/vmod/vmod_vtc.vcc b/vmod/vmod_vtc.vcc
index 833a163a4..d19aef94d 100644
--- a/vmod/vmod_vtc.vcc
+++ b/vmod/vmod_vtc.vcc
@@ -161,7 +161,7 @@ $Function BLOB proxy_header(ENUM {v1,v2} version,
IP client, IP server, STRING authority=0)
Format a proxy header of the given version ``v1`` or ``v2`` and
-addresses (The VCL IP type also conatins the port number).
+addresses (The VCL IP type also contains the port number).
Optionally also send an authority TLV with version ``v2`` (ignored for
version ``v1``).
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
Author: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
Date: Mon Jan 10 18:49:12 2022 +0100
doc: Various typos spotted by lintian
Brought to my attention by @asadsa92.
diff --git a/bin/varnishtest/tests/r01688.vtc b/bin/varnishtest/tests/r01688.vtc
index bb4c92da3..ff10e0005 100644
--- a/bin/varnishtest/tests/r01688.vtc
+++ b/bin/varnishtest/tests/r01688.vtc
@@ -12,7 +12,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
if (req.url == "/foo" || req.url == "/quux") {
- return(synth(998, "included synthetic reponse"));
+ return(synth(998, "included synthetic response"));
}
}
diff --git a/bin/varnishtest/tests/s00010.vtc b/bin/varnishtest/tests/s00010.vtc
index f9e0bbb15..65db8d577 100644
--- a/bin/varnishtest/tests/s00010.vtc
+++ b/bin/varnishtest/tests/s00010.vtc
@@ -65,7 +65,7 @@ logexpect l1 -wait
barrier b2 sync
client c1 -wait
-# case 2: send_timeout overriden in VCL
+# case 2: send_timeout overridden in VCL
varnish v1 -cliok "param.reset send_timeout"
@@ -111,7 +111,7 @@ logexpect l3 -wait
barrier b2 sync
client c3 -wait
-# case 4: idle_send_timeout overriden in VCL
+# case 4: idle_send_timeout overridden in VCL
varnish v1 -cliok "param.reset idle_send_timeout"
diff --git a/doc/sphinx/reference/index.rst b/doc/sphinx/reference/index.rst
index 3ce03678a..09ae6342d 100644
--- a/doc/sphinx/reference/index.rst
+++ b/doc/sphinx/reference/index.rst
@@ -59,7 +59,7 @@ Logging and monitoring
VSLQ - Filter/Query expressions for VSL <vsl-query>
VarnishLog - Logging raw VSL <varnishlog>
VarnishNCSA - Logging in NCSA format <varnishncsa>
- VarnishHist - Realtime reponse histogram display <varnishhist>
+ VarnishHist - Realtime response histogram display <varnishhist>
VarnishTop - Realtime activity display <varnishtop>
Counters and statistics
diff --git a/doc/sphinx/reference/vcl-backend.rst b/doc/sphinx/reference/vcl-backend.rst
index fa8c0cfe9..148172295 100644
--- a/doc/sphinx/reference/vcl-backend.rst
+++ b/doc/sphinx/reference/vcl-backend.rst
@@ -57,7 +57,7 @@ one IPv4 and one IPv6 address::
.host = "example.com:8081";
-The TCP port number can be specied as part of ``.host`` as a bove
+The TCP port number can be specified as part of ``.host`` as above
or separately using the ``.port`` attribute::
.port = 8081;
diff --git a/doc/sphinx/reference/vcl-var.rst b/doc/sphinx/reference/vcl-var.rst
index 286d9bf9d..b8278b57a 100644
--- a/doc/sphinx/reference/vcl-var.rst
+++ b/doc/sphinx/reference/vcl-var.rst
@@ -67,7 +67,7 @@ in ``resp.status`` and ``beresp.status`` to ``return(synth(...))`` and
}
The ``obj.status`` variable will inherit the VWXYZ form, but in a ban
-expresion only the XYZ part will be available. The VWXYZ form is strictly
+expression only the XYZ part will be available. The VWXYZ form is strictly
limited to VCL execution.
Assigning an HTTP standardized code to ``resp.status`` or ``beresp.status``
diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index b309a737c..3770dc626 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -91,7 +91,7 @@ variables::
There are obvious limitations to what can be done, for instance it
makes no sense to ``unset req.url;`` - a request must have some kind
-of URL to be valid, and likewise trying to manipulate a backend reponse
+of URL to be valid, and likewise trying to manipulate a backend response
when there is none (yet) makes no sense.
The VCL compiler will detect such errors.
diff --git a/doc/sphinx/whats-new/changes-6.3.rst b/doc/sphinx/whats-new/changes-6.3.rst
index 4dadc44e8..b42376462 100644
--- a/doc/sphinx/whats-new/changes-6.3.rst
+++ b/doc/sphinx/whats-new/changes-6.3.rst
@@ -55,7 +55,7 @@ Changes to VCL
VCL variables
~~~~~~~~~~~~~
-The :ref:`ref_param_timeout_idle` parameter can be overriden in VCL using the
+The :ref:`ref_param_timeout_idle` parameter can be overridden in VCL using the
``sess.timeout_idle`` variable.
Other changes to VCL
diff --git a/doc/sphinx/whats-new/upgrading-6.1.rst b/doc/sphinx/whats-new/upgrading-6.1.rst
index 28003fb1c..fe2672d7e 100644
--- a/doc/sphinx/whats-new/upgrading-6.1.rst
+++ b/doc/sphinx/whats-new/upgrading-6.1.rst
@@ -219,7 +219,7 @@ Other changes
A JSON response in the CLI always includes a timestamp (epoch time
in seconds with millisecond precision), indicating the time at
- which the reponse was generated.
+ which the response was generated.
* The ``backend.list`` command now lists both directors and
backends, with their health status. The command now has a ``-v``
diff --git a/include/tbl/params.h b/include/tbl/params.h
index a96b5225f..bb2574ee2 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -325,7 +325,7 @@ PARAM_SIMPLE(
/* def */ "60.000",
/* units */ "seconds",
/* descr */
- "Timeout for the childs replies to CLI requests from the "
+ "Timeout for the child's replies to CLI requests from the "
"mgt_param."
)
diff --git a/include/vcli.h b/include/vcli.h
index 51e1e55f7..16705d71d 100644
--- a/include/vcli.h
+++ b/include/vcli.h
@@ -65,5 +65,5 @@ enum VCLI_status_e {
int VCLI_WriteResult(int fd, unsigned status, const char *result);
int VCLI_ReadResult(int fd, unsigned *status, char **ptr, double tmo);
void VCLI_AuthResponse(int S_fd, const char *challenge,
- char reponse[CLI_AUTH_RESPONSE_LEN + 1]);
+ char response[CLI_AUTH_RESPONSE_LEN + 1]);
#endif
diff --git a/vmod/vmod_std.vcc b/vmod/vmod_std.vcc
index c01b29cc2..acd273c88 100644
--- a/vmod/vmod_std.vcc
+++ b/vmod/vmod_std.vcc
@@ -48,7 +48,7 @@ $Function REAL random(REAL lo, REAL hi)
Returns a random real number between *lo* and *hi*.
This function uses the "testable" random generator in varnishd which
-enables determinstic tests to be run (See ``m00002.vtc``). This
+enables deterministic tests to be run (See ``m00002.vtc``). This
function should not be used for cryptographic applications.
Example::
@@ -354,7 +354,7 @@ be returned or VCL failure will happen.
The IP address includes a port number that can be found with ``std.port()``
that defaults to 80. The default port can be set to a different value with
-the *p* argument. It will be overriden if *s* contains both an IP address
+the *p* argument. It will be overridden if *s* contains both an IP address
and a port number or service name.
When *s* contains both, the syntax is either ``address:port`` or
diff --git a/vmod/vmod_vtc.vcc b/vmod/vmod_vtc.vcc
index 833a163a4..d19aef94d 100644
--- a/vmod/vmod_vtc.vcc
+++ b/vmod/vmod_vtc.vcc
@@ -161,7 +161,7 @@ $Function BLOB proxy_header(ENUM {v1,v2} version,
IP client, IP server, STRING authority=0)
Format a proxy header of the given version ``v1`` or ``v2`` and
-addresses (The VCL IP type also conatins the port number).
+addresses (The VCL IP type also contains the port number).
Optionally also send an authority TLV with version ``v2`` (ignored for
version ``v1``).
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit