From ee0c1ae29df847c58023c2c179fc85be5a9e1b17 Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Wed, 6 Dec 2023 18:30:45 +0100 Subject: [PATCH] ODATA-1619: Consistently use "parameter" when describing canonical functions (#219) --- docs/odata-url-conventions/odata-url-conventions.html | 4 ++-- docs/odata-url-conventions/odata-url-conventions.md | 8 ++++---- odata-url-conventions/5 Query Options.md | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/odata-url-conventions/odata-url-conventions.html b/docs/odata-url-conventions/odata-url-conventions.html index cd6f79f42..e6a1713cd 100644 --- a/docs/odata-url-conventions/odata-url-conventions.html +++ b/docs/odata-url-conventions/odata-url-conventions.html @@ -1122,8 +1122,8 @@
5.1.1.5.7 s Edm.String substring(Edm.String,Edm.Int32,Edm.Int32) OrderedCollection substring(OrderedCollection,Edm.Int32) OrderedCollection substring(OrderedCollection,Edm.Int32,Edm.Int32) -

The two-argument substring function with string parameter values returns a substring of the first parameter string value, starting at the Nth character and finishing at the last character (where N is the second parameter integer value). The three-argument substring function with string parameter values returns a substring of the first parameter string value identified by selecting up to M characters starting at the Nth character (where N is the second parameter integer value and M is the third parameter integer value).

-

The two-argument substring function with ordered collection parameter values returns an ordered collection consisting of all items of the first collection starting at the Nth item and finishing at the last item. The three-argument substring function with ordered collection parameter values returns an ordered collection consisting of up to M items of the first collection starting at the Nth item (where N is the second parameter integer value and M is the third parameter integer value).

+

The two-parameter substring function with string parameter values returns a substring of the first parameter string value, starting at the Nth character and finishing at the last character (where N is the second parameter integer value). The three-parameter substring function with string parameter values returns a substring of the first parameter string value identified by selecting up to M characters starting at the Nth character (where N is the second parameter integer value and M is the third parameter integer value).

+

The two-parameter substring function with ordered collection parameter values returns an ordered collection consisting of all items of the first collection starting at the Nth item and finishing at the last item. The three-parameter substring function with ordered collection parameter values returns an ordered collection consisting of up to M items of the first collection starting at the Nth item (where N is the second parameter integer value and M is the third parameter integer value).

The start index N is zero-based.

If the start index N is larger than the length of the string/collection, an empty string/collection is returned.

If the length M is larger than the length of the remaining string/collection starting at the Nth character/item, as many characters/items as are available are returned.

diff --git a/docs/odata-url-conventions/odata-url-conventions.md b/docs/odata-url-conventions/odata-url-conventions.md index 30f9ed101..f312237c9 100644 --- a/docs/odata-url-conventions/odata-url-conventions.md +++ b/docs/odata-url-conventions/odata-url-conventions.md @@ -2166,19 +2166,19 @@ OrderedCollection substring(OrderedCollection,Edm.Int32) OrderedCollection substring(OrderedCollection,Edm.Int32,Edm.Int32) ``` -The two-argument `substring` function with string parameter values +The two-parameter `substring` function with string parameter values returns a substring of the first parameter string value, starting at the Nth character and finishing at the last character (where N is the second -parameter integer value). The three-argument `substring` function with +parameter integer value). The three-parameter `substring` function with string parameter values returns a substring of the first parameter string value identified by selecting up to M characters starting at the Nth character (where N is the second parameter integer value and M is the third parameter integer value). -The two-argument `substring` function with ordered collection parameter +The two-parameter `substring` function with ordered collection parameter values returns an ordered collection consisting of all items of the first collection starting at the Nth item and finishing at the last -item. The three-argument `substring` function with ordered collection +item. The three-parameter `substring` function with ordered collection parameter values returns an ordered collection consisting of up to M items of the first collection starting at the Nth item (where N is the second parameter integer value and M is the third parameter integer diff --git a/odata-url-conventions/5 Query Options.md b/odata-url-conventions/5 Query Options.md index 4621804f5..9707783e6 100644 --- a/odata-url-conventions/5 Query Options.md +++ b/odata-url-conventions/5 Query Options.md @@ -725,19 +725,19 @@ OrderedCollection substring(OrderedCollection,Edm.Int32) OrderedCollection substring(OrderedCollection,Edm.Int32,Edm.Int32) ``` -The two-argument `substring` function with string parameter values +The two-parameter `substring` function with string parameter values returns a substring of the first parameter string value, starting at the Nth character and finishing at the last character (where N is the second -parameter integer value). The three-argument `substring` function with +parameter integer value). The three-parameter `substring` function with string parameter values returns a substring of the first parameter string value identified by selecting up to M characters starting at the Nth character (where N is the second parameter integer value and M is the third parameter integer value). -The two-argument `substring` function with ordered collection parameter +The two-parameter `substring` function with ordered collection parameter values returns an ordered collection consisting of all items of the first collection starting at the Nth item and finishing at the last -item. The three-argument `substring` function with ordered collection +item. The three-parameter `substring` function with ordered collection parameter values returns an ordered collection consisting of up to M items of the first collection starting at the Nth item (where N is the second parameter integer value and M is the third parameter integer