remove c++ comment in header

[wxWidgets.git] / docs / readme.txt

diff --git a/docs/readme.txt b/docs/readme.txt
index 8a5a31f112322d9d1b91ab5238cd5518a2465145..9562855457f0a1092c95a7189717978a046042a0 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWindows 2.1.11
+wxWindows 2.1.12
 ----------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
@@ -23,6 +23,16 @@ Changes in this release
 
 These are some of the major improvements:
 
+wxWindows 2.1.12
+================
+
+- New wxDateTime class to replace millenium-uncompliant wxTime
+  and wxDate classes.
+- New wxCalendarCtrl class and sample.
+- New wxCmdLineParser class.
+- Further bug fixes.
+- TIFF support added to wxImage.
+
 wxWindows 2.1.11
 ================
 
@@ -97,6 +107,7 @@ wx2_x_y_vc.zip             MS VC++ 5/6 project files
 wx2_x_y_bc.zip             Borland C++ 5 project files
 wx2_x_y_cw.zip             Metrowerks CodeWarrior 4.1 project files
 jpeg.zip                   Optional JPEG library
+tiff.zip                   Optional TIFF library
 ogl3.zip                   Optional Object Graphics Library
 glcanvas.zip               Optional wxGLCanvas class (Motif, GTK, MSW)
 tex2rtf2.zip               Tex2RTF documentation tool
@@ -160,10 +171,24 @@ For licensing information, please see the files:
 Although this may seem complex, it is there to allow authors of
 proprietary/commercial applications to use wxWindows in
 addition to those writing GPL'ed applications. In summary,
-the licence is L-GPL plus a clause allowing unrestricted
+the licence is LGPL plus a clause allowing unrestricted
 distribution of application binaries. To answer a FAQ, you
 don't have to distribute any source if you wish to write
-commercial applications using wxWindows.
+commercial applications using wxWindows. 
+
+However, if you distribute wxGTK or wxMotif (with Lesstif) version
+of your application, don't forget that it is linked against
+GTK+ (or Lesstif) which is covered by LGPL *without* exception
+notice. Under Linux systems your app is probably linked
+against LGPL glibc as well. Please read carefuly LGPL, section 6.
+which describes conditions for distribution of closed source applications
+linked against LGPL library. Basically you should link dynamicaly and
+include source code of LGPL libraries with your product (unless it is
+already present in user's system - like glibc usually is).
+
+If compiled with --enable-odbc (Unix only), wxWindows library will 
+contain iODBC library which is covered by LGPL.
+
 
 Documentation
 -------------
@@ -204,5 +229,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
-The wxWindows Team, November 1999
+The wxWindows Team, Janurary 2000