summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Fanning <stevemfanning@yahoo.co.uk>2020-06-01 00:06:02 +0200
committerOlivier Hallot <olivier.hallot@libreoffice.org>2020-06-08 18:57:24 +0200
commit3c0f925c0367855db0265e6785c32a1ffc2a0731 (patch)
treec5b8fb614479991c384aa47021454c6fd39cd5c7
parent(04060181.xhp) Include square brackets in syntax sections to indicate optiona... (diff)
downloadhelp-3c0f925c0367855db0265e6785c32a1ffc2a0731.tar.gz
help-3c0f925c0367855db0265e6785c32a1ffc2a0731.zip
(04060119.xhp) Include square brackets in syntax sections to indicate optional parameters.
Note: PMT() and PPMT() functions - syntax now matches ODF 1.2. Change-Id: I7c291ed84eaf875953e86996cc74c2c9a956e13c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95235 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 4b4e25cad5a6971b1be4f077bbe42fd08366b4fd) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95732 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
-rw-r--r--source/text/scalc/01/04060119.xhp18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/text/scalc/01/04060119.xhp b/source/text/scalc/01/04060119.xhp
index 5abb0366f7..99f0d6fd50 100644
--- a/source/text/scalc/01/04060119.xhp
+++ b/source/text/scalc/01/04060119.xhp
@@ -41,7 +41,7 @@
<h2 id="hd_id3150026">PPMT</h2>
<paragraph role="paragraph" id="par_id3146942" xml-lang="en-US"><ahelp hid="HID_FUNC_KAPZ">Returns for a given period the payment on the principal for an investment that is based on periodic and constant payments and a constant interest rate.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3146878" xml-lang="en-US">PPMT(Rate; Period; NPer; PV; FV; Type)</paragraph>
+<paragraph role="code" id="par_id3146878" xml-lang="en-US">PPMT(Rate; Period; NPer; PV [ ; FV [ ; Type ] ])</paragraph>
<paragraph role="paragraph" id="par_id3151228" xml-lang="en-US">
<emph>Rate</emph> is the periodic interest rate.</paragraph>
<paragraph role="paragraph" id="par_id3148887" xml-lang="en-US">
@@ -189,7 +189,7 @@
<h2 id="hd_id3150878">PRICE</h2>
<paragraph role="paragraph" id="par_id3153210" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_PRICE">Calculates the market value of a fixed interest security with a par value of 100 currency units as a function of the forecast yield.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3152804" xml-lang="en-US">PRICE(Settlement; Maturity; Rate; Yield; Redemption; Frequency; Basis)</paragraph>
+<paragraph role="code" id="par_id3152804" xml-lang="en-US">PRICE(Settlement; Maturity; Rate; Yield; Redemption; Frequency [; Basis])</paragraph>
<paragraph role="paragraph" id="par_id3156121" xml-lang="en-US">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph role="paragraph" id="par_id3149983" xml-lang="en-US">
@@ -216,7 +216,7 @@
<h2 id="hd_id3151297">PRICEDISC</h2>
<paragraph role="paragraph" id="par_id3155100" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_PRICEDISC">Calculates the price per 100 currency units of par value of a non-interest- bearing security.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3146084" xml-lang="en-US">PRICEDISC(Settlement; Maturity; Discount; Redemption; Basis)</paragraph>
+<paragraph role="code" id="par_id3146084" xml-lang="en-US">PRICEDISC(Settlement; Maturity; Discount; Redemption [; Basis])</paragraph>
<paragraph role="paragraph" id="par_id3159179" xml-lang="en-US">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph role="paragraph" id="par_id3154304" xml-lang="en-US">
@@ -238,7 +238,7 @@
<h2 id="hd_id3154693">PRICEMAT</h2>
<paragraph role="paragraph" id="par_id3153906" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_PRICEMAT">Calculates the price per 100 currency units of par value of a security, that pays interest on the maturity date.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3155393" xml-lang="en-US">PRICEMAT(Settlement; Maturity; Issue; Rate; Yield; Basis)</paragraph>
+<paragraph role="code" id="par_id3155393" xml-lang="en-US">PRICEMAT(Settlement; Maturity; Issue; Rate; Yield [; Basis])</paragraph>
<paragraph role="paragraph" id="par_id3153102" xml-lang="en-US">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph role="paragraph" id="par_id3150530" xml-lang="en-US">
@@ -305,7 +305,7 @@
<h2 id="hd_id3153739">MDURATION</h2>
<paragraph role="paragraph" id="par_id3149923" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_MDURATION">Calculates the modified Macauley duration of a fixed interest security in years.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3148987" xml-lang="en-US">MDURATION(Settlement; Maturity; Coupon; Yield; Frequency; Basis)</paragraph>
+<paragraph role="code" id="par_id3148987" xml-lang="en-US">MDURATION(Settlement; Maturity; Coupon; Yield; Frequency [; Basis])</paragraph>
<paragraph role="paragraph" id="par_id3148619" xml-lang="en-US">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph role="paragraph" id="par_id3149805" xml-lang="en-US">
@@ -446,7 +446,7 @@
<h2 id="hd_id3149323">YIELD</h2>
<paragraph role="paragraph" id="par_id3150643" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_YIELD">Calculates the yield of a security.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3149744" xml-lang="en-US">YIELD(Settlement; Maturity; Rate; Price; Redemption; Frequency; Basis)</paragraph>
+<paragraph role="code" id="par_id3149744" xml-lang="en-US">YIELD(Settlement; Maturity; Rate; Price; Redemption; Frequency [; Basis])</paragraph>
<paragraph role="paragraph" id="par_id3154526" xml-lang="en-US">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph role="paragraph" id="par_id3153266" xml-lang="en-US">
@@ -472,7 +472,7 @@
<h2 id="hd_id3150100">YIELDDISC</h2>
<paragraph role="paragraph" id="par_id3150486" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_YIELDDISC">Calculates the annual yield of a non-interest-bearing security.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3159191" xml-lang="en-US">YIELDDISC(Settlement; Maturity; Price; Redemption; Basis)</paragraph>
+<paragraph role="code" id="par_id3159191" xml-lang="en-US">YIELDDISC(Settlement; Maturity; Price; Redemption [; Basis])</paragraph>
<paragraph role="paragraph" id="par_id3150237" xml-lang="en-US">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph role="paragraph" id="par_id3146924" xml-lang="en-US">
@@ -494,7 +494,7 @@
<h2 id="hd_id3155140">YIELDMAT</h2>
<paragraph role="paragraph" id="par_id3151332" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_YIELDMAT">Calculates the annual yield of a security, the interest of which is paid on the date of maturity.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3159113" xml-lang="en-US">YIELDMAT(Settlement; Maturity; Issue; Rate; Price; Basis)</paragraph>
+<paragraph role="code" id="par_id3159113" xml-lang="en-US">YIELDMAT(Settlement; Maturity; Issue; Rate; Price [; Basis])</paragraph>
<paragraph role="paragraph" id="par_id3149309" xml-lang="en-US">
<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph role="paragraph" id="par_id3151381" xml-lang="en-US">
@@ -519,7 +519,7 @@
<h2 id="hd_id3149577">PMT</h2>
<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US"><ahelp hid="HID_FUNC_RMZ">Returns the periodic payment for an annuity with constant interest rates.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph role="code" id="par_id3147278" xml-lang="en-US">PMT(Rate; NPer; PV; FV; Type)</paragraph>
+<paragraph role="code" id="par_id3147278" xml-lang="en-US">PMT(Rate; NPer; PV [ ; [ FV ] [ ; Type ] ])</paragraph>
<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US">
<emph>Rate</emph> is the periodic interest rate.</paragraph>
<paragraph role="paragraph" id="par_id3148641" xml-lang="en-US">