source/text/shared/guide/protection.xhp | 82 ++++++++++++++-----------------
source/text/swriter/guide/protection.xhp | 2
2 files changed, 40 insertions(+), 44 deletions(-)
New commits:
commit 1d9db89cb1d9e2beb64672b55f200e24da405670
Author: Rafael Lima <rafael.palma.l...@gmail.com>
AuthorDate: Mon Sep 20 20:58:28 2021 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Sep 22 14:41:18 2021 +0200
tdf#144559 Fix information about document encryption
Change-Id: Ibadf9946d144fc9573d6cbfa2f4abdc8d56721ba
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122283
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/source/text/shared/guide/protection.xhp
b/source/text/shared/guide/protection.xhp
index 42c7deee5..991172cfe 100644
--- a/source/text/shared/guide/protection.xhp
+++ b/source/text/shared/guide/protection.xhp
@@ -19,31 +19,30 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
<meta>
- <topic id="textsharedguideprotectionxml" indexer="include">
- <title xml-lang="en-US" id="tit">Protecting Content in
%PRODUCTNAME</title>
- <filename>/text/shared/guide/protection.xhp</filename>
- </topic>
- </meta>
- <body>
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3150620"><bookmark_value>protecting; contents</bookmark_value>
- <bookmark_value>protected contents</bookmark_value>
- <bookmark_value>contents protection</bookmark_value>
- <bookmark_value>encryption of contents</bookmark_value>
- <bookmark_value>passwords for protecting contents</bookmark_value>
- <bookmark_value>security;protecting contents</bookmark_value>
- <bookmark_value>form controls; protecting</bookmark_value>
- <bookmark_value>draw objects;protecting</bookmark_value>
- <bookmark_value>OLE objects;protecting</bookmark_value>
- <bookmark_value>graphics;protecting</bookmark_value>
- <bookmark_value>frames;protecting</bookmark_value>
-</bookmark><comment>mw moved 4 index entries to
swriter/guide/protection.xhp</comment>
-<paragraph xml-lang="en-US" id="hd_id3155364" role="heading"
level="1"><variable id="protection"><link
href="text/shared/guide/protection.xhp" name="Protecting Content in
%PRODUCTNAME">Protecting Content in <item
type="productname">%PRODUCTNAME</item></link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph">The
following is an overview of the different ways of protecting contents in <item
type="productname">%PRODUCTNAME</item> from being modified, deleted or
viewed.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3146957" role="heading"
level="2">Protecting All Documents When Saving</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150775" role="paragraph">All
documents that are saved in <link href="text/shared/00/00000021.xhp"
name="OpenDocument format">OpenDocument format</link> can be saved with a
password. Documents that are saved with a password cannot be opened without the
password. The content is secured so that it cannot be read with an external
editor. This applies to content, graphics and OLE objects.</paragraph>
+ <topic id="textsharedguideprotectionxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME</title>
+ <filename>/text/shared/guide/protection.xhp</filename>
+ </topic>
+</meta>
+<body>
+ <bookmark xml-lang="en-US" branch="index"
id="bm_id3150620"><bookmark_value>protecting; contents</bookmark_value>
+ <bookmark_value>protected contents</bookmark_value>
+ <bookmark_value>contents protection</bookmark_value>
+ <bookmark_value>encryption of contents</bookmark_value>
+ <bookmark_value>passwords for protecting contents</bookmark_value>
+ <bookmark_value>security;protecting contents</bookmark_value>
+ <bookmark_value>form controls; protecting</bookmark_value>
+ <bookmark_value>draw objects;protecting</bookmark_value>
+ <bookmark_value>OLE objects;protecting</bookmark_value>
+ <bookmark_value>graphics;protecting</bookmark_value>
+ <bookmark_value>frames;protecting</bookmark_value>
+ </bookmark>
+ <h1 id="hd_id3155364"><variable id="protection"><link
href="text/shared/guide/protection.xhp" name="Protecting Contents in
%PRODUCTNAME">Protecting Contents in <item
type="productname">%PRODUCTNAME</item></link>
+</variable></h1>
+ <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph">The
following is an overview of the different ways of protecting contents in <item
type="productname">%PRODUCTNAME</item> from being modified, deleted or
viewed.</paragraph>
+ <h2 id="hd_id3146957">Protecting Documents With Passwords When Saving</h2>
+ <paragraph xml-lang="en-US" id="par_id3150775" role="paragraph">All
documents that are saved in <link href="text/shared/00/00000021.xhp"
name="OpenDocument format">OpenDocument format</link> can be saved with a
password. Documents that are saved with a password cannot be opened without the
password. The content is secured so that it cannot be read with an external
editor. This applies to content, graphics and OLE objects.</paragraph>
<table id="tbl_id3145071">
<tablerow>
<tablecell>
@@ -62,10 +61,9 @@
</tablecell>
</tablerow>
</table>
-
- <paragraph xml-lang="en-US" id="par_id3145068"
role="warning">Information entered in <emph>File - Properties</emph> is not
encrypted. This includes the name of the author, creation date, word and
character counts.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149294" role="heading"
level="2">Protecting Revision Marking</paragraph>
- <paragraph xml-lang="en-US" id="par_id3161646" role="paragraph">With
every change made in <item type="productname">%PRODUCTNAME</item> Calc and
<item type="productname">%PRODUCTNAME</item> Writer, the review function
records who made the change. This function can be turned on with protection, so
that it can only be turned off when the correct password is entered. Until
then, all changes will continue to be recorded. Acceptance or rejection of
changes is not possible.</paragraph>
+ <tip id="par_id761632164002322">It is possible to use OpenPGP to define
private and public keys to be used to encrypt %PRODUCTNAME documents. Read
<embedvar href="text/shared/guide/openpgp.xhp#openpgph1"/> to learn more on how
to set up OpenPGP encryption keys.</tip>
+ <h2 id="hd_id3149294">Protecting Revision Marking</h2>
+ <paragraph xml-lang="en-US" id="par_id3161646" role="paragraph">With every
change made in <item type="productname">%PRODUCTNAME</item> Calc and <item
type="productname">%PRODUCTNAME</item> Writer, the review function records who
made the change. This function can be turned on with protection, so that it can
only be turned off when the correct password is entered. Until then, all
changes will continue to be recorded. Acceptance or rejection of changes is not
possible.</paragraph>
<table id="tbl_id3148797">
<tablerow>
<tablecell>
@@ -84,9 +82,8 @@
</tablecell>
</tablerow>
</table>
-<comment>MW moved contents of "Protecting Cell Ranges in Calc" to the Calc
guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved
Writer specific contents to the new writer guide protection.xhp</comment>
-<paragraph xml-lang="en-US" id="hd_id3155113" role="heading"
level="2">Protecting Frames, Graphics, and OLE Objects</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153703" role="paragraph">You can
protect the content, position and size of inserted graphics. The same applies
to frames (in Writer) and OLE objects.</paragraph>
+ <h2 id="hd_id3155113">Protecting Frames, Graphics, and OLE Objects</h2>
+ <paragraph xml-lang="en-US" id="par_id3153703" role="paragraph">You can
protect the content, position and size of inserted graphics. The same applies
to frames (in Writer) and OLE objects.</paragraph>
<table id="tbl_id3158447">
<tablerow>
<tablecell>
@@ -105,9 +102,8 @@
</tablecell>
</tablerow>
</table>
-
- <paragraph xml-lang="en-US" id="hd_id3152992" role="heading"
level="2">Protecting Drawing Objects and Form Objects</paragraph>
- <paragraph xml-lang="en-US" id="par_id3166429" role="paragraph">The draw
objects that you insert into your documents with the <emph>Drawing
</emph>toolbar can be protected from being accidentally moved or changed in
size. You can do the same with form objects inserted with the <emph>Form
Controls</emph> toolbar.</paragraph>
+ <h2 id="hd_id3152992">Protecting Drawing Objects and Form Objects</h2>
+ <paragraph xml-lang="en-US" id="par_id3166429" role="paragraph">The draw
objects that you insert into your documents with the <emph>Drawing
</emph>toolbar can be protected from being accidentally moved or changed in
size. You can do the same with form objects inserted with the <emph>Form
Controls</emph> toolbar.</paragraph>
<table id="tbl_id3151062">
<tablerow>
<tablecell>
@@ -126,13 +122,13 @@
</tablecell>
</tablerow>
</table>
-<comment>removed webdav text, see i71792</comment><comment>MW moved "Opening
Microsoft Office Documents That Are Protected With a Password" to
shared/guide/ms_import_export_limitations.xhp </comment><embed
href="text/shared/00/00000004.xhp#related"/>
- <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
- <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
- <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph"
localize="false">
- <embedvar
href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
- </paragraph>
- <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph"><link
href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME
Writer</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph"><link
href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME
Calc</link></paragraph>
- </body>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
+ <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+ <embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+ <embed href="text/swriter/guide/protection.xhp#protection"/>
+ <embed href="text/scalc/guide/cell_protect.xhp#cell_protect"/>
+ <embed href="text/shared/guide/openpgp.xhp#openpgph1"/>
+ </section>
+</body>
</helpdocument>
diff --git a/source/text/swriter/guide/protection.xhp
b/source/text/swriter/guide/protection.xhp
index c3b6aa655..8bf9bf2bf 100644
--- a/source/text/swriter/guide/protection.xhp
+++ b/source/text/swriter/guide/protection.xhp
@@ -39,7 +39,7 @@
</bookmark>
-<h1 id="hd_id6007263"><variable id="protection"><link
href="text/swriter/guide/protection.xhp" name="Protecting Content in
%PRODUCTNAME Writer">Protecting Contents in <item
type="productname">%PRODUCTNAME Writer</item></link></variable></h1>
+<h1 id="hd_id6007263"><variable id="protection"><link
href="text/swriter/guide/protection.xhp" name="Protecting Content in
%PRODUCTNAME Writer">Protecting Contents in %PRODUCTNAME
Writer</link></variable></h1>
<paragraph id="par_id1924802" role="paragraph" xml-lang="en-US">The following
is an overview of the different ways of protecting contents in <item
type="productname">%PRODUCTNAME</item> Writer from being modified or
deleted.</paragraph>
<h2 id="hd_id3150114">Protecting Sections in <item
type="productname">%PRODUCTNAME</item> Writer</h2>
