update help text of CONVERT_ADD spreadsheet function

1 files changed, 173 insertions, 21 deletions

diff --git a/helpcontent2/source/text/scalc/01/04060116.xhp b/helpcontent2/source/text/scalc/01/04060116.xhp
index 47fe5a9a34..03c4eefbba 100644
--- a/helpcontent2/source/text/scalc/01/04060116.xhp
+++ b/helpcontent2/source/text/scalc/01/04060116.xhp
@@ -409,7 +409,7 @@
                   <paragraph xml-lang="en-US" id="par_id3147512" role="tablecontent" l10n="U" oldref="179">Weight</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3148476" role="tablecontent" l10n="U" oldref="180">g, sg, lbm, u, ozm, stone, ton, grain, pweight, hweight, shweight</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3148476" role="tablecontent" l10n="U" oldref="180"><emph>g</emph>, sg, lbm, <emph>u</emph>, ozm, stone, ton, grain, pweight, hweight, shweight, brton</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -417,7 +417,7 @@
                   <paragraph xml-lang="en-US" id="par_id3155361" role="tablecontent" l10n="U" oldref="181">Length</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3148925" role="tablecontent" l10n="U" oldref="182">m, mi, Nmi, in, ft, yd, ang, Pica, ell, parsec</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3148925" role="tablecontent" l10n="U" oldref="182"><emph>m</emph>, mi, Nmi, in, ft, yd, ang, Pica, ell, <emph>parsec</emph>, <emph>lightyear</emph>, survey_mi</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -425,7 +425,7 @@
                   <paragraph xml-lang="en-US" id="par_id3158429" role="tablecontent" l10n="U" oldref="183">Time</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3150707" role="tablecontent" l10n="U" oldref="184">yr, day, hr, mn, sec</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3150707" role="tablecontent" l10n="U" oldref="184">yr, day, hr, mn, <emph>sec</emph>, <emph>s</emph></paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -433,7 +433,7 @@
                   <paragraph xml-lang="en-US" id="par_id3153238" role="tablecontent" l10n="U" oldref="185">Pressure</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3166437" role="tablecontent" l10n="U" oldref="186">Pa, atm, mmHg, Torr, psi</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3166437" role="tablecontent" l10n="U" oldref="186"><emph>Pa</emph>, <emph>atm</emph>, <emph>at</emph>, <emph>mmHg</emph>, Torr, psi</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -441,7 +441,7 @@
                   <paragraph xml-lang="en-US" id="par_id3152944" role="tablecontent" l10n="U" oldref="187">Force</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3155582" role="tablecontent" l10n="U" oldref="188">N, dyn, pond</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3155582" role="tablecontent" l10n="U" oldref="188"><emph>N</emph>, <emph>dyn</emph>, <emph>dy</emph>, lbf, <emph>pond</emph></paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -449,7 +449,7 @@
                   <paragraph xml-lang="en-US" id="par_id3153686" role="tablecontent" l10n="U" oldref="189">Energy</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3153386" role="tablecontent" l10n="U" oldref="190">J, e, c, cal, eV, HPh, Wh, BTU</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3153386" role="tablecontent" l10n="U" oldref="190"><emph>J</emph>, <emph>e</emph>, <emph>c</emph>, <emph>cal</emph>, <emph>eV</emph>, <emph>ev</emph>, HPh, <emph>Wh</emph>, <emph>wh</emph>, flb, BTU, btu</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -457,7 +457,7 @@
                   <paragraph xml-lang="en-US" id="par_id3154100" role="tablecontent" l10n="U" oldref="191">Power</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3149915" role="tablecontent" l10n="U" oldref="192">W, HP, PS</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3149915" role="tablecontent" l10n="U" oldref="192"><emph>W</emph>, <emph>w</emph>, HP, PS</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -465,7 +465,7 @@
                   <paragraph xml-lang="en-US" id="par_id3148988" role="tablecontent" l10n="U" oldref="193">Field strength</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3148616" role="tablecontent" l10n="U" oldref="194">T, ga</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3148616" role="tablecontent" l10n="U" oldref="194"><emph>T</emph>, <emph>ga</emph></paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -473,7 +473,7 @@
                   <paragraph xml-lang="en-US" id="par_id3151120" role="tablecontent" l10n="U" oldref="195">Temperature</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3148659" role="tablecontent" l10n="U" oldref="196">C, F, K, Reau, Rank</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3148659" role="tablecontent" l10n="U" oldref="196">C, F, <emph>K</emph>, <emph>kel</emph>, Reau, Rank</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -481,7 +481,7 @@
                   <paragraph xml-lang="en-US" id="par_id3154610" role="tablecontent" l10n="U" oldref="197">Volume</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3149423" role="tablecontent" l10n="U" oldref="198">l, tsp, tbs, oz, cup, pt, qt, gal, m3, mi3, Nmi3, in3, ft3, yd3, ang3, Pica3, barrel, bushel, regton, Schooner, Middy, Glass</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3149423" role="tablecontent" l10n="U" oldref="198"><emph>l</emph>, <emph>L</emph>, <emph>lt</emph>, tsp, tbs, oz, cup, pt, us_pt, qt, gal, <emph>m3</emph>, mi3, Nmi3, in3, ft3, yd3, ang3, Pica3, barrel, bushel, regton, Schooner, Middy, Glass</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -489,7 +489,7 @@
                   <paragraph xml-lang="en-US" id="par_id3149244" role="tablecontent" l10n="U" oldref="199">Area</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3150425" role="tablecontent" l10n="U" oldref="200">m2, mi2, Nmi2, in2, ft2, yd2, ang2, Pica2, Morgen, ar, acre, ha</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3150425" role="tablecontent" l10n="U" oldref="200"><emph>m2</emph>, mi2, Nmi2, in2, ft2, yd2, <emph>ang2</emph>, Pica2, Morgen, <emph>ar</emph>, acre, ha</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
