[Libreoffice-commits] help.git: source/text
Olivier Hallot (via logerrit)
logerrit at kemper.freedesktop.org
Sun Aug 18 22:21:44 UTC 2019
source/text/scalc/01/func_networkdays.intl.xhp | 8 ++++----
source/text/scalc/01/func_networkdays.xhp | 10 +++++-----
source/text/scalc/01/func_workday.intl.xhp | 12 ++++++------
source/text/scalc/01/func_workday.xhp | 10 +++++-----
4 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 87ce3991074ddd4c16e6b9568afa7d960725ef35
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Thu Aug 15 19:00:41 2019 -0300
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Aug 19 00:20:56 2019 +0200
tdf#123980 Review WORKDAYS function family
Change-Id: I385f31b98b50762659c3319c0998a264213be23e
Reviewed-on: https://gerrit.libreoffice.org/77554
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/source/text/scalc/01/func_networkdays.intl.xhp b/source/text/scalc/01/func_networkdays.intl.xhp
index c081e400e..5df0a4556 100644
--- a/source/text/scalc/01/func_networkdays.intl.xhp
+++ b/source/text/scalc/01/func_networkdays.intl.xhp
@@ -31,7 +31,7 @@
<bookmark_value>NETWORKDAYS.INTL function</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_NETWORKDAYS_MS" id="bm_id231020162214032558" localize="false"/>
-<paragraph id="hd_id231020162211573602" role="heading" level="1" xml-lang="en-US"><variable id="networkdaysintl"><link href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></variable></paragraph>
+<h2 id="hd_id231020162211573602"><variable id="networkdaysintl"><link href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></variable></h2>
<paragraph id="par_id231020162213393086" role="paragraph" xml-lang="en-US"><ahelp hid=".">Returns the number of workdays between a start date and an end date. There are options to define weekend days and holidays. The optional weekend parameter (or a string) can be used to define the weekend days (or the non-working days in each week). Also, optionally, the user can define a holiday list. The weekend days and user-defined holidays are not counted as working days.</ahelp></paragraph>
</section>
<embed href="text/scalc/00/avail_release.xhp#4.3"/>
@@ -51,9 +51,9 @@
<paragraph id="par_id231020162249556946" role="paragraph" xml-lang="en-US">The function can be used without the two optional parameters – weekday and holidays – by leaving them out:</paragraph>
<paragraph id="par_id23102016224955931" role="paragraph" xml-lang="en-US"><item type="input">=NETWORKDAYS.INTL(C3;D3)</item> gives 22 working days.</paragraph>
<section id="relatedtopics">
-<paragraph id="par_id231020162253594361" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></paragraph>
-<paragraph id="par_id241020160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_workdays.intl.xhp">WORKDAY.INTL</link></paragraph>
-<paragraph id="par_id241030160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_workday.xhp">WORKDAYS</link></paragraph>
+ <embed href="text/scalc/01/func_networkdays.xhp#networkdays"/>
+ <embed href="text/scalc/01/func_workday.intl.xhp#workdaysintl"/>
+ <embed href="text/scalc/01/func_workday.xhp#workday"/>
<paragraph id="par_id23102016225717242" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060102.xhp">Date functions</link></paragraph>
</section>
</body>
diff --git a/source/text/scalc/01/func_networkdays.xhp b/source/text/scalc/01/func_networkdays.xhp
index 7ad83da25..a1daadfee 100644
--- a/source/text/scalc/01/func_networkdays.xhp
+++ b/source/text/scalc/01/func_networkdays.xhp
@@ -33,8 +33,8 @@
<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_NETWORKDAYS" id="bm_id3153696" localize="false"/>
-<paragraph id="hd_id3151254" role="heading" level="2" xml-lang="en-US"><variable id="networkdays"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></variable></paragraph>
-<paragraph id="par_id3153788" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_NETWORKDAYS">Returns the number of workdays between a <emph>start date and an end date</emph>. Holidays can be deducted.</ahelp></paragraph>
+<h2 id="hd_id3151254"><variable id="networkdays"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></variable></h2>
+<paragraph id="par_id3153788" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_NETWORKDAYS">Returns the number of workdays between a <emph>start date</emph> and an <emph>end date</emph>. Holidays can be deducted.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id3145775" role="code" xml-lang="en-US">NETWORKDAYS(StartDate; EndDate; Holidays; Workdays)</paragraph>
@@ -50,9 +50,9 @@
<paragraph id="par_id160920161751233621" role="paragraph" xml-lang="en-US">How many workdays fall between September 12nd and 25th in 2016 if only Mondays, Tuesdays and Wednesdays are considered as workdays?</paragraph>
<paragraph id="par_id160920161751235483" role="paragraph" xml-lang="en-US"><item type="input">=NETWORKDAYS(DATE(2016;9;12); DATE(2016;9;25); ; {1;0;0;0;1;1;1})</item> returns 6 workdays.</paragraph>
<section id="relatedtopics">
-<paragraph id="par_id241020160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></paragraph>
-<paragraph id="par_id241070160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_workday.intl.xhp">WORKDAY.INTL</link></paragraph>
-<paragraph id="par_id241030160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_workday.xhp">WORKDAYS</link></paragraph>
+ <embed href="text/scalc/01/func_networkdays.intl.xhp#networkdaysintl"/>
+ <embed href="text/scalc/01/func_workday.intl.xhp#workdaysintl"/>
+ <embed href="text/scalc/01/func_workday.xhp#workday"/>
<paragraph id="par_id23102016225717242" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060102.xhp">Date functions</link></paragraph>
</section>
</body>
diff --git a/source/text/scalc/01/func_workday.intl.xhp b/source/text/scalc/01/func_workday.intl.xhp
index 58167a377..4f4a31ae9 100644
--- a/source/text/scalc/01/func_workday.intl.xhp
+++ b/source/text/scalc/01/func_workday.intl.xhp
@@ -32,13 +32,13 @@
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_WORKDAY_MS" id="bm_id231020162348499245" localize="false"/>
-<paragraph id="hd_id231020162348002143" role="heading" level="1" xml-lang="en-US"><variable id="workdaysintl"><link href="text/scalc/01/func_workday.intl.xhp">WORKDAY.INTL</link></variable></paragraph>
-<paragraph id="par_id23102016234837285" role="paragraph" xml-lang="en-US"><ahelp hid=".">The result is a date number that can be formatted as a date. User can see the date of a day that is a certain number of workdays away from the start date (before or after). There are options to define weekend days and holidays. The optional weekend parameter (or a string) can be used to define the weekend days (or the non-working days in each week). Also, optionally, the user can define a holiday list. The weekend days and user-defined holidays are not counted as working days.</ahelp></paragraph>
+<h2 id="hd_id231020162348002143"><variable id="workdaysintl"><link href="text/scalc/01/func_workday.intl.xhp">WORKDAY.INTL</link></variable></h2>
+<paragraph id="par_id23102016234837285" role="paragraph" xml-lang="en-US"><ahelp hid=".">Returns the date calculated from a start date with a specific number of work days, before or after the start date. The calculation can include week-ends and holidays as non-working days.</ahelp></paragraph>
</section>
<embed href="text/scalc/00/avail_release.xhp#4.3"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph id="par_id241020160008306838" role="code" xml-lang="en-US">WORKDAY.INTL(StartDate; Days; Weekend; Holidays)</paragraph>
-<paragraph id="par_id241020160008308885" role="paragraph" xml-lang="en-US"><emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation. This is required.</paragraph>
+<paragraph id="par_id241020160008308885" role="paragraph" xml-lang="en-US"><emph>StartDate</emph>: is the date from when the calculation is carried out.</paragraph>
<paragraph id="par_id241020160008305329" role="paragraph" xml-lang="en-US"><emph>Days</emph> is the number of workdays. Positive value for a result after the start date, negative value for a result before the start date.</paragraph>
<embed href="text/scalc/01/common_func_workdaysintl.xhp#embed_workdays_intl"/>
<embed href="text/scalc/01/04060102.xhp#datenumberinfo"/>
@@ -57,9 +57,9 @@
<paragraph id="par_id241020160012181870" role="paragraph" xml-lang="en-US">The function can be used without the two optional parameters – Weekday and Holidays – by leaving them out:</paragraph>
<paragraph id="par_id241020160012182048" role="paragraph" xml-lang="en-US"><item type="input">=WORKDAY.INTL(C3;D3)</item> gives the result: January 10, 2017.</paragraph>
<section id="relatedtopics">
-<paragraph id="par_id231020162253594361" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></paragraph>
-<paragraph id="par_id241020160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></paragraph>
-<paragraph id="par_id241030160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_workday.xhp">WORKDAY</link></paragraph>
+ <embed href="text/scalc/01/func_networkdays.xhp#networkdays"/>
+ <embed href="text/scalc/01/func_networkdays.intl.xhp#networkdaysintl"/>
+ <embed href="text/scalc/01/func_workday.xhp#workday"/>
<paragraph id="par_id23102016225717242" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060102.xhp">Date functions</link></paragraph>
</section>
</body>
diff --git a/source/text/scalc/01/func_workday.xhp b/source/text/scalc/01/func_workday.xhp
index 7529a7aa3..21120d6e0 100644
--- a/source/text/scalc/01/func_workday.xhp
+++ b/source/text/scalc/01/func_workday.xhp
@@ -31,8 +31,8 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149012"><bookmark_value>WORKDAY function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_WORKDAY" id="bm_id3150028" localize="false"/><paragraph role="heading" id="hd_id3149012" xml-lang="en-US" level="2"><variable id="workday"><link href="text/scalc/01/func_workday.xhp">WORKDAY</link>
-</variable></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_WORKDAY" id="bm_id3150028" localize="false"/>
+<h2 id="hd_id3149012"><variable id="workday"><link href="text/scalc/01/func_workday.xhp">WORKDAY</link></variable></h2>
<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_WORKDAY"> The result is a date number that can be formatted as a date. You then see the date of a day that is a certain number of <emph>workdays</emph> away from the <emph>start date</emph>.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
<paragraph role="code" id="par_id3154844" xml-lang="en-US">WORKDAY(StartDate; Days; Holidays)</paragraph>
@@ -48,9 +48,9 @@
<paragraph role="paragraph" id="par_id3152782" xml-lang="en-US">What date came 17 workdays after 1 December 2001? Enter the start date "2001-12-01" in C3 and the number of workdays in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31", "2002-01-01".</paragraph>
<paragraph role="paragraph" id="par_id3146142" xml-lang="en-US"><item type="input">=WORKDAY(C3;D3;F3:J3)</item> returns 2001-12-28. Format the serial date number as a date, for example in the format YYYY-MM-DD.<comment>UFI: fixed #i30213#</comment></paragraph>
<section id="relatedtopics">
-<paragraph id="par_id231020162253594361" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link></paragraph>
-<paragraph id="par_id241020160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_networkdays.intl.xhp">NETWORKDAYS.INTL</link></paragraph>
-<paragraph id="par_id241030160012187036" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/func_workday.intl.xhp">WORKDAY.INTL</link></paragraph>
+ <embed href="text/scalc/01/func_networkdays.xhp#networkdays"/>
+ <embed href="text/scalc/01/func_networkdays.intl.xhp#networkdaysintl"/>
+ <embed href="text/scalc/01/func_workday.intl.xhp#workdaysintl"/>
<paragraph id="par_id23102016225717242" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060102.xhp">Date functions</link></paragraph>
</section>
</body>
More information about the Libreoffice-commits
mailing list