fix xrefs

diff --git a/doc/antora/modules/reference/nav.adoc b/doc/antora/modules/reference/nav.adoc
index ce9ef6a42d91edea13e1e1f9aeb9a99462488147..e1bc529b19be65079eb89412c22074dae9cac421 100644 (file)
--- a/doc/antora/modules/reference/nav.adoc
+++ b/doc/antora/modules/reference/nav.adoc
@@ -103,7 +103,7 @@
 **** xref:xlat/misc/config.adoc[Server Configuration]
 **** xref:xlat/misc/length.adoc[length]
 **** xref:xlat/misc/misc.adoc[Miscellaneous]
-**** xref:xlat/misc/pairs.print.adoc[pairs.print]
+**** xref:xlat/misc/pairs.adoc[pairs.print]
 **** xref:xlat/misc/rand.adoc[rand]
 
 *** xref:xlat/character.adoc[Single Letter Expansions]

diff --git a/doc/antora/modules/reference/pages/type/cast.adoc b/doc/antora/modules/reference/pages/type/cast.adoc
index 1a4ab573ff664cd2b92a814df3e80970e6b3e32c..aa4c867121b3f704a20e333154c810e0eb407dcf 100644 (file)
--- a/doc/antora/modules/reference/pages/type/cast.adoc
+++ b/doc/antora/modules/reference/pages/type/cast.adoc
@@ -159,7 +159,7 @@ causes the values to be merged together, The resulting string is
 `"19216801"`.
 
 If you need to add text in between each list entry, see the
