INTEGRATION: CWS hc680pp1 (1.4.34); FILE MERGED

2005/09/30 20:09:57 ufi 1.4.34.3: RESYNC: (1.4-1.5); FILE MERGED
2005/06/02 09:57:29 fpe 1.4.34.2:  regular update
2005/04/29 14:11:28 fpe 1.4.34.1: Regular Update

1 files changed, 8 insertions, 8 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01030300.xhp b/helpcontent2/source/text/shared/optionen/01030300.xhp
index 26807f8ed9..a5bdc88ca3 100755
--- a/helpcontent2/source/text/shared/optionen/01030300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030300.xhp
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: 01030300.xhp,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 23:33:56 $
+ *  last change: $Author: kz $ $Date: 2005-10-05 14:01:03 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -42,7 +42,7 @@
 </topic>
 <history>
 <created date="2004-08-25T16:38:01">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-19T14:08:49">UFI: everything changed, see "Electronic Signatures and Encryption GUI" spec doc
+<lastedited date="2005-05-09T16:39:04">UFI: everything changed, see "Electronic Signatures and Encryption GUI" spec doc
 YJ: checked</lastedited>
 </history>
 </meta>
@@ -66,10 +66,10 @@ YJ: checked</lastedited>
 <bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SAVEORSENDDOCS" id="bm_id5852534" localize="false"/>
 <paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
 <paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SIGNDOCS" id="bm_id1294289" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_PRINTDOCS" id="bm_id2789696" localize="false"/>
 <paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
 <paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or notes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_PRINTDOCS" id="bm_id2789696" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SIGNDOCS" id="bm_id1294289" localize="false"/>
 <paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
 <paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or notes.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_CREATEPDF" id="bm_id1584215" localize="false"/>
@@ -77,7 +77,7 @@ YJ: checked</lastedited>
 <paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays notes.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_REMOVEPERSINFO" id="bm_id7565233" localize="false"/>
 <paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Delete</emph> button on <link href="text/shared/01/01100200.xhp"><emph>File - Properties - General</emph></link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Delete</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECOMMPASSWD" id="bm_id6656086" localize="false"/>
 <paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3" l10n="NEW">Recommend password protection on saving</paragraph>
 <paragraph role="paragraph" id="par_idN10680" xml-lang="en-US" l10n="NEW"><ahelp hid="703988744">Select to specify that the <emph>Save with password</emph> option in the file saves dialogs checked by default. Deselect the option to save a file without password.</ahelp></paragraph>
@@ -85,7 +85,7 @@ YJ: checked</lastedited>
 <paragraph role="paragraph" id="par_idN1068B" xml-lang="en-US" l10n="NEW">Adjust the security level for executing macros and specify trusted macro authors.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_MACROSEC" id="bm_id3726920" localize="false"/>
 <paragraph role="heading" id="par_idN1068E" xml-lang="en-US" level="2" l10n="NEW">Macro Security</paragraph>
-<paragraph role="paragraph" id="par_idN10692" xml-lang="en-US" l10n="NEW"><ahelp hid="703992332">Opens the <link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link> dialog.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10692" xml-lang="en-US" l10n="NEW"><ahelp hid="703992332">Opens the <emph>Macro Security</emph> dialog.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN106A3" xml-lang="en-US" level="2" l10n="NEW">File sharing options for this document</paragraph>
 <paragraph role="paragraph" id="par_idN106A7" xml-lang="en-US" l10n="NEW">The following options are valid only for the current document:</paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECOMMREADONLY" id="bm_id8295846" localize="false"/>
@@ -94,7 +94,7 @@ YJ: checked</lastedited>
 <paragraph role="note" id="par_idN106B1" xml-lang="en-US" l10n="NEW">This file sharing option protects the document against accidental changes. It is still possible to edit a copy of the document and save that copy with the same name as the original.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECORDCHANGES" id="bm_id868861" localize="false"/>
 <paragraph role="heading" id="par_idN106B4" xml-lang="en-US" level="3" l10n="NEW">Record changes</paragraph>
-<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW"><ahelp hid="703988751">Select to enable recording changes. This is the same as <link href="text/shared/01/02230100.xhp"><emph>Edit - Changes - Record</emph></link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW"><ahelp hid="703988751">Select to enable recording changes. This is the same as <emph>Edit - Changes - Record</emph>.</ahelp></paragraph>
 <paragraph role="tip" id="par_idN106C9" xml-lang="en-US" l10n="NEW">To protect the recording state with a password, click <emph>Protect</emph> and enter a password. Other users of this document can apply their changes, but they cannot disable change recording without the password.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_PROTRECORDS" id="bm_id2517166" localize="false"/>
 <paragraph role="heading" id="par_idN106D0" xml-lang="en-US" level="3" l10n="NEW">Protect / Unprotect</paragraph>