CWS-TOOLING: integrate CWS hcshared24

1 files changed, 14 insertions, 8 deletions

diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index 533a05b40d..79eb1411a1 100755
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.xhp
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -198,7 +198,8 @@
                <paragraph xml-lang="en-US" id="par_id3156293" role="tablecontent" l10n="U" oldref="174">[a-e]</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3149167" role="tablecontent" l10n="CHG" oldref="175">Represents any of the characters that are between a and e.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149167" role="tablecontent" l10n="CHG" oldref="175">Represents any of the characters that are between a and e, including both start and end characters</paragraph>
+               <paragraph xml-lang="en-US" id="par_id100520090232005" role="tablecontent" l10n="NEW">The characters are ordered by their code numbers.</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
@@ -214,7 +215,7 @@
                <paragraph xml-lang="en-US" id="par_id3145318" role="tablecontent" l10n="U" oldref="178">[^a-s]</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3153351" role="tablecontent" l10n="CHG" oldref="179">Represents any character that is not between a and s.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153351" role="tablecontent" l10n="CHG" oldref="179">Represents everything that is not between a and s.</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
@@ -231,7 +232,7 @@
                <paragraph xml-lang="en-US" id="par_id3153951" role="tablecontent" l10n="U" oldref="186">|</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="CHG" oldref="187">Finds the terms that occur before or after the "|". For example, "this|that" finds "this" and "that".</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="CHG" oldref="187">Finds the terms that occur before the "|" and also finds the terms that occur after the "|". For example, "this|that" finds "this" and "that".</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
@@ -239,7 +240,7 @@
                <paragraph xml-lang="en-US" id="par_id3147376" role="tablecontent" l10n="U" oldref="209">{2}</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3150103" role="tablecontent" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds "tree".</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3150103" role="tablecontent" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds and selects "tree".</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
@@ -247,7 +248,7 @@
                <paragraph xml-lang="en-US" id="par_id3151289" role="tablecontent" l10n="U" oldref="211">{1,2}</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="U" oldref="212">Defines the number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds both "tree" and "treated".</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="CHG" oldref="212">Defines the minimum and maximum number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds and selects "tre" and "tree".</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
@@ -333,7 +334,7 @@
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3150092" role="tablecontent" l10n="CHG" oldref="231">Represents an uppercase character if <emph>Match case</emph> is selected in <emph>Options.</emph>
-</paragraph>
+               </paragraph>
             </tablecell>
          </tablerow>
       </table>
@@ -348,7 +349,12 @@
       <paragraph xml-lang="en-US" id="par_id5806756" role="paragraph" l10n="NEW">$ means the match must end a paragraph. </paragraph>
       <section id="relatedtopics">
          <embed href="text/shared/01/02100000.xhp#02100000"/>
-         <paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
+<switch select="appl">
+<case select="WRITER"><embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
+         <embed href="text/swriter/guide/finding.xhp#finding"/>
+</case>
+</switch>
+<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
       </section>
    </body>