AllLangHelp_shared.mk                                 |    1 
 source/text/shared/optionen/01030300.xhp              |   27 ------
 source/text/shared/optionen/securityoptionsdialog.xhp |   73 ++++++++++++++++++
 source/text/shared/optionen/viewcertificate_d.xhp     |    6 -
 source/text/shared/optionen/viewcertificate_g.xhp     |    2 
 5 files changed, 79 insertions(+), 30 deletions(-)

New commits:
commit 1b43d2a89422ccde063fac2dbd5a80c49b36e560
Author: Gabor Kelemen <[email protected]>
Date:   Mon Apr 17 12:06:21 2017 +0200

    Fix bookmarks related to the View Certificate window
    
    Change-Id: Iec618b32dcb248db26aa118f21997499cbf6db31
    Reviewed-on: https://gerrit.libreoffice.org/36614
    Reviewed-by: Gabor Kelemen <[email protected]>
    Tested-by: Gabor Kelemen <[email protected]>

diff --git a/source/text/shared/optionen/viewcertificate_d.xhp 
b/source/text/shared/optionen/viewcertificate_d.xhp
index aa6bfcd5a..9a7f77c4c 100644
--- a/source/text/shared/optionen/viewcertificate_d.xhp
+++ b/source/text/shared/optionen/viewcertificate_d.xhp
@@ -30,12 +30,12 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" 
branch="hid/xmlsecurity/ui/certdetails/tablecontainer" id="bm_id9764091" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/xmlsecurity/ui/certdetails/CertDetails" 
id="bm_id5656300" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/certdetails/tablecontainer" 
id="bm_id9764091" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/certdetails/CertDetails" 
id="bm_id5656300" localize="false"/>
 <paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" 
l10n="NEW"><variable id="details"><link 
href="text/shared/optionen/viewcertificate_d.xhp">Details</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10562" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">The Details page of the <link 
href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog 
displays detailed information about the certificate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/xmlsecurity/ui/certdetails/valuedetails" id="bm_id6321909" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/certdetails/valuedetails" 
id="bm_id6321909" localize="false"/>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">Use the value list box to view values and copy them 
to the clipboard.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/viewcertificate_g.xhp 
b/source/text/shared/optionen/viewcertificate_g.xhp
index c23b087c5..271a7f5ef 100644
--- a/source/text/shared/optionen/viewcertificate_g.xhp
+++ b/source/text/shared/optionen/viewcertificate_g.xhp
@@ -30,7 +30,7 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_TP_GENERAL" 
id="bm_id8695333" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/certgeneral/box1" 
id="bm_id8695333" localize="false"/>
 <paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" 
l10n="NEW"><variable id="general"><link 
href="text/shared/optionen/viewcertificate_g.xhp">General</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" 
l10n="NEW"><ahelp hid=".">The General page of the <link 
href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog 
displays basic information about the certificate.</ahelp></paragraph>
commit b20e40b89fc75992c9d790cc36699727d2d866f8
Author: Gabor Kelemen <[email protected]>
Date:   Mon Apr 17 00:56:04 2017 +0200

    tdf#105280 Split out Security Options and Warnings help page
    
    This makes the Security options page much cleaner.
    Also fix a missing ahelp and some capitalization.
    
    Change-Id: Ie03ed0833fdc01635988846f259249031c3ed405
    Reviewed-on: https://gerrit.libreoffice.org/36592
    Reviewed-by: Gabor Kelemen <[email protected]>
    Tested-by: Gabor Kelemen <[email protected]>

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 0deb8b212..f026b2242 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -831,6 +831,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/optionen/01020300 \
     helpcontent2/source/text/shared/optionen/01030000 \
     helpcontent2/source/text/shared/optionen/01030300 \
+    helpcontent2/source/text/shared/optionen/securityoptionsdialog \
     helpcontent2/source/text/shared/optionen/01030500 \
     helpcontent2/source/text/shared/optionen/01040000 \
     helpcontent2/source/text/shared/optionen/01040200 \
