summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/guide/word_completion.xhp
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/swriter/guide/word_completion.xhp')
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/word_completion.xhp27
1 files changed, 16 insertions, 11 deletions
diff --git a/helpcontent2/source/text/swriter/guide/word_completion.xhp b/helpcontent2/source/text/swriter/guide/word_completion.xhp
index 40c9eaa09b..d498dfd623 100755
--- a/helpcontent2/source/text/swriter/guide/word_completion.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideword_completionxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideword_completionxml" indexer="include">
<title id="tit" xml-lang="en-US">Word Completion for Text Documents</title>
<filename>/text/swriter/guide/word_completion.xhp</filename>
</topic>
@@ -52,12 +50,17 @@
<bookmark_value>deactivating;word completion</bookmark_value>
<bookmark_value>refusing word completions</bookmark_value>
<bookmark_value>rejecting word completions</bookmark_value>
-</bookmark><comment>mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry</comment><paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
+</bookmark><comment>mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry</comment>
+<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1076F" xml-lang="en-US" l10n="NEW">$[officename] collects words that you frequently use in the current session. When you later type the first three letters of a collected word, $[officename] automatically completes the word. </paragraph>
+<<<<<<< .working
+<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press Ctrl+Tab to cycle through the available words. To cycle in the opposite direction, press Ctrl+Shift+Tab. </paragraph>
+=======
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</item> to cycle through the available words. To cycle in the opposite direction, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</item>. </paragraph>
+>>>>>>> .merge-right.r265757
<paragraph role="heading" id="par_idN1078D" xml-lang="en-US" level="2" l10n="NEW"> Using word completion </paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10794" xml-lang="en-US" l10n="NEW">By default, you accept the word completion by pressing the Enter key. </paragraph>
</listitem>
@@ -68,7 +71,9 @@
<paragraph role="heading" id="par_idN1079E" xml-lang="en-US" level="2" l10n="NEW"> Switching off the word completion </paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN107A5" xml-lang="en-US" l10n="NEW"> Choose <emph>Tools - AutoCorrect - Word Completion</emph> . </paragraph>
+<paragraph role="paragraph" id="par_idN107A5" xml-lang="en-US" l10n="NEW"> Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
+<emph> - Word Completion</emph> . </paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN107AD" xml-lang="en-US" l10n="NEW"> Clear <emph>Enable word completion</emph> . </paragraph>