summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-02-20 00:56:57 +0000
committerRüdiger Timm <rt@openoffice.org>2008-02-20 00:56:57 +0000
commit311d49b70e1a3815613bc23deb00e4ba9ba33f5a (patch)
treeb13755af8b32a613839de039e55d836d1b0a1c74
parent0029e4cf5e7a9a64c12d6525f757a3f83faae315 (diff)
INTEGRATION: CWS hcshared16 (1.6.114); FILE MERGED
2008/02/13 11:14:54 ufi 1.6.114.1: last build
-rw-r--r--helpcontent2/source/text/swriter/guide/using_hyphen.xhp40
1 files changed, 9 insertions, 31 deletions
diff --git a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
index b8ce2fafc2..3a1631c529 100644
--- a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: using_hyphen.xhp,v $
+ * $RCSfile: using_hyphen.xhp,v $fileonly,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: vg $ $Date: 2006-11-01 17:23:25 $
+ * last change: $Author: rt $ $Date: 2008-02-20 01:56:57 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -35,27 +36,21 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
+ <helpdocument version="1.0">
<meta>
<topic id="textswriterguideusing_hyphenxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Hyphenation</title>
<filename>/text/swriter/guide/using_hyphen.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-25T15:31:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149695"><bookmark_value>hyphenation;manual/automatic</bookmark_value>
-<bookmark_value>hyphenation;preventing for specific words</bookmark_value>
<bookmark_value>separation, see hyphenation</bookmark_value>
<bookmark_value>automatic hyphenation in text</bookmark_value>
<bookmark_value>manual hyphenation in text</bookmark_value>
-<bookmark_value>words;wrapping/not wrapping in text</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3149695" xml-lang="en-US" level="1" l10n="U" oldref="20"><variable id="using_hyphen"><link href="text/swriter/guide/using_hyphen.xhp" name="Hyphenation">Hyphenation</link>
+</bookmark><comment>mw transferred 2 entries to hyphen_prevent.xhp</comment><paragraph role="heading" id="hd_id3149695" xml-lang="en-US" level="1" l10n="U" oldref="20"><variable id="using_hyphen"><link href="text/swriter/guide/using_hyphen.xhp" name="Hyphenation">Hyphenation</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="31">By default, $[officename] moves words that do not fit on a line to the next line. If you want, you can use automatic or manual hyphenation to avoid this behavior: </paragraph>
<paragraph role="heading" id="hd_id3155864" xml-lang="en-US" level="2" l10n="U" oldref="30">Automatic hyphenation</paragraph>
@@ -133,28 +128,11 @@
<paragraph role="listitem" id="par_id3148949" xml-lang="en-US" l10n="U" oldref="63">To insert the hyphen in another part of the word, click the arrow buttons.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3148966" xml-lang="en-US" level="2" l10n="U" oldref="64">Preventing Hyphenation of Specific Words</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153634" xml-lang="en-US" l10n="U" oldref="40">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153658" xml-lang="en-US" l10n="U" oldref="41">Select a dictionary in the <emph>User-defined dictionary </emph>list, and then click <emph>Edit</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3147125" xml-lang="en-US" l10n="U" oldref="43">If the list is empty, click <emph>New</emph> to create a dictionary.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150218" xml-lang="en-US" l10n="U" oldref="42">In the<emph> Word</emph> box, type the word you want to exclude from hyphenation, followed by an equal sign (=), for example, "pretentious=".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="65">Click <emph>New</emph>, and then click <emph>Close</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_id3147036" xml-lang="en-US" l10n="U" oldref="29">To quickly exclude a word from hyphenation, select the word, choose <emph>Format - Character</emph>, click the <emph>Font </emph>tab, and select "None" in the <emph>Language </emph>box.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
<embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
<embed href="text/swriter/guide/template_default.xhp#template_default"/>
+<embed href="text/swriter/guide/hyphen_prevent.xhp#hyphen_prevent"/>
<paragraph role="paragraph" id="par_id3154361" xml-lang="en-US" l10n="U" oldref="46"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
</body>
</helpdocument>