INTEGRATION: CWS hc680dec (1.4.42); FILE MERGED

2006/01/17 13:21:14 ufi 1.4.42.1: 17Jan06

2 files changed, 48 insertions, 28 deletions

diff --git a/helpcontent2/source/text/shared/01/02020000.xhp b/helpcontent2/source/text/shared/01/02020000.xhp
index 719b79bc24..2863ef685e 100644
--- a/helpcontent2/source/text/shared/01/02020000.xhp
+++ b/helpcontent2/source/text/shared/01/02020000.xhp
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
  *
- *  $RCSfile: 02020000.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.4 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:49:35 $
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  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.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  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
  *
- *    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.
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
  *
- *    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
  *
  ************************************************************************-->
 	
@@ -42,15 +62,15 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-13T10:46:39">converted from old format - fpe</lastedited>
+<lastedited date="2006-01-17T13:02:54">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
 <section id="wiederholen">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3149991"><bookmark_value>restoring editing</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149991"><bookmark_value>restoring;editing</bookmark_value>
 <bookmark_value>redo command</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_REDO" id="bm_id5051868" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_REDO" id="bm_id5051868" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Redo" id="bm_id3154840" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_IMAPDLG_REDO" id="bm_id3155069" localize="false"/>
 <paragraph role="heading" id="hd_id3149991" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02020000.xhp" name="Redo">Redo</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/02180000.xhp b/helpcontent2/source/text/shared/01/02180000.xhp
index affd90de2e..5787194fdc 100644
--- a/helpcontent2/source/text/shared/01/02180000.xhp
+++ b/helpcontent2/source/text/shared/01/02180000.xhp
@@ -62,7 +62,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-21T13:22:11">converted from old format - fpe</lastedited>
+<lastedited date="2006-01-09T15:18:20">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
@@ -74,9 +74,9 @@
 <bookmark xml-lang="en-US" branch="hid/SID_MANAGE_LINKS" id="bm_id4013242" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ManageLinks" id="bm_id3147588" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>opening; files with links</bookmark_value>
-<bookmark_value>links; update process on opening</bookmark_value>
-<bookmark_value>updating; links on opening</bookmark_value>
-<bookmark_value>editing;links to other files</bookmark_value>
+<bookmark_value>links; updating specific links</bookmark_value>
+<bookmark_value>updating; links, on opening</bookmark_value>
+<bookmark_value>links; opening files with</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3150279" xml-lang="en-US" level="1" l10n="U" oldref="1">Edit Links</paragraph>
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="2"><variable id="verknuepfungentext"><ahelp hid=".uno:ManageLinks">Lets you edit the properties of each link in the current document, including the path to the source file. This command is not available if the current document does not contain links to other files.</ahelp>