INTEGRATION: CWS hcshared06 (1.6.56); FILE MERGED

2006/10/13 11:50:26 ufi 1.6.56.1: some changes

1 files changed, 27 insertions, 45 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01150100.xhp b/helpcontent2/source/text/shared/optionen/01150100.xhp
index 3f2d96c505..48261878f8 100755
--- a/helpcontent2/source/text/shared/optionen/01150100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150100.xhp
@@ -1,58 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+<!--
+ ***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01150100.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.7 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: rt $ $Date: 2006-12-01 16:58:23 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    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.
  *
- *  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.
+ *    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.
  *
- *  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.
+ *    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
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************-->
+ ************************************************************************
+ -->
 	
 <helpdocument version="1.0">
 <meta>
@@ -62,7 +44,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-20T15:58:35">converted from old format - fpe</lastedited>
+<lastedited date="2006-10-13T11:28:51">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
@@ -72,7 +54,7 @@
 <embed href="text/shared/00/00000007.xhp#asiahinweis"/>
 </section>
 <paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000406.xhp#asialayout"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3143268"><bookmark_value>kerning;language settings</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3143268"><bookmark_value>kerning;Asian texts</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="2" l10n="U" oldref="3">Kerning</paragraph>
 <paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="4">Defines the default settings for kerning between individual characters.</paragraph>