[Libreoffice-commits] help.git: source/text
Steve Fanning (via logerrit)
logerrit at kemper.freedesktop.org
Fri Mar 20 22:59:27 UTC 2020
source/text/scalc/01/04060106.xhp | 16 +++++++---------
source/text/scalc/01/04060110.xhp | 4 ++--
source/text/scalc/01/ful_func.xhp | 26 +++++++++++++-------------
source/text/scalc/01/func_concat.xhp | 4 ++--
source/text/scalc/01/func_textjoin.xhp | 6 +++---
5 files changed, 27 insertions(+), 29 deletions(-)
New commits:
commit daf2f20d7b63e1fda11b3e28522ce8a3a4b0c067
Author: Steve Fanning <stevemfanning.wh at gmail.com>
AuthorDate: Fri Mar 20 18:52:27 2020 -0300
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Fri Mar 20 23:59:03 2020 +0100
tdf#131361 Correct param's GCD, LCM, PRODUCT
- Also re-label sections to a better mnemonic id's
Change-Id: I7b54216891116e9e9bb515d20218955b3d92fff9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/90848
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp
index a5d890e09..46deb1449 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -503,8 +503,8 @@
<paragraph id="par_id2769249" role="paragraph" xml-lang="en-US">The greatest common divisor is the positive largest integer which will divide, without remainder, each of the given integers.</paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3154524" role="code" xml-lang="en-US">GCD(Integer1; Integer2; ...; Integer30)</paragraph>
-<paragraph id="par_id3149340" role="paragraph" xml-lang="en-US"><emph>Integer1 To 30</emph> are up to 30 integers whose greatest common divisor is to be calculated.</paragraph>
+<paragraph id="par_id3154524" role="code" xml-lang="en-US">GCD(<embedvar href="text/scalc/01/ful_func.xhp#integer255_1" markup="keep"/>)</paragraph>
+<embed href="text/scalc/01/ful_func.xhp#integer255"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3151285" role="paragraph" xml-lang="en-US"><item type="input">=GCD(16;32;24) </item>gives the result 8, because 8 is the largest number that can divide 16, 24 and 32 without a remainder.</paragraph>
@@ -543,11 +543,11 @@
<paragraph id="par_id3146814" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_KGV">Returns the least common multiple of one or more integers.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3147279" role="code" xml-lang="en-US">LCM(Integer1; Integer2; ...; Integer30)</paragraph>
-<paragraph id="par_id3156348" role="paragraph" xml-lang="en-US"><emph>Integer1 to 30</emph> are up to 30 integers whose lowest common multiple is to be calculated.</paragraph>
+<paragraph id="par_id3147279" role="code" xml-lang="en-US">LCM(<embedvar href="text/scalc/01/ful_func.xhp#integer255_1" markup="keep"/>)</paragraph>
+<embed href="text/scalc/01/ful_func.xhp#integer255"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
-<paragraph id="par_id3154914" role="paragraph" xml-lang="en-US">If you enter the numbers <item type="input">512</item>;<item type="input">1024</item> and <item type="input">2000</item> in the Integer 1;2 and 3 text boxes, 128000 will be returned as the result.</paragraph>
+<paragraph id="par_id3154914" role="paragraph" xml-lang="en-US">If you enter the numbers 512; 1024 and 2000 as Integer 1;2 and 3, then 128000 will be returned.</paragraph>
</section>
<section id="Section38">
@@ -884,10 +884,8 @@
<paragraph id="par_id3144414" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_PRODUKT">Multiplies all the numbers given as arguments and returns the product.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3144446" role="code" xml-lang="en-US">PRODUCT(Number1; Number2; ...; Number30)</paragraph>
-<paragraph id="par_id3144460" role="paragraph" xml-lang="en-US"><emph>Number1 to 30</emph> are up to 30 arguments whose product is to be calculated.</paragraph>
-<paragraph id="par_id1589098" role="paragraph" xml-lang="en-US">PRODUCT returns number1 * number2 * number3 * ...</paragraph>
-
+<paragraph id="par_id3144446" role="code" xml-lang="en-US">PRODUCT(<embedvar href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
+<embed href="text/scalc/01/ful_func.xhp#number255"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3144494" role="paragraph" xml-lang="en-US"><item type="input">=PRODUCT(2;3;4)</item> returns 24.</paragraph><comment>see also FACT, SUM</comment>
</section>
diff --git a/source/text/scalc/01/04060110.xhp b/source/text/scalc/01/04060110.xhp
index b9ad5ab2e..22b1e92fd 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -196,8 +196,8 @@
<paragraph id="par_id3154524" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_VERKETTEN">Combines several text strings into one string.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3155954" role="code" xml-lang="en-US">CONCATENATE( <embedvar href="text/scalc/01/ful_func.xhp#string256_1" markup="keep"/> )</paragraph>
-<embed href="text/scalc/01/ful_func.xhp#string256"/>
+<paragraph id="par_id3155954" role="code" xml-lang="en-US">CONCATENATE( <embedvar href="text/scalc/01/ful_func.xhp#string255_1" markup="keep"/> )</paragraph>
+<embed href="text/scalc/01/ful_func.xhp#string255"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3150008" role="paragraph" xml-lang="en-US"> <item type="input">=CONCATENATE("Good ";"Morning ";"Mrs. ";"Doe")</item> returns: Good Morning Mrs. Doe.</paragraph>
</section>
diff --git a/source/text/scalc/01/ful_func.xhp b/source/text/scalc/01/ful_func.xhp
index 35c1cab55..1d1e29f85 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -45,29 +45,29 @@
<section id="func_im_des">
<paragraph id="par_id29750345314640" role="paragraph" xml-lang="en-US">The result is presented in the string format and has the character "i" or "j" as an imaginary unit.</paragraph>
</section>
- <comment>256 arguments</comment>
- <paragraph role="paragraph" id="par_id71584446760037"><variable id="string256_1">String 1[; String 2][; … ;[String 255]]</variable></paragraph>
- <section id="string256">
+ <comment>255 arguments</comment>
+ <paragraph role="paragraph" id="par_id71584446760037"><variable id="string255_1">String 1[; String 2][; … ;[String 255]]</variable></paragraph>
+ <section id="string255">
<paragraph role="paragraph" id="par_id631556228516997"><emph>String 1[; String 2][; … ;[String 255]]</emph> are strings, references to cells or to cell ranges of strings.</paragraph>
</section>
- <paragraph role="paragraph" id="par_id401584447957914"><variable id="integer256_1">Integer 1[; Integer 2][; … ;[Integer 255]]</variable></paragraph>
- <section id="integer256">
+ <paragraph role="paragraph" id="par_id401584447957914"><variable id="integer255_1">Integer 1[; Integer 2][; … ;[Integer 255]]</variable></paragraph>
+ <section id="integer255">
<paragraph role="paragraph" id="par_id1001584395844941"><emph>Integer 1[; Integer 2][; … ;[Integer 255]]</emph> are integers, references to cells or to cell ranges of integers.</paragraph>
</section>
- <paragraph role="paragraph" id="par_id101584447970004"><variable id="number256_1">Number 1[; Number 2][; … ;[Number 255]]</variable></paragraph>
- <section id="number256">
+ <paragraph role="paragraph" id="par_id101584447970004"><variable id="number255_1">Number 1[; Number 2][; … ;[Number 255]]</variable></paragraph>
+ <section id="number255">
<paragraph role="paragraph" id="par_id931584395947010"><emph>Number 1[; Number 2][; … ;[Number 255]]</emph> are numbers, references to cells or to cell ranges of numbers.</paragraph>
</section>
- <paragraph role="paragraph" id="par_id291584447988879"><variable id="logical256_1">Logical 1[; Logical 2][; … ;[Logical 255]]</variable></paragraph>
- <section id="logical256">
+ <paragraph role="paragraph" id="par_id291584447988879"><variable id="logical255_1">Logical 1[; Logical 2][; … ;[Logical 255]]</variable></paragraph>
+ <section id="logical255">
<paragraph role="paragraph" id="par_id931584395957010"><emph>Logical 1[; Logical 2][; … ;[Logical 255]]</emph> are boolean values, references to cells or to cell ranges of logical values.</paragraph>
</section>
- <paragraph role="paragraph" id="par_id91584448008632"><variable id="complex256_1">Complex 1[; Complex 2][; … ;[Complex 255]]</variable></paragraph>
- <section id="complex256">
+ <paragraph role="paragraph" id="par_id91584448008632"><variable id="complex255_1">Complex 1[; Complex 2][; … ;[Complex 255]]</variable></paragraph>
+ <section id="complex255">
<paragraph role="paragraph" id="par_id931584335947010"><emph>Complex 1[; Complex 2][; … ;[Complex 255]]</emph> are complex numbers, references to cells or to cell ranges of complex numbers.</paragraph>
</section>
- <paragraph role="paragraph" id="par_id61584448028298"><variable id="reference256_1">Reference 1[; Reference 2][; … ;[Reference 255]]</variable></paragraph>
- <section id="reference256">
+ <paragraph role="paragraph" id="par_id61584448028298"><variable id="reference255_1">Reference 1[; Reference 2][; … ;[Reference 255]]</variable></paragraph>
+ <section id="reference255">
<paragraph role="paragraph" id="par_id431584335947010"><emph>Reference 1[; Reference 2][; … ;[Reference 255]]</emph> are references to cells.</paragraph>
</section>
</body>
diff --git a/source/text/scalc/01/func_concat.xhp b/source/text/scalc/01/func_concat.xhp
index d7d1dc7a4..d2beddb89 100644
--- a/source/text/scalc/01/func_concat.xhp
+++ b/source/text/scalc/01/func_concat.xhp
@@ -28,8 +28,8 @@
<paragraph role="paragraph" id="par_id461556226873963">When ranges are used, the cells are traversed row by row (from top to bottom) to concatenate.</paragraph>
<embed href="text/scalc/00/avail_release.xhp#5.2"/>
<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
- <paragraph role="code" id="par_id911556226813412">CONCAT( <embedvar href="text/scalc/01/ful_func.xhp#string256_1" markup="keep"/> )</paragraph>
- <embed href="text/scalc/01/ful_func.xhp#string256"/>
+ <paragraph role="code" id="par_id911556226813412">CONCAT( <embedvar href="text/scalc/01/ful_func.xhp#string255_1" markup="keep"/> )</paragraph>
+ <embed href="text/scalc/01/ful_func.xhp#string255"/>
<embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
<paragraph role="paragraph" id="par_id531556227248228"><input>=CONCAT("Hello ", A1:C3)</input> concatenates the string "Hello" with all strings in range <literal>A1:C3</literal>.</paragraph>
<section id="relatedtopics">
diff --git a/source/text/scalc/01/func_textjoin.xhp b/source/text/scalc/01/func_textjoin.xhp
index f2878ff7b..6e7221418 100644
--- a/source/text/scalc/01/func_textjoin.xhp
+++ b/source/text/scalc/01/func_textjoin.xhp
@@ -21,15 +21,15 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id581556228060864">
<bookmark_value>TEXTJOIN function</bookmark_value>
</bookmark>
- <h2 id="hd_id551556227727946"><variable id="textjoinfunct"><link href="text/scalc/01/func_textjoin.xhp" name="textjoinfunction">TEXTJOIN</link></variable></h2>
+ <h2 id="hd_id551556227727946"><variable id="textjoinfunct"><link href="text/scalc/01/func_textjoin.xhp" name="textjoinfunction">TEXTJOIN</link></variable></h2>
<paragraph id="par_id121556227727948" role="paragraph"><variable id="textjoinfunction"><ahelp hid=".">Concatenates one or more strings, and uses delimiters between them.</ahelp></variable></paragraph>
</section>
<embed href="text/scalc/00/avail_release.xhp#5.2"/>
<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
- <paragraph role="code" id="par_id541556228253979">TEXTJOIN( delimiter, skip_empty, <embedvar href="text/scalc/01/ful_func.xhp#string256_1" markup="keep"/> )</paragraph>
+ <paragraph role="code" id="par_id541556228253979">TEXTJOIN( delimiter, skip_empty, <embedvar href="text/scalc/01/ful_func.xhp#string255_1" markup="keep"/> )</paragraph>
<paragraph role="paragraph" id="par_id741556228390897"><emph>delimiter</emph> is a text string and can be a range.</paragraph>
<paragraph role="paragraph" id="par_id621556228397269"><emph>skip_empty</emph> is a logical (TRUE or FALSE, 1 or 0) argument. When TRUE, empty strings will be ignored.</paragraph>
- <embed href="text/scalc/01/ful_func.xhp#string256"/>
+ <embed href="text/scalc/01/ful_func.xhp#string255"/>
<paragraph role="paragraph" id="par_id1001556228523394">Ranges are traversed row by row (from top to bottom).</paragraph>
<paragraph role="paragraph" id="par_id81556228530082">If <emph>delimiter</emph> is a range, the range need not be of the same size as the number of strings to be joined.</paragraph>
<paragraph role="paragraph" id="par_id831556228543099">If there are more delimiters than strings to be joined, not all delimiters will be used.</paragraph>
More information about the Libreoffice-commits
mailing list