INTEGRATION: CWS hcshared18 (1.7.2); FILE MERGED

2008/05/28 18:14:00 fpe 1.7.2.4: remove DOCTYPE headers from source files to avoid performance problems in installed help
2008/05/27 14:23:42 ufi 1.7.2.3: RESYNC: (1.7-1.8); FILE MERGED
2008/05/22 12:36:02 ufi 1.7.2.2: fixing ids
2008/05/21 09:11:07 ufi 1.7.2.1: vor testbuild

1 files changed, 36 insertions, 27 deletions

diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp
index f9fa747eb3..78d238a743 100644
--- a/helpcontent2/source/text/shared/01/extensionupdate.xhp
+++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp
@@ -1,39 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<helpdocument version="1.0">
+	
 <!--
  ***********************************************************************
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ *  $RCSfile: extensionupdate.xhp,v $fileonly,v $
  *
- * $RCSfile: extensionupdate.xhp,v $
- * $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- * This file is part of OpenOffice.org.
+ *  last change: $Author: vg $ $Date: 2008-06-03 03:36:53 $
  *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
 <topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Extension Update</title>
@@ -47,8 +53,9 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
 </section>
-<paragraph role="paragraph" id="par_id6401257" xml-lang="en-US" l10n="NEW">When you click the Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/><paragraph role="paragraph" id="par_id5841242" xml-lang="en-US" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id6401257" xml-lang="en-US" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/>
+<paragraph role="paragraph" id="par_id5841242" xml-lang="en-US" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id6794030" xml-lang="en-US" l10n="NEW">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
 <paragraph role="paragraph" id="par_id7096774" xml-lang="en-US" l10n="NEW">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
 <list type="ordered">
@@ -56,7 +63,7 @@
 <paragraph role="paragraph" id="par_id6420484" xml-lang="en-US" l10n="NEW">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
 </listitem>
 </list>
-<list type="unordered">
+<list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id6986602" xml-lang="en-US" l10n="NEW">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
 </listitem>
@@ -67,7 +74,8 @@
 <paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">A manual update is necessary.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK" id="bm_id4799645" localize="false"/><list type="ordered" startwith="2">
+<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK" id="bm_id4799645" localize="false"/>
+<list type="ordered" startwith="2">
 <listitem>
 <paragraph role="paragraph" id="par_id757469" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
 </listitem>
@@ -83,7 +91,8 @@
 <paragraph role="paragraph" id="par_id3372295" xml-lang="en-US" l10n="NEW">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/><paragraph role="heading" id="hd_id5699942" xml-lang="en-US" level="2" l10n="NEW">Show all Updates</paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/>
+<paragraph role="heading" id="hd_id5699942" xml-lang="en-US" level="2" l10n="NEW">Show all Updates</paragraph>
 <paragraph role="paragraph" id="par_id641193" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id7634510" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>