@@ -497,40 +497,193 @@
                   <paragraph xml-lang="en-US" id="par_id3150629" role="tablecontent" l10n="U" oldref="201">Speed</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3159246" role="tablecontent" l10n="U" oldref="202">m/s, m/h, mph, kn, admkn</paragraph>
+                       <paragraph xml-lang="en-US" id="par_id3159246" role="tablecontent" l10n="U" oldref="202"><emph>m/s</emph>, <emph>m/sec</emph>, m/h, mph, kn, admkn</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3150789" role="tablecontent" l10n="U" oldref="201">Information</paragraph>
+               </tablecell>
+               <tablecell>
+                       <paragraph xml-lang="en-US" id="par_id3159899" role="tablecontent" l10n="U" oldref="202"><emph>bit</emph>, <emph>byte</emph></paragraph>
                </tablecell>
             </tablerow>
          </table>
 
-         <paragraph xml-lang="en-US" id="par_id3143277" role="paragraph" l10n="U" oldref="203">Each unit of measure can be preceded by a prefix character from the following list:</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3143277" role="paragraph" l10n="U" oldref="203">Units of measure in <emph>bold</emph> can be preceded by a prefix character from the following list:</paragraph>
          <table id="tbl_id3144759">
             <tablerow>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="204">Permitted prefix characters</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="204">Prefix</paragraph>
                </tablecell>
                <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3148423" role="tablehead">Multiplier</paragraph>
 </tablecell>
             </tablerow>
             <tablerow>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3149490" role="tablecontent" l10n="U" oldref="205">10^(&lt;0)</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3149490" role="tablecontent">Y (yotta)</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3149931" role="tablecontent" l10n="U" oldref="206">d, c, m, u, n, p, f, a, z, y</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3149931" role="tablecontent">10^24</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3149589" role="tablecontent" l10n="U" oldref="207">10^(&gt;0)</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3149491" role="tablecontent">Z (zetta)</paragraph>
                </tablecell>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id3151248" role="tablecontent" l10n="U" oldref="208">e, h, k, M, G, T, P, E, Z, Y</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3149932" role="tablecontent">10^21</paragraph>
                </tablecell>
             </tablerow>
             <tablerow>
                <tablecell>
