source/text/shared/optionen/01010200.xhp |   34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 3e6ed0152d5a8f824a4e1a3066caef1e0ad1be85
Author:     Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Mon Jul 17 14:11:00 2023 +0200
Commit:     Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Thu Jul 20 14:16:46 2023 +0200

    (related) tdf#68565 add "Place backup in same folder as document" option
    
      + add new option and description
      * move position of three options to align with dialog
        (no content changes for i10n)
    
    Change-Id: I99fa9a3ba58dea844cf94dd2653f9aefb4f3d4e0
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154468
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>
    Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>

diff --git a/source/text/shared/optionen/01010200.xhp 
b/source/text/shared/optionen/01010200.xhp
index 0f339f1f5e..848766c450 100644
--- a/source/text/shared/optionen/01010200.xhp
+++ b/source/text/shared/optionen/01010200.xhp
@@ -26,16 +26,16 @@
 </meta>
 <body>
 <section id="saving">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3143284">
+<bookmark branch="index" id="bm_id3143284">
 <bookmark_value>saving; options</bookmark_value>
 <bookmark_value>defaults;of saving</bookmark_value>
 <bookmark_value>URL; saving absolute/relative paths</bookmark_value>
 <bookmark_value>relative saving of URLs</bookmark_value>
 <bookmark_value>absolute saving of URLs</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/@@nowidget@@" 
id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/alienwarndialog/@@nowidget@@" 
id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/OptSavePage" 
id="bm_id3109850" localize="false"/>
+<bookmark branch="hid/cui/ui/optsavepage/@@nowidget@@" id="bm_@@nowidget@@" 
localize="false"/>
+<bookmark branch="hid/sfx/ui/alienwarndialog/@@nowidget@@" 
id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/cui/ui/optsavepage/OptSavePage" id="bm_id3109850" 
localize="false"/>
 <h1 id="hd_id3143284"><link 
href="text/shared/optionen/01010200.xhp">General</link></h1>
   <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/OptSavePage">In the <emph>General</emph> section, you 
can select default settings for saving documents, and can select default file 
formats.</ahelp></paragraph>
       </section>
@@ -81,13 +81,6 @@
   <paragraph xml-lang="en-US" id="par_id3166463" role="paragraph">If 
<emph>Load view position with the document even if it was saved by a different 
user</emph> is not selected, the view position will only be loaded with a 
document if the author metadata in the document matches the first and last name 
in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - $[officename] - User 
Data</emph>. Note that the author will only be saved with a document if the 
setting <emph>Apply user data</emph> in <menuitem>File - Properties - 
General</menuitem> is enabled.</paragraph>
       <h2 id="hd_id3146794">Save</h2>
       <embed href="text/shared/guide/doc_autosave.xhp#doc_autosave"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/docinfo" 
id="bm_id3154939" localize="false"/>
-<h3 id="hd_id3154071">Edit document properties before saving</h3>
-  <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/docinfo">Specifies that the <emph>Properties</emph> 
dialog will appear every time you select the <emph>Save As</emph> 
command.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/backup" 
id="bm_id3151380" localize="false"/>
-<h3 id="hd_id3145606">Always create backup copy</h3>
-  <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/backup">Saves the previous version of a document as a 
backup copy whenever you save a document. Every time <item 
type="productname">%PRODUCTNAME</item> creates a backup copy, the previous 
backup copy is replaced. The backup copy gets the extension 
<emph>.BAK</emph>.</ahelp></paragraph>
-  <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph">To change 
the location of the backup copy, choose <switchinline select="sys"><caseinline 
select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - 
Paths</emph>, and then enter a new path for the backup file.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/autosave" 
id="bm_id3159252" localize="false"/>
 <h3 id="hd_id3154908">Save AutoRecovery information every</h3>
   <paragraph xml-lang="en-US" id="par_id3149560" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/autosave">Specifies that <item 
type="productname">%PRODUCTNAME</item> saves the information needed to restore 
all open documents in case of a crash. You can specify the saving time 
interval.</ahelp></paragraph>
@@ -97,6 +90,15 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/userautosave" 
id="bm_id3159253" localize="false"/>
 <h3 id="hd_id3154909">Automatically save the document too</h3>
   <paragraph xml-lang="en-US" id="par_id3149561" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/userautosave">Specifies that <item 
