Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / UPGRADING

diff --git a/UPGRADING b/UPGRADING
index 516c94ffb153021fabd36f89e9ef52278e1bfef9..74bb0127da12dd110345ecba121037e595484f1c 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,15 +1,26 @@
-How do I upgrade my existing LyX system to version 2.0.x?
+How do I upgrade my existing LyX system to version 2.1.x?
 ---------------------------------------------------------
 
+* Upgrading from LyX 2.0.x:
+
+Python version >=2.4 is now required.
+
+Python version >3.0 is still not yet supported.
+
 * Upgrading from LyX 1.6.x:
 
 The format of preference and session files has changed. LyX 2.0.x is
 able to read old files but will save them in the new format.
 
-The format of layout files has changed but, as before,
-layout2layout.py will convert older versions to the new format
-automatically.
+The format of layout files has changed but, as before, layout2layout.py
+will convert older versions to the new format automatically.
+
+The syntax of the languages file has been changed. If you use a
+modified languages file, you will need to adapt it to the new syntax.
 
+There has been a large change in how Flex insets are named.
+When exporting back to 1.6.x format user-defined flex insets will not
+be properly reverted. See RELEASE-NOTES for details.
 
 * Upgrading from LyX 1.5.x:
 
@@ -92,7 +103,7 @@ have to update them
 Build requirements
 ------------------
 
-LyX 2.0 uses the Qt 4.x toolkit (version 4.4.0 or newer).
+LyX 2.0 uses the Qt 4.x toolkit (see INSTALL file).
 
 If you do not have the JPEG library installed, you may need to install it
 before you can use the graphics capabilities of LyX. If you do not have the
@@ -236,4 +247,4 @@ babel). If you relied, on babel being loaded before your own
 definitions, you can add an extra "\usepackage{babel}" statement at
 the beginning of your preamble.
 
-http://bugzilla.lyx.org/show_bug.cgi?id=315
+http://www.lyx.org/trac/ticket/315