[Libreoffice-commits] help.git: source/text

Thu Dec 15 13:40:39 UTC 2016

source/text/shared/optionen/01030300.xhp |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit b57f991c21f157f79e12b18664972d51ab7f3fbc
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Wed Dec 14 22:06:57 2016 +0100

    tdf#100096 Document security option for link blocking
    
    Also fix the nonsensical ahids of that page
    
    Change-Id: Iaa7b190c031e0c925d066d576ec14f4b282ef67c
    Reviewed-on: https://gerrit.libreoffice.org/32021
    Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
    Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>

diff --git a/source/text/shared/optionen/01030300.xhp b/source/text/shared/optionen/01030300.xhp
index 747fe87..7a451d4 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -46,24 +46,29 @@
 <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="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or comments.</ahelp></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="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or comments.</ahelp></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="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 comments.</ahelp></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="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 comments.</ahelp></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="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>Reset Properties</emph> button on <emph>File - Properties - General</emph>.</ahelp></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="703988744">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>
+<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=".">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>
+<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="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>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsecuritypage/savepassword" id="bm_id3294778" localize="false"/><paragraph role="heading" id="hd_id3168736" xml-lang="en-US" level="3" l10n="NEW">Persistently save passwords protected by a master password</paragraph>
