[Libreoffice-commits] help.git: 2 commits - source/text

Mon Apr 23 11:45:26 UTC 2018

source/text/scalc/01/05120000.xhp      |   10 +++++-----
 source/text/scalc/01/func_roundsig.xhp |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit cc09d26f79acdb4c488fbc54fd51325f1b9dfbb7
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date:   Sun Apr 22 23:27:41 2018 +0100

    Fix in conditional format help page external link
    
    Change-Id: Id70b5549c02abaa650c9d8ba8c9a23872b7f2f33
    Reviewed-on: https://gerrit.libreoffice.org/53301
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/scalc/01/05120000.xhp b/source/text/scalc/01/05120000.xhp
index 39d042419..39b241163 100644
--- a/source/text/scalc/01/05120000.xhp
+++ b/source/text/scalc/01/05120000.xhp
@@ -49,6 +49,9 @@
 <paragraph xml-lang="en-US" id="hd_id31531891" role="heading" level="2">Condition</paragraph>
       <paragraph xml-lang="en-US" id="par_id31494131" role="paragraph">You can define as many conditions as you want.</paragraph>
       <paragraph xml-lang="en-US" id="par_id31494132" role="paragraph">Specify if conditional formatting is dependent on one of the entry listed on the drop down box:</paragraph>
+      <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/add" id="bm_id5008051" localize="false"/>
+      <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/delete" id="bm_id5008052" localize="false"/>
+      <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/edassign" id="bm_id5008055" localize="false"/>
       <list type="unordered">
       <listitem>
           <paragraph xml-lang="en-US" id="par_id31494133" role="listitem">If you select <emph>All cells</emph>, see Color Scale, Data Bar or Icon Set
@@ -65,12 +68,9 @@
               <paragraph xml-lang="en-US" id="par_id31494136" role="listitem">In front of <emph>Apply Styles</emph>, select the desired style in the list or chose <emph>New Style</emph> to create one.</paragraph>
           </listitem>
           <listitem>
-            <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/add" id="bm_id5008051" localize="false"/>
-            <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/delete" id="bm_id5008052" localize="false"/>
               <paragraph xml-lang="en-US" id="par_id31494137" role="listitem"><ahelp hid=".">Click the <emph>Add</emph> button to add another condition, click the <emph>Remove</emph> button to remove a condition.</ahelp></paragraph>
           </listitem>
           <listitem>
-            <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/edassign" id="bm_id5008055" localize="false"/>
               <paragraph xml-lang="en-US" id="par_id31494138" role="listitem"><ahelp hid=".">In the <emph>Range</emph> field, define the range of cells concerned by the conditional formatting.</ahelp> Click on the <emph>Shrink</emph> button to minimize the dialog box. Click again on the button to come back to the dialog box once the range is selected.</paragraph>
           </listitem>
           </list>
@@ -90,7 +90,7 @@
 Apply a color scale to a range consist of displaying a bicolor or tricolor gradient on this range depending on the value of each cell. A typical example might be an array of temperatures, lower blue colored, warmer red with a gradient nuances to the intermediate values.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155603" role="paragraph">You must choose the two "extreme" colors indicate the method of calculation. The calculation of the color applied will be made in relation to: Min - Max - Percentile - Value - Percent - Formula.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155604" role="paragraph">The choices Min and Max are sufficient to themselves as found in the range. Other options need to be specified by a value (Percentile, Value, Percentage) or a cell reference or formula (Formula).</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155605" role="paragraph">For a detailed explanation and examples, please visit <link href="https://wiki.documentfoundation.org/Faq/Calc/142">How to apply a Color Scale Conditional Formatting page in TDF Wiki</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155605" role="paragraph">For a detailed explanation and examples, please visit <link href="https://wiki.documentfoundation.org/Faq/Calc/142">How to apply a Color Scale Conditional Formatting page</link> in TDF Wiki.</paragraph>
 
 <paragraph xml-lang="en-US" id="hd_id3153709" role="heading" level="2">Icon Set</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153764" role="paragraph">It is desired to plot the position of a value relative to the thresholds. The set of icons will help to indicate the thresholds and choose the type of icons. Available icon sets are:</paragraph>
@@ -121,7 +121,7 @@ Apply a color scale to a range consist of displaying a bicolor or tricolor gradi
 </listitem>
 </list>
       <paragraph xml-lang="en-US" id="par_id3153765" role="paragraph">Conditions to display each icon can be specified relative to a value (Value), a percentage of the number of values in the range (Percentage) as a percentage of range values (Percentile) or formula (Formula).</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155606" role="paragraph">For a detailed explanation and examples, please visit <link href="https://wiki.documentfoundation.org/Faq/Calc/141">How to use Icon Set Conditional Formatting page in TDF Wiki</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155606" role="paragraph">For a detailed explanation and examples, please visit <link href="https://wiki.documentfoundation.org/Faq/Calc/141">How to use Icon Set Conditional Formatting page</link> in TDF Wiki.</paragraph>
 
 <paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="2">Dates</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145228" role="paragraph">This option will apply a defined style depending on a date that you choose in the drop down box: Today - Yesterday - Tomorrow - Last 7 days - This week - Last week.</paragraph>
commit 20f5204fb81945fc6c282f7322cd16290de1efd4
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date:   Sun Apr 22 23:13:07 2018 +0100

    Fix example for ROUNDSIG
    
    Change-Id: I35699a995e8c6b751337d90e471f258f0c55bb16
    Reviewed-on: https://gerrit.libreoffice.org/53300
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/scalc/01/func_roundsig.xhp b/source/text/scalc/01/func_roundsig.xhp
index 5e89a9762..bf0a0884e 100644
--- a/source/text/scalc/01/func_roundsig.xhp
+++ b/source/text/scalc/01/func_roundsig.xhp
@@ -33,8 +33,8 @@
     <embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
 
     <paragraph role="paragraph" id="par_id691519155470333" xml-lang="en-US"><item type="input">=ROUNDSIG(123.456789; 5)</item> returns 123.46.</paragraph>
-    <paragraph role="paragraph" id="par_id821519155475673" xml-lang="en-US"><item type="input">=ROUNDSIG(0.000123456789; 5)</item> returns 1.2346E-4</paragraph>
-    <paragraph role="paragraph" id="par_id381519155481234" xml-lang="en-US"><item type="input">=ROUNDSIG(123456789012345; 2)</item> returns 1.2E13</paragraph>
+    <paragraph role="paragraph" id="par_id821519155475673" xml-lang="en-US"><item type="input">=ROUNDSIG(0.000123456789; 5)</item> returns 0.00012346</paragraph>
+    <paragraph role="paragraph" id="par_id381519155481234" xml-lang="en-US"><item type="input">=ROUNDSIG(123456789012345; 2)</item> returns 1.2E14</paragraph>
     <paragraph role="paragraph" id="par_id231519155486155" xml-lang="en-US"><item type="input">=ROUNDSIG(123456789; 4)</item> returns 123500000 or 123.5E6</paragraph>
     <section id="relatedtopics">
         <paragraph role="paragraph" id="par_id51519156941987" xml-lang="en-US">See also <link href="text/scalc/01/04060106.xhp#Section21" name="ROUND function">ROUND</link>, <link href="text/scalc/01/04060106.xhp#Section7" name="MROUND function">MROUND</link>, <link href="text/scalc/01/04060106.xhp#Section19" name="ROUNDUP function">ROUNDUP</link>, <link href="text/scalc/01/04060106.xhp#Section20" name="ROUNDDOWN function">ROUNDDOWN</link>.</paragraph>
