source/text/shared/01/05020100.xhp              |    1 
 source/text/shared/01/06010000.xhp              |   21 ++++++++------
 source/text/shared/01/06040500.xhp              |    5 ++-
 source/text/shared/01/06990000.xhp              |    8 ++---
 source/text/shared/guide/language_select.xhp    |    1 
 source/text/shared/guide/microsoft_terms.xhp    |   10 -------
 source/text/shared/main0201.xhp                 |    2 -
 source/text/shared/optionen/01010400.xhp        |    9 ++++--
 source/text/shared/optionen/01010401.xhp        |    3 +-
 source/text/shared/optionen/01140000.xhp        |    2 -
 source/text/simpress/04/01020000.xhp            |   34 ++++++++++++------------
 source/text/swriter/04/01020000.xhp             |    2 -
 source/text/swriter/guide/spellcheck_dialog.xhp |    5 +--
 source/text/swriter/main0503.xhp                |    8 ++---
 14 files changed, 56 insertions(+), 55 deletions(-)

New commits:
commit 42797a6bc9f90ab9bfa4818bc1344f52125d2afa
Author:     Ilmari Lauhakangas <[email protected]>
AuthorDate: Thu Mar 5 21:29:42 2020 +0200
Commit:     Olivier Hallot <[email protected]>
CommitDate: Thu Mar 12 18:09:47 2020 +0100

    tdf#128494 Change Spellcheck to Spelling
    
    1098fba99acb8c8cc7e87c55ece12ef175593147 left Help in a broken
    state.
    
    Change-Id: Ie8d8f6506a6634fefce875590fe54fa2e477c82a
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/90060
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <[email protected]>

diff --git a/source/text/shared/01/05020100.xhp 
b/source/text/shared/01/05020100.xhp
index ba3e24282..1ee32d101 100644
--- a/source/text/shared/01/05020100.xhp
+++ b/source/text/shared/01/05020100.xhp
@@ -36,6 +36,7 @@
 <bookmark_value>typefaces; formats</bookmark_value>
 <bookmark_value>font sizes; relative changes</bookmark_value>
 <bookmark_value>languages; spellchecking and formatting</bookmark_value>
+<bookmark_value>languages; spelling</bookmark_value>
 <bookmark_value>characters; enabling CTL and Asian characters</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/charnamepage/CharNamePage" 
id="bm_id3148919" localize="false"/>
diff --git a/source/text/shared/01/06010000.xhp 
b/source/text/shared/01/06010000.xhp
index 4597581c9..cd69a5e69 100644
--- a/source/text/shared/01/06010000.xhp
+++ b/source/text/shared/01/06010000.xhp
@@ -22,7 +22,7 @@
 
 <meta>
       <topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Spelling and Grammar</title>
+         <title id="tit">Spelling</title>
          <filename>/text/shared/01/06010000.xhp</filename>
       </topic>
    </meta>
@@ -30,13 +30,16 @@
       <section id="rechtschreibung">
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3149047"><bookmark_value>dictionaries; spellcheck</bookmark_value>
          <bookmark_value>spellcheck; dialog</bookmark_value>
+         <bookmark_value>dictionaries; spelling</bookmark_value>
+         <bookmark_value>spelling; dialog</bookmark_value>
          <bookmark_value>languages; spellcheck</bookmark_value>
-</bookmark><comment>mw changes "spellcheck;languages"</comment>
+         <bookmark_value>languages; spelling</bookmark_value>
+</bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:Spelling" id="bm_id3150702" 
localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SpellingAndGrammarDialog" 
id="bm_id1022200801253693" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/SpellingDialog" 
id="bm_id1022200801253694" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/@@nowidget@@" 
id="bm_id1022200801253694" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153882" role="heading" level="1"><link 
href="text/shared/01/06010000.xhp" name="Spellcheck">Spelling and 
Grammar</link></paragraph>
+<h1 id="hd_id3153882"><link href="text/shared/01/06010000.xhp" 
name="Spelling">Spelling</link></h1>
          <paragraph xml-lang="en-US" id="par_id3154682" 
role="paragraph"><variable id="recht"><ahelp hid=".">Checks the document or the 
current selection for spelling errors. If a grammar checking extension is 
installed, the dialog also checks for grammar errors.</ahelp>
 </variable></paragraph>
       </section>
@@ -45,10 +48,10 @@
       </section>
       <embed 