diff --git a/source/text/shared/optionen/01030300.xhp 
b/source/text/shared/optionen/01030300.xhp
index 9936f0a16..0a289e50d 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -42,32 +42,7 @@
   <embed href="text/shared/00/00000406.xhp#scripting"/>
 </section>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/options" 
id="bm_id9049653" localize="false"/><paragraph role="heading" id="par_idN10640" 
xml-lang="en-US" level="2" l10n="CHG">Options</paragraph>
-<paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" 
l10n="CHG"><ahelp hid=".">Opens the "Security options and warning" 
dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/SecurityOptionsDialog" 
id="bm_id1976684" localize="false"/><paragraph role="paragraph" 
id="par_id5616626" xml-lang="en-US" l10n="NEW">The Security options and 
warnings dialog contains the following controls:</paragraph>
-
-<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/savesenddocs" id="bm_id1976683" 
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="cui/ui/securityoptionsdialog/savesenddocs">Select to see 
a warning dialog when you try to save or send a document that contains recorded 
changes, versions, or comments.</ahelp></paragraph>
-
-<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/whenprinting" id="bm_id43946" 
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="cui/ui/securityoptionsdialog/whenprinting">Select to see 
a warning dialog when you try to print a document that contains recorded 
changes or comments.</ahelp></paragraph>
-
-<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/whensigning" id="bm_id6449171" 
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="cui/ui/securityoptionsdialog/whensigning">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 comments.</ahelp></paragraph>
-
-<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/whenpdf" 
id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" 
xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" 
l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/whenpdf">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 comments.</ahelp></paragraph>
-
-<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/removepersonal" id="bm_id4263740" 
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="CHG"><ahelp hid="cui/ui/securityoptionsdialog/removepersonal">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>Reset Properties</emph> button on <emph>File - 
Properties - General</emph>.</ahelp></paragraph>
-
-<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/password" 
id="bm_id7186498" 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="CHG"><ahelp hid="cui/ui/securityoptionsdialog/password">Select to always 
enable the <emph>Save with password</emph> option in the file save dialogs. 
Deselect the option to save files by default without 
password.</ahelp></paragraph>
-
-<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/ctrlclick" 
id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" 
xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow 
hyperlinks</paragraph>
-<paragraph role="paragraph" id="par_id79042" xml-lang="en-US" 
l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/ctrlclick">If enabled, you 
must hold down the Ctrl key while clicking a hyperlink to follow that link. If 
not enabled, a click opens the hyperlink.</ahelp></paragraph>
-
-<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/blockuntrusted" id="bm_id5288858" 
localize="false"/><paragraph role="heading" id="hd_id1972107" xml-lang="en-US" 
level="3">Block any links from documents not among the trusted locations (see 
Macro Security)</paragraph>
-<paragraph role="paragraph" id="par_id79043" xml-lang="en-US"><ahelp 
hid="cui/ui/securityoptionsdialog/blockuntrusted">Blocks the use of links 
pointing to images not in the trusted locations defined on the <link 
href="text/shared/optionen/macrosecurity_ts.xhp" name="Trusted Sources">Trusted 
Sources</link> tab of the Macro Security dialog.</ahelp> This can increase 
security in case you work with documents from untrusted sources (e.g. the 
internet) and are worried about vulnerabilities in image processing software 
components. Blocking the use of links means that images are not loaded in 
documents, only a placeholder frame is visible.</paragraph>
+<paragraph role="paragraph" id="par_idN10644" xml-lang="en-US" 
l10n="CHG"><ahelp hid=".">Opens the "Security Options and Warnings" 
dialog.</ahelp></paragraph>
 
 <paragraph role="heading" id="hd_id4076357" xml-lang="en-US" level="2" 
l10n="NEW">Passwords for web connections</paragraph>
 <paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="NEW">You 
