Merge remote-tracking branch 'upstream/master'

2 files changed, 11 insertions, 18 deletions

diff --git a/doc/openscad.1 b/doc/openscad.1
index 87806f2..bce2e98 100644
--- a/doc/openscad.1
+++ b/doc/openscad.1
@@ -48,9 +48,6 @@ variable's value is an expression, so if this mechanism is used to assign
 strings, care has to be taken that the shell does not consume quotation marks.
 More than one \fB-D\fP options can be given.
 .TP
-.B \-v, \-\-version
-Show version of program.
-.TP
 .B \-\-render
 If exporting an image, use a full CGAL render. (Default is an OpenCSG compile)
 .TP
@@ -72,6 +69,13 @@ If exporting an image, specify the pixel width and height
 .B \-\-projection=[o|p]
 If exporting an image, specify whether to use orthographic or perspective 
 projection
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-\-info
+Show which versions of libraries were used to compile the program, and which
+OpenGL details are discovered.
 .SH COMMAND LINE EXAMPLES
 .PP
 
diff --git a/doc/testing.txt b/doc/testing.txt
index 626bae5..f609b65 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -3,8 +3,10 @@ Running regression tests:
 
 Prerequisites: cmake, python, ImageMagick 6.5.9.3 or newer
 
-First, get a working qmake GUI build. It is used by the tests.
-Next, get MCAD installed by using 'git submodule update --init'
+First, get a working qmake GUI build of the main openscad binary. It is 
+used by the tests. Next, get MCAD installed by using 
+
+  'git submodule update --init'
 
 A) Building test environment
 
@@ -67,18 +69,6 @@ This is almost the same as adding a new regression test:
 Migration away from dedicated regression tests:
 -----------------------------------------------
 
-As the main OpenSCAD binary gained the capability to output PNG renderings,
-the necessity for dedicated test binaries went away; for many test, OpenSCAD
-is now directly called, resulting in better test coverage and less code to
-maintain.
-
-So far, the following tests have been fully converted to use the main binary:
-
-* moduledumptest
-* csgtermtest
-* cgalpngtest
-* opencsgtest
-
 Two tests still need an intermediate script that mangles away timestamps and
 near-zero floating point numbers:
 
@@ -89,7 +79,6 @@ near-zero floating point numbers:
 Some tests are yet to be converted:
 
 * csgtexttest -- verify whether this is not redundant with dumptest
-* throwntogethertest -- should be a .png output mode
 
 These look like tests, but are not actually in use: