diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:10:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:10:16 +0000 |
| commit | 18f2f50ce8a6aa88d8f41d621c47fbe611e2e6c4 (patch) | |
| tree | b78ae41cb8f4be21bbf03c20b5764cc882783d05 /helpcontent2/source/text/shared/optionen | |
| parent | INTEGRATION: CWS hc680pb3 (1.2.30); FILE MERGED (diff) | |
| download | help-18f2f50ce8a6aa88d8f41d621c47fbe611e2e6c4.tar.gz help-18f2f50ce8a6aa88d8f41d621c47fbe611e2e6c4.zip | |
INTEGRATION: CWS hc680pb3 (1.3.20); FILE MERGED
2005/03/16 10:31:25 fpe 1.3.20.1: Regular update
Diffstat (limited to 'helpcontent2/source/text/shared/optionen')
| -rwxr-xr-x | helpcontent2/source/text/shared/optionen/01160201.xhp | 8 | ||||
| -rwxr-xr-x | helpcontent2/source/text/shared/optionen/mailmerge.xhp | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/helpcontent2/source/text/shared/optionen/01160201.xhp b/helpcontent2/source/text/shared/optionen/01160201.xhp index 0876e76dcd..e6de9f71e6 100755 --- a/helpcontent2/source/text/shared/optionen/01160201.xhp +++ b/helpcontent2/source/text/shared/optionen/01160201.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,12 +62,14 @@ </topic> <history> <created date="2004-07-29T11:07:57">UFI: Create/Edit Database Link dialog</created> -<lastedited date="2004-09-30T14:26:21">DEDR: Reviewed</lastedited> +<lastedited date="2005-03-01T15:52:31">DEDR: Reviewed</lastedited> </history> </meta> <body> <paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW">Database Link</paragraph> <paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US" l10n="NEW">Creates or edits an entry in the <link href="text/shared/optionen/01160200.xhp">Databases</link> tab page.</paragraph> +<bookmark xml-lang="en-US" branch="hid/SID_OPENURL" id="bm_id6481215" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/.uno:OpenUrl" id="bm_id564897" localize="false"/> <paragraph role="heading" id="par_idN1054F" xml-lang="en-US" level="2" l10n="NEW">Database file</paragraph> <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Enter the path and the file name of the database file. The name of the file must end with the *.odb extension.</paragraph> <bookmark xml-lang="en-US" branch="hid/svx_PushButton_DLG_DOCUMENTLINK_PB_BROWSEFILE" id="bm_id8789330" localize="false"/> 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"/> |