upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bug/main/doc-arm-rhel9-v9_18' into 'v9_18'

Browse source 
Compatibility for building ARM on older sphinx [v9_18]

See merge request isc-projects/bind9!6817
This commit is contained in:
Petr Špaček 2022-09-26 15:23:34 +00:00
commit b8c92ad51f
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.docs
View file

@ -2,6 +2,7 @@ SPHINX_V = $(SPHINX_V_@AM_V@)
SPHINX_V_ = $(SPHINX_V_@AM_DEFAULT_V@)
SPHINX_V_0 = -q
SPHINX_V_1 = -n
SPHINX_W = -W
AM_V_SPHINX = $(AM_V_SPHINX_@AM_V@)
AM_V_SPHINX_ = $(AM_V_SPHINX_@AM_DEFAULT_V@)
@ -20,7 +21,7 @@ SESSION_KEY = .. |session_key| replace:: ``$(runstatedir)/session.key``
export RST_EPILOG = $(RNDC_CONF)$(LF)$(RNDC_KEY)$(LF)$(NAMED_CONF)$(LF)$(BIND_KEYS)$(LF)$(NAMED_PID)$(LF)$(SESSION_KEY)
common_SPHINXOPTS = \
-W \
$(SPHINX_W) \
-c $(srcdir) \
-a \
$(SPHINX_V)

2
doc/arm/dnssec.inc.rst
View file

@ -282,7 +282,7 @@ NSEC3
To sign using :ref:`NSEC3 <advanced_discussions_nsec3>` instead of :ref:`NSEC
<advanced_discussions_nsec>`, add an NSEC3PARAM record to the initial update
request. The :term:`OPTOUT <opt-out>` bit in the NSEC3
request. The :term:`OPTOUT <Opt-out>` bit in the NSEC3
chain can be set in the flags field of the
NSEC3PARAM record.

8
doc/arm/reference.rst
View file

@ -35,7 +35,7 @@ The file :file:`named.conf` may contain three types of entities:
Block
:ref:`Blocks <configuration_blocks>` are containers for :term:`statements
<statement>` which either have common functionality - for example,
<Statement>` which either have common functionality - for example,
the definition of a cryptographic key in a :namedconf:ref:`key` block - or which
define the scope of the statement - for example, a statement which appears
in a :namedconf:ref:`zone` block has scope only for that zone.
@ -68,7 +68,7 @@ The file :file:`named.conf` may contain three types of entities:
more argument/value pairs. The :any:`also-notify` statement may take a number
of such argument/value pairs, such as ``also-notify port 5353;``,
where ``port`` is the argument and ``5353`` is the corresponding value.
- Statements can appear in a single :term:`block` - for
- Statements can appear in a single :term:`block <Block>` - for
example, an :namedconf:ref:`algorithm` statement can appear only in a
:namedconf:ref:`key` block - or in multiple blocks - for example, an
:any:`also-notify` statement can appear in an :namedconf:ref:`options`
@ -6544,8 +6544,8 @@ The following options can be specified in a :any:`dnssec-policy` statement:
of the indicated length.
.. warning::
Do not use extra :term:`iterations`, :term:`salt`, and
:term:`opt-out` unless their implications are fully understood.
Do not use extra :term:`iterations <Iterations>`, :term:`salt <Salt>`, and
:term:`opt-out <Opt-out>` unless their implications are fully understood.
A higher number of iterations causes interoperability problems and opens
servers to CPU-exhausting DoS attacks.