Merge branch 'feature/upstream' into develop

1 files changed, 6 insertions, 42 deletions

diff --git a/scons-time.1 b/scons-time.1
index 2b456e6..6c139b3 100644
--- a/scons-time.1
+++ b/scons-time.1
@@ -2,12 +2,12 @@
 .\"     Title: SCONS-TIME
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 08/08/2019
-.\"    Manual: SCons 3.1.1
-.\"    Source: SCons 3.1.1
+.\"      Date: 12/17/2019
+.\"    Manual: SCons 3.1.2
+.\"    Source: SCons 3.1.2
 .\"  Language: English
 .\"
-.TH "SCONS\-TIME" "1" "08/08/2019" "SCons 3\&.1\&.1" "SCons 3\&.1\&.1"
+.TH "SCONS\-TIME" "1" "12/17/2019" "SCons 3\&.1\&.2" "SCons 3\&.1\&.2"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -35,7 +35,7 @@ scons-time \- generate and display SCons timing information
 .SH "GENERATING TIMING INFORMATION"
 .PP
 \fBscons\-time run\fR
-[\fB\-hnqv\fR] [\fB\-\-aegis=\fR\fIPROJECT\fR] [\fB\-f \fR\fIFILE\fR] [\fB\-\-number=\fR\fINUMBER\fR] [\fB\-\-outdir=\fR\fIOUTDIR\fR] [\fB\-p \fR\fISTRING\fR] [\fB\-\-python=\fR\fIPYTHON\fR] [\fB\-s \fR\fIDIR\fR] [\fB\-\-scons=\fR\fISCONS\fR] [\fB\-\-svn=\fR\fIURL\fR] [\fIARGUMENTS\fR]
+[\fB\-hnqv\fR] [\fB\-f \fR\fIFILE\fR] [\fB\-\-number=\fR\fINUMBER\fR] [\fB\-\-outdir=\fR\fIOUTDIR\fR] [\fB\-p \fR\fISTRING\fR] [\fB\-\-python=\fR\fIPYTHON\fR] [\fB\-s \fR\fIDIR\fR] [\fB\-\-scons=\fR\fISCONS\fR] [\fB\-\-svn=\fR\fIURL\fR] [\fIARGUMENTS\fR]
 .SS "Extracting Function Timings"
 .PP
 \fBscons\-time func\fR
@@ -377,7 +377,7 @@ files\&.
 .SS "The run Subcommand"
 .PP
 \fBscons\-time run\fR
-[\fB\-hnqv\fR] [\fB\-\-aegis=\fR\fIPROJECT\fR] [\fB\-f \fR\fIFILE\fR] [\fB\-\-number=\fR\fINUMBER\fR] [\fB\-\-outdir=\fR\fIOUTDIR\fR] [\fB\-p \fR\fISTRING\fR] [\fB\-\-python=\fR\fIPYTHON\fR] [\fB\-s \fR\fIDIR\fR] [\fB\-\-scons=\fR\fISCONS\fR] [\fB\-\-svn=\fR\fIURL\fR] [\fIARGUMENTS\fR] The
+[\fB\-hnqv\fR] [\fB\-f \fR\fIFILE\fR] [\fB\-\-number=\fR\fINUMBER\fR] [\fB\-\-outdir=\fR\fIOUTDIR\fR] [\fB\-p \fR\fISTRING\fR] [\fB\-\-python=\fR\fIPYTHON\fR] [\fB\-s \fR\fIDIR\fR] [\fB\-\-scons=\fR\fISCONS\fR] [\fB\-\-svn=\fR\fIURL\fR] [\fIARGUMENTS\fR] The
 \fBscons\-time run\fR
 subcommand is the basic subcommand for profiling a specific configuration against a version of SCons\&.
 .PP
@@ -420,22 +420,6 @@ The
 \fBscons\-time run\fR
 subcommand supports the following options:
 .PP
-\-\-aegis=PROJECT
-.RS 4
-Specifies the Aegis
-\fIPROJECT\fR
-from which the version(s) of
-\fBscons\fR
-being timed will be extracted\&. When
-\fB\-\-aegis\fR
-is specified, the
-\fB\-\-number=\fR\fINUMBER\fR
-option specifies delta numbers that will be tested\&. Output from each invocation run will be placed in file names that match the Aegis delta numbers\&. If the
-\fB\-\-number=\fR
-option is not specified, then the default behavior is to time the tip of the specified
-\fIPROJECT\fR\&.
-.RE
-.PP
 \-f FILE, \-\-file=FILE
 .RS 4
 Reads configuration information from the specified
@@ -466,13 +450,6 @@ Specifies the run number to be used in the names of the log files and profile ou
 .RE
 .PP
 When used in conjunction with the
-\fB\-\-aegis=\fR\fIPROJECT\fR
-option,
-\fINUMBER\fR
-specifies one or more comma\-separated Aegis delta numbers that will be retrieved automatically from the specified Aegis
-\fIPROJECT\fR\&.
-.PP
-When used in conjunction with the
 \fB\-\-svn=\fR\fIURL\fR
 option,
 \fINUMBER\fR
@@ -640,19 +617,6 @@ options\&. The configuration file is actually executed as a Python script\&. Set
 \fBscons\-time\fR
 script more conveniently than having to specify command\-line options or arguments for every run, and provides a handy way to "shrink\-wrap" the necessary information for producing (and reporting) consistent timing runs for a given configuration\&.
 .PP
-\fBaegis\fR
-.RS 4
-The Aegis executable for extracting deltas\&. The default is simply
-\fBaegis\fR\&.
-.RE
-.PP
-\fBaegis_project\fR
-.RS 4
-The Aegis project from which deltas should be extracted\&. The default is whatever is specified with the
-\fB\-\-aegis=\fR
-command\-line option\&.
-.RE
-.PP
 \fBarchive_list\fR
 .RS 4
 A list of archives (files or directories) that will be copied to the temporary directory in which SCons will be invoked\&.