-`%str.concat()` function in the xref:xlat/builtin/index.adoc[built-in
+`%str.concat()` function in the xref:xlat/all.adoc[built-in
 expansions] list.
 
 .Example Creating multiple Attributes

diff --git a/doc/antora/modules/reference/pages/unlang/condition/regex.adoc b/doc/antora/modules/reference/pages/unlang/condition/regex.adoc
index 23c528e61ceed73b84ed151bc59098edb3d87daa..23ec233328dc89fa27080d3ca332e2489368af46 100644 (file)
--- a/doc/antora/modules/reference/pages/unlang/condition/regex.adoc
+++ b/doc/antora/modules/reference/pages/unlang/condition/regex.adoc
@@ -113,7 +113,7 @@ library the server was built with.  Multiple flags may be specified per
 When the `=~` or `!~` operators are used, then parentheses in the regular
 expression will sub capture groups, which contain part of the subject string.
 
-The xref:xlat/builtin/miscellaneous/misc.adoc#_regex_match[%regex.match()] function expands to the portion of the subject tha
+The xref:xlat/misc/misc.adoc#_regex_match[%regex.match()] function expands to the portion of the subject tha
 matched. The expansions +
 `%regex.match(1)`..`%regex.match(32)` expand to the contents of any subcapture groups.
 
@@ -121,7 +121,7 @@ When using libpcre[2], named capture groups may also be accessed using the
 built-in expansion +
 `%regex.match(<named capture group>)`.
 
-Please see the xref:xlat/builtin/index.adoc#_0_32[xlat documentation] for
+Please see the xref:xlat/all.adoc#_0_32[xlat documentation] for
 more information on regular expression matching.
 
 .Extracting the 'user' portion of a realm qualified string

diff --git a/doc/antora/modules/reference/pages/xlat/all.adoc b/doc/antora/modules/reference/pages/xlat/all.adoc
index 01c62474a67c94e78abe6bcefbdd7dac8ffa0136..48d8a77d1ab3eaee76405bb1d2abd35eca97f2ba 100644 (file)
--- a/doc/antora/modules/reference/pages/xlat/all.adoc
+++ b/doc/antora/modules/reference/pages/xlat/all.adoc
@@ -7,13 +7,13 @@
 .Miscellaneous Functions
 [options="headers, autowidth]
 |===
-| *Function*                                                           | *Description*
+| *Function*                                       | *Description*
 | xref:xlat/misc/config.adoc[Server Configuration]  | Examine configuration items
 | xref:xlat/misc/length.adoc[length]               | Get the length of data
 | xref:xlat/misc/misc.adoc[Miscellaneous]          | Functions to execute regular expression search on string, using pattern.
 | xref:xlat/misc/pairs.adoc[pairs.print]           | print attributes with name and value.
-| xref:xlat/misc/rand.adoc[rand]                   | random integers|
-===
+| xref:xlat/misc/rand.adoc[rand]                   | random integers
+|===
 
 
 .File Handling Functions
@@ -32,7 +32,7 @@
 
 .String manipulation
 [options="header, autowidth"]
-|=====
+|===
 | *Function*                            | *Description*
 | xref:xlat/str/concat.adoc[concat]     | Concatenate strings with delimiters
 | xref:xlat/str/split.adoc[split]       | Split a string based on delimiters
@@ -42,4 +42,4 @@
 | xref:xlat/str/rand.adoc[rand]         | Return a random string based on input format
 | xref:xlat/str/lower.adoc[lower]       | Convert the input string to lowercase.
 | xref:xlat/str/upper.adoc[upper]       | Convert the input string to uppercase
-|=====
+|===

diff --git a/doc/antora/modules/reference/pages/xlat/character.adoc b/doc/antora/modules/reference/pages/xlat/character.adoc
index d4be7b53e0cb95294ce3877082ea370846f257f6..dce6d5d78bee302ae3a33af48e2ca59d8d58c091 100644 (file)
--- a/doc/antora/modules/reference/pages/xlat/character.adoc
+++ b/doc/antora/modules/reference/pages/xlat/character.adoc
@@ -2,7 +2,7 @@
 
 The following are single letter expansions.
 
-The xref:xlat/builtin/miscellaneous/misc.adoc[builtin] `%time(...)` expansion and the
+The `%time(...)` function and the
 xref:reference:raddb/mods-available/date.adoc[date] module should be used
 instead of these expansions.
 
@@ -34,7 +34,7 @@ unsigned decimal number, and returns an integer number of seconds
 since the Unix epoch.
 
 This expansion is only useful where the time resolution is in seconds.
-If more resolution is needed, the xref:xlat/builtin/index.adoc[builtin]
+If more resolution is needed, the xref:xlat/all.adoc[builtin]
 `%time(...)` expansion should be used instead.
 
 `%Y()`::

diff --git a/doc/antora/modules/reference/pages/xlat/function.adoc b/doc/antora/modules/reference/pages/xlat/function.adoc
index ec175c81fe9dd9cab548021586fe6f9ff441ed14..050ebc55c8989cf1b26f8c1f612be60bdce57fb0 100644 (file)
--- a/doc/antora/modules/reference/pages/xlat/function.adoc
+++ b/doc/antora/modules/reference/pages/xlat/function.adoc
@@ -8,7 +8,7 @@
 
 .Description
 Functions allow for complex expansions at run time.  There are many
-xref:xlat/builtin/index.adoc[built-in expansions].  Many modules also define
+xref:xlat/all.adoc[built-in expansions].  Many modules also define
 their own expansions.  The module-specific expansions are documented in each module.
 
 function:: The name of the function.  e.g. `md5` or `sql`, etc.

diff --git a/doc/antora/modules/reference/pages/xlat/index.adoc b/doc/antora/modules/reference/pages/xlat/index.adoc
index 1c136b59c03af507e08fcc68f84956e0785d32e0..894051c6be77ef67f722928b3c5c829d55084436 100644 (file)
--- a/doc/antora/modules/reference/pages/xlat/index.adoc
+++ b/doc/antora/modules/reference/pages/xlat/index.adoc
@@ -24,7 +24,7 @@ references, function calls, etc.  The table below gives more examples of expansi
 | xref:xlat/character.adoc[single character]        | Single character expansions.
 | xref:xlat/function.adoc[functions]                | Function call syntax.
 | xref:xlat/alternation.adoc[condition]             | Conditionally expand a string.
-| xref:xlat/builtin/index.adoc[built-in expansions]       | Functions as string length, tolower, etc...
+| xref:xlat/all.adoc[built-in expansions]       | Functions as string length, tolower, etc...
 |=====
 
 Expansions are used inside of

diff --git a/doc/antora/modules/reference/pages/xlat/misc/misc.adoc b/doc/antora/modules/reference/pages/xlat/misc/misc.adoc
index b129b94ef424a0c8397f2a24e5a0325560fd566e..e32e6f2988ab79676e5dc85432bbf1ab8b666598 100644 (file)
--- a/doc/antora/modules/reference/pages/xlat/misc/misc.adoc
+++ b/doc/antora/modules/reference/pages/xlat/misc/misc.adoc
@@ -26,7 +26,7 @@ Return named subcapture value from the last regular expression evaluated.
 
 Results of named capture groups are available using the `%regex.match(<named capture
 group>}` expansion. They will also be accessible using the numbered expansions
-described xref:xlat/builtin/miscellaneous/misc.adoc#_0_32[above].
+described xref:xlat/misc/misc.adoc#_0_32[above].
 
 Every time a regular expression is evaluated, whether it matches or not,
 the named capture group values will be cleared.

diff --git a/doc/antora/modules/reference/pages/xlat/str/concat.adoc b/doc/antora/modules/reference/pages/xlat/str/concat.adoc
index e7c5bc8affd2b3388cbad9d835cefb2ae56ffd65..368c2c3e3ecaae6cbd593e2878d84728f13c63fd 100644 (file)
--- a/doc/antora/modules/reference/pages/xlat/str/concat.adoc
+++ b/doc/antora/modules/reference/pages/xlat/str/concat.adoc
@@ -2,7 +2,7 @@
 
 Used to join two or more attributes, separated by an optional delimiter.
 
-This expansion is the inverse of xref:xlat/str/explode.adoc[explode].
+This expansion is the inverse of xref:xlat/str/split.adoc[split].
 
 .Return: _string_