CWS-TOOLING: integrate CWS hcshared19

3 files changed, 18 insertions, 15 deletions

diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index b2fbc034ae..b4028ba58e 100755
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -12,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 00000001.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,11 +32,10 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textshared0500000001xml" indexer="include" status="PUBLISH">
+<topic id="textshared0500000001xml" indexer="include">
 <title id="tit" xml-lang="en-US">Getting Support</title>
 <filename>/text/shared/05/00000001.xhp</filename>
 </topic>
@@ -54,10 +52,15 @@
 <paragraph role="paragraph" id="par_id9173253" xml-lang="en-US" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial StarOffice or StarSuite software by Sun Microsystems, Inc. </paragraph>
 <paragraph role="paragraph" id="par_id3150667" xml-lang="en-US" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
 <paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="4">Visit <link href="http://www.sun.com/star/support">www.sun.com/star/support</link> to get an overview of additional support offerings by Sun Microsystems and other parties.</paragraph>
-<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment><paragraph role="heading" id="hd_id26327" xml-lang="en-US" level="2" l10n="NEW">Local language support pages</paragraph>
+<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment>
+<paragraph role="heading" id="hd_id26327" xml-lang="en-US" level="2" l10n="NEW">Local language support pages</paragraph>
 <paragraph role="paragraph" id="par_id1318380" xml-lang="en-US" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
 <paragraph role="heading" id="hd_id2611386" xml-lang="en-US" level="2" l10n="NEW">Mailing lists</paragraph>
-<paragraph role="paragraph" id="par_id3166335" xml-lang="en-US" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3166335" xml-lang="en-US" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+<paragraph role="heading" id="hd_id0915200811081722" xml-lang="en-US" level="2" l10n="NEW">Forum</paragraph>
+<paragraph role="paragraph" id="par_id0915200811081778" xml-lang="en-US" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org. A list of web forums hosted by Sun Microsystems can be found at <link href="http://user.services.openoffice.org/en/forum/listforums.php">http://user.services.openoffice.org/en/forum/listforums.php</link>.</paragraph>
+<paragraph role="heading" id="hd_id0804200803314150" xml-lang="en-US" level="2" l10n="NEW">Security</paragraph>
+<paragraph role="paragraph" id="par_id0804200803314235" xml-lang="en-US" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
 <paragraph role="heading" id="hd_id3168534" xml-lang="en-US" level="2" l10n="NEW">Downloads</paragraph>
 <paragraph role="paragraph" id="par_id3028143" xml-lang="en-US" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
 <paragraph role="heading" id="hd_id2602967" xml-lang="en-US" level="2" l10n="NEW">Documentation</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index e19c2b646b..55d77ffb7f 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -12,7 +12,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 00000110.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -129,7 +129,7 @@
 <paragraph role="paragraph" id="par_idN1092C" xml-lang="en-US" l10n="NEW">On a Help page, select the text that you want to copy.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN10930" xml-lang="en-US" l10n="NEW">Press Ctrl+C.</paragraph>
+<paragraph role="paragraph" id="par_idN10930" xml-lang="en-US" l10n="NEW">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_idN10933" xml-lang="en-US" l10n="NEW">To search the current Help page:</paragraph>
@@ -137,7 +137,7 @@
 <listitem>
 <paragraph role="paragraph" id="par_idN10939" xml-lang="en-US" l10n="NEW">Click the <emph>Find on this Page</emph> icon.</paragraph>
 <paragraph role="paragraph" id="par_idN10940" xml-lang="en-US" l10n="NEW">The <emph>Find on this Page</emph> dialog opens.</paragraph>
-<paragraph role="note" id="par_idN10A36" xml-lang="en-US" l10n="NEW">You can also click in the Help page and press Ctrl+F.</paragraph>
+<paragraph role="note" id="par_idN10A36" xml-lang="en-US" l10n="NEW">You can also click in the Help page and press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_idN10A22" xml-lang="en-US" l10n="NEW">In the <emph>Search for</emph> box, enter the text that you want to find.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/makefile.mk b/helpcontent2/source/text/shared/05/makefile.mk
index a1e2e634e0..b53847959e 100644
--- a/helpcontent2/source/text/shared/05/makefile.mk
+++ b/helpcontent2/source/text/shared/05/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
 #
 # This file is part of OpenOffice.org.
 #