[Libreoffice-commits] help.git: Branch 'libreoffice-6-2' - source/text

[Libreoffice Gerrit user]

 source/text/scalc/01/func_regex.xhp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0afeaf5e8ace28ccb5365ffdc763197f8084fb50
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Nov 30 07:16:19 2018 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Sat Dec 1 20:35:12 2018 +0100

    REGEX: correct ICU URL to use http, not https (which seems unavailable)
    
    Change-Id: Iaeed0d81dc88418c2bffab730fd682ca8cb3b101
    Reviewed-on: https://gerrit.libreoffice.org/64313
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit f9566b6655aad0408724c4df65178f43c3e3d4f8)
    Reviewed-on: https://gerrit.libreoffice.org/64400

diff --git a/source/text/scalc/01/func_regex.xhp b/source/text/scalc/01/func_regex.xhp
index bd08223d5..c733abc95 100644
--- a/source/text/scalc/01/func_regex.xhp
+++ b/source/text/scalc/01/func_regex.xhp
@@ -29,7 +29,7 @@
     <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
     <paragraph role="code" id="par_id701542231253817" xml-lang="en-US">REGEX( Text ; Expression [ ; [ Replacement ] [ ; Flags|Occurrence ] ] )</paragraph>
     <paragraph role="paragraph" id="par_id621542232197446" xml-lang="en-US"><emph>Text</emph>: A text or reference to a cell where the regular expression is to be applied.</paragraph>
-    <paragraph role="paragraph" id="par_id211542232209275" xml-lang="en-US"><emph>Expression</emph>: A text representing the regular expression, using <link href="https://userguide.icu-project.org/strings/regexp" name="ICU REGEXP">ICU regular expressions</link>. If there is no match and <emph>Replacement</emph> is not given, #N/A is returned.</paragraph>
+    <paragraph role="paragraph" id="par_id211542232209275" xml-lang="en-US"><emph>Expression</emph>: A text representing the regular expression, using <link href="http://userguide.icu-project.org/strings/regexp" name="ICU REGEXP">ICU regular expressions</link>. If there is no match and <emph>Replacement</emph> is not given, #N/A is returned.</paragraph>
     <paragraph role="paragraph" id="par_id581542232755604" xml-lang="en-US"><emph>Replacement</emph>: Optional. The replacement text and references to capture groups. If there is no match, <emph>Text</emph> is returned unmodified.</paragraph>
     <paragraph role="paragraph" id="par_id421542232246840" xml-lang="en-US"><emph>Flags</emph>: Optional. "g" replaces all matches of <emph>Expression</emph> in <emph>Text</emph>, not extracted. If there is no match, <emph>Text</emph> is returned unmodified.</paragraph>
     <paragraph role="paragraph" id="par_id421542232246841" xml-lang="en-US"><emph>Occurrence</emph>: Optional. Number to indicate which match of <emph>Expression</emph> in <emph>Text</emph> is to be extracted or replaced. If there is no match and <emph>Replacement</emph> is not given, #N/A is returned. If there is no match and <emph>Replacement</emph> is given, <emph>Text</emph> is returned unmodified. If <emph>Occurrence</emph> is 0, <emph>Text</emph> is returned unmodified.</paragraph>
@@ -41,7 +41,7 @@
     <paragraph role="paragraph" id="par_id371542291684178" xml-lang="en-US"><item type="input">=REGEX("axbxcxd";"(.)x";"$1y";2)</item>  returns "axbycxd", the second match of "(.)x" (i.e. "bx") replaced with the captured group of one character (i.e. "b") followed by "y".</paragraph>
     <section id="relatedtopics">
         <paragraph role="paragraph" id="par_id711542233602553" xml-lang="en-US"><link href="text/shared/01/02100001.xhp" name="regex lists">List of regular expressions</link></paragraph>
-        <paragraph role="paragraph" id="par_id431542233650614" xml-lang="en-US"><link href="https://userguide.icu-project.org/strings/regexp" name="ICU REGEXP">ICU regular expressions</link></paragraph>
+        <paragraph role="paragraph" id="par_id431542233650614" xml-lang="en-US"><link href="http://userguide.icu-project.org/strings/regexp" name="ICU REGEXP">ICU regular expressions</link></paragraph>
     </section>
 </body>
 </helpdocument>