anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better documentation of compressed (bug 9189)

Browse Source 
The compressed/uncompressed option of LyX files was poorly documented. Now it
is a bit better.
This commit is contained in:
Georg Baum 2015-11-11 23:03:18 +01:00
parent 2d63caf817
commit 520dde2038
2 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/doc/Additional.lyx
View File

@ -138,6 +138,7 @@ End
\html_css_as_file 0
\html_be_strict true
\author -712698321 "Jürgen Spitzmüller"
\author -195340706 "Georg Baum"
\author 711066561 "Enrico Forestieri"
\end_header
@ -20049,6 +20050,25 @@ Control
For introducing your own external commands consult vc-command in the manual
of \SpecialChar LyX
functions.
\change_inserted -195340706 1447278952
\end_layout
\begin_layout Standard
\change_inserted -195340706 1447279250
It is strongly recommended to store documents in uncompressed format if
using version control (uncheck
\family sans
Document\SpecialChar menuseparator
Compressed
\family default
if it is checked): Uncompressed LyX documents are text files and therefore
for merging two different versions by version control systems.
Compressed LyX documents are binary files, which cannot be merged by version
control systems.
\change_unchanged
\end_layout
\begin_layout Subsection

48
lib/doc/UserGuide.lyx
View File

@ -141,11 +141,12 @@ enumitem
\papercolumns 1
\papersides 2
\paperpagestyle default
\tracking_changes false
\tracking_changes true
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict true
\author -195340706 "Georg Baum"
\end_header
\begin_body
@ -8170,12 +8171,14 @@ Verbatim
\end_layout
\begin_layout Verbatim
This is verbatim.
\end_layout
\begin_layout Verbatim
\noindent
\align block
The following 2 lines are empty:
\end_layout
@ -8188,6 +8191,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
Almost everything is allowed in verbatim:"%&$§#~'`
\backslash
}][{|
@ -37641,10 +37645,34 @@ reference "sec:File-Formats"
\begin_layout Subsection
Compressed
\change_inserted -195340706 1447278411
\begin_inset CommandInset label
LatexCommand label
name "subsec:Compressed"
\end_inset
\change_unchanged
\end_layout
\begin_layout Standard
Un/compresses the current document.
\change_inserted -195340706 1447279328
Use this if you want to save a compressed document in uncompressed format
or vice versa.
For documents under version control it is strongly recommended to disable
compression (see
\emph on
Additional \SpecialChar LyX
Features
\emph default
for details).
\change_unchanged
\end_layout
\begin_layout Subsection
@ -43058,6 +43086,24 @@ Backup documents, every
Save documents compressed by default
\family default
always saves files in a compressed format.
\change_inserted -195340706 1447278517
This applies to newly created documents only.
The compression status of existing documents is not changed when saving
(see section
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:Compressed"
\end_inset
).
\change_unchanged
\end_layout
\begin_layout Subsubsection