href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
       <paragraph xml-lang="en-US" id="par_idN1064B" role="paragraph">The 
spellcheck starts at the current cursor position and advances to the end of the 
document or selection. You can then choose to continue the spellcheck from the 
beginning of the document.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3166445" 
role="paragraph">Spellcheck looks for misspelled words and gives you the option 
of adding an unknown word to a user dictionary. When the first misspelled word 
is found, the <emph>Spellcheck</emph> dialog opens.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id1022200801300654" 
role="paragraph">If a grammar checking extension is installed, this dialog is 
called <emph>Spelling and Grammar</emph>. Spelling errors are underlined in 
red, grammar errors in blue. First the dialog presents all spelling errors, 
then all grammar errors.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3166445" role="paragraph">Spelling 
looks for misspelled words and gives you the option of adding an unknown word 
to a user dictionary. When the first misspelled word is found, the 
<emph>Spelling</emph> dialog opens.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1022200801300654" 
role="paragraph">Spelling errors are underlined in red, grammar errors in blue. 
First the dialog presents all spelling errors, then all grammar 
errors.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/checkgrammar" 
id="bm_id1024200804045685" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id1022200801354366" 
role="paragraph"><ahelp hid=".">Enable <emph>Check grammar</emph> to work first 
on all spellcheck errors, then on all grammar errors.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id1022200801354366" 
role="paragraph"><ahelp hid=".">Enable <emph>Check grammar</emph> to work first 
on all spelling errors, then on all grammar errors.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/sentence" 
id="bm_id756859" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149511" role="heading" level="2">Not in 
dictionary</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph"><ahelp 
hid=".">Displays the sentence with the misspelled word highlighted. Edit the 
word or the sentence, or click one of the suggestions in the text box 
below.</ahelp></paragraph>
@@ -56,7 +59,7 @@
 <paragraph xml-lang="en-US" id="hd_id3149885" role="heading" 
level="2">Suggestions</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph"><ahelp 
hid="cui/ui/spellingdialog/suggestionslb">Lists suggested words to replace the 
misspelled word. Select the word that you want to use, and then click 
<emph>Correct</emph> or <emph>Correct All</emph>.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/languagelb" 
id="bm_id3150822" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="2">Text 
Language<comment>spec doc Spelling_and_Grammar.odt</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="2">Text 
Language</paragraph>
       <paragraph xml-lang="en-US" id="par_id3144422" role="paragraph"><ahelp 
hid="cui/ui/spellingdialog/languagelb">Specifies the language to use to check 
the spelling.</ahelp></paragraph>
       <embed href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/autocorrect" 
id="bm_id9182103" localize="false"/>
@@ -66,14 +69,14 @@
 </caseinline></switchinline></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/options" 
id="bm_id9094821" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151382" role="heading" 
level="2">Options</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph"><ahelp 
hid="cui/ui/spellingdialog/options">Opens a dialog, where you can select the 
user-defined dictionaries, and set the rules for the 
spellchecking.</ahelp><comment>UFI: dialog has no name at all in 
680m104</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph"><ahelp 
hid="cui/ui/spellingdialog/options">Opens a dialog, where you can select the 
user-defined dictionaries, and set the rules for the 
spellchecking.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/addmb" 
id="bm_id5068819" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153353" role="heading" level="2">Add to 
Dictionary</paragraph>
       <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph"><ahelp 
hid="cui/ui/spellingdialog/add">Adds the unknown word to a user-defined 
dictionary.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/ignore" 
id="bm_id7157811" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3155994" role="heading" level="2">Ignore 
Once</paragraph>
       <paragraph xml-lang="en-US" id="par_id3148920" role="paragraph"><ahelp 
hid="cui/ui/spellingdialog/ignore">Skips the unknown word and continues with 
the spellcheck.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="par_idN107CB" role="note">This label of 
this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog 
open when you return to your document. To continue the spellcheck from the 
current position of the cursor, click 
<emph>Resume</emph>.</paragraph><comment>Ignore Rule button</comment>
+      <paragraph xml-lang="en-US" id="par_idN107CB" role="note">This label of 
this button changes to <emph>Resume</emph> if you leave the Spelling dialog 
open when you return to your document. To continue the spellcheck from the 
current position of the cursor, click <emph>Resume</emph>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/ignorerule" 
id="bm_id1024200804072166" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id1024200804091149" 
role="paragraph"><ahelp hid="." visibility="hidden">While performing a grammar 
check, click Ignore Rule to ignore the rule that is currently flagged as a 
grammar error.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/spellingdialog/ignoreall" 
id="bm_id4155705" localize="false"/>
diff --git a/source/text/shared/01/06040500.xhp 
b/source/text/shared/01/06040500.xhp
index f3f628b43..54be0e695 100644
--- a/source/text/shared/01/06040500.xhp
+++ b/source/text/shared/01/06040500.xhp
@@ -29,6 +29,7 @@
 <body>
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3152823"><bookmark_value>AutoCorrect function; context 
menu</bookmark_value>
 <bookmark_value>spellcheck; context menus</bookmark_value>