can enter a master password to enable easy access to sites that require a user 
name and password.</paragraph>
diff --git a/source/text/shared/optionen/securityoptionsdialog.xhp 
b/source/text/shared/optionen/securityoptionsdialog.xhp
new file mode 100644
index 000000000..3cd7027c4
--- /dev/null
+++ b/source/text/shared/optionen/securityoptionsdialog.xhp
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+
+<meta>
+  <topic id="sharedoptionensecurityoptionsdialogxml">
+    <title id="tit" xml-lang="en-US">Security Options and Warnings</title>
+    <filename>/text/shared/optionen/securityoptionsdialog.xhp</filename>
+  </topic>
+</meta>
+
+<body>
+
+
+<section id="security_options_and_warnings">
+<bookmark xml-lang="en-US" branch="index" id="bm_id2322154">
+<bookmark_value>selecting;security warnings</bookmark_value>
+<bookmark_value>selecting;security options</bookmark_value>
+<bookmark_value>options;security</bookmark_value>
+<bookmark_value>warnings;security</bookmark_value>
+</bookmark>
+<paragraph id="hd_id201704161714419669" role="heading" level="1" 
xml-lang="en-US"><link 
href="/text/shared/optionen/securityoptionsdialog.xhp">Security Options and 
Warnings</link></paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/SecurityOptionsDialog" 
id="bm_id201704161715484484" localize="false"/>
+<paragraph id="par_id201704161715253349" role="paragraph" 
xml-lang="en-US"><ahelp hid=".">Set security related options and warnings about 
hidden information in documents.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+    <paragraph role="paragraph" id="par_id5616645" xml-lang="en-US">Press the 
<emph>Options</emph> button on the <link 
href="text/shared/optionen/01030300.xhp" name="Security">Security</link> 
page.</paragraph>
+</section>
+<paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">The 
Security options and warnings dialog contains the following 
controls:</paragraph>
+
+<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/savesenddocs" id="bm_id1976683" 
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="cui/ui/securityoptionsdialog/savesenddocs">Select to see 
a warning dialog when you try to save or send a document that contains recorded 
changes, versions, or comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/whenprinting" id="bm_id43946" 
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="cui/ui/securityoptionsdialog/whenprinting">Select to see 
a warning dialog when you try to print a document that contains recorded 
changes or comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/whensigning" id="bm_id6449171" 
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="cui/ui/securityoptionsdialog/whensigning">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 comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/whenpdf" 
id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" 
xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
+<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" 
l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/whenpdf">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 comments.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/removepersonal" id="bm_id4263740" 
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="CHG"><ahelp hid="cui/ui/securityoptionsdialog/removepersonal">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>Reset Properties</emph> button on <emph>File - 
Properties - General</emph>.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/password" 
id="bm_id7186498" 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="CHG"><ahelp hid="cui/ui/securityoptionsdialog/password">Select to always 
enable the <emph>Save with password</emph> option in the file save dialogs. 
Deselect the option to save files by default without 
password.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/ctrlclick" 
id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" 
xml-lang="en-US" level="3" l10n="NEW">Ctrl-click required to follow 
hyperlinks</paragraph>
+<paragraph role="paragraph" id="par_id79042" xml-lang="en-US" 
l10n="NEW"><ahelp hid="cui/ui/securityoptionsdialog/ctrlclick">If enabled, you 
must hold down the Ctrl key while clicking a hyperlink to follow that link. If 
not enabled, a click opens the hyperlink.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" 
branch="hid/cui/ui/securityoptionsdialog/blockuntrusted" id="bm_id5288858" 
localize="false"/><paragraph role="heading" id="hd_id1972107" xml-lang="en-US" 
level="3">Block any links from documents not among the trusted locations (see 
Macro Security)</paragraph>
+<paragraph role="paragraph" id="par_id79043" xml-lang="en-US"><ahelp 
hid="cui/ui/securityoptionsdialog/blockuntrusted">Blocks the use of links 
pointing to images not in the trusted locations defined on the <link 
href="text/shared/optionen/macrosecurity_ts.xhp" name="Trusted Sources">Trusted 
Sources</link> tab of the Macro Security dialog.</ahelp> This can increase 
security in case you work with documents from untrusted sources (e.g. the 
internet) and are worried about vulnerabilities in image processing software 
components. Blocking the use of links means that images are not loaded in 
documents, only a placeholder frame is visible.</paragraph>
+
+</body>
+
+</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to