source/text/scalc/01/04060110.xhp | 8 ++++---- source/text/shared/00/00000005.xhp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 6d4b675ebf4144666c5d832a97173ae5545c02e5 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Wed Jun 22 09:21:16 2022 +0200 Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com> CommitDate: Sat Jun 25 19:02:49 2022 +0200 Numeral systems are "based" on digits, not numbers nor characters Change-Id: I9c411fe39e81d734d68c9e98253b3d125978f3bc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136239 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> (cherry picked from commit a9daf1b47b52f675225f31843b67e186a140845b) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136426 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/source/text/scalc/01/04060110.xhp b/source/text/scalc/01/04060110.xhp index 049999574..ff904317f 100644 --- a/source/text/scalc/01/04060110.xhp +++ b/source/text/scalc/01/04060110.xhp @@ -110,7 +110,7 @@ <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> <paragraph id="par_id3155743" role="code" xml-lang="en-US">BASE(Number; Radix [; MinimumLength])</paragraph> <paragraph id="par_id3151339" role="paragraph" xml-lang="en-US"> <emph>Number</emph> is the positive integer to be converted.</paragraph> -<paragraph id="par_id3159262" role="paragraph" xml-lang="en-US"> <emph>Radix</emph> indicates the base of the number system. It may be any positive integer between 2 and 36.</paragraph> +<paragraph id="par_id3159262" role="paragraph" xml-lang="en-US"> <emph>Radix</emph> indicates the base of the numeral system. It may be any positive integer between 2 and 36.</paragraph> <paragraph id="par_id3148746" role="paragraph" xml-lang="en-US"> <emph>MinimumLength</emph> (optional) determines the minimum length of the character sequence that has been created. If the text is shorter than the indicated minimum length, zeros are added to the left of the string.</paragraph> <embed href="text/scalc/01/common_func.xhp#sectionexample"/> @@ -212,13 +212,13 @@ <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_DEZIMAL" id="bm_id3150338" localize="false"/> <h2 id="hd_id3145166">DECIMAL</h2> -<paragraph id="par_id3156361" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_DEZIMAL">Converts text that represents a number in a <link href="text/shared/00/00000005.xhp#number_system" name="number system">number system</link> with the given base radix to a positive integer.</ahelp> The radix must be in the range 2 to 36. Spaces and tabs are ignored. The <emph>Text</emph> field is not case-sensitive.</paragraph> -<paragraph id="par_id3157994" role="paragraph" xml-lang="en-US">If the radix is 16, a leading x or X or 0x or 0X, and an appended h or H, are disregarded. If the radix is 2, an appended b or B is disregarded. Other characters that do not belong to the number system generate an error.</paragraph> +<paragraph id="par_id3156361" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_DEZIMAL">Converts text that represents a number in a <link href="text/shared/00/00000005.xhp#number_system" name="numeral system">numeral system</link> with the given base radix to a positive integer.</ahelp> The radix must be in the range 2 to 36. Spaces and tabs are ignored. The <emph>Text</emph> field is not case-sensitive.</paragraph> +<paragraph id="par_id3157994" role="paragraph" xml-lang="en-US">If the radix is 16, a leading x or X or 0x or 0X, and an appended h or H, are disregarded. If the radix is 2, an appended b or B is disregarded. Other characters that do not belong to the numeral system generate an error.</paragraph> <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/> <paragraph id="par_id3154328" role="code" xml-lang="en-US">DECIMAL("Text"; Radix)</paragraph> <paragraph id="par_id3150128" role="paragraph" xml-lang="en-US"> <emph>Text</emph> is the text to be converted.</paragraph> -<paragraph id="par_id3145241" role="paragraph" xml-lang="en-US"> <emph>Radix</emph> indicates the base of the number system. It may be any positive integer between 2 and 36.</paragraph> +<paragraph id="par_id3145241" role="paragraph" xml-lang="en-US"> <emph>Radix</emph> indicates the base of the numeral system. It may be any positive integer between 2 and 36.</paragraph> <embed href="text/scalc/01/common_func.xhp#sectionexample"/> <paragraph id="par_id3145355" role="paragraph" xml-lang="en-US"> <item type="input">=DECIMAL("17";10)</item> returns 17.</paragraph> diff --git a/source/text/shared/00/00000005.xhp b/source/text/shared/00/00000005.xhp index bb23d6002..eb8367579 100644 --- a/source/text/shared/00/00000005.xhp +++ b/source/text/shared/00/00000005.xhp @@ -170,8 +170,8 @@ </section> <section id="number_system"> - <h2 xml-lang="en-US" id="hd_id3154512">Number System</h2> - <paragraph xml-lang="en-US" id="par_id3157846" role="paragraph">A number system is determined by the number of characters available for representing numbers. The decimal system, for instance is based on the ten numbers (0..9), the binary system is based on the two numbers 0 and 1, the hexadecimal system is based on 16 characters (0...9 and A...F).</paragraph> + <h2 xml-lang="en-US" id="hd_id3154512">Numeral System</h2> + <paragraph xml-lang="en-US" id="par_id3157846" role="paragraph">A numeral system is determined by the number of digits available for representing numbers. The decimal system, for instance is based on the ten digits (0..9), the binary system is based on the two digits 0 and 1, the hexadecimal system is based on 16 digits (0...9 and A...F).</paragraph> </section> <section id="object">