INTEGRATION: CWS hcshared15 (1.5.6); FILE MERGED

2008/01/11 14:00:18 ufi 1.5.6.2: new makefiles und zwischenstand
2007/12/18 12:12:15 ufi 1.5.6.1: saving

2 files changed, 12 insertions, 9 deletions

diff --git a/helpcontent2/source/text/scalc/01/func_eastersunday.xhp b/helpcontent2/source/text/scalc/01/func_eastersunday.xhp
index 06343b5e1c..4d7b307851 100644
--- a/helpcontent2/source/text/scalc/01/func_eastersunday.xhp
+++ b/helpcontent2/source/text/scalc/01/func_eastersunday.xhp
@@ -7,9 +7,9 @@
  *
  *  $RCSfile: func_eastersunday.xhp,v $fileonly,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ihi $ $Date: 2007-11-23 16:27:12 $
+ *  last change: $Author: vg $ $Date: 2008-01-24 13:54:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,7 +52,7 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3154570" xml-lang="en-US" l10n="U" oldref="176"><ahelp hid="HID_FUNC_OSTERSONNTAG">Returns the date of Easter Sunday for the entered year.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id9460127" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
-<paragraph role="paragraph" id="par_id2113711" xml-lang="en-US" l10n="NEW">EASTERSUNDAY(Year)</paragraph>
+<paragraph role="code" id="par_id2113711" xml-lang="en-US" l10n="NEW">EASTERSUNDAY(Year)</paragraph>
 <paragraph role="paragraph" id="par_id3938413" xml-lang="en-US" l10n="NEW">
 <emph>Year</emph> is an integer between 1583 and 9956 or 0 and 99. You can also calculate other holidays by simple addition with this date.</paragraph>
 <paragraph role="paragraph" id="par_id3156156" xml-lang="en-US" l10n="U" oldref="177">Easter Monday = EASTERSUNDAY(Year) + 1</paragraph>
@@ -60,7 +60,9 @@
 <paragraph role="paragraph" id="par_id3146072" xml-lang="en-US" l10n="U" oldref="179">Pentecost Sunday = EASTERSUNDAY(Year) + 49</paragraph>
 <paragraph role="paragraph" id="par_id3149553" xml-lang="en-US" l10n="U" oldref="180">Pentecost Monday = EASTERSUNDAY(Year) + 50</paragraph>
 <paragraph role="heading" id="hd_id3155120" xml-lang="en-US" level="3" l10n="U" oldref="181">Examples</paragraph>
-<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="182">EASTERSUNDAY(2000) returns 4/23/00</paragraph>
-<paragraph role="paragraph" id="par_id3150940" xml-lang="en-US" l10n="U" oldref="184">EASTERSUNDAY(2000)+49 returns the internal serial number 36688. If you use the MMDDYY date format, the result is 06/11/00.</paragraph>
+<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="182">
+<item type="input">=EASTERSUNDAY(2000)</item> returns 4/23/00</paragraph>
+<paragraph role="paragraph" id="par_id3150940" xml-lang="en-US" l10n="U" oldref="184">
+<item type="input">=EASTERSUNDAY(2000)+49</item> returns the internal serial number 36688. If you use the MMDDYY date format, the result is 06/11/00.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/func_now.xhp b/helpcontent2/source/text/scalc/01/func_now.xhp
index f4f611e395..ff9f12595c 100644
--- a/helpcontent2/source/text/scalc/01/func_now.xhp
+++ b/helpcontent2/source/text/scalc/01/func_now.xhp
@@ -7,9 +7,9 @@
  *
  *  $RCSfile: func_now.xhp,v $fileonly,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ihi $ $Date: 2007-11-23 16:27:28 $
+ *  last change: $Author: vg $ $Date: 2008-01-24 13:56:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,9 +52,10 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3148829" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="HID_FUNC_JETZT">Returns the computer system date and time.</ahelp> The value is updated when you recalculate the document or each time a cell value is modified.</paragraph>
 <paragraph role="heading" id="hd_id3146988" xml-lang="en-US" level="3" l10n="U" oldref="49">Syntax</paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="50">NOW()</paragraph>
+<paragraph role="code" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="50">NOW()</paragraph>
 <paragraph role="paragraph" id="par_id4598529" xml-lang="en-US" l10n="NEW">NOW is a function without arguments.</paragraph>
 <paragraph role="heading" id="hd_id3154205" xml-lang="en-US" level="3" l10n="U" oldref="51">Example</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="52">=NOW()-A1 returns the difference between the date in A1 and now. Format the result as a number.</paragraph>
+<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="52">
+<item type="input">=NOW()-A1</item> returns the difference between the date in A1 and now. Format the result as a number.</paragraph>
 </body>
 </helpdocument>