+<bookmark_value>spelling; context menus</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3152823" xml-lang="en-US" 
level="1">AutoCorrect context menu</paragraph>
 <paragraph role="paragraph" id="par_id3146936" xml-lang="en-US">To access this 
menu, right-click a misspelled word in your document. To view the misspelled 
words in your document, choose <emph>Tools - Automatic Spell 
Checking</emph>.</paragraph>
@@ -39,8 +40,8 @@
 <bookmark xml-lang="en-US" branch="hid/editeng/ui/spellmenu/check" 
id="bm_id3155934" localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/spellmenu/spelldialog" id="bm_id3155351" 
localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/spellmenu/@@nowidget@@" id="bm_@@nowidget@@" 
localize="false"/>
-<paragraph role="heading" id="hd_id3153089" xml-lang="en-US" 
level="2">Spellcheck</paragraph>
-<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US"><ahelp 
hid="modules/swriter/ui/spellmenu/spelldialog">Opens the <link 
href="text/shared/01/06010000.xhp" name="Spellcheck">Spellcheck</link> 
dialog.</ahelp></paragraph>
+<h2 id="hd_id3153089">Spelling</h2>
+<paragraph role="paragraph" id="par_id3154497"><ahelp 
hid="modules/swriter/ui/spellmenu/spelldialog">Opens the <link 
href="text/shared/01/06010000.xhp" name="Spelling">Spelling</link> 
dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/editeng/ui/spellmenu/insert" 
id="bm_id3154422" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/editeng/ui/spellmenu/add" 
id="bm_id3154423" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/spellmenu/add" 
id="bm_id3153551" localize="false"/>
diff --git a/source/text/shared/01/06990000.xhp 
b/source/text/shared/01/06990000.xhp
index 37168aed5..a291dc7b3 100644
--- a/source/text/shared/01/06990000.xhp
+++ b/source/text/shared/01/06990000.xhp
@@ -18,11 +18,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-       
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0106990000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Spellcheck</title>
+<title id="tit">Spelling</title>
 <filename>/text/shared/01/06990000.xhp</filename>
 </topic>
 <history>
@@ -32,14 +32,14 @@
 <body>
 <section id="rechtschreibung">
 <bookmark xml-lang="en-US" branch="hid/.uno:SpellDialog" id="bm_id9349345" 
localize="false"/>
-<paragraph role="heading" id="hd_id3147069" xml-lang="en-US" level="1"><link 
href="text/shared/01/06990000.xhp" 
name="Spellcheck">Spellcheck</link></paragraph>
+<h1 id="hd_id3147069"><link href="text/shared/01/06990000.xhp" 
name="Spelling">Spelling</link></h1>
 <paragraph role="paragraph" id="par_id3153116" xml-lang="en-US"><ahelp 
hid=".">Checks spelling manually.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#rechtschreibungmenue"/>
 </section>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id2551957" xml-lang="en-US"><link 
href="text/shared/01/06010000.xhp" name="Check">Spellcheck 
dialog</link></paragraph>
+<paragraph role="paragraph" id="par_id2551957"><link 
href="text/shared/01/06010000.xhp" name="Spelling">Spelling 
dialog</link></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/guide/language_select.xhp 
b/source/text/shared/guide/language_select.xhp
index 042445b36..83f1827ef 100644
--- a/source/text/shared/guide/language_select.xhp
+++ b/source/text/shared/guide/language_select.xhp
@@ -34,6 +34,7 @@
       <bookmark_value>drawings; languages</bookmark_value>
       <bookmark_value>defaults;languages</bookmark_value>
       <bookmark_value>spellcheck; default languages</bookmark_value>
