cws tl74: merge with DEV300_m81

1 files changed, 10 insertions, 10 deletions

diff --git a/helpcontent2/source/text/shared/optionen/mailmerge.xhp b/helpcontent2/source/text/shared/optionen/mailmerge.xhp
index ae80fdfdf1..bc5a3316cd 100755
--- a/helpcontent2/source/text/shared/optionen/mailmerge.xhp
+++ b/helpcontent2/source/text/shared/optionen/mailmerge.xhp
@@ -49,34 +49,34 @@
 </section>
 <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">User information</paragraph>
 <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Enter the user information to use when you send e-mail.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_DISPLAYNAME" id="bm_id3323770" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME" id="bm_id3323770" localize="false"/>
 <paragraph role="heading" id="par_idN1058A" xml-lang="en-US" level="3" l10n="NEW">Your name</paragraph>
 <paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_ADDRESS" id="bm_id5569627" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_ADDRESS" id="bm_id5569627" localize="false"/>
 <paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3" l10n="NEW">E-mail address</paragraph>
 <paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your e-mail address for replies.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_MAILCONFIG_CB_REPLYTO" id="bm_id8856166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO" id="bm_id8856166" localize="false"/>
 <paragraph role="heading" id="par_idN105C0" xml-lang="en-US" level="3" l10n="NEW">Send replies to different e-mail address</paragraph>
 <paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the e-mail address that you enter in the Reply address text box as the reply-to e-mail address.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_REPLYTO" id="bm_id2134769" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_REPLYTO" id="bm_id2134769" localize="false"/>
 <paragraph role="heading" id="par_idN105DB" xml-lang="en-US" level="3" l10n="NEW">Reply address</paragraph>
 <paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the address to use for e-mail replies.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105EE" xml-lang="en-US" level="2" l10n="NEW">Outgoing server (SMTP) settings</paragraph>
 <paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US" l10n="NEW">Specify the server settings for outgoing e-mails.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_Edit_TP_MAILCONFIG_ED_SERVER" id="bm_id7700735" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_MAILCONFIG:ED_SERVER" id="bm_id7700735" localize="false"/>
 <paragraph role="heading" id="par_idN105FD" xml-lang="en-US" level="3" l10n="NEW">Server name</paragraph>
 <paragraph role="paragraph" id="par_idN10601" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the SMTP server name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_NumericField_TP_MAILCONFIG_NF_PORT" id="bm_id6578569" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_MAILCONFIG:NF_PORT" id="bm_id6578569" localize="false"/>
 <paragraph role="heading" id="par_idN10618" xml-lang="en-US" level="3" l10n="NEW">Port</paragraph>
 <paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the SMTP port.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_ListBox_TP_MAILCONFIG_LB_SECURE" id="bm_id5304116" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/879363086" id="bm_id72634" localize="false"/>
+<!-- removed HID sw_ListBox_TP_MAILCONFIG_LB_SECURE -->
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_MAILCONFIG_CB_SECURE" id="bm_id72634" localize="false"/>
 <paragraph role="heading" id="par_idN10633" xml-lang="en-US" level="2" l10n="NEW">Use secure connection</paragraph>
 <paragraph role="paragraph" id="par_idN10637" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When available, uses a secure connection to send e-mails.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_MAILCONFIG_PB_AUTHENTICATION" id="bm_id611896" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION" id="bm_id611896" localize="false"/>
 <paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="2" l10n="NEW">Server Authentication</paragraph>
 <paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link> dialog where you can specify the server authentication settings for secure e-mail.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_MAILCONFIG_PB_TEST" id="bm_id926847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_MAILCONFIG:PB_TEST" id="bm_id926847" localize="false"/>
 <paragraph role="heading" id="par_idN10677" xml-lang="en-US" level="2" l10n="NEW">Test Settings</paragraph>
 <paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link> dialog to test the current settings.</ahelp></paragraph>
 </body>