From 30103d27ec76df9cadd5db6deae52fac05c4b062 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Tue, 20 Aug 2019 19:05:34 -0400 Subject: [PATCH] Rename predefined to built-in --- doc/antora/modules/unlang/nav.adoc | 2 +- doc/antora/modules/unlang/pages/regex.adoc | 2 +- .../unlang/pages/xlat/{predefined.adoc => builtin.adoc} | 6 +++--- doc/antora/modules/unlang/pages/xlat/index.adoc | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename doc/antora/modules/unlang/pages/xlat/{predefined.adoc => builtin.adoc} (99%) diff --git a/doc/antora/modules/unlang/nav.adoc b/doc/antora/modules/unlang/nav.adoc index 7e185d509321..be9d4a8a9a12 100644 --- a/doc/antora/modules/unlang/nav.adoc +++ b/doc/antora/modules/unlang/nav.adoc @@ -50,7 +50,7 @@ ** xref:xlat/index.adoc[String Expansion] *** xref:xlat/alternation.adoc[Alternation Syntax] -*** xref:xlat/predefined.adoc[Pre-defined Expansions] +*** xref:xlat/builtin.adoc[Built-in Expansions] *** xref:xlat/character.adoc[Single Letter Expansions] *** xref:xlat/attribute.adoc[Attribute References] *** xref:xlat/module.adoc[Module References] diff --git a/doc/antora/modules/unlang/pages/regex.adoc b/doc/antora/modules/unlang/pages/regex.adoc index 97bcbc9d57b7..bb89ce2f28b8 100644 --- a/doc/antora/modules/unlang/pages/regex.adoc +++ b/doc/antora/modules/unlang/pages/regex.adoc @@ -121,7 +121,7 @@ When using libpcre[2], named capture groups may also be accessed using the built-in expansion + `%{regex:}`. -Please see the xref:xlat/predefined.adoc#_0_32[xlat documentation] for +Please see the xref:xlat/builtin.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/unlang/pages/xlat/predefined.adoc b/doc/antora/modules/unlang/pages/xlat/builtin.adoc similarity index 99% rename from doc/antora/modules/unlang/pages/xlat/predefined.adoc rename to doc/antora/modules/unlang/pages/xlat/builtin.adoc index 1b0713495a52..eebc9f6215b9 100644 --- a/doc/antora/modules/unlang/pages/xlat/predefined.adoc +++ b/doc/antora/modules/unlang/pages/xlat/builtin.adoc @@ -1,7 +1,7 @@ -= Pre-defined Expansions += Built-In Expansions In addition to storing attribute references, the server has a number -of pre-defined expansions. These expansions act largely as functions +of built-in expansions. These expansions act largely as functions which operate on inputs, and produce an output. == Attribute Manipulation @@ -832,7 +832,7 @@ Return named subcapture value from the last regular expression evaluated. Results of named capture groups are available using the `%{regex:}` expansion. They will also be accessible using the numbered expansions -described xref:predefined.adoc#_0_32[above]. +described xref:builtin.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/unlang/pages/xlat/index.adoc b/doc/antora/modules/unlang/pages/xlat/index.adoc index ae03008ab4c9..cdea99408fb1 100644 --- a/doc/antora/modules/unlang/pages/xlat/index.adoc +++ b/doc/antora/modules/unlang/pages/xlat/index.adoc @@ -19,8 +19,8 @@ expansion can be many things: | xref:xlat/attribute.adoc[attributes] | Expand the value of a named attribute. | xref:xlat/character.adoc[single character] | Single character expansions. | xref:xlat/module.adoc[modules] | Pass a string to a module such as `sql`. -| xref:xlat/alternation.adoc[condition] | Conditionally expand a string. -| xref:xlat/predefined.adoc[pre-defined expansions] | Such as string length, lowercase strings, etc. +| xref:xlat/alternation.adoc[condition] | Conditionally expand a string. +| xref:xlat/builtin.adoc[built-in expansions] | Such as string length, tolower, etc... |===== This feature is used to create policies which refer to concepts rather