[Libreoffice-commits] help.git: AllLangHelp_shared.mk source/auxiliary source/text
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 6 14:42:35 UTC 2018
AllLangHelp_shared.mk | 1
source/auxiliary/shared.tree | 2
source/text/shared/01/01070000.xhp | 43 ++-----
source/text/shared/guide/cmis-remote-files-setup.xhp | 9 -
source/text/shared/guide/digital_signatures.xhp | 1
source/text/shared/guide/openpgp.xhp | 104 +++++++++++++++++++
source/text/shared/optionen/01010100.xhp | 16 ++
source/text/shared/optionen/01010600.xhp | 10 -
8 files changed, 136 insertions(+), 50 deletions(-)
New commits:
commit fe0a1e4dbf6de65be1820553fba7b7e215013f85
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Sun Dec 2 22:46:19 2018 -0200
Commit: Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Thu Dec 6 15:42:13 2018 +0100
tdf#116078 OpenPGP encryption
+ some update (drop) references to LO file picker
Addressed comments by reviewer.
fix ordered list
Fixed reviewer comment.
Fixed DTD violations
Change-Id: Ie71f736a5713b042e185e93e595b6880ffe7541c
Reviewed-on: https://gerrit.libreoffice.org/64436
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 6d87868ef..b0259809d 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -689,6 +689,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/guide/navigator_setcursor \
helpcontent2/source/text/shared/guide/navpane_on \
helpcontent2/source/text/shared/guide/numbering_stop \
+ helpcontent2/source/text/shared/guide/openpgp \
helpcontent2/source/text/shared/guide/pageformat_max \
helpcontent2/source/text/shared/guide/paintbrush \
helpcontent2/source/text/shared/guide/pasting \
diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree
index b5722fc1c..de91edac3 100644
--- a/source/auxiliary/shared.tree
+++ b/source/auxiliary/shared.tree
@@ -113,6 +113,7 @@
<topic id="shared/text/shared/01/signexistingpdf.xhp">Signing Existing PDFs</topic>
<topic id="swriter/text/swriter/01/addsignatureline.xhp">Adding Signature Lines in Text Documents</topic>
<topic id="swriter/text/swriter/01/signsignatureline.xhp">Signing Signature Lines in Text Documents</topic>
+ <topic id="shared/text/shared/guide/openpgp.xhp">Encrypting Documents with OpenPGP</topic>
</node>
<node id="1008" title="Printing, Faxing, Sending">
<topic id="shared/text/shared/guide/labels_database.xhp">Printing Address Labels</topic>
@@ -145,6 +146,7 @@
<topic id="shared/text/shared/guide/doc_autosave.xhp">Saving Documents Automatically</topic>
<topic id="shared/text/shared/guide/export_ms.xhp">Saving Documents in Other Formats</topic>
<topic id="shared/text/shared/guide/data_dbase2office.xhp">Importing and Exporting Data in Text Format</topic>
+<topic id="shared/text/shared/guide/openpgp.xhp">Encrypting Documents with OpenPGP</topic>
</node>
<node id="1014" title="Links and References">
<topic id="shared/text/shared/guide/hyperlink_insert.xhp">Inserting Hyperlinks</topic>
diff --git a/source/text/shared/01/01070000.xhp b/source/text/shared/01/01070000.xhp
index 78e131f50..c1e0b221f 100644
--- a/source/text/shared/01/01070000.xhp
+++ b/source/text/shared/01/01070000.xhp
@@ -41,40 +41,11 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#saveas"/>
</section>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US">The following sections describe the <item type="productname">%PRODUCTNAME</item> <emph>Save as</emph> dialog. To activate the <item type="productname">%PRODUCTNAME</item> <emph>Open</emph> and <emph>Save</emph> dialog boxes, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General"><emph>%PRODUCTNAME- General</emph></link>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id251543697768103">%PRODUCTNAME uses the native file picker dialog of the window manager of your operating system for the <menuitem>Save as</menuitem> command.</paragraph>
+
<paragraph role="note" id="par_id3147654" xml-lang="en-US">To save a document as a template, use the command <emph>File - Templates - Save As Template</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/fpicker/ui/explorerfiledialog/connect_to_server" id="bm_id3154381" localize="false"/>
-<section id="connecttoserver">
-<paragraph role="heading" id="hd_id3146774" xml-lang="en-US" level="2">Connect To Server</paragraph>
-<paragraph role="paragraph" id="par_id3153820" xml-lang="en-US"><ahelp hid=".">Opens a dialog where you can set up connection to various types of servers, including WebDAV, FTP, SSH, Windows Share and CMIS.</ahelp></paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_LEVELUP" id="bm_id3154380" localize="false"/>
-<paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2">Up One Level</paragraph>
-<section id="levelup">
-<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US"><ahelp hid="HID_FILESAVE_LEVELUP">Move up one folder in the folder hierarchy. Long-click to see the higher level folders.</ahelp><comment>UFI: still a long-click</comment></paragraph>
-<embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_CREATEDIRECTORY" id="bm_id3155321" localize="false"/><paragraph role="heading" id="hd_id3159157" xml-lang="en-US" level="2">Create New Folder</paragraph>
-<section id="createdir">
-<paragraph role="paragraph" id="par_id3155583" xml-lang="en-US"><ahelp hid="HID_FILESAVE_CREATEDIRECTORY">Creates a new folder.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_PLACES_LISTBOX" id="bm_id3149513" localize="false"/>
-<section id="places">
-<paragraph role="heading" id="hd_id3155627" xml-lang="en-US" level="2">Places area</paragraph>
-<paragraph role="paragraph" id="par_id3149901" xml-lang="en-US"><ahelp hid=".">Displays "favourite" places, i.e. shortcuts to local or remote locations.</ahelp></paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_FILEVIEW" id="bm_id3149514" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW" id="bm_id3154673" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_CONTROL_FILEVIEW" id="bm_id3151311" localize="false"/>
-<paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="2">Display area</paragraph>
-<section id="fileview">
-<paragraph role="paragraph" id="par_id3149902" xml-lang="en-US"><ahelp hid=".">Displays the files and folders in the folder that you are in.</ahelp></paragraph>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_FILEURL" id="bm_id3155179" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL" id="bm_id3154751" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_EDIT_FILEURL" id="bm_id3154470" localize="false"/>
+
<paragraph role="heading" id="hd_id3154810" xml-lang="en-US" level="2">File name</paragraph>
<section id="filename">
<paragraph role="paragraph" id="par_id3153626" xml-lang="en-US"><ahelp hid=".">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link></ahelp></paragraph>
@@ -86,10 +57,12 @@
<section id="filetype">
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US"><ahelp hid=".">Select the file format for the document that you are saving.</ahelp> In the display area, only the documents with this file type are displayed. File types are described in <link href="text/shared/00/00000020.xhp" name="Information on Import and Export Filters">Information on Import and Export Filters</link>.</paragraph>
</section>
+
<embed href="text/shared/01/ref_pdf_export.xhp#ref_pdf_export"/>
<embed href="text/shared/00/00000021.xhp#xmlformat"/>
<paragraph role="warning" id="par_id3145116" xml-lang="en-US">Always save your document in a <item type="productname">%PRODUCTNAME</item> file type before saving it to an external file type. When you export to an external file type, some formatting features may be lost.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_DOSAVE" id="bm_id3149170" localize="false"/>
+
<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK" id="bm_id3150693" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK" id="bm_id3149099" localize="false"/>
<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2">Save</paragraph>
@@ -101,11 +74,17 @@
<paragraph role="paragraph" id="par_id3145152" xml-lang="en-US"><ahelp hid="HID_FILESAVE_SAVEWITHPASSWORD">Protects the file with a <link href="text/shared/01/password_dlg.xhp" name="password">password</link> that must be entered before a user can open the file.</ahelp></paragraph>
<paragraph role="note" id="par_id3152920" xml-lang="en-US">Only documents using the <item type="productname">%PRODUCTNAME</item> XML-based format can be saved with a password.</paragraph>
</section><comment>removed autoextension, i82752</comment>
+
+<h2 id="hd_id41543592332834">Encrypt with GPG key</h2>
+<paragraph role="paragraph" id="par_id71543592343227" xml-lang="en-US">Use OpenPGP public keys to encrypt documents.</paragraph>
+
<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_CUSTOMIZEFILTER" id="bm_id3147300" localize="false"/><paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="2">Edit filter settings</paragraph>
<paragraph role="paragraph" id="par_id3152883" xml-lang="en-US"><ahelp hid="HID_FILESAVE_CUSTOMIZEFILTER">Allows you to set the spreadsheet saving options for some types of data files.</ahelp><comment>UFI: had to change text and remove Calc switch because switch did not work correctly</comment></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_SELECTION" id="bm_id3150012" localize="false"/><paragraph role="heading" id="hd_id3154988" xml-lang="en-US" level="2">Selection</paragraph>
<paragraph role="paragraph" id="par_id3159125" xml-lang="en-US"><ahelp hid="HID_FILESAVE_SELECTION">Exports only the selected graphic objects in <item type="productname">%PRODUCTNAME</item> Draw and Impress to another format. If this box is not checked, the entire document is exported.</ahelp></paragraph>
<paragraph role="note" id="par_id3148577" xml-lang="en-US">If you are exporting to any document file type, the entire document is exported.</paragraph>
+
<section id="relatedtopics">
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
<paragraph role="paragraph" id="par_id3146986" xml-lang="en-US"><link href="text/shared/00/00000207.xhp" name="Export of Text Files">Export of Text Files</link></paragraph>
diff --git a/source/text/shared/guide/cmis-remote-files-setup.xhp b/source/text/shared/guide/cmis-remote-files-setup.xhp
index 8a91ca9ad..d32ddab8a 100644
--- a/source/text/shared/guide/cmis-remote-files-setup.xhp
+++ b/source/text/shared/guide/cmis-remote-files-setup.xhp
@@ -15,10 +15,8 @@
<filename>/text/shared/guide/cmis-remote-files-setup.xhp</filename>
</topic>
</meta>
-
<body>
-
<section id="setup_remote_files">
<bookmark xml-lang="en-US" branch="hid/svtools/uiconfig/ui/placeedit/@@nowidget@@" id="@@nowidget@@" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svtools/uiconfig/ui/placeedit/PlaceEditDialog" id="bm_id3137069" localize="false"/>
@@ -26,10 +24,8 @@
<bookmark_value>remote file service;setup</bookmark_value>
</bookmark>
-
<paragraph id="hd_id200820161036353610" role="heading" level="1" xml-lang="en-US"><link href="text/shared/guide/cmis-remote-files-setup.xhp">Setting up a remote file service connection</link></paragraph>
</section>
-<paragraph id="par_id150820161816033788" role="note" xml-lang="en-US">To access remote servers, you must use %PRODUCTNAME’s own Open and Save dialogs. If you currently use your operating system dialogs for saving and opening files, go to <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item> and check the option <item type="menuitem">Use %PRODUCTNAME dialogs</item>.</paragraph>
<section id="howtoget">
<paragraph id="par_id150820161816033744" role="paragraph" xml-lang="en-US">To enable a remote server connection, use one of these methods:</paragraph>
@@ -44,14 +40,13 @@
<listitem>
<paragraph id="par_id150820161816037870" role="ul_item" xml-lang="en-US">Select <item type="menuitem">File - Save to Remote Server</item></paragraph>
</listitem></list>
-<paragraph id="par_id150820161816033600" role="paragraph" xml-lang="en-US">Then click on the Add Service button in the dialog to open the File Services dialog.</paragraph>
+ <paragraph id="par_id150820161816033600" role="paragraph" xml-lang="en-US">Then press <widget>Add Service</widget> button in the dialog to open the File Services dialog.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="index" id="bm_id170820162240508275">
<bookmark_value>WebDAV;remote file service setup</bookmark_value>
<bookmark_value>remote file service setup;WebDAV</bookmark_value>
</bookmark>
-
<paragraph id="hd_id1501201618160340" role="heading" level="3" xml-lang="en-US">Connecting to a <link href="text/shared/00/00000002.xhp#webdav">WebDAV</link> server</paragraph>
<paragraph id="par_id150820161816034989" role="paragraph" xml-lang="en-US"><variable id="introservice">In the File Services dialog, set:</variable></paragraph>
@@ -83,7 +78,6 @@
<bookmark_value>remote file service setup;SSH</bookmark_value>
</bookmark>
-
<paragraph id="hd_id1508201618160340" role="heading" level="3" xml-lang="en-US">Connecting to <link href="text/shared/00/00000002.xhp#ftp">FTP</link> and SSH servers</paragraph>
<paragraph id="par_id150820161816034969" role="paragraph" xml-lang="en-US" localize="false"><embedvar href="text/shared/guide/cmis-remote-files-setup.xhp#introservice" markup="keep"/></paragraph>
@@ -212,5 +206,4 @@
<paragraph id="par_id210820161039438142" role="paragraph" xml-lang="en-US"><link href="text/shared/guide/cmis-remote-files.xhp#check">Checking-in and checking-out documents</link></paragraph>
</section>
</body>
-
</helpdocument>
diff --git a/source/text/shared/guide/digital_signatures.xhp b/source/text/shared/guide/digital_signatures.xhp
index 39046bc15..84ff4cfea 100644
--- a/source/text/shared/guide/digital_signatures.xhp
+++ b/source/text/shared/guide/digital_signatures.xhp
@@ -100,6 +100,7 @@
<paragraph xml-lang="en-US" id="par_id6075624" role="paragraph">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
<paragraph xml-lang="en-US" id="par_id6819971" role="warning">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
<section id="relatedtopics">
+ <paragraph role="paragraph" id="par_id681543699425744" localize="false"><embedvar href="text/shared/guide/openpgp.xhp#openpgphead" markup="ignore"/></paragraph>
<paragraph xml-lang="en-US" id="par_id3204443" role="paragraph"><link href="https://wiki.documentfoundation.org/How_to_use_digital_Signatures" name="wiki.documentfoundation.org: How to use digital Signatures">English Wiki page on digital signatures</link></paragraph>
<paragraph xml-lang="en-US" id="par_id486465" role="paragraph"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3448591" role="paragraph"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
diff --git a/source/text/shared/guide/openpgp.xhp b/source/text/shared/guide/openpgp.xhp
new file mode 100644
index 000000000..d24a450d8
--- /dev/null
+++ b/source/text/shared/guide/openpgp.xhp
@@ -0,0 +1,104 @@
+<?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/.
+ *
+ -->
+
+ <meta>
+ <topic id="encryptopenpgp" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">OpenPGP</title>
+ <filename>/text/shared/guide/openpgp.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <bookmark xml-lang="en-US" branch="index" id="bm_id361543701916002">
+ <bookmark_value>OpenPGP;document encryption</bookmark_value>
+ <bookmark_value>file encryption;OpenPGP</bookmark_value>
+ <bookmark_value>public key;file encryption</bookmark_value>
+ <bookmark_value>private key;file encryption</bookmark_value>
+ <bookmark_value>file encryption;symmetric keys</bookmark_value>
+ </bookmark>
+ <section id="openpgphead">
+ <h1 id="hd_id131543693200115"><link href="text/shared/guide/openpgp.xhp" name="openpgp">Encrypting Documents with OpenPGP</link></h1>
+ <paragraph id="par_id531543693200117" role="paragraph" xml-lang="en-US"><ahelp hid=".">%PRODUCTNAME can encrypt documents using OpenPGP public key cryptography. The document is encrypted using a symmetric encryption algorithm.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <paragraph role="paragraph" id="par_id551543694091730" xml-lang="en-US">Choose menu <menuitem>File - Save as</menuitem>, select <widget>Encrypt with GPG key</widget>, Press <widget>Save</widget>.</paragraph>
+ </section>
+ <paragraph role="paragraph" id="par_id421543694016897">%PRODUCTNAME can encrypt documents confidentially using OpenPGP. The document is encrypted using a symmetric encryption algorithm, which requires a symmetric key. Each symmetric key is used only once and is also called a session key. The document and its session key are sent to the recipient. The session key must be sent to the recipients so they know how to decrypt the document, but to protect it during transmission it is encrypted with the recipient's public key. Only the private key belonging to the recipient can decrypt the session key.</paragraph>
+
+ <paragraph role="paragraph" id="par_id931543694032072">%PRODUCTNAME uses the OpenPGP software installed in your computer. If no OpenPGP software is available you must download and install one suitable for your operating system, likely from your application store or software distribution channel.</paragraph>
+ <paragraph role="paragraph" id="par_id131543846940809">Here are some external GPG applications known to work with %PRODUCTNAME:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph id="par_id831543846877587" role="listitem"><emph>gpg4win</emph> on Windows</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id191543846891252" role="listitem"><emph>GPGTools</emph> on MacOS</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id791543846905735" role="listitem">On Linux, usually already installed:</paragraph>
+ <paragraph id="par_id411544099245722" role="listitem"><emph>gnupg</emph> - a command line utility for signing, encrypting and key management.</paragraph>
+ <paragraph id="par_id811544099299847" role="listitem">Graphical applications for gnupg such as <emph>Seahorse</emph> (gnome), <emph>Kleopatra</emph> and <emph>KGpg</emph> (KDE).</paragraph>
+ <paragraph id="par_id631544099446081" role="listitem"><emph>gpgme</emph> - an application program interface (API) to develop applications with GPG.</paragraph>
+ </listitem>
+ </list>
+ <paragraph role="paragraph" id="par_id461543694043196">You must define a personal pair of cryptography keys with the OpenPGP application. Refer to the OpenPGP software installed on how to create a pair of keys, it is usually the first step to execute after the software installation.</paragraph>
+ <h2 id="hd_id881543694319935">%PRODUCTNAME Encryption Setup</h2>
+ <embed href="text/shared/optionen/01010100.xhp#cryptointro"/>
+ <paragraph role="paragraph" id="par_id611543699681558">Choose menu <menuitem>Tools – Options – User Data</menuitem>. In the <emph>Cryptography</emph> area:</paragraph>
+ <embed href="text/shared/optionen/01010100.xhp#opengpg"/>
+ <h2 id="hd_id251543694437685">Encrypting documents</h2>
+ <paragraph role="paragraph" id="par_id121543694447798">OpenPGP encryption requires the use of the public key of the recipient and this key must be available in the OpenPGP key chain stored in your computer. To encrypt a document:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph id="par_id501543694474227" role="listitem" xml-lang="en-US">Choose <menuitem>File – Save As</menuitem>,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id641543694535615" role="listitem">Enter a name for the file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id621543694550648" role="listitem">Mark the <widget>Encrypt with GPG key</widget> checkbox.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id91543694595310" role="listitem">Press <widget>Save</widget>. %PRODUCTNAME opens the OpenPGP public key selection dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id31543694619204" role="listitem">Choose the public key of the recipient. You can select multiple keys at the time.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id811543694660297" role="listitem">Press <widget>OK</widget> to close the dialog and save the file.</paragraph>
+ </listitem>
+ </list>
+ <paragraph role="paragraph" id="par_id981543694776604">The file is saved encrypted with the selected public keys.</paragraph>
+ <warning id="par_id851543694185733">Only the private key belonging to the recipient can decrypt the document, unless you also encrypt for yourself.</warning>
+ <h2 id="hd_id81543694812238">Decrypting documents</h2>
+ <paragraph role="paragraph" id="par_id731543694835151">You can only decrypt documents that have been encrypted with your public key. To decrypt a document:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph id="par_id801543694880414" role="listitem">Open the document. An Enter password prompt shows.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id891543694892170" role="listitem">Enter the password of the OpenPGP private key. The document is decrypted and the contents is available.</paragraph>
+ </listitem>
+ </list>
+ <h2 id="hd_id811543694928568">Difference between document encryption with OpenPGP and Save with password</h2>
+
+ <paragraph role="paragraph" id="par_id391543694940352">Both commands address confidentiality, but in different ways.</paragraph>
+
+ <paragraph role="paragraph" id="par_id331543694947279">When you save a document with a password, you must remember the password inserted to open the document later. Anyone else that needs to open the document must also know the password used at save time. Therefore, the Save password must be transmitted to be known by other users.</paragraph>
+
+ <paragraph role="paragraph" id="par_id351543694955038">Files encrypted with the save password cannot be decrypted unless the save password is supplied.</paragraph>
+
+ <paragraph role="paragraph" id="par_id681543694965846">With document OpenPGP encryption, you define the set of users that can decrypt the document and you don’t need to send passwords through channels which security is unknown. Besides, the OpenPGP application manages the key chain of public keys more efficiently.</paragraph>
+ <section id="relatedtopics">
+ <paragraph role="paragraph" id="par_id681543699425744" localize="false"><embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures" markup="ignore"/></paragraph>
+ <paragraph role="paragraph" id="par_id51543697316590"><link href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy#OpenPGP" name="Wikipedia on OpenPGP">Wikipedia on OpenPGP</link></paragraph>
+ </section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/optionen/01010100.xhp b/source/text/shared/optionen/01010100.xhp
index 92d395224..1929d265f 100644
--- a/source/text/shared/optionen/01010100.xhp
+++ b/source/text/shared/optionen/01010100.xhp
@@ -131,5 +131,21 @@
<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3">E-mail</paragraph>
<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US"><ahelp hid=".">Type your e-mail address.</ahelp> For example, my.name at my.provider.com</paragraph>
</section>
+<h2 id="hd_id61543592770503">Cryptography</h2>
+<section id="cryptointro">
+<paragraph role="paragraph" id="par_id311543858573650">Set the preferred public key for OpenPGP encryption and digital signature. These preferred keys will be pre-selected in key selection dialog every time you sign or encrypt a document, so you don't have to select it yourself when signing with one specific key frequently.</paragraph>
+</section>
+<section id="opengpg">
+ <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/signingkey" id="bm_id681543700758015" localize="false"/>
+ <h3 id="hd_id231543592828796">OpenPGP signing key</h3>
+ <paragraph role="paragraph" id="par_id641543592980979" xml-lang="en-US">Select your OpenPGP key from the drop-down list for signing ODF documents.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/encryptionkey" id="bm_id401543700791227" localize="false"/>
+ <h3 id="hd_id241543592833855">OpenPGP encryption key</h3>
+ <paragraph role="paragraph" id="par_id41543592987773" xml-lang="en-US">Select your OpenPGP key from the drop-down list for encrypting ODF documents.</paragraph>
+ <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/encrypttoself:wrap" id="bm_id291543701243669" localize="false"/>
+ <h3 id="hd_id191543593080405">When encrypting documents, always encrypt to self</h3>
+ <paragraph role="paragraph" id="par_id721543594922942" xml-lang="en-US">Mark this checkbox to also encrypt the file with your public key, so you can open the document with your private key.</paragraph>
+ <warning id="par_id851543858754421"><emph>Keep this option selected</emph>, if you ever want to be able to decrypt documents you've encrypted for other people.</warning>
+</section>
</body>
</helpdocument>
diff --git a/source/text/shared/optionen/01010600.xhp b/source/text/shared/optionen/01010600.xhp
index af0028c5b..771d31f74 100644
--- a/source/text/shared/optionen/01010600.xhp
+++ b/source/text/shared/optionen/01010600.xhp
@@ -46,16 +46,6 @@
<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/exthelp" id="bm_id1425519" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="3">Extended tips</paragraph>
<paragraph xml-lang="en-US" id="par_idN106FA" role="paragraph"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="hd_id3152577" role="heading" level="2">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/filedlg" id="bm_id7715994" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145366" role="heading" level="3">Use $[officename] dialogs</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149260" role="paragraph"><ahelp hid="cui/ui/optgeneralpage/filedlg">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
-<switch select="sys">
-<case select="WIN">
-<paragraph xml-lang="en-US" id="par_idN10856" role="warning">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
-</case>
-</switch>
-<paragraph xml-lang="en-US" id="par_id3153138" role="paragraph">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
<paragraph xml-lang="en-US" id="hd_id3148617" role="heading" level="2">Document status</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/docstatus" id="bm_id3986632" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149299" role="heading" level="3">Printing sets "document modified" status</paragraph>
More information about the Libreoffice-commits
mailing list