[master] df8ee3355 Fix two cases where sphinx detected URLs where it should not.

Poul-Henning Kamp phk at FreeBSD.org
Tue Jan 14 08:38:09 UTC 2025


commit df8ee3355e519bdc9bdb33dc154769bcf7b3d13f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 14 08:36:36 2025 +0000

    Fix two cases where sphinx detected URLs where it should not.

diff --git a/doc/sphinx/phk/ipv6suckage.rst b/doc/sphinx/phk/ipv6suckage.rst
index d57d9fbf7..d4dd18bf1 100644
--- a/doc/sphinx/phk/ipv6suckage.rst
+++ b/doc/sphinx/phk/ipv6suckage.rst
@@ -37,12 +37,16 @@ webserver on the same machine.
 No worries, says the power that controls what URLs look like, we
 will just stick the port number after the IP# with a colon:
 
+.. code-block:: text
+
 	http://192.168.0.1:8080/...
 
 That obviously does not work with IPv6, so RFC3986 comes around and
 says "darn, we didn't think of that" and puts the IPV6 address in
 [...] giving us:
 
+.. code-block:: text
+
 	http://[1080::8:800:200C:417A]:8080/
 
 Remember that "harmless in shells" detail ?  Yeah, sorry about that.
@@ -55,11 +59,15 @@ even need to know if it is a IPv4 or IPv6 address in the first place.
 But it returns the IP# in one buffer and the port number in another,
 so if you want to format the sockaddr in the by RFC5952 recommended
 way (the same as RFC3986), you need to inspect the version field
-in the sockaddr to see if you should do
+in the sockaddr to see if you should do:
+
+.. code-block:: text
 
 	"%s:%s", host, port
 
-or
+or:
+
+.. code-block:: text
 
 	"[%s]:%s", host, port
 
diff --git a/doc/sphinx/reference/varnishncsa.rst b/doc/sphinx/reference/varnishncsa.rst
index de5ea8428..6375f7288 100644
--- a/doc/sphinx/reference/varnishncsa.rst
+++ b/doc/sphinx/reference/varnishncsa.rst
@@ -237,7 +237,7 @@ SIGNALS
 NOTES
 =====
 
-The %r formatter is equivalent to "%m http://%{Host}i%U%q %H". This
+The %r formatter is equivalent to ``%m http://%{Host}i%U%q %H``. This
 differs from apache's %r behavior, equivalent to "%m %U%q %H".
 Furthermore, when using the %r formatter, if the Host header appears
 multiple times in a single transaction, the first occurrence is used.


More information about the varnish-commit mailing list