source/text/scalc/01/func_networkdays.xhp | 56 ++++++++++++++++--------------
source/text/shared/01/05020301.xhp | 6 +--
2 files changed, 33 insertions(+), 29 deletions(-)
New commits:
commit 29627a94f11a6c7c27041949b2353fb29fa12141
Author: Stanislav Horacek <stanislav.hora...@gmail.com>
Date: Fri Sep 16 18:09:39 2016 +0200
tdf#100353 describe fourth argument of NETWORKDAYS function
Change-Id: I970483f5bc0e8d2d6f172b7876d45cf23ba26e59
Reviewed-on: https://gerrit.libreoffice.org/28967
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>
diff --git a/source/text/scalc/01/func_networkdays.xhp
b/source/text/scalc/01/func_networkdays.xhp
index 9574220..c56f573 100644
--- a/source/text/scalc/01/func_networkdays.xhp
+++ b/source/text/scalc/01/func_networkdays.xhp
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -18,32 +16,38 @@
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
+-->
-
- <helpdocument version="1.0">
<meta>
-<topic id="textscalc01func_networkdaysxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">NETWORKDAYS</title>
-<filename>/text/scalc/01/func_networkdays.xhp</filename>
-</topic>
+ <topic id="textscalc01func_networkdaysxml" indexer="include"
status="PUBLISH">
+ <title id="tit" xml-lang="en-US">NETWORKDAYS</title>
+ <filename>/text/scalc/01/func_networkdays.xhp</filename>
+ </topic>
</meta>
+
<body>
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3151254"><bookmark_value>NETWORKDAYS function</bookmark_value>
+
+<bookmark xml-lang="en-US" branch="index" id="bm_id3151254">
+ <bookmark_value>NETWORKDAYS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_NETWORKDAYS"
id="bm_id3153696" localize="false"/><paragraph role="heading" id="hd_id3151254"
xml-lang="en-US" level="2" l10n="U" oldref="240"><variable
id="networkdays"><link
href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153788" xml-lang="en-US" l10n="U"
oldref="241"><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>
-<paragraph role="heading" id="hd_id3148677" xml-lang="en-US" level="3"
l10n="U" oldref="242">Syntax</paragraph>
-<paragraph role="code" id="par_id3145775" xml-lang="en-US" l10n="U"
oldref="243">NETWORKDAYS(StartDate; EndDate; Holidays)</paragraph>
-<paragraph role="paragraph" id="par_id3153885" xml-lang="en-US" l10n="U"
oldref="244">
-<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.</paragraph>
-<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U"
oldref="245">
-<emph>EndDate</emph> is the date up until when the calculation is carried out.
If the end date is a workday, the day is included in the
calculation.</paragraph>
-<paragraph role="paragraph" id="par_id3154115" xml-lang="en-US" l10n="U"
oldref="246">
-<emph>Holidays</emph> is an optional list of holidays. These are non-working
days. Enter a cell range in which the holidays are listed
individually.</paragraph>
-<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="3"
l10n="U" oldref="247">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154661" xml-lang="en-US" l10n="CHG"
oldref="248">How many workdays fall between 2001-12-15 and 2002-01-15? The
start date is located in C3 and the end date 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_id3147328" xml-lang="en-US" l10n="U"
oldref="249">=NETWORKDAYS(C3;D3;F3:J3) returns 17 workdays.</paragraph>
+
+<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>
+
+<paragraph id="hd_id3148677" role="heading" level="3"
xml-lang="en-US">Syntax</paragraph>
+<paragraph id="par_id3145775" role="code"
xml-lang="en-US">NETWORKDAYS(StartDate; EndDate; Holidays; Workdays)</paragraph>
+<paragraph id="par_id3153885" 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.</paragraph>
+<paragraph id="par_id3151110" role="paragraph"
xml-lang="en-US"><emph>EndDate</emph> is the date up until when the calculation
is carried out. If the end date is a workday, the day is included in the
calculation.</paragraph>
+<paragraph id="par_id3154115" role="paragraph"
xml-lang="en-US"><emph>Holidays</emph> is an optional list of holidays. These
are non-working days. Enter a cell range in which the holidays are listed
individually.</paragraph>
+<paragraph id="par_id160920161749585013" role="paragraph"
xml-lang="en-US"><emph>Workdays</emph> is an optional list of number values
defining standard work week. This list starts by Sunday, workdays are indicated
by zero and non-working days by non-zero value.</paragraph>
+
+<paragraph id="hd_id3146902" role="heading" level="3"
xml-lang="en-US">Examples</paragraph>
+<paragraph id="par_id3154661" role="paragraph" xml-lang="en-US">How many
workdays fall between 2001-12-15 and 2002-01-15? The start date is located in
C3 and the end date 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 id="par_id3147328" role="paragraph" xml-lang="en-US"><item
type="input">=NETWORKDAYS(C3;D3;F3:J3)</item> returns 17 workdays.</paragraph>
+<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>
</body>
-</helpdocument>
+
+</helpdocument>
\ No newline at end of file
commit d26da961ff68cb9d764eaf6332430394f100ec1d
Author: Stanislav Horacek <stanislav.hora...@gmail.com>
Date: Fri Sep 16 17:44:37 2016 +0200
remove redundant spaces
introduced in 206a20ba56d185411cd099f324a0d9c0529eaf48
Change-Id: Iea9fd5844f0aaf49e89c2e79a2a4cc9066b11806
Reviewed-on: https://gerrit.libreoffice.org/28966
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>
diff --git a/source/text/shared/01/05020301.xhp
b/source/text/shared/01/05020301.xhp
index ec040e5..ad4310d 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -716,7 +716,7 @@
<paragraph id="hd_id3149929" role="heading" level="3"
xml-lang="en-US">Entering Dates</paragraph>
<paragraph id="par_id3148397" role="paragraph" xml-lang="en-US">To enter a
date in a cell, use the Gregorian calendar format. For example, in an English
locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
-<paragraph id="par_id3153274" role="paragraph" xml-lang="en-US">All date
formats are dependent on the locale that is set in <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+<paragraph id="par_id3153274" role="paragraph" xml-lang="en-US">All date
formats are dependent on the locale that is set in <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
</caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - Language settings -
Languages</emph>. For example, if your locale is set to 'Japanese', then the
Gengou calendar is used. The default date format in <item
type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
<paragraph id="par_id3153795" role="paragraph" xml-lang="en-US">To specify a
calendar format that is independent of the locale, add a modifier in front of
the date format. For example, to display a date using the Jewish calendar
format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
@@ -787,7 +787,7 @@
</tablerow>
</table>
-<paragraph id="par_id3152419" role="paragraph" xml-lang="en-US"><switchinline
select="appl"><caseinline select="CALC">If you perform a calculation that
involves one or more cells using a date format, the result is formatted
according to the following mappings:
+<paragraph id="par_id3152419" role="paragraph" xml-lang="en-US"><switchinline
select="appl"><caseinline select="CALC">If you perform a calculation that
involves one or more cells using a date format, the result is formatted
according to the following mappings:
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC">
@@ -885,7 +885,7 @@
</case>
</switch>
-<paragraph id="par_id3149174" role="paragraph" xml-lang="en-US"><switchinline
select="appl"><caseinline select="CALC">The Date&Time format displays the
date and time that an entry was made to a cell with this format.
+<paragraph id="par_id3149174" role="paragraph" xml-lang="en-US"><switchinline
select="appl"><caseinline select="CALC">The Date&Time format displays the
date and time that an entry was made to a cell with this format.
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
