3 files changed, 10 insertions, 5 deletions

diff --git a/source/text/shared/optionen/01040900.xhp b/source/text/shared/optionen/01040900.xhp
index db31c44102..fc98cd7391 100644
--- a/source/text/shared/optionen/01040900.xhp
+++ b/source/text/shared/optionen/01040900.xhp
@@ -42,6 +42,7 @@
 <bookmark_value>OLE objects; captions (Writer)</bookmark_value>
 <bookmark_value>tab stops; spacing in text documents</bookmark_value>
 <bookmark_value>spacing; tab stops in text documents</bookmark_value>
+<bookmark_value>word counts; separators</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optgeneralpage/OptGeneralPage" id="bm_id3150443" localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040900.xhp" name="General">General</link></paragraph>
 <paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="modules/swriter/ui/optgeneralpage/OptGeneralPage">Specifies general settings for text documents.</ahelp></paragraph>
@@ -146,5 +147,8 @@
 <paragraph role="paragraph" id="par_id3150419" xml-lang="en-US"><ahelp hid=".">When this setting is enabled, the measurement units of indents and spacing on <emph>Format - Paragraph - Indents &amp; Spacing</emph> tab will be character (ch) and line.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optgeneralpage/squaremode" id="bm_id3154739" localize="false"/><paragraph role="heading" id="hd_id3154945" xml-lang="en-US" level="3">Use square page mode for text grid</paragraph>
 <paragraph role="paragraph" id="par_id3150418" xml-lang="en-US"><ahelp hid=".">When this setting is enabled, the text grid will look like square page.</ahelp> Square page is a kind of page layout which is used to train students to write articles in China and Japan.</paragraph>
+<paragraph role="heading" id="hd_id3166976" xml-lang="en-US" level="2" l10n="U" oldref="46">Word count</paragraph>
+<paragraph role="heading" id="hd_id3166980" xml-lang="en-US" level="3">Additional separators</paragraph>
+<paragraph role="paragraph" id="par_id3166985" xml-lang="en-US">Specifies the characters that are considered as word separators when counting words, in addition to spaces, tabs and line and paragraph breaks.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/01/06040000.xhp b/source/text/swriter/01/06040000.xhp
index d7257e76a8..621706a2fd 100644
--- a/source/text/swriter/01/06040000.xhp
+++ b/source/text/swriter/01/06040000.xhp
@@ -31,7 +31,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:WordCountDialog" id="bm_id1483504" localize="false"/>
 <section id="wordcount">
          <paragraph xml-lang="en-US" id="par_idN10542" role="heading" level="1" l10n="NEW"><link href="text/swriter/01/06040000.xhp">Word Count</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_idN10552" role="paragraph" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters, with or without spaces, in the current selection and in the whole document.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10552" role="paragraph" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters, with or without spaces, in the current selection and in the whole document. The count is kept up to date as you type or change the selection.</ahelp></paragraph>
          <embed href="text/swriter/guide/words_count.xhp#how"/>
       </section>
       <section id="howtoget">
diff --git a/source/text/swriter/guide/words_count.xhp b/source/text/swriter/guide/words_count.xhp
index 6f6413c4d3..8da2393de3 100644
--- a/source/text/swriter/guide/words_count.xhp
+++ b/source/text/swriter/guide/words_count.xhp
@@ -40,20 +40,21 @@
 </variable></paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_idN105D1" role="listitem" l10n="NEW">Word count is shown in the status bar, and is kept up to date as you edit.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN105D1" role="listitem" l10n="NEW">Word and character count is shown in the status bar, and is kept up to date as you edit.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN106D1" role="listitem" l10n="NEW">If you want to count only some text of your document, select the text.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3149821" role="listitem" l10n="CHG" oldref="5">To display extended statistics such as character count, double click the word count in the status bar, or choose <emph>Tools - Word Count</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3149821" role="listitem" l10n="CHG" oldref="5">To display extended statistics such as count of characters without spaces, double click the word count in the status bar, or choose <emph>Tools - Word Count</emph>.</paragraph>
          </listitem>
       </list>
       <section id="how">
          <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does %PRODUCTNAME count words?</paragraph>
-         <paragraph xml-lang="en-US" id="par_id1116200901133998" role="paragraph" l10n="NEW">In general, every string of characters between two spaces is a word. Tabs, line breaks, and paragraph breaks are word limits, too.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id1116200901133985" role="paragraph" l10n="NEW">Words with dashes or always visible hyphens, as in plug-in, add-on, user/config, are counted as one word each.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1116200901133998" role="paragraph" l10n="NEW">In general, every string of characters between two spaces is a word. Dashes, tabs, line breaks, and paragraph breaks are word limits, too.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1116200901133985" role="paragraph" l10n="NEW">Words with always visible hyphens, as in plug-in, add-on, user/config, are counted as one word each.</paragraph>
          <paragraph xml-lang="en-US" id="par_id111620090113399" role="paragraph" l10n="NEW">The words can be a mix of letters, numbers, and special characters. So the following text counts as four words: abc123 1.23 "$" http://www.example.com.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id111620090113400" role="paragraph" l10n="NEW">To add a custom character to be considered as the word limit, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph> and add the character into the <emph>Additional separators</emph> field.</paragraph>
       </section>
       <paragraph xml-lang="en-US" id="par_idN106E2" role="tip" l10n="NEW">To get some more statistics about the document, choose <emph>File - Properties - Statistics</emph>.</paragraph>
       <embed href="text/shared/00/00000004.xhp#related"/>