+      <bookmark_value>spelling; default languages</bookmark_value>
       <bookmark_value>dictionaries, see also languages</bookmark_value>
 </bookmark><comment>mw deleted "applying;" and changed "languages;"</comment>
 <paragraph xml-lang="en-US" id="hd_id3083278" role="heading" 
level="1"><variable id="language_select"><link 
href="text/shared/guide/language_select.xhp" name="Selecting the Document 
Language">Selecting the Document Language</link>
diff --git a/source/text/shared/guide/microsoft_terms.xhp 
b/source/text/shared/guide/microsoft_terms.xhp
index 6b58607d4..5ac9cb0de 100644
--- a/source/text/shared/guide/microsoft_terms.xhp
+++ b/source/text/shared/guide/microsoft_terms.xhp
@@ -108,14 +108,6 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3159153" xml-lang="en-US">Mail 
Merge</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145748" xml-lang="en-US"><link 
href="text/swriter/guide/form_letters_main.xhp" name="Form Letter">Form 
Letter</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
 <paragraph role="tablecontent" id="par_id3152940" 
xml-lang="en-US">Markup</paragraph>
 </tablecell>
 <tablecell>
@@ -151,7 +143,7 @@
 <paragraph role="tablecontent" id="par_id3156373" xml-lang="en-US">Spelling 
and Grammar</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3150297" xml-lang="en-US"><link 
href="text/shared/01/06010000.xhp" 
name="Spellcheck">Spellcheck</link></paragraph>
+<paragraph role="tablecontent" id="par_id3150297"><link 
href="text/shared/01/06010000.xhp" name="Spelling">Spelling</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index 700683fc6..164d88b8b 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -60,7 +60,7 @@
 <embed href="text/shared/00/00000401.xhp#syansicht"/>
 </case>
 </switch>
-<paragraph role="heading" id="par_idN106A5" xml-lang="en-US" level="2"><link 
href="text/shared/01/06010000.xhp">Spellcheck</link></paragraph>
+<h2 id="par_idN106A5"><link 
href="text/shared/01/06010000.xhp">Spelling</link></h2>
 <embed href="text/shared/01/06010000.xhp#recht"/>
 <embed href="text/shared/00/00000406.xhp#syrechtschreibung"/>
 <embed href="text/shared/02/18030000.xhp#pruefung"/>
diff --git a/source/text/shared/optionen/01010400.xhp 
b/source/text/shared/optionen/01010400.xhp
index acbb46a70..fba1f1e64 100644
--- a/source/text/shared/optionen/01010400.xhp
+++ b/source/text/shared/optionen/01010400.xhp
@@ -36,13 +36,16 @@
 <bookmark_value>spellcheck; dictionary of exceptions</bookmark_value>
 <bookmark_value>ignore list for spellcheck</bookmark_value>
 <bookmark_value>spellcheck; ignore list</bookmark_value>
+<bookmark_value>spelling; dictionary of exceptions</bookmark_value>
+<bookmark_value>ignore list for spelling</bookmark_value>
+<bookmark_value>spelling; ignore list</bookmark_value>
 <bookmark_value>hyphenation; minimal number of characters</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optlingupage/OptLinguPage" 
id="bm_id3147291" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optlingupage/@@nowidget@@" 
id="bm_id3147291" localize="false"/>
 <comment>removed "german" references, i78879</comment>
 <paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1"><link 
href="text/shared/optionen/01010400.xhp" name="Writing Aids">Writing 
Aids</link></paragraph>
-<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US"><ahelp 
hid="cui/ui/optlingupage/OptLinguPage">Specifies the properties of the 
spellcheck, thesaurus and hyphenation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153527"><ahelp 
hid="cui/ui/optlingupage/OptLinguPage">Specifies the properties of the 
spelling, thesaurus and hyphenation.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#writingaids"/>
@@ -51,7 +54,7 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optlingupage/lingumodules" 
id="bm_id3147653" localize="false"/>
 <paragraph role="heading" id="hd_id3149096" xml-lang="en-US" 
