Customization.lyx: distribute and accept recent changes

[features.git] / lib / doc / Customization.lyx

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 33a9735ca8b5e1c6ba6d344924eddc82d3fdbe29..551a14b35546672ac9b07cab94f687a799e3c097 100644 (file)
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -124,12 +124,11 @@ logicalmkup
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
 \end_header
 
 \begin_body
@@ -12162,21 +12161,17 @@ Argument item:1
 
 \end_deeper
 \begin_layout Description
-
-\change_inserted -712698321 1514539256
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1514534780
 AutoNests
 \end_layout
 
 \end_inset
 
- Includes a comma-separated list of layout names that should be nested in
- and after the current one.
+ Includes a comma-separated list of layouts that should be nested in and
+ after the current layout.
  Only makes sense for nestable layouts (such as environments).
  Must be ended by 
 \begin_inset Quotes eld
@@ -12187,8 +12182,6 @@ AutoNests
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1514538124
 EndAutoNests
 \end_layout
 
@@ -12204,11 +12197,7 @@ EndAutoNests
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1514539161
 IsAutoNestedBy
-\change_unchanged
-
 \end_layout
 
 \end_inset
@@ -12945,25 +12934,19 @@ TitleLatexName
 \end_inset
 
  global entries).
-\change_inserted -712698321 1514539171
-
 \end_layout
 
 \begin_layout Description
-
-\change_inserted -712698321 1514539282
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1514539190
 IsAutoNestedBy
 \end_layout
 
 \end_inset
 
- Includes a comma-separated list of layout names after which this one should
+ Includes a comma-separated list of layouts after which this one should
  be nested.
  Only makes sense with regard to nestable layouts (such as environments).
  Must be ended by 
@@ -12975,8 +12958,6 @@ IsAutoNestedBy
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1514539279
 EndIsAutoNestedBy
 \end_layout
 
@@ -12992,16 +12973,12 @@ EndIsAutoNestedBy
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1514539172
-AutoNest
+AutoNests
 \end_layout
 
 \end_inset
 
 .
-\change_unchanged
-
 \end_layout
 
 \begin_layout Description
@@ -27988,11 +27965,11 @@ commandframe Frame color for command insets
 \end_layout
 
 \begin_layout Description
-commentbg Background color of comments
+comment Label color for comments
 \end_layout
 
 \begin_layout Description
-commentlabel Label color for comments
+commentbg Background color of comments
 \end_layout
 
 \begin_layout Description
@@ -28134,11 +28111,11 @@ nonunique_inlinecompletion Inline completion color for the non-unique part
 \end_layout
 
 \begin_layout Description
-notebg Background color of notes
+note Label color for notes
 \end_layout
 
 \begin_layout Description
-notelabel Label color for notes
+notebg Background color of notes
 \end_layout
 
 \begin_layout Description