type="productname">%PRODUCTNAME</item> saves all open documents when saving 
auto recovery information. Uses the same time interval as AutoRecovery 
does.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/docinfo" 
id="bm_id3154939" localize="false"/>
+<h3 id="hd_id3154071">Edit document properties before saving</h3>
+  <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/docinfo">Specifies that the <emph>Properties</emph> 
dialog will appear every time you select the <emph>Save As</emph> 
command.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/backup" 
id="bm_id3151380" localize="false"/>
+<h3 id="hd_id3145606">Always create backup copy</h3>
+<paragraph id="par_id3154123" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/backup">Saves the previous version of a document as a 
backup copy whenever you save a document. Every time <item 
type="productname">%PRODUCTNAME</item> creates a backup copy, the previous 
backup copy is replaced. The backup copy gets the extension 
<emph>.BAK</emph>.</ahelp></paragraph>
+<paragraph id="par_id3153192" role="paragraph">To change the location of the 
backup copy, choose <switchinline select="sys"><caseinline 
select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - 
Paths</emph>, and then enter a new path for the backup file.</paragraph>
+<h4 id="hd_id11689632256368">Place backup in same folder as document</h4>
+<paragraph role="paragraph" id="par_id501689632337867">Backup copy is saved to 
the same folder as the document. If the backup copy cannot be saved in the same 
folder for some reason, it is saved in the <menuitem>Backups</menuitem> folder 
specified in <menuitem>Paths</menuitem>.</paragraph>
 <h3 id="hd_id3153575"><variable id="relative_saving_option">Save URLs relative 
to file system</variable></h3>
   <paragraph xml-lang="en-US" id="par_id3149484" role="paragraph">This option 
allows you to select the default for <link 
href="text/shared/00/00000005.xhp#saving"><emph>relative</emph></link> 
addressing of URLs in the file system and on the Internet. Relative addressing 
is only possible if the source document and the referenced document are both on 
the same drive.</paragraph>
   <paragraph xml-lang="en-US" id="par_id3145799" role="paragraph">A relative 
address always starts from the directory in which the current document is 
located. In contrast, absolute addressing always starts from a root directory. 
The following table demonstrates the difference in syntax between relative and 
absolute referencing:</paragraph>
@@ -151,17 +153,17 @@
       <note id="par_id0915200911205367">Currently, the ODF 1.2 (Extended) or 
newer formats enable files of Draw and Impress to contain comments. Those 
comments can be inserted by <item type="menuitem">Insert - Comment</item> in 
the latest software version. The comments get lost when loading files into 
prior software versions that were saved by the latest software version.</note>
       <paragraph xml-lang="en-US" id="par_id7198400" role="paragraph"><ahelp 
hid=".">Some companies or organizations may require ODF documents in the ODF 
1.0/1.1, or ODF 1.2 format. You can select these format to save in the listbox. 
These older formats cannot store all new features, so the new format ODF 1.3 
(Extended) is recommended where possible.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id7198401" role="paragraph">The ODF 
1.2 Extended (compatibility mode) is a more backward-compatible ODF 1.2 
extended mode. It uses features that are deprecated in ODF 1.2 and/or it is 
'bug-compatible' to older OpenOffice.org versions. It may be useful if you need 
to interchange ODF documents with users who use pre-ODF 1.2 or ODF 1.2-only 
legacy applications.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/warnalienformat" 
id="bm_id6262092" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/alienwarndialog/ask" 
id="bm_id7885982" localize="false"/>
-<h3 id="par_idN1091E">Warn when not saving in ODF or default format</h3>
-      <paragraph xml-lang="en-US" id="par_idN10922" role="paragraph"><ahelp 
hid=".">You can choose to get a warning message when you save a document in a 
format that is not OpenDocument or which you did not set as default format in 
<emph>Load/Save - General</emph> in the Options dialog box.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3158444" role="paragraph">You can 
choose which file format will be applied as the default when saving documents 
of various document types. If you always exchange your documents with other 
persons who use Microsoft Office, for example, you may specify here that 
%PRODUCTNAME only uses the Microsoft Office file formats as a 
default.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/doctype" 
id="bm_id3149207" localize="false"/>
 <h3 id="hd_id3153270">Document type</h3>
       <paragraph xml-lang="en-US" id="par_id3150828" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/doctype">Specifies the document type for which you want 
to define the default file format.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/saveas" 
id="bm_id3152775" localize="false"/>
 <h3 id="hd_id3149527">Always save as</h3>
       <paragraph xml-lang="en-US" id="par_id3149035" role="paragraph"><ahelp 
hid="cui/ui/optsavepage/saveas">Specifies how documents of the type selected on 
the left will always be saved as this file type. You may select another file 
type for the current document in the <emph>Save as</emph> 
dialog.</ahelp></paragraph>
+<bookmark branch="hid/cui/ui/optsavepage/warnalienformat" id="bm_id6262092" 
localize="false"/>
+<bookmark branch="hid/sfx/ui/alienwarndialog/ask" id="bm_id7885982" 
localize="false"/>
+<h3 id="par_idN1091E">Warn when not saving in ODF or default format</h3>
+<paragraph  id="par_idN10922" role="paragraph"><ahelp hid=".">You can choose 
to get a warning message when you save a document in a format that is not 
OpenDocument or which you did not set as default format in <emph>Load/Save - 
General</emph> in the Options dialog box.</ahelp></paragraph>
+<paragraph id="par_id3158444" role="paragraph">You can choose which file 
format will be applied as the default when saving documents of various document 
types. If you always exchange your documents with other persons who use 
Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses 
the Microsoft Office file formats as a default.</paragraph>
       <embed href="text/shared/00/00000001.xhp#optionsbuttonwarn01"/>
    </body>
 </helpdocument>

Reply via email to