[gnumeric] Doc fixes.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Doc fixes.
- Date: Wed, 29 Jul 2015 00:15:51 +0000 (UTC)
commit 23508572102f63fd97d5a4b2e41e8a6dd07eb952
Author: Morten Welinder <terra gnome org>
Date: Tue Jul 28 20:15:42 2015 -0400
Doc fixes.
doc/C/files-opening.xml | 2 +-
doc/C/files-saving.xml | 2 +-
doc/C/func.defs | 100 ++++++++++++++++++++++++++++-------------------
doc/C/functions.xml | 98 +++++++++++++++++++++++++++------------------
4 files changed, 121 insertions(+), 81 deletions(-)
---
diff --git a/doc/C/files-opening.xml b/doc/C/files-opening.xml
index 04efe24..03394e1 100644
--- a/doc/C/files-opening.xml
+++ b/doc/C/files-opening.xml
@@ -1058,7 +1058,7 @@
<entry> <literal>.sylk</literal> / <literal>.slk</literal></entry>
</row>
<row>
- <entry><link linkend="file-format-tab">Tab Separated Values</link></entry>
+ <entry><link linkend="file-format-csv">Tab Separated Values</link></entry>
<entry><literal>.tsv</literal> / <literal>.tab</literal></entry>
</row>
<row>
diff --git a/doc/C/files-saving.xml b/doc/C/files-saving.xml
index c7734c2..a56523b 100644
--- a/doc/C/files-saving.xml
+++ b/doc/C/files-saving.xml
@@ -1301,7 +1301,7 @@
<entry> <literal>.sylk</literal> / <literal>.slk</literal></entry>
</row>
<row>
- <entry><link linkend="file-format-tab">Tab Separated Values</link></entry>
+ <entry><link linkend="file-format-csv">Tab Separated Values</link></entry>
<entry><literal>.tsv</literal> / <literal>.tab</literal></entry>
</row>
<row>
diff --git a/doc/C/func.defs b/doc/C/func.defs
index 5371856..7da982e 100644
--- a/doc/C/func.defs
+++ b/doc/C/func.defs
@@ -1093,15 +1093,15 @@ Weight and mass:
Distance:
'm' Meter
'mi' Statute mile
- 'survey_mi' U.S. survey mile
+ 'survey_mi' U.S. survey mile
'Nmi' Nautical mile
'in' Inch
'ft' Foot
'yd' Yard
- 'ell' English Ell
+ 'ell' English Ell
'ang' Angstrom
- 'ly' Light-Year
- 'pc' Parsec
+ 'ly' Light-Year
+ 'pc' Parsec
'parsec' Parsec
'Pica' Pica Points
'Picapt' Pica Points
@@ -1121,14 +1121,12 @@ Pressure:
'atm' Atmosphere
'Pa' Pascal
'mmHg' mm of Mercury
-
- 'Torr' Torr
+ 'Torr' Torr
Force:
'N' Newton
'dyn' Dyne
- 'pond' Pond
-
+ 'pond' Pond
'lbf' Pound force
Energy:
@@ -1155,9 +1153,7 @@ Temperature:
'C' Degree Celsius
'F' Degree Fahrenheit
'K' Kelvin
-
'Rank' Degree Rankine
-
'Reau' Degree Réaumur
Volume (liquid measure):
@@ -1177,55 +1173,69 @@ Volume (liquid measure):
'regton' Registered ton
'MTON' Measurement ton (freight ton)
'l' Liter
-
- 'L' Liter
-
+ 'L' Liter
'lt' Liter
-
'ang3' Cubic Angstrom
-
'ang^3' Cubic Angstrom
-
'barrel' U.S. oil barrel (bbl)
-
'bushel' U.S. bushel
-
- 'ft3' Cubic feet
-
+ 'ft3' Cubic feet
'ft^3' Cubic feet
-
'in3' Cubic inch
-
'in^3' Cubic inch
-
- 'ly3' Cubic light-year
-
+ 'ly3' Cubic light-year
'ly^3' Cubic light-year
-
'm3' Cubic meter
-
'm^3' Cubic meter
-
'mi3' Cubic mile
-
'mi^3' Cubic mile
-
'yd3' Cubic yard
-
'yd^3' Cubic yard
-
'Nmi3' Cubic nautical mile
-
'Nmi^3' Cubic nautical mile
-
'Picapt3' Cubic Pica
-
- 'Picapt^3' Cubic Pica
-
+ 'Picapt^3' Cubic Pica
'Pica3' Cubic Pica
-
'Pica^3' Cubic Pica
+Area:
+ 'uk_acre' International acre
+ 'us_acre' U.S. survey/statute acre
+ 'ang2' Square angstrom
+ 'ang^2' Square angstrom
+ 'ar' Are
+ 'ha' Hectare
+ 'in2' Square inches
+ 'in^2' Square inches
+ 'ly2' Square light-year
+ 'ly^2' Square light-year
+ 'm2' Square meter
+ 'm^2' Square meter
+ 'Morgen' Morgen (North German Confederation)
+ 'mi2' Square miles
+ 'mi^2' Square miles
+ 'Nmi2' Square nautical miles
+ 'Nmi^2' Square nautical miles
+ 'Picapt2' Square Pica
+ 'Picapt^2' Square Pica
+ 'Pica2' Square Pica
+ 'Pica^2' Square Pica
+ 'yd2' Square yards
+ 'yd^2' Square yards
+
+Bits and Bytes:
+ 'bit' Bit
+ 'byte' Byte
+
+Speed:
+ 'admkn' Admiralty knot
+ 'kn' knot
+ 'm/h' Meters per hour
+ 'm/hr' Meters per hour
+ 'm/s' Meters per second
+ 'm/sec' Meters per second
+ 'mph' Miles per hour
+
For metric units any of the following prefixes can be used:
'Y' yotta 1E+24
'Z' zetta 1E+21
@@ -1234,12 +1244,12 @@ For metric units any of the following prefixes can be used:
'T' tera 1E+12
'G' giga 1E+09
'M' mega 1E+06
- 'k' kilo 1E+03
+ 'k' kilo 1E+03
'h' hecto 1E+02
'e' deca (deka) 1E+01
'd' deci 1E-01
'c' centi 1E-02
- 'm' milli 1E-03
+ 'm' milli 1E-03
'u' micro 1E-06
'n' nano 1E-09
'p' pico 1E-12
@@ -1247,6 +1257,16 @@ For metric units any of the following prefixes can be used:
'a' atto 1E-18
'z' zepto 1E-21
'y' yocto 1E-24
+
+For bits and bytes any of the following prefixes can be also be used:
+ 'Yi' yobi 2^80
+ 'Zi' zebi 2^70
+ 'Ei' exbi 2^60
+ 'Pi' pebi 2^50
+ 'Ti' tebi 2^40
+ 'Gi' gibi 2^30
+ 'Mi' mebi 2^20
+ 'ki' kibi 2^10
@NOTE=If @{from} and @{to} are different types, CONVERT returns #N/A!
@EXCEL=This function is Excel compatible (except "picapt").
@ODF=This function is OpenFormula compatible.
diff --git a/doc/C/functions.xml b/doc/C/functions.xml
index 5e68d18..5a68aa2 100644
--- a/doc/C/functions.xml
+++ b/doc/C/functions.xml
@@ -3966,15 +3966,15 @@
<para>Distance:</para>
<para> 'm' Meter</para>
<para> 'mi' Statute mile</para>
- <para> 'survey_mi' U.S. survey mile</para>
+ <para> 'survey_mi' U.S. survey mile</para>
<para> 'Nmi' Nautical mile</para>
<para> 'in' Inch</para>
<para> 'ft' Foot</para>
<para> 'yd' Yard</para>
- <para> 'ell' English Ell</para>
+ <para> 'ell' English Ell</para>
<para> 'ang' Angstrom</para>
- <para> 'ly' Light-Year</para>
- <para> 'pc' Parsec</para>
+ <para> 'ly' Light-Year</para>
+ <para> 'pc' Parsec</para>
<para> 'parsec' Parsec</para>
<para> 'Pica' Pica Points</para>
<para> 'Picapt' Pica Points</para>
@@ -3994,14 +3994,12 @@
<para> 'atm' Atmosphere</para>
<para> 'Pa' Pascal</para>
<para> 'mmHg' mm of Mercury</para>
- <para/>
- <para> 'Torr' Torr</para>
+ <para> 'Torr' Torr</para>
<para/>
<para>Force:</para>
<para> 'N' Newton</para>
<para> 'dyn' Dyne</para>
- <para> 'pond' Pond</para>
- <para/>
+ <para> 'pond' Pond</para>
<para> 'lbf' Pound force</para>
<para/>
<para>Energy:</para>
@@ -4028,9 +4026,7 @@
<para> 'C' Degree Celsius</para>
<para> 'F' Degree Fahrenheit</para>
<para> 'K' Kelvin</para>
- <para/>
<para> 'Rank' Degree Rankine</para>
- <para/>
<para> 'Reau' Degree Réaumur</para>
<para/>
<para>Volume (liquid measure):</para>
@@ -4050,54 +4046,68 @@
<para> 'regton' Registered ton</para>
<para> 'MTON' Measurement ton (freight ton)</para>
<para> 'l' Liter</para>
- <para/>
- <para> 'L' Liter</para>
- <para/>
+ <para> 'L' Liter</para>
<para> 'lt' Liter</para>
- <para/>
<para> 'ang3' Cubic Angstrom</para>
- <para/>
<para> 'ang^3' Cubic Angstrom</para>
- <para/>
<para> 'barrel' U.S. oil barrel (bbl)</para>
- <para/>
<para> 'bushel' U.S. bushel</para>
- <para/>
- <para> 'ft3' Cubic feet</para>
- <para/>
+ <para> 'ft3' Cubic feet</para>
<para> 'ft^3' Cubic feet</para>
- <para/>
<para> 'in3' Cubic inch</para>
- <para/>
<para> 'in^3' Cubic inch</para>
- <para/>
- <para> 'ly3' Cubic light-year</para>
- <para/>
+ <para> 'ly3' Cubic light-year</para>
<para> 'ly^3' Cubic light-year</para>
- <para/>
<para> 'm3' Cubic meter</para>
- <para/>
<para> 'm^3' Cubic meter</para>
- <para/>
<para> 'mi3' Cubic mile</para>
- <para/>
<para> 'mi^3' Cubic mile</para>
- <para/>
<para> 'yd3' Cubic yard</para>
- <para/>
<para> 'yd^3' Cubic yard</para>
- <para/>
<para> 'Nmi3' Cubic nautical mile</para>
- <para/>
<para> 'Nmi^3' Cubic nautical mile</para>
- <para/>
<para> 'Picapt3' Cubic Pica</para>
+ <para> 'Picapt^3' Cubic Pica</para>
+ <para> 'Pica3' Cubic Pica</para>
+ <para> 'Pica^3' Cubic Pica</para>
<para/>
- <para> 'Picapt^3' Cubic Pica</para>
+ <para>Area:</para>
+ <para> 'uk_acre' International acre</para>
+ <para> 'us_acre' U.S. survey/statute acre</para>
+ <para> 'ang2' Square angstrom</para>
+ <para> 'ang^2' Square angstrom</para>
+ <para> 'ar' Are</para>
+ <para> 'ha' Hectare</para>
+ <para> 'in2' Square inches</para>
+ <para> 'in^2' Square inches</para>
+ <para> 'ly2' Square light-year</para>
+ <para> 'ly^2' Square light-year</para>
+ <para> 'm2' Square meter</para>
+ <para> 'm^2' Square meter</para>
+ <para> 'Morgen' Morgen (North German Confederation)</para>
+ <para> 'mi2' Square miles</para>
+ <para> 'mi^2' Square miles</para>
+ <para> 'Nmi2' Square nautical miles</para>
+ <para> 'Nmi^2' Square nautical miles</para>
+ <para> 'Picapt2' Square Pica</para>
+ <para> 'Picapt^2' Square Pica</para>
+ <para> 'Pica2' Square Pica</para>
+ <para> 'Pica^2' Square Pica</para>
+ <para> 'yd2' Square yards</para>
+ <para> 'yd^2' Square yards</para>
<para/>
- <para> 'Pica3' Cubic Pica</para>
+ <para>Bits and Bytes:</para>
+ <para> 'bit' Bit</para>
+ <para> 'byte' Byte</para>
<para/>
- <para> 'Pica^3' Cubic Pica</para>
+ <para>Speed:</para>
+ <para> 'admkn' Admiralty knot</para>
+ <para> 'kn' knot</para>
+ <para> 'm/h' Meters per hour</para>
+ <para> 'm/hr' Meters per hour</para>
+ <para> 'm/s' Meters per second</para>
+ <para> 'm/sec' Meters per second</para>
+ <para> 'mph' Miles per hour</para>
<para/>
<para>For metric units any of the following prefixes can be used:</para>
<para> 'Y' yotta 1E+24</para>
@@ -4107,12 +4117,12 @@
<para> 'T' tera 1E+12</para>
<para> 'G' giga 1E+09</para>
<para> 'M' mega 1E+06</para>
- <para> 'k' kilo 1E+03</para>
+ <para> 'k' kilo 1E+03</para>
<para> 'h' hecto 1E+02</para>
<para> 'e' deca (deka) 1E+01</para>
<para> 'd' deci 1E-01</para>
<para> 'c' centi 1E-02</para>
- <para> 'm' milli 1E-03</para>
+ <para> 'm' milli 1E-03</para>
<para> 'u' micro 1E-06</para>
<para> 'n' nano 1E-09</para>
<para> 'p' pico 1E-12</para>
@@ -4120,6 +4130,16 @@
<para> 'a' atto 1E-18</para>
<para> 'z' zepto 1E-21</para>
<para> 'y' yocto 1E-24</para>
+ <para/>
+ <para>For bits and bytes any of the following prefixes can be also be used:</para>
+ <para> 'Yi' yobi 2^80</para>
+ <para> 'Zi' zebi 2^70</para>
+ <para> 'Ei' exbi 2^60</para>
+ <para> 'Pi' pebi 2^50</para>
+ <para> 'Ti' tebi 2^40</para>
+ <para> 'Gi' gibi 2^30</para>
+ <para> 'Mi' mebi 2^20</para>
+ <para> 'ki' kibi 2^10</para>
</refsect1>
<refsect1>
<title>Note</title>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
