summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-07-05 21:06:25 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2022-07-09 17:36:22 +0100
commit0693531c37d7d6bfdf731c5e77effba50261fdc9 (patch)
treef58a4641e1e4b65910265eadeb7bcc906c534ad5
parentb0a1badb37b57932cde9786cc3b6a36af7df16ce (diff)
downloadexim4-0693531c37d7d6bfdf731c5e77effba50261fdc9.tar.gz
Docs: subsections
-rw-r--r--doc/doc-docbook/MyStyle-html.xsl6
-rw-r--r--doc/doc-docbook/spec.xfpt16
2 files changed, 13 insertions, 9 deletions
diff --git a/doc/doc-docbook/MyStyle-html.xsl b/doc/doc-docbook/MyStyle-html.xsl
index fa1c419d9..70a4d874c 100644
--- a/doc/doc-docbook/MyStyle-html.xsl
+++ b/doc/doc-docbook/MyStyle-html.xsl
@@ -139,9 +139,9 @@ changed "titleabbrev.markup" to "title.markup". -->
<!-- The default stylesheets generate both chapters and sections with <h2>
headings in the HTML. The argument is that the HTML headings don't go deep
enough to match the DocBook levels. But surely it would be better to stop them
-at the bottom end? Anyway, the Exim documents have only one level of section
-within chapters, and even if they went to two, it wouldn't exhaust HTML's
-capabilities. So I have copied the style stuff here, making a 1-character
+at the bottom end? Anyway, the Exim documents have no more than two levels of
+section within chapters, which won't exhaust HTML's capabilities.
+So I have copied the style stuff here, making a 1-character
change from "+ 1" to "+ 2" in roughly the middle. -->
<xsl:template name="section.heading">
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index e34fe7920..5ec984437 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -42139,7 +42139,8 @@ This description assumes
that headers will be in /usr/local/include, and that the libraries
are in /usr/local/lib.
-. subsection
+.subsection Configuration SSECDMARCCONFIG
+.cindex DMARC configuration
There are three main-configuration options:
.cindex DMARC "configuration options"
@@ -42180,9 +42181,9 @@ If not set (the default), the From: header is expanded from
the dsn_from option, and <> is used for the
envelope from.
-. I wish we had subsections...
-
+.subsection Controls SSECDMARCCONTROLS
.cindex DMARC controls
+
By default, the DMARC processing will run for any remote,
non-authenticated user. It makes sense to only verify DMARC
status of messages coming from remote, untrusted sources. You can
@@ -42213,7 +42214,8 @@ send them.)
There are no options to either control. Both must appear before
the DATA acl.
-. subsection
+.subsection ACL SSECDMARCACL
+.cindex DMARC "ACL condition"
DMARC checks cam be run on incoming SMTP messages by using the
&"dmarc_status"& ACL condition in the DATA ACL. You are required to
@@ -42281,7 +42283,8 @@ are "none", "reject" and "quarantine". It is blank when there
is any error, including no DMARC record.
.endlist
-. subsection
+.subsection Logging SSECDMARCLOGGING
+.cindex DMARC logging
By default, Exim's DMARC configuration is intended to be
non-intrusive and conservative. To facilitate this, Exim will not
@@ -42308,7 +42311,8 @@ Configure, somewhere before the DATA ACL, the control option to
enable sending DMARC forensic reports
.endlist
-. subsection
+.subsection Example SSECDMARCEXAMPLE
+.cindex DMARC example
Example usage:
.code