diff options
Diffstat (limited to 'helpcontent2/source/text/shared/optionen/mailmerge.xhp')
| -rwxr-xr-x | helpcontent2/source/text/shared/optionen/mailmerge.xhp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/helpcontent2/source/text/shared/optionen/mailmerge.xhp b/helpcontent2/source/text/shared/optionen/mailmerge.xhp index a3ba947101..4332c27306 100755 --- a/helpcontent2/source/text/shared/optionen/mailmerge.xhp +++ b/helpcontent2/source/text/shared/optionen/mailmerge.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,7 +62,7 @@ </topic> <history> <created date="2004-10-06T16:03:54">UFI: Mail Merge E-Mail tab page for Writer options</created> -<lastedited date="2004-10-27T09:21:06">DEDR: Reviewed</lastedited> +<lastedited date="2005-03-01T16:03:26">DEDR: Reviewed</lastedited> </history> </meta> <body> @@ -94,6 +94,7 @@ <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"/> <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"/> |