Merge branch '1.3.x'

Conflicts:
	COPYING
	NEWS
	config/cvc4.m4

1 files changed, 5 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index d30c0ab77..f0159f4a1 100644
--- a/NEWS
+++ b/NEWS
@@ -7,11 +7,11 @@ Changes since 1.3
 * The LFSC proof checker has been incorporated into CVC4 sources.
 * By default, CVC4 builds in "production" mode (optimized, with fewer
   internal checks on).  The common alternative is a "debug" build, which
-  is much slower.  CVC4 also builds with GPL dependences by default now
-  (if those libraries are available), as this is the best-performing
-  version of CVC4.  However, the new configure option "--bsd" disables
-  these GPL dependences and builds the best-performing BSD-licenced version
-  of CVC4.
+  is much slower.  By default, CVC4 builds with no GPL'ed dependences.
+  However, this is not the best-performing version; for that, you should
+  configure with "--enable-gpl --best", which links against GPL'ed
+  libraries that improve usability and performance.  For details on
+  licensing and dependences, see the README file.
 * Small API adjustments to Datatypes to even out the API and make it
   function better in Java.
 * Better automatic handling of output language setting when using CVC4