Merging upstream version 3.2.5+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 9 insertions, 9 deletions

diff --git a/doc/antora/modules/unlang/nav.adoc b/doc/antora/modules/unlang/nav.adoc
index 77be328..e2d68b3 100644
--- a/doc/antora/modules/unlang/nav.adoc
+++ b/doc/antora/modules/unlang/nav.adoc
@@ -35,7 +35,7 @@
 ** xref:condition/index.adoc[Conditional Expressions]
 *** xref:condition/cmp.adoc[Comparisons]
 *** xref:condition/operands.adoc[Operands]
-*** xref:condition/return_code.adoc[The Return Code Operator]
+*** xref:condition/return_codes.adoc[The Return Code Operator]
 *** xref:condition/eq.adoc[The '==' Operator]
 *** xref:condition/and.adoc[The '&&' Operator]
 *** xref:condition/or.adoc[The '||' Operator]
diff --git a/doc/antora/modules/unlang/pages/case.adoc b/doc/antora/modules/unlang/pages/case.adoc
index ba2b5fe..2d5749d 100644
--- a/doc/antora/modules/unlang/pages/case.adoc
+++ b/doc/antora/modules/unlang/pages/case.adoc
@@ -14,7 +14,7 @@ outside of a xref:switch.adoc[switch] statement.
 
 
 The `<match>` text can be an attribute reference such as `&User-Name`,
-or it can be a xref:type/string/index.adoc[string].  If the match
+or it can be a xref:type/index.adoc[string].  If the match
 text is a dynamically expanded string, then the match is performed on
 the output of the string expansion.
 
diff --git a/doc/antora/modules/unlang/pages/condition/index.adoc b/doc/antora/modules/unlang/pages/condition/index.adoc
index b9d9d5f..10a84c8 100644
--- a/doc/antora/modules/unlang/pages/condition/index.adoc
+++ b/doc/antora/modules/unlang/pages/condition/index.adoc
@@ -18,7 +18,7 @@ Conditions are expressed using the following syntax:
 |=====
 | Syntax | Description
 | xref:attr.adoc[&Attribute-Name] | Check for attribute existence.
-| xref:condition/return_code.adoc[rcode] | Check return code of a previous module.
+| xref:condition/return_codes.adoc[rcode] | Check return code of a previous module.
 | xref:condition/operands.adoc[data] | Check value of data.
 | xref:condition/cmp.adoc[lhs OP rhs] | Compare two kinds of data.
 | xref:condition/para.adoc[( condition )] | Check sub-condition
diff --git a/doc/antora/modules/unlang/pages/condition/operands.adoc b/doc/antora/modules/unlang/pages/condition/operands.adoc
index 4a2d00b..5b19af3 100644
--- a/doc/antora/modules/unlang/pages/condition/operands.adoc
+++ b/doc/antora/modules/unlang/pages/condition/operands.adoc
@@ -11,7 +11,7 @@ integer
 ----
 
 Any text not matching xref:attr.adoc[&Attribute-Name] or
-xref:condition/return_code.adoc[Return Code] is interpreted as a value for a
+xref:condition/return_codes.adoc[Return Code] is interpreted as a value for a
 particular xref:type/index.adoc[data type].
 
 Double-quoted strings and back-quoted strings are dynamically expanded
diff --git a/doc/antora/modules/unlang/pages/default.adoc b/doc/antora/modules/unlang/pages/default.adoc
index 3b298f6..30912ef 100644
--- a/doc/antora/modules/unlang/pages/default.adoc
+++ b/doc/antora/modules/unlang/pages/default.adoc
@@ -14,7 +14,7 @@ outside of a xref:switch.adoc[switch] statement.
 
 
 The `<match>` text can be an attribute reference such as `&User-Name`,
-or it can be a xref:type/string/index.adoc[string].  If the match
+or it can be a xref:type/index.adoc[string].  If the match
 text is a dynamically expanded string, then the match is performed on
 the output of the string expansion.
 
diff --git a/doc/antora/modules/unlang/pages/type/index.adoc b/doc/antora/modules/unlang/pages/type/index.adoc
index 7d0d70f..f26489b 100644
--- a/doc/antora/modules/unlang/pages/type/index.adoc
+++ b/doc/antora/modules/unlang/pages/type/index.adoc
@@ -6,7 +6,7 @@ conditional expressions or when assigning a value to an attribute.
 == Using Data Types
 
 The server support a wide range of data types, as given in the
-xref:unlang/type/all_types.adoc[list of data types] page.  The choice
+xref:type/all_types.adoc[list of data types] page.  The choice
 of which data type applies is determined by the context in which that
 data type is used.  This context is usually taken from an attribute
 which is being assigned a value.
@@ -55,7 +55,7 @@ contains special characters that may otherwise confuse the parser.
 `"192.168.0.2"`:: xref:type/string/double.adoc[Double-quoted string].
 +
 The contents of the string are dynamically expanded as described in
-the xref:unlang/xlat/index.adoc[dynamic expansion] page.  The
+the xref:xlat/index.adoc[dynamic expansion] page.  The
 resulting output is then interpreted as the given data type.
 
 `{backtick}/bin/echo 192.168.0.2{backtick}`:: xref:type/string/backticks.adoc[backtick-quoted string].
@@ -110,7 +110,7 @@ interpreted as the data type `ipaddr`, and not as the literal string
 `"192.0.2."`.
 
 For a full list of data types which can be used in a cast, please see
-the xref:unlang/type/all_types.adoc[list of data types] page, and the
+the xref:type/all_types.adoc[list of data types] page, and the
 "Basic Type Types" section.
 
 // Copyright (C) 2020 Network RADIUS SAS.  Licenced under CC-by-NC 4.0.
diff --git a/doc/antora/modules/unlang/pages/xlat/builtin.adoc b/doc/antora/modules/unlang/pages/xlat/builtin.adoc
index f236a57..10d3148 100644
--- a/doc/antora/modules/unlang/pages/xlat/builtin.adoc
+++ b/doc/antora/modules/unlang/pages/xlat/builtin.adoc
@@ -782,7 +782,7 @@ Return named subcapture value from the last regular expression evaluated.
 
 Results of named capture groups are available using the `%{regex:<named capture
 group>}` expansion. They will also be accessible using the numbered expansions
-described xref:builtin.adoc#_0_32[above].
+described xref:#_0_32[above].
 
 Every time a regular expression is evaluated, whether it matches or not,
 the named capture group values will be cleared.