Merge branch 'dev' into major

* dev: (38 commits)
  Update documentation
  Rid ct_telnet of doc build warnings
  Create temporary fix for problem with parallel test cases
  Update primary bootstrap
  Correct "Missing Suites" link
  Add documentation on timetraps and start flags
  Add missing tests for timetrap handling and fix remaining errors
  Solve problem with ct_init/end_per_group being counted as test cases
  Fix errors in test suites
  Fix invalid call to undefined function
  Fix problem with test_server_ctrl creating invalid conf test
  Improve info in CT framework log
  Update vsn.mk for common_test and test_server
  Enhance logging performance
  Change order of include files
  Add link to last executed test suite on index page
  Fix problem with location value when init config func calls help func
  Fix crash when CTHook init fails
  Correct error in test suite
  Fix error with incorrect notification after end_per_testcase craches
  ...

Conflicts:
	bootstrap/bin/start.boot
	bootstrap/bin/start_clean.boot
	bootstrap/lib/compiler/ebin/beam_asm.beam
	bootstrap/lib/compiler/ebin/beam_disasm.beam
	bootstrap/lib/compiler/ebin/compile.beam
	bootstrap/lib/compiler/ebin/sys_pre_expand.beam
	bootstrap/lib/kernel/ebin/code.beam
	bootstrap/lib/kernel/ebin/code_server.beam
	bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
	bootstrap/lib/kernel/ebin/inet.beam
	bootstrap/lib/kernel/ebin/inet_config.beam
	bootstrap/lib/kernel/ebin/inet_dns.beam
	bootstrap/lib/stdlib/ebin/beam_lib.beam
	bootstrap/lib/stdlib/ebin/dets.beam
	bootstrap/lib/stdlib/ebin/erl_compile.beam
	bootstrap/lib/stdlib/ebin/erl_internal.beam
	bootstrap/lib/stdlib/ebin/erl_scan.beam
	bootstrap/lib/stdlib/ebin/erl_tar.beam
	bootstrap/lib/stdlib/ebin/io_lib_fread.beam
	bootstrap/lib/stdlib/ebin/otp_internal.beam
	bootstrap/lib/stdlib/ebin/sofs.beam
	bootstrap/lib/stdlib/ebin/supervisor.beam
	bootstrap/lib/stdlib/ebin/zip.beam
	lib/common_test/src/ct.erl
	lib/common_test/src/ct_run.erl
	lib/common_test/test/ct_error_SUITE.erl
	lib/common_test/test/ct_repeat_1_SUITE.erl
	lib/common_test/test/ct_skip_SUITE.erl
	lib/test_server/src/test_server.erl

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index 1ab563d74f..9045646733 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -83,7 +83,7 @@
     <title>Run tests from command line</title>
     <pre>
 	ct_run [-dir TestDir1 TestDir2 .. TestDirN] |
-	[-suite Suite1 Suite2 .. SuiteN
+	[[-dir TestDir] -suite Suite1 Suite2 .. SuiteN
 	 [[-group Group1 Group2 .. GroupN] [-case Case1 Case2 .. CaseN]]]
 	[-step [config | keep_inactive]]
 	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
@@ -92,6 +92,7 @@
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-label Label]
 	[-logdir LogDir]
+	[-logopts LogOpts]
 	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
 	[-stylesheet CSSFile]
 	[-cover CoverCfgFile]
@@ -117,6 +118,7 @@
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-label Label]
 	[-logdir LogDir]
+	[-logopts LogOpts]
 	[-allow_user_terms]
 	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
 	[-stylesheet CSSFile]
@@ -138,10 +140,11 @@
     <pre>
         ct_run -vts [-browser Browser]
         [-dir TestDir1 TestDir2 .. TestDirN] |
-        [-suite Suite [[-group Group] [-case Case]]]
+        [[dir TestDir] -suite Suite [[-group Group] [-case Case]]]
 	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
 	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
          ConfigString2 and .. and CallbackModuleN ConfigStringN]
+	[-logopts LogOpts]
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-include InclDir1 InclDir2 .. InclDirN]
 	[-no_auto_compile]