level="2">Available Language Modules</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US"><ahelp 
hid="cui/ui/optlingupage/lingumodules">Contains the installed language 
modules.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153663" xml-lang="en-US">A language 
module can contain one, two or three submodules: Spellcheck, hyphenation and 
thesaurus. Each sub-module can be available in one or more languages. If you 
click in front of the name of the module, you activate all the available 
sub-modules simultaneously. If you remove a set mark, you deactivate all the 
available sub-modules simultaneously. If you wish to activate or deactivate 
individual sub-modules, click the <emph>Edit</emph> button to open the <link 
href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit 
Modules</emph></link> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3153663">A language module can contain 
one, two or three submodules: Spelling, hyphenation and thesaurus. Each 
sub-module can be available in one or more languages. If you click in front of 
the name of the module, you activate all the available sub-modules 
simultaneously. If you remove a set mark, you deactivate all the available 
sub-modules simultaneously. If you wish to activate or deactivate individual 
sub-modules, click the <emph>Edit</emph> button to open the <link 
href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit 
Modules</emph></link> dialog.</paragraph>
 <paragraph role="note" id="par_id3294778" xml-lang="en-US">The configuration 
allows two different directories: one folder where the user has write 
permissions, and one without write permissions. The user can only edit and 
delete the user dictionaries that are located in the writable path. Other 
dictionaries can be read only.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optlingupage/lingumodulesedit" 
id="bm_id3154898" localize="false"/>
 <paragraph role="heading" id="hd_id3154307" xml-lang="en-US" 
level="3">Edit</paragraph>
@@ -59,7 +62,7 @@
 <section id="benutzerwb">
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optlingupage/lingudicts" 
id="bm_id3150503" localize="false"/>
 <paragraph role="heading" id="hd_id3153348" xml-lang="en-US" 
level="2">User-defined dictionaries</paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US"><ahelp 
hid=".">Lists the available user dictionaries.</ahelp> Mark the user 
dictionaries that you want to use for spellcheck and hyphenation.</paragraph>
+<paragraph role="paragraph" id="par_id3155419"><ahelp hid=".">Lists the 
available user dictionaries.</ahelp> Mark the user dictionaries that you want 
to use for spelling and hyphenation.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optlingupage/lingudictsnew" 
id="bm_id3154923" localize="false"/>
 <paragraph role="heading" id="hd_id3144511" xml-lang="en-US" 
level="3">New</paragraph>
 <paragraph role="paragraph" id="par_id3146794" xml-lang="en-US"><ahelp 
hid="cui/ui/optlingupage/lingudictsnew">Opens the <emph>New Dictionary</emph> 
dialog, in which you can name a new user-defined dictionary or dictionary of 
exceptions and specify the language.</ahelp></paragraph>
diff --git a/source/text/shared/optionen/01010401.xhp 
b/source/text/shared/optionen/01010401.xhp
index af928497b..fe19a72a2 100644
--- a/source/text/shared/optionen/01010401.xhp
+++ b/source/text/shared/optionen/01010401.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-       
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedoptionen01010401xml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3154230"><bookmark_value>spellcheck; activating for a 
language</bookmark_value>
+<bookmark_value>spelling; activating for a language</bookmark_value>
 <bookmark_value>hyphenation; activating for a language</bookmark_value>
 <bookmark_value>thesaurus; activating for a language</bookmark_value>
 <bookmark_value>languages; activating modules</bookmark_value>
diff --git a/source/text/shared/optionen/01140000.xhp 
b/source/text/shared/optionen/01140000.xhp
index 831def051..57303fa15 100644
--- a/source/text/shared/optionen/01140000.xhp
+++ b/source/text/shared/optionen/01140000.xhp
@@ -75,7 +75,7 @@
       <paragraph xml-lang="en-US" id="par_id3148492" 
role="paragraph">Additionally to the date acceptance patterns defined here, 
every locale accepts input in an ISO 8601 Y-M-D pattern, and since %PRODUCTNAME 
3.5 that also leads to the YYYY-MM-DD format being applied.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3157939" role="paragraph">Syntax: 
<emph>Y</emph> means year, <emph>M</emph> means month, and <emph>D</emph> means 
day, regardless of localization.</paragraph>
       <h2 id="hd_id3153127">Default languages for documents</h2>
-      <paragraph xml-lang="en-US" id="par_id3149763" 
role="paragraph">Specifies the languages for spellchecking, thesaurus and 
hyphenation.</paragraph>
+      <paragraph id="par_id3149763" role="paragraph">Specifies the languages 
for spelling, thesaurus and hyphenation.</paragraph>
       <embed href="text/shared/guide/language_select.xhp#language_select"/>
       <section id="sprachmodul">
          <warning id="par_id3148663">The spellcheck for the selected language 
only functions when you have installed the corresponding language module. 
<embedvar href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
diff --git a/source/text/simpress/04/01020000.xhp 
b/source/text/simpress/04/01020000.xhp
index dfd36ccf2..48bce6491 100644
--- a/source/text/simpress/04/01020000.xhp
+++ b/source/text/simpress/04/01020000.xhp
@@ -69,7 +69,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149052" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3149052" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -102,7 +102,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10769" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="par_idN10769" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F5</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -114,12 +114,12 @@
 <paragraph role="tablecontent" id="hd_id3150860" 
xml-lang="en-US">F7</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154559" 
xml-lang="en-US">Spellcheck</paragraph>
+<paragraph role="tablecontent" id="par_id3154559">Spelling</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153004" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3153004" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -136,7 +136,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155439" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3155439" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -230,7 +230,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153580" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3153580" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Page Up 
</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -239,7 +239,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3152944" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3152944" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Page Down 
</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -309,7 +309,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154195" 
xml-lang="en-US">Shift+<switchinline select="sys"><caseinline 
select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3154195" 
xml-lang="en-US">Shift+<switchinline select="sys"><caseinline 
select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+G</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -326,7 +326,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149309" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3149309" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ 
click</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -353,7 +353,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149784" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3149784" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Plus 
key</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -362,7 +362,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148972" 
xml-lang="en-US">Shift+<switchinline select="sys"><caseinline 
select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3148972" 
xml-lang="en-US">Shift+<switchinline select="sys"><caseinline 
select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Plus 
key</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -371,7 +371,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149040" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3149040" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Minus 
key</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -380,7 +380,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148742" 
xml-lang="en-US">Shift+<switchinline select="sys"><caseinline 
select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3148742" 
xml-lang="en-US">Shift+<switchinline select="sys"><caseinline 
select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Minus 
key</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -698,7 +698,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154384" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3154384" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Arrow 
Key</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -715,11 +715,11 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154117" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3154117" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ drag (with 
<link href="text/shared/optionen/01070500.xhp" name="Copy when moving">Copy 
when moving</link> option active)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150584" xml-lang="en-US">Hold down 
<switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="par_id3150584" xml-lang="en-US">Hold down 
<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> and drag an 
object to create a copy of the object.</paragraph>
 </tablecell>
 </tablerow>
@@ -797,7 +797,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145258" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="tablecontent" id="hd_id3145258" 
xml-lang="en-US"><switchinline select="sys"><caseinline select="MAC">Command
 
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/source/text/swriter/04/01020000.xhp 
b/source/text/swriter/04/01020000.xhp
index 34732d5fa..6c401679e 100644
--- a/source/text/swriter/04/01020000.xhp
+++ b/source/text/swriter/04/01020000.xhp
@@ -127,7 +127,7 @@
                <paragraph xml-lang="en-US" id="hd_id3149647" 
role="tablecontent">F7</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3149957" 
role="tablecontent">Spellcheck</paragraph>
+               <paragraph id="par_id3149957" 
role="tablecontent">Spelling</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
diff --git a/source/text/swriter/guide/spellcheck_dialog.xhp 
b/source/text/swriter/guide/spellcheck_dialog.xhp
index 8f0fbe41e..1d0026834 100644
--- a/source/text/swriter/guide/spellcheck_dialog.xhp
+++ b/source/text/swriter/guide/spellcheck_dialog.xhp
@@ -32,7 +32,6 @@
   <bookmark_value>checking spelling;manually</bookmark_value>
   <bookmark_value>grammar checker</bookmark_value>
 </bookmark>
-<comment>mw added "grammar checker"</comment>
 
 <paragraph id="hd_id3149684" role="heading" level="1" 
xml-lang="en-US"><variable id="spellcheck_dialog"><link 
href="text/swriter/guide/spellcheck_dialog.xhp" name="Checking Spelling and 
Grammar">Checking Spelling and Grammar</link></variable></paragraph>
 <paragraph id="par_id3149814" role="paragraph" xml-lang="en-US">You can 
manually check the spelling and grammar of a text selection or the entire 
document.</paragraph>
@@ -47,7 +46,7 @@
     <paragraph id="par_id3149836" role="listitem" xml-lang="en-US">Choose 
