INTEGRATION: CWS hcshared18 (1.11.52); FILE MERGED

2008/05/28 18:15:11 fpe 1.11.52.4: remove DOCTYPE headers from source files to avoid performance problems in installed help
2008/05/21 09:12:25 ufi 1.11.52.3: vor testbuild
2008/04/18 07:59:27 ufi 1.11.52.2: RESYNC: (1.11-1.12); FILE MERGED
2008/04/02 10:30:43 ufi 1.11.52.1: zwischenstand

1 files changed, 33 insertions, 25 deletions

diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index 4744dee47f..ee6ca90819 100755
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
@@ -1,41 +1,47 @@
 <?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: space_hyphen.xhp,v $fileonly,v $
  *
- * $RCSfile: space_hyphen.xhp,v $
- * $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- * This file is part of OpenOffice.org.
+ *  last change: $Author: vg $ $Date: 2008-06-03 09:06:20 $
  *
- * 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="textsharedguidespace_hyphenxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidespace_hyphenxml" indexer="include">
 <title id="tit" xml-lang="en-US">Inserting Protected Spaces, Hyphens and Conditional Separators</title>
 <filename>/text/shared/guide/space_hyphen.xhp</filename>
 </topic>
@@ -51,16 +57,18 @@
 <bookmark_value>replacing;dashes</bookmark_value>
 <bookmark_value>protected dashes</bookmark_value>
 <bookmark_value>exchanging, see also replacing</bookmark_value>
-</bookmark><comment>mw made "protected dahes;..." a one level entry and inserted a "see also" cross-reference.</comment><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Protected Spaces, Hyphens and Conditional Separators">Inserting Protected Spaces, Hyphens and Conditional Separators</link>
+</bookmark>
+<paragraph role="head1" id="hd_id3155364" xml-lang="en-US" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Protected Spaces, Hyphens and Conditional Separators">Inserting Protected Spaces, Hyphens and Conditional Separators</link>
 </variable></paragraph>
 <paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="61">Non-breaking spaces</paragraph>
 <paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="31">To prevent two words from being separated at the end of a line, press the <switchinline select="sys"><caseinline select="MAC">Command key 
 </caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you type a space between the words.</paragraph>
+<paragraph role="note" id="par_id5749687" xml-lang="en-US" l10n="NEW">In Calc, you cannot insert non-breaking spaces.</paragraph>
 <paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="62">Non-breaking dash</paragraph>
 <paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="32">An example of a non-breaking dash is a company name such as A-Z. Obviously you would not want A- to appear at the end of a line and Z at the beginning of the next line. To solve this problem, press Shift+Ctrl+ minus sign. In other words, hold down the Shift and Ctrl keys and press the minus key.</paragraph>
 <paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="65">Hyphen, dash</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="66">In order to enter longer dashes, you can find under <emph>Tools - AutoCorrect</emph>
-<emph>- Options</emph> the <emph>Replace dashes</emph> option (only on Windows systems). This option replaces one or two minus signs under certain conditions with an en-dash or an em-dash (see <link href="text/shared/01/06040100.xhp" name="$[officename] Help">$[officename] Help</link>).</paragraph>
+<emph>- Options</emph> the <emph>Replace dashes</emph> option. This option replaces one or two minus signs under certain conditions with an en-dash or an em-dash (see <link href="text/shared/01/06040100.xhp" name="$[officename] Help">$[officename] Help</link>).</paragraph>
 <paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="67">For additional replacements see the replacements table under <emph>Tools - AutoCorrect</emph>
 <emph>- </emph><link href="text/shared/01/06040200.xhp" name="Replace"><emph>Replace</emph></link>. Here you can, among other things, replace a shortcut automatically by a dash, even in another font.</paragraph>
 <paragraph role="heading" id="hd_id3153825" xml-lang="en-US" level="2" l10n="U" oldref="63">Definite separator</paragraph>