-                  <paragraph xml-lang="en-US" id="par_id0908200903061174" role="tablecontent" l10n="NEW">Information units "bit" and "byte" may also be prefixed by one of the following IEC 60027-2 / IEEE 1541 prefixes:</paragraph>
+                  <paragraph xml-lang="en-US" id="par_id3149492" role="tablecontent">E (exa)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149933" role="tablecontent">10^18</paragraph>
                </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149493" role="tablecontent">P (peta)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149934" role="tablecontent">10^15</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149494" role="tablecontent">T (tera)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149935" role="tablecontent">10^12</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149495" role="tablecontent">G (giga)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149936" role="tablecontent">10^9</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149496" role="tablecontent">M (mega)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149937" role="tablecontent">10^6</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149497" role="tablecontent">k (kilo)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149938" role="tablecontent">10^3</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149498" role="tablecontent">h (hecto)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149939" role="tablecontent">10^2</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149499" role="tablecontent">e (deca)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149940" role="tablecontent">10^1</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149500" role="tablecontent">d (deci)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3143940" role="tablecontent">10^-1</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149501" role="tablecontent">c (centi)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149941" role="tablecontent">10^-2</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149502" role="tablecontent">m (milli)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149942" role="tablecontent">10^-3</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149503" role="tablecontent">u (micro)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149943" role="tablecontent">10^-6</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149504" role="tablecontent">n (nano)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149944" role="tablecontent">10^-9</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149505" role="tablecontent">p (pico)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149945" role="tablecontent">10^-12</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149506" role="tablecontent">f (femto)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149946" role="tablecontent">10^-15</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149507" role="tablecontent">a (atto)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149947" role="tablecontent">10^-18</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149508" role="tablecontent">z (zepto)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149948" role="tablecontent">10^-21</paragraph>
+               </tablecell>
+            </tablerow>
+            <tablerow>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149509" role="tablecontent">y (yocto)</paragraph>
+               </tablecell>
+               <tablecell>
+                  <paragraph xml-lang="en-US" id="par_id3149949" role="tablecontent">10^-24</paragraph>
+               </tablecell>
+            </tablerow>
+         </table>
+         <paragraph xml-lang="en-US" id="par_id0908200903061174" role="paragraph">Information units "bit" and "byte" may also be prefixed by one of the following IEC 60027-2 / IEEE 1541 prefixes:</paragraph>
+         <table id="tbl_id3144749">
+            <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id0908200903090966" role="code" l10n="NEW">ki kibi 1024</paragraph>
                   <paragraph xml-lang="en-US" id="par_id0908200903090958" role="code" l10n="NEW">Mi mebi 1048576</paragraph>
@@ -553,7 +706,6 @@
             <emph>FromUnit</emph> is the unit from which conversion is taking place.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153790" role="paragraph" l10n="U" oldref="213">
             <emph>ToUnit</emph> is the unit to which conversion is taking place. Both units must be of the same type.</paragraph>
-<paragraph xml-lang="en-US" id="par_id09022809540918" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_CONVERT_ADD_function">Current list of CONVERT_ADD units in the OpenOffice.org Wiki.</link></paragraph>
          <paragraph xml-lang="en-US" id="hd_id3156270" role="heading" level="3" l10n="U"
                     oldref="214">Examples</paragraph>
          <paragraph xml-lang="en-US" id="par_id3156336" role="paragraph" l10n="U" oldref="215">
@@ -592,4 +744,4 @@
          <embed href="text/scalc/01/04060100.xhp#drking"/>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>