[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - source/text
Steve Fanning (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jun 8 16:12:58 UTC 2020
source/text/scalc/01/04060103.xhp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 57cebf3f2226c19b642785afc2881c189090f944
Author: Steve Fanning <stevemfanning at yahoo.co.uk>
AuthorDate: Fri May 29 16:36:35 2020 +0200
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Jun 8 18:12:38 2020 +0200
(04060103.xhp) Corrections to function syntax statements
Change-Id: Ic058b98ada2d384ef8128776bdbef9f73afe870a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95117
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
(cherry picked from commit c6213b839442ecafd54eb6396e63b058a00af376)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95710
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
diff --git a/source/text/scalc/01/04060103.xhp b/source/text/scalc/01/04060103.xhp
index de2ac6669..8a8efbffb 100644
--- a/source/text/scalc/01/04060103.xhp
+++ b/source/text/scalc/01/04060103.xhp
@@ -44,7 +44,7 @@
<h2 id="hd_id3153366">AMORDEGRC</h2>
<paragraph xml-lang="en-US" id="par_id3147434" role="paragraph"><ahelp hid="HID_AAI_FUNC_AMORDEGRC">Calculates the amount of depreciation for a settlement period as degressive amortization.</ahelp> Unlike AMORLINC, a depreciation coefficient that is independent of the depreciable life is used here.</paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3147427" role="code">AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate[; Basis])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147427" role="code">AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate [; Basis])</paragraph>
<paragraph xml-lang="en-US" id="par_id3147125" role="paragraph">
<emph>Cost</emph> is the acquisition costs.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151074" role="paragraph">
@@ -67,7 +67,7 @@
<h2 id="hd_id3153765">AMORLINC</h2>
<paragraph xml-lang="en-US" id="par_id3159264" role="paragraph"><ahelp hid="HID_AAI_FUNC_AMORLINC">Calculates the amount of depreciation for a settlement period as linear amortization. If the capital asset is purchased during the settlement period, the proportional amount of depreciation is considered.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3147363" role="code">AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate[; Basis])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147363" role="code">AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate [; Basis])</paragraph>
<paragraph xml-lang="en-US" id="par_id3146920" role="paragraph">
<emph>Cost</emph> means the acquisition costs.</paragraph>
<paragraph xml-lang="en-US" id="par_id3163807" role="paragraph">
@@ -91,7 +91,7 @@
</bookmark><comment>mw changed "accrued interests"</comment>
<paragraph xml-lang="en-US" id="par_id3151276" role="paragraph"><ahelp hid="HID_AAI_FUNC_ACCRINT">Calculates the accrued interest of a security in the case of periodic payments.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3159092" role="code">ACCRINT(Issue; FirstInterest; Settlement; Rate; [Par]; Frequency[; Basis])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159092" role="code">ACCRINT(Issue; FirstInterest; Settlement; Rate; [Par]; Frequency [; Basis])</paragraph>
<paragraph xml-lang="en-US" id="par_id3150519" role="paragraph">
<emph>Issue</emph> (required) is the issue date of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155376" role="paragraph">
@@ -118,7 +118,7 @@
<h2 id="hd_id3151240">ACCRINTM</h2>
<paragraph xml-lang="en-US" id="par_id3157981" role="paragraph"><ahelp hid="HID_AAI_FUNC_ACCRINTM">Calculates the accrued interest of a security in the case of one-off payment at the settlement date.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3147074" role="code">ACCRINTM(Issue; Settlement; Rate[; Par][; Basis])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147074" role="code">ACCRINTM(Issue; Settlement; Rate [; Par [; Basis]])</paragraph>
<paragraph xml-lang="en-US" id="par_id3144773" role="paragraph">
<emph>Issue</emph> (required) is the issue date of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154956" role="paragraph">
@@ -141,7 +141,7 @@
<h2 id="hd_id3145753">RECEIVED</h2>
<paragraph xml-lang="en-US" id="par_id3150051" role="paragraph"><ahelp hid="HID_AAI_FUNC_RECEIVED">Calculates the amount received that is paid for a fixed-interest security at a given point in time.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3145362" role="code">RECEIVED(Settlement; Maturity; Investment; Discount[; Basis])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145362" role="code">RECEIVED(Settlement; Maturity; Investment; Discount [; Basis])</paragraph>
<paragraph xml-lang="en-US" id="par_id3154654" role="paragraph">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153011" role="paragraph">
@@ -168,7 +168,7 @@
<paragraph xml-lang="en-US" id="par_id3146099" role="paragraph">Use this function to calculate the amount of money needed to be invested at a fixed rate today, to receive a specific amount, an annuity, over a specified number of periods. You can also determine how much money is to remain after the elapse of the period. Specify as well if the amount is to be paid out at the beginning or at the end of each period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153334" role="paragraph">Enter these values either as numbers, expressions or references. If, for example, interest is paid annually at 8%, but you want to use month as your period, enter 8%/12 under <emph>Rate</emph> and <item type="productname">%PRODUCTNAME</item> Calc with automatically calculate the correct factor.</paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3150395" role="code">PV(Rate; NPer; Pmt[; FV][; Type])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150395" role="code">PV(Rate; NPer; Pmt [; FV [; Type]])</paragraph>
<paragraph xml-lang="en-US" id="par_id3151341" role="paragraph">
<emph>Rate</emph> defines the interest rate per period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153023" role="paragraph">
@@ -541,7 +541,7 @@
<h2 id="hd_id3155104">DISC</h2>
<paragraph xml-lang="en-US" id="par_id3153891" role="paragraph"><ahelp hid="HID_AAI_FUNC_DISC">Calculates the allowance (discount) of a security as a percentage.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3149756" role="code">DISC(Settlement; Maturity; Price; Redemption[; Basis])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149756" role="code">DISC(Settlement; Maturity; Price; Redemption [; Basis])</paragraph>
<paragraph xml-lang="en-US" id="par_id3156014" role="paragraph">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154304" role="paragraph">
@@ -565,7 +565,7 @@
<paragraph xml-lang="en-US" id="par_id3145768" role="paragraph"><ahelp hid="HID_AAI_FUNC_DURATION">Calculates the duration of a fixed interest security in years.</ahelp></paragraph>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3153373" role="code">DURATION(Settlement; Maturity; Coupon; Yield; Frequency[; Basis])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153373" role="code">DURATION(Settlement; Maturity; Coupon; Yield; Frequency [; Basis])</paragraph>
<paragraph xml-lang="en-US" id="par_id3155397" role="paragraph">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148558" role="paragraph">
@@ -632,7 +632,7 @@
<paragraph xml-lang="en-US" id="par_id3159190" role="paragraph"><ahelp hid="HID_FUNC_GDA">Returns the depreciation of an asset for a specified period using the arithmetic-declining method.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3152361" role="paragraph">Use this form of depreciation if you require a higher initial depreciation value as opposed to linear depreciation. The depreciation value gets less with each period and is usually used for assets whose value loss is higher shortly after purchase (for example, vehicles, computers). Please note that the book value will never reach zero under this calculation type.</paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3166452" role="code">DDB(Cost; Salvage; Life; Period[; Factor])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166452" role="code">DDB(Cost; Salvage; Life; Period [; Factor])</paragraph>
<paragraph xml-lang="en-US" id="par_id3153237" role="paragraph">
<emph>Cost</emph> fixes the initial cost of an asset.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149787" role="paragraph">
@@ -659,7 +659,7 @@
<paragraph xml-lang="en-US" id="par_id3148989" role="paragraph"><ahelp hid="HID_FUNC_GDA2">Returns the depreciation of an asset for a specified period using the fixed-declining balance method.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3156213" role="paragraph">This form of depreciation is used if you want to get a higher depreciation value at the beginning of the depreciation (as opposed to linear depreciation). The depreciation value is reduced with every depreciation period by the depreciation already deducted from the initial cost.</paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3153349" role="code">DB(Cost; Salvage; Life; Period[; Month])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153349" role="code">DB(Cost; Salvage; Life; Period [; Month])</paragraph>
<paragraph xml-lang="en-US" id="par_id3148462" role="paragraph">
<emph>Cost</emph> is the initial cost of an asset.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148658" role="paragraph">
@@ -686,7 +686,7 @@
<paragraph xml-lang="en-US" id="par_id3143282" role="paragraph"><ahelp hid="HID_FUNC_IKV">Calculates the internal rate of return for an investment.</ahelp> The values represent cash flow values at regular intervals, at least one value must be negative (payments), and at least one value must be positive (income).</paragraph>
<paragraph id="par_idN10E621" role="paragraph" xml-lang="en-US">If the payments take place at irregular intervals, use the <link href="text/scalc/01/04060118.xhp#xirr" name="XIRR">XIRR</link> function.</paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph xml-lang="en-US" id="par_id3155427" role="code">IRR(Values[; Guess])</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155427" role="code">IRR(Values [; Guess])</paragraph>
<paragraph xml-lang="en-US" id="par_id3144758" role="paragraph">
<emph>Values</emph> represents an array containing the values.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149233" role="paragraph">
More information about the Libreoffice-commits
mailing list