<emph>Tools - Spelling</emph>.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3156104" role="listitem" xml-lang="en-US">When a 
possible spelling error is encountered, the <item 
type="menuitem">Spellcheck</item> dialog opens and $[officename] offers some 
suggested corrections.</paragraph>
+    <paragraph id="par_id3156104" role="listitem">When a possible spelling 
error is encountered, the <item type="menuitem">Spelling</item> dialog opens 
and $[officename] offers some suggested corrections.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3149861" role="listitem" xml-lang="en-US">Do one of 
the following:</paragraph>
@@ -59,7 +58,7 @@
 
 <section id="relatedtopics">
 <embed 
href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/><comment>removed 
a line</comment>
-<paragraph id="par_id3147107" role="paragraph" xml-lang="en-US"><link 
href="text/shared/01/06010000.xhp" name="Spellcheck dialog">Spelling and 
Grammar dialog</link></paragraph>
+<paragraph id="par_id3147107" role="paragraph" xml-lang="en-US"><link 
href="text/shared/01/06010000.xhp" name="Spelling">Spelling 
dialog</link></paragraph>
 <embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
 <embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
 </section>
diff --git a/source/text/swriter/main0503.xhp b/source/text/swriter/main0503.xhp
index 2d6b4d172..4d0556f65 100644
--- a/source/text/swriter/main0503.xhp
+++ b/source/text/swriter/main0503.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-       
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-       
+
+
 <meta>
 <topic id="textswritermain0503xml" indexer="include">
 <title id="tit" xml-lang="en-US">$[officename] Writer Features</title>
@@ -34,7 +34,7 @@
 </section>
 <paragraph role="heading" id="hd_id3147755" xml-lang="en-US" 
level="2">Writing</paragraph>
 <paragraph role="paragraph" id="par_id3147768" xml-lang="en-US">$[officename] 
Writer lets you create both basic documents, such as memos, <link 
href="text/shared/guide/fax.xhp" name="faxes">faxes</link>, letters , resumes 
and <link href="text/swriter/01/01150000.xhp" name="merge documents">merge 
documents</link>, as well as long and complex or multi-part documents, complete 
with bibliographies, reference tables and indexes.</paragraph>
-<paragraph role="paragraph" id="par_id3147797" xml-lang="en-US">$[officename] 
Writer also includes such useful features as a <link 
href="text/shared/01/06010000.xhp" name="spellchecker">spellchecker</link>, a 
<link href="text/swriter/guide/using_thesaurus.xhp" 
name="thesaurus">thesaurus</link>, <link href="text/shared/01/06040000.xhp" 
name="AutoCorrect">AutoCorrect</link>, and <link 
href="text/swriter/01/06030000.xhp" name="Hyphenation">hyphenation</link> as 
well as a variety of templates for almost every purpose. You can also create 
your own templates using the wizards.</paragraph>
+<paragraph role="paragraph" id="par_id3147797" xml-lang="en-US">$[officename] 
Writer also includes such useful features as a <link 
href="text/shared/01/06010000.xhp" name="Spelling">spellchecker</link>, a <link 
href="text/swriter/guide/using_thesaurus.xhp" 
name="thesaurus">thesaurus</link>, <link href="text/shared/01/06040000.xhp" 
name="AutoCorrect">AutoCorrect</link>, and <link 
href="text/swriter/01/06030000.xhp" name="Hyphenation">hyphenation</link> as 
well as a variety of templates for almost every purpose. You can also create 
your own templates using the wizards.</paragraph>
 <paragraph role="heading" id="hd_id3147225" xml-lang="en-US" 
level="2">Designing and Structuring</paragraph>
 <paragraph role="paragraph" id="par_id3147239" xml-lang="en-US">$[officename] 
offers a wide variety of options to design documents. Use the <link 
href="text/swriter/01/05140000.xhp" name="Styles">Styles window</link> to 
create, assign and modify styles for paragraphs, individual characters, frames 
and pages. In addition, the <link href="text/swriter/01/02110000.xhp" 
name="Navigator">Navigator</link> helps you to quickly move around inside your 
documents, lets you look at your document in an outline view, and keeps track 
of the objects that you have inserted into your document.</paragraph>
 <paragraph role="paragraph" id="par_id3147272" xml-lang="en-US">You can also 
create various <link href="text/swriter/01/04120000.xhp" name="indexes and 
tables">indexes and tables</link> in text documents. You can define the 
structure and appearance of the indexes and tables according to your individual 
needs. Live hyperlinks and bookmarks let you jump directly to the corresponding 
items in the text.</paragraph>
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to