@port-labs/jq-node-bindings 0.0.14 → 0.0.15-dev2

package/deps/jq/jq.1.prebuilt

@@ -1,7 +1,5 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "JQ" "1" "December 2017" "" ""
+.TH "JQ" "1" "November 2024" "" ""
 .
 .SH "NAME"
 \fBjq\fR \- Command\-line JSON processor
@@ -16,7 +14,7 @@
 \fBjq\fR can accept text input as well, but by default, \fBjq\fR reads a stream of JSON entities (including numbers and other literals) from \fBstdin\fR\. Whitespace is only needed to separate entities such as 1 and 2, and true and false\. One or more \fIfiles\fR may be specified, in which case \fBjq\fR will read input from those instead\.
 .
 .P
-The \fIoptions\fR are described in the \fIINVOKING JQ\fR section; they mostly concern input and output formatting\. The \fIfilter\fR is written in the jq language and specifies how to transform the input file or document\.
+The \fIoptions\fR are described in the [INVOKING JQ] section; they mostly concern input and output formatting\. The \fIfilter\fR is written in the jq language and specifies how to transform the input file or document\.
 .
 .SH "FILTERS"
 A jq program is a "filter": it takes an input, and produces an output\. There are a lot of builtin filters for extracting a particular field of an object, or converting a number to a string, or various other standard tasks\.
@@ -34,191 +32,279 @@ It\'s important to remember that every filter has an input and an output\. Even
 But that\'s getting ahead of ourselves\. :) Let\'s start with something simpler:
 .
 .SH "INVOKING JQ"
-jq filters run on a stream of JSON data\. The input to jq is parsed as a sequence of whitespace\-separated JSON values which are passed through the provided filter one at a time\. The output(s) of the filter are written to standard out, again as a sequence of whitespace\-separated JSON data\.
+jq filters run on a stream of JSON data\. The input to jq is parsed as a sequence of whitespace\-separated JSON values which are passed through the provided filter one at a time\. The output(s) of the filter are written to standard output, as a sequence of newline\-separated JSON data\.
 .
 .P
-Note: it is important to mind the shell\'s quoting rules\. As a general rule it\'s best to always quote (with single\-quote characters) the jq program, as too many characters with special meaning to jq are also shell meta\-characters\. For example, \fBjq "foo"\fR will fail on most Unix shells because that will be the same as \fBjq foo\fR, which will generally fail because \fBfoo is not defined\fR\. When using the Windows command shell (cmd\.exe) it\'s best to use double quotes around your jq program when given on the command\-line (instead of the \fB\-f program\-file\fR option), but then double\-quotes in the jq program need backslash escaping\.
+The simplest and most common filter (or jq program) is \fB\.\fR, which is the identity operator, copying the inputs of the jq processor to the output stream\. Because the default behavior of the jq processor is to read JSON texts from the input stream, and to pretty\-print outputs, the \fB\.\fR program\'s main use is to validate and pretty\-print the inputs\. The jq programming language is quite rich and allows for much more than just validation and pretty\-printing\.
 .
 .P
-You can affect how jq reads and writes its input and output using some command\-line options:
+Note: it is important to mind the shell\'s quoting rules\. As a general rule it\'s best to always quote (with single\-quote characters on Unix shells) the jq program, as too many characters with special meaning to jq are also shell meta\-characters\. For example, \fBjq "foo"\fR will fail on most Unix shells because that will be the same as \fBjq foo\fR, which will generally fail because \fBfoo is not defined\fR\. When using the Windows command shell (cmd\.exe) it\'s best to use double quotes around your jq program when given on the command\-line (instead of the \fB\-f program\-file\fR option), but then double\-quotes in the jq program need backslash escaping\. When using the Powershell (\fBpowershell\.exe\fR) or the Powershell Core (\fBpwsh\fR/\fBpwsh\.exe\fR), use single\-quote characters around the jq program and backslash\-escaped double\-quotes (\fB\e"\fR) inside the jq program\.
 .
 .IP "\(bu" 4
-\fB\-\-version\fR:
+Unix shells: \fBjq \'\.["foo"]\'\fR
 .
-.IP
-Output the jq version and exit with zero\.
+.IP "\(bu" 4
+Powershell: \fBjq \'\.[\e"foo\e"]\'\fR
 .
 .IP "\(bu" 4
-\fB\-\-seq\fR:
+Windows command shell: \fBjq "\.[\e"foo\e"]"\fR
 .
-.IP
-Use the \fBapplication/json\-seq\fR MIME type scheme for separating JSON texts in jq\'s input and output\. This means that an ASCII RS (record separator) character is printed before each value on output and an ASCII LF (line feed) is printed after every output\. Input JSON texts that fail to parse are ignored (but warned about), discarding all subsequent input until the next RS\. This mode also parses the output of jq without the \fB\-\-seq\fR option\.
+.IP "" 0
 .
-.IP "\(bu" 4
-\fB\-\-stream\fR:
+.P
+Note: jq allows user\-defined functions, but every jq program must have a top\-level expression\.
+.
+.P
+You can affect how jq reads and writes its input and output using some command\-line options:
+.
+.TP
+\fB\-\-null\-input\fR / \fB\-n\fR:
 .
 .IP
-Parse the input in streaming fashion, outputing arrays of path and leaf values (scalars and empty arrays or empty objects)\. For example, \fB"a"\fR becomes \fB[[],"a"]\fR, and \fB[[],"a",["b"]]\fR becomes \fB[[0],[]]\fR, \fB[[1],"a"]\fR, and \fB[[1,0],"b"]\fR\.
+Don\'t read any input at all\. Instead, the filter is run once using \fBnull\fR as the input\. This is useful when using jq as a simple calculator or to construct JSON data from scratch\.
+.
+.TP
+\fB\-\-raw\-input\fR / \fB\-R\fR:
 .
 .IP
-This is useful for processing very large inputs\. Use this in conjunction with filtering and the \fBreduce\fR and \fBforeach\fR syntax to reduce large inputs incrementally\.
+Don\'t parse the input as JSON\. Instead, each line of text is passed to the filter as a string\. If combined with \fB\-\-slurp\fR, then the entire input is passed to the filter as a single long string\.
 .
-.IP "\(bu" 4
-\fB\-\-slurp\fR/\fB\-s\fR:
+.TP
+\fB\-\-slurp\fR / \fB\-s\fR:
 .
 .IP
 Instead of running the filter for each JSON object in the input, read the entire input stream into a large array and run the filter just once\.
 .
-.IP "\(bu" 4
-\fB\-\-raw\-input\fR/\fB\-R\fR:
+.TP
+\fB\-\-compact\-output\fR / \fB\-c\fR:
 .
 .IP
-Don\'t parse the input as JSON\. Instead, each line of text is passed to the filter as a string\. If combined with \fB\-\-slurp\fR, then the entire input is passed to the filter as a single long string\.
+By default, jq pretty\-prints JSON output\. Using this option will result in more compact output by instead putting each JSON object on a single line\.
 .
-.IP "\(bu" 4
-\fB\-\-null\-input\fR/\fB\-n\fR:
+.TP
+\fB\-\-raw\-output\fR / \fB\-r\fR:
 .
 .IP
-Don\'t read any input at all! Instead, the filter is run once using \fBnull\fR as the input\. This is useful when using jq as a simple calculator or to construct JSON data from scratch\.
+With this option, if the filter\'s result is a string then it will be written directly to standard output rather than being formatted as a JSON string with quotes\. This can be useful for making jq filters talk to non\-JSON\-based systems\.
 .
-.IP "\(bu" 4
-\fB\-\-compact\-output\fR / \fB\-c\fR:
+.TP
+\fB\-\-raw\-output0\fR:
 .
 .IP
-By default, jq pretty\-prints JSON output\. Using this option will result in more compact output by instead putting each JSON object on a single line\.
+Like \fB\-r\fR but jq will print NUL instead of newline after each output\. This can be useful when the values being output can contain newlines\. When the output value contains NUL, jq exits with non\-zero code\.
 .
-.IP "\(bu" 4
-\fB\-\-tab\fR:
+.TP
+\fB\-\-join\-output\fR / \fB\-j\fR:
 .
 .IP
-Use a tab for each indentation level instead of two spaces\.
+Like \fB\-r\fR but jq won\'t print a newline after each output\.
 .
-.IP "\(bu" 4
-\fB\-\-indent n\fR:
+.TP
+\fB\-\-ascii\-output\fR / \fB\-a\fR:
 .
 .IP
-Use the given number of spaces (no more than 8) for indentation\.
+jq usually outputs non\-ASCII Unicode codepoints as UTF\-8, even if the input specified them as escape sequences (like "\eu03bc")\. Using this option, you can force jq to produce pure ASCII output with every non\-ASCII character replaced with the equivalent escape sequence\.
 .
-.IP "\(bu" 4
+.TP
+\fB\-\-sort\-keys\fR / \fB\-S\fR:
+.
+.IP
+Output the fields of each object with the keys in sorted order\.
+.
+.TP
 \fB\-\-color\-output\fR / \fB\-C\fR and \fB\-\-monochrome\-output\fR / \fB\-M\fR:
 .
 .IP
-By default, jq outputs colored JSON if writing to a terminal\. You can force it to produce color even if writing to a pipe or a file using \fB\-C\fR, and disable color with \fB\-M\fR\.
+By default, jq outputs colored JSON if writing to a terminal\. You can force it to produce color even if writing to a pipe or a file using \fB\-C\fR, and disable color with \fB\-M\fR\. When the \fBNO_COLOR\fR environment variable is not empty, jq disables colored output by default, but you can enable it by \fB\-C\fR\.
 .
 .IP
 Colors can be configured with the \fBJQ_COLORS\fR environment variable (see below)\.
 .
-.IP "\(bu" 4
-\fB\-\-ascii\-output\fR / \fB\-a\fR:
+.TP
+\fB\-\-tab\fR:
 .
 .IP
-jq usually outputs non\-ASCII Unicode codepoints as UTF\-8, even if the input specified them as escape sequences (like "\eu03bc")\. Using this option, you can force jq to produce pure ASCII output with every non\-ASCII character replaced with the equivalent escape sequence\.
+Use a tab for each indentation level instead of two spaces\.
 .
-.IP "\(bu" 4
-\fB\-\-unbuffered\fR
+.TP
+\fB\-\-indent n\fR:
 .
 .IP
-Flush the output after each JSON object is printed (useful if you\'re piping a slow data source into jq and piping jq\'s output elsewhere)\.
+Use the given number of spaces (no more than 7) for indentation\.
 .
-.IP "\(bu" 4
-\fB\-\-sort\-keys\fR / \fB\-S\fR:
+.TP
+\fB\-\-unbuffered\fR:
 .
 .IP
-Output the fields of each object with the keys in sorted order\.
+Flush the output after each JSON object is printed (useful if you\'re piping a slow data source into jq and piping jq\'s output elsewhere)\.
 .
-.IP "\(bu" 4
-\fB\-\-raw\-output\fR / \fB\-r\fR:
+.TP
+\fB\-\-stream\fR:
 .
 .IP
-With this option, if the filter\'s result is a string then it will be written directly to standard output rather than being formatted as a JSON string with quotes\. This can be useful for making jq filters talk to non\-JSON\-based systems\.
-.
-.IP "\(bu" 4
-\fB\-\-join\-output\fR / \fB\-j\fR:
+Parse the input in streaming fashion, outputting arrays of path and leaf values (scalars and empty arrays or empty objects)\. For example, \fB"a"\fR becomes \fB[[],"a"]\fR, and \fB[[],"a",["b"]]\fR becomes \fB[[0],[]]\fR, \fB[[1],"a"]\fR, and \fB[[2,0],"b"]\fR\.
 .
 .IP
-Like \fB\-r\fR but jq won\'t print a newline after each output\.
+This is useful for processing very large inputs\. Use this in conjunction with filtering and the \fBreduce\fR and \fBforeach\fR syntax to reduce large inputs incrementally\.
 .
-.IP "\(bu" 4
-\fB\-f filename\fR / \fB\-\-from\-file filename\fR:
+.TP
+\fB\-\-stream\-errors\fR:
 .
 .IP
-Read filter from the file rather than from a command line, like awk\'s \-f option\. You can also use \'#\' to make comments\.
+Like \fB\-\-stream\fR, but invalid JSON inputs yield array values where the first element is the error and the second is a path\. For example, \fB["a",n]\fR produces \fB["Invalid literal at line 1, column 7",[1]]\fR\.
 .
-.IP "\(bu" 4
-\fB\-Ldirectory\fR / \fB\-L directory\fR:
+.IP
+Implies \fB\-\-stream\fR\. Invalid JSON inputs produce no error values when \fB\-\-stream\fR without \fB\-\-stream\-errors\fR\.
+.
+.TP
+\fB\-\-seq\fR:
 .
 .IP
-Prepend \fBdirectory\fR to the search list for modules\. If this option is used then no builtin search list is used\. See the section on modules below\.
+Use the \fBapplication/json\-seq\fR MIME type scheme for separating JSON texts in jq\'s input and output\. This means that an ASCII RS (record separator) character is printed before each value on output and an ASCII LF (line feed) is printed after every output\. Input JSON texts that fail to parse are ignored (but warned about), discarding all subsequent input until the next RS\. This mode also parses the output of jq without the \fB\-\-seq\fR option\.
 .
-.IP "\(bu" 4
-\fB\-e\fR / \fB\-\-exit\-status\fR:
+.TP
+\fB\-f\fR / \fB\-\-from\-file\fR:
 .
 .IP
-Sets the exit status of jq to 0 if the last output values was neither \fBfalse\fR nor \fBnull\fR, 1 if the last output value was either \fBfalse\fR or \fBnull\fR, or 4 if no valid result was ever produced\. Normally jq exits with 2 if there was any usage problem or system error, 3 if there was a jq program compile error, or 0 if the jq program ran\.
+Read the filter from a file rather than from a command line, like awk\'s \-f option\. This changes the filter argument to be interpreted as a filename, instead of the source of a program\.
+.
+.TP
+\fB\-L directory\fR / \fB\-\-library\-path directory\fR:
 .
 .IP
-Another way to set the exit status is with the \fBhalt_error\fR builtin function\.
+Prepend \fBdirectory\fR to the search list for modules\. If this option is used then no builtin search list is used\. See the section on modules below\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-arg name value\fR:
 .
 .IP
 This option passes a value to the jq program as a predefined variable\. If you run jq with \fB\-\-arg foo bar\fR, then \fB$foo\fR is available in the program and has the value \fB"bar"\fR\. Note that \fBvalue\fR will be treated as a string, so \fB\-\-arg foo 123\fR will bind \fB$foo\fR to \fB"123"\fR\.
 .
 .IP
-Named arguments are also available to the jq program as \fB$ARGS\.named\fR\.
+Named arguments are also available to the jq program as \fB$ARGS\.named\fR\. When the name is not a valid identifier, this is the only way to access it\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-argjson name JSON\-text\fR:
 .
 .IP
 This option passes a JSON\-encoded value to the jq program as a predefined variable\. If you run jq with \fB\-\-argjson foo 123\fR, then \fB$foo\fR is available in the program and has the value \fB123\fR\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-slurpfile variable\-name filename\fR:
 .
 .IP
-This option reads all the JSON texts in the named file and binds an array of the parsed JSON values to the given global variable\. If you run jq with \fB\-\-argfile foo bar\fR, then \fB$foo\fR is available in the program and has an array whose elements correspond to the texts in the file named \fBbar\fR\.
+This option reads all the JSON texts in the named file and binds an array of the parsed JSON values to the given global variable\. If you run jq with \fB\-\-slurpfile foo bar\fR, then \fB$foo\fR is available in the program and has an array whose elements correspond to the texts in the file named \fBbar\fR\.
 .
-.IP "\(bu" 4
-\fB\-\-argfile variable\-name filename\fR:
-.
-.IP
-Do not use\. Use \fB\-\-slurpfile\fR instead\.
+.TP
+\fB\-\-rawfile variable\-name filename\fR:
 .
 .IP
-(This option is like \fB\-\-slurpfile\fR, but when the file has just one text, then that is used, else an array of texts is used as in \fB\-\-slurpfile\fR\.)
+This option reads in the named file and binds its contents to the given global variable\. If you run jq with \fB\-\-rawfile foo bar\fR, then \fB$foo\fR is available in the program and has a string whose contents are to the texts in the file named \fBbar\fR\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-args\fR:
 .
 .IP
 Remaining arguments are positional string arguments\. These are available to the jq program as \fB$ARGS\.positional[]\fR\.
 .
-.IP "\(bu" 4
+.TP
 \fB\-\-jsonargs\fR:
 .
 .IP
 Remaining arguments are positional JSON text arguments\. These are available to the jq program as \fB$ARGS\.positional[]\fR\.
 .
-.IP "\(bu" 4
+.TP
+\fB\-\-exit\-status\fR / \fB\-e\fR:
+.
+.IP
+Sets the exit status of jq to 0 if the last output value was neither \fBfalse\fR nor \fBnull\fR, 1 if the last output value was either \fBfalse\fR or \fBnull\fR, or 4 if no valid result was ever produced\. Normally jq exits with 2 if there was any usage problem or system error, 3 if there was a jq program compile error, or 0 if the jq program ran\.
+.
+.IP
+Another way to set the exit status is with the \fBhalt_error\fR builtin function\.
+.
+.TP
+\fB\-\-binary\fR / \fB\-b\fR:
+.
+.IP
+Windows users using WSL, MSYS2, or Cygwin, should use this option when using a native jq\.exe, otherwise jq will turn newlines (LFs) into carriage\-return\-then\-newline (CRLF)\.
+.
+.TP
+\fB\-\-version\fR / \fB\-V\fR:
+.
+.IP
+Output the jq version and exit with zero\.
+.
+.TP
+\fB\-\-build\-configuration\fR:
+.
+.IP
+Output the build configuration of jq and exit with zero\. This output has no supported format or structure and may change without notice in future releases\.
+.
+.TP
+\fB\-\-help\fR / \fB\-h\fR:
+.
+.IP
+Output the jq help and exit with zero\.
+.
+.TP
+\fB\-\-\fR:
+.
+.IP
+Terminates argument processing\. Remaining arguments are not interpreted as options\.
+.
+.TP
 \fB\-\-run\-tests [filename]\fR:
 .
 .IP
-Runs the tests in the given file or standard input\. This must be the last option given and does not honor all preceding options\. The input consists of comment lines, empty lines, and program lines followed by one input line, as many lines of output as are expected (one per output), and a terminating empty line\. Compilation failure tests start with a line containing only "%%FAIL", then a line containing the program to compile, then a line containing an error message to compare to the actual\.
+Runs the tests in the given file or standard input\. This must be the last option given and does not honor all preceding options\. The input consists of comment lines, empty lines, and program lines followed by one input line, as many lines of output as are expected (one per output), and a terminating empty line\. Compilation failure tests start with a line containing only \fB%%FAIL\fR, then a line containing the program to compile, then a line containing an error message to compare to the actual\.
 .
 .IP
 Be warned that this option can change backwards\-incompatibly\.
 .
-.IP "" 0
-.
 .SH "BASIC FILTERS"
 .
 .SS "Identity: \."
-The absolute simplest filter is \fB\.\fR \. This is a filter that takes its input and produces it unchanged as output\. That is, this is the identity operator\.
+The absolute simplest filter is \fB\.\fR \. This filter takes its input and produces the same value as output\. That is, this is the identity operator\.
+.
+.P
+Since jq by default pretty\-prints all output, a trivial program consisting of nothing but \fB\.\fR can be used to format JSON output from, say, \fBcurl\fR\.
+.
+.P
+Although the identity filter never modifies the value of its input, jq processing can sometimes make it appear as though it does\. For example, using the current implementation of jq, we would see that the expression:
+.
+.IP "" 4
+.
+.nf
+
+1E1234567890 | \.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+produces \fB1\.7976931348623157e+308\fR on at least one platform\. This is because, in the process of parsing the number, this particular version of jq has converted it to an IEEE754 double\-precision representation, losing precision\.
+.
+.P
+The way in which jq handles numbers has changed over time and further changes are likely within the parameters set by the relevant JSON standards\. Moreover, build configuration options can alter how jq processes numbers\.
+.
+.P
+The following remarks are therefore offered with the understanding that they are intended to be descriptive of the current version of jq and should not be interpreted as being prescriptive:
+.
+.P
+(1) Any arithmetic operation on a number that has not already been converted to an IEEE754 double precision representation will trigger a conversion to the IEEE754 representation\.
+.
+.P
+(2) jq will attempt to maintain the original decimal precision of number literals (if the \fB\-\-disable\-decnum\fR build configuration option was not used), but in expressions such \fB1E1234567890\fR, precision will be lost if the exponent is too large\.
+.
+.P
+(3) In jq programs, a leading minus sign will trigger the conversion of the number to an IEEE754 representation\.
+.
+.P
+(4) Comparisons are carried out using the untruncated big decimal representation of numbers if available, as illustrated in one of the following examples\.
 .
 .P
-Since jq by default pretty\-prints all output, this trivial program can be a useful way of formatting JSON output from, say, \fBcurl\fR\.
+The examples below use the builtin function \fBhave_decnum\fR in order to demonstrate the expected effects of using / not using the \fB\-\-disable\-decnum\fR build configuration option, and also to allow automated tests derived from these examples to pass regardless of whether that option is used\.
 .
 .IP "" 4
 .
@@ -227,25 +313,45 @@ Since jq by default pretty\-prints all output, this trivial program can be a use
 jq \'\.\'
    "Hello, world!"
 => "Hello, world!"
+
+jq \'\.\'
+   0\.12345678901234567890123456789
+=> 0\.12345678901234567890123456789
+
+jq \'[\., tojson] | \. == if have_decnum then [12345678909876543212345,"12345678909876543212345"] else [12345678909876543000000,"12345678909876543000000"] end\'
+   12345678909876543212345
+=> true
+
+jq \'\. < 0\.12345678901234567890123456788\'
+   0\.12345678901234567890123456789
+=> false
+
+jq \'map([\., \. == 1]) | tojson | \. == if have_decnum then "[[1,true],[1\.000,true],[1\.0,true],[1\.00,true]]" else "[[1,true],[1,true],[1,true],[1,true]]" end\'
+   [1, 1\.000, 1\.0, 100e\-2]
+=> true
+
+jq \'\. as $big | [$big, $big + 1] | map(\. > 10000000000000000000000000000000) | \. == if have_decnum then [true, false] else [false, false] end\'
+   10000000000000000000000000000001
+=> true
 .
 .fi
 .
 .IP "" 0
 .
 .SS "Object Identifier\-Index: \.foo, \.foo\.bar"
-The simplest \fIuseful\fR filter is \fB\.foo\fR\. When given a JSON object (aka dictionary or hash) as input, it produces the value at the key "foo", or null if there\'s none present\.
+The simplest \fIuseful\fR filter has the form \fB\.foo\fR\. When given a JSON object (aka dictionary or hash) as input, \fB\.foo\fR produces the value at the key "foo" if the key is present, or null otherwise\.
 .
 .P
-A filter of the form \fB\.foo\.bar\fR is equivalent to \fB\.foo|\.bar\fR\.
+A filter of the form \fB\.foo\.bar\fR is equivalent to \fB\.foo | \.bar\fR\.
 .
 .P
-This syntax only works for simple, identifier\-like keys, that is, keys that are all made of alphanumeric characters and underscore, and which do not start with a digit\.
+The \fB\.foo\fR syntax only works for simple, identifier\-like keys, that is, keys that are all made of alphanumeric characters and underscore, and which do not start with a digit\.
 .
 .P
-If the key contains special characters, you need to surround it with double quotes like this: \fB\."foo$"\fR, or else \fB\.["foo$"]\fR\.
+If the key contains special characters or starts with a digit, you need to surround it with double quotes like this: \fB\."foo$"\fR, or else \fB\.["foo$"]\fR\.
 .
 .P
-For example \fB\.["foo::bar"]\fR and \fB\.["foo\.bar"]\fR work while \fB\.foo::bar\fR does not, and \fB\.foo\.bar\fR means \fB\.["foo"]\.["bar"]\fR\.
+For example \fB\.["foo::bar"]\fR and \fB\.["foo\.bar"]\fR work while \fB\.foo::bar\fR does not\.
 .
 .IP "" 4
 .
@@ -268,7 +374,7 @@ jq \'\.["foo"]\'
 .IP "" 0
 .
 .SS "Optional Object Identifier\-Index: \.foo?"
-Just like \fB\.foo\fR, but does not output even an error when \fB\.\fR is not an array or an object\.
+Just like \fB\.foo\fR, but does not output an error when \fB\.\fR is not an object\.
 .
 .IP "" 4
 .
@@ -294,11 +400,11 @@ jq \'[\.foo?]\'
 .
 .IP "" 0
 .
-.SS "Generic Object Index: \.[<string>]"
-You can also look up fields of an object using syntax like \fB\.["foo"]\fR (\.foo above is a shorthand version of this, but only for identifier\-like strings)\.
+.SS "Object Index: \.[<string>]"
+You can also look up fields of an object using syntax like \fB\.["foo"]\fR (\fB\.foo\fR above is a shorthand version of this, but only for identifier\-like strings)\.
 .
-.SS "Array Index: \.[2]"
-When the index value is an integer, \fB\.[<value>]\fR can index arrays\. Arrays are zero\-based, so \fB\.[2]\fR returns the third element\.
+.SS "Array Index: \.[<number>]"
+When the index value is an integer, \fB\.[<number>]\fR can index arrays\. Arrays are zero\-based, so \fB\.[2]\fR returns the third element\.
 .
 .P
 Negative indices are allowed, with \-1 referring to the last element, \-2 referring to the next to last element, and so on\.
@@ -323,8 +429,8 @@ jq \'\.[\-2]\'
 .
 .IP "" 0
 .
-.SS "Array/String Slice: \.[10:15]"
-The \fB\.[10:15]\fR syntax can be used to return a subarray of an array or substring of a string\. The array returned by \fB\.[10:15]\fR will be of length 5, containing the elements from index 10 (inclusive) to index 15 (exclusive)\. Either index may be negative (in which case it counts backwards from the end of the array), or omitted (in which case it refers to the start or end of the array)\.
+.SS "Array/String Slice: \.[<number>:<number>]"
+The \fB\.[<number>:<number>]\fR syntax can be used to return a subarray of an array or substring of a string\. The array returned by \fB\.[10:15]\fR will be of length 5, containing the elements from index 10 (inclusive) to index 15 (exclusive)\. Either index may be negative (in which case it counts backwards from the end of the array), or omitted (in which case it refers to the start or end of the array)\. Indices are zero\-based\.
 .
 .IP "" 4
 .
@@ -351,11 +457,14 @@ jq \'\.[\-2:]\'
 .IP "" 0
 .
 .SS "Array/Object Value Iterator: \.[]"
-If you use the \fB\.[index]\fR syntax, but omit the index entirely, it will return \fIall\fR of the elements of an array\. Running \fB\.[]\fR with the input \fB[1,2,3]\fR will produce the numbers as three separate results, rather than as a single array\.
+If you use the \fB\.[index]\fR syntax, but omit the index entirely, it will return \fIall\fR of the elements of an array\. Running \fB\.[]\fR with the input \fB[1,2,3]\fR will produce the numbers as three separate results, rather than as a single array\. A filter of the form \fB\.foo[]\fR is equivalent to \fB\.foo | \.[]\fR\.
 .
 .P
 You can also use this on an object, and it will return all the values of the object\.
 .
+.P
+Note that the iterator operator is a generator of values\.
+.
 .IP "" 4
 .
 .nf
@@ -366,7 +475,11 @@ jq \'\.[]\'
 
 jq \'\.[]\'
    []
-=>
+=> 
+
+jq \'\.foo[]\'
+   {"foo":[1,2,3]}
+=> 1, 2, 3
 
 jq \'\.[]\'
    {"a": 1, "b": 1}
@@ -377,11 +490,14 @@ jq \'\.[]\'
 .IP "" 0
 .
 .SS "\.[]?"
-Like \fB\.[]\fR, but no errors will be output if \. is not an array or object\.
+Like \fB\.[]\fR, but no errors will be output if \. is not an array or object\. A filter of the form \fB\.foo[]?\fR is equivalent to \fB\.foo | \.[]?\fR\.
 .
 .SS "Comma: ,"
 If two filters are separated by a comma, then the same input will be fed into both and the two filters\' output value streams will be concatenated in order: first, all of the outputs produced by the left expression, and then all of the outputs produced by the right\. For instance, filter \fB\.foo, \.bar\fR, produces both the "foo" fields and "bar" fields as separate outputs\.
 .
+.P
+The \fB,\fR operator is one way to construct generators\.
+.
 .IP "" 4
 .
 .nf
@@ -403,10 +519,10 @@ jq \'\.[4,2]\'
 .IP "" 0
 .
 .SS "Pipe: |"
-The | operator combines two filters by feeding the output(s) of the one on the left into the input of the one on the right\. It\'s pretty much the same as the Unix shell\'s pipe, if you\'re used to that\.
+The | operator combines two filters by feeding the output(s) of the one on the left into the input of the one on the right\. It\'s similar to the Unix shell\'s pipe, if you\'re used to that\.
 .
 .P
-If the one on the left produces multiple results, the one on the right will be run for each of those results\. So, the expression \fB\.[] | \.foo\fR retrieves the "foo" field of each element of the input array\.
+If the one on the left produces multiple results, the one on the right will be run for each of those results\. So, the expression \fB\.[] | \.foo\fR retrieves the "foo" field of each element of the input array\. This is a cartesian product, which can be surprising\.
 .
 .P
 Note that \fB\.a\.b\.c\fR is the same as \fB\.a | \.b | \.c\fR\.
@@ -445,7 +561,13 @@ jq \'(\. + 2) * 5\'
 jq supports the same set of datatypes as JSON \- numbers, strings, booleans, arrays, objects (which in JSON\-speak are hashes with only string keys), and "null"\.
 .
 .P
-Booleans, null, strings and numbers are written the same way as in javascript\. Just like everything else in jq, these simple values take an input and produce an output \- \fB42\fR is a valid jq expression that takes an input, ignores it, and returns 42 instead\.
+Booleans, null, strings and numbers are written the same way as in JSON\. Just like everything else in jq, these simple values take an input and produce an output \- \fB42\fR is a valid jq expression that takes an input, ignores it, and returns 42 instead\.
+.
+.P
+Numbers in jq are internally represented by their IEEE754 double precision approximation\. Any arithmetic operation with numbers, whether they are literals or results of previous filters, will produce a double precision floating point result\.
+.
+.P
+However, when parsing a literal jq will store the original literal string\. If no mutation is applied to this value then it will make to the output in its original form, even if conversion to double would result in a loss\.
 .
 .SS "Array construction: []"
 As in JSON, \fB[]\fR is used to construct arrays, as in \fB[1,2,3]\fR\. The elements of the arrays can be any jq expression, including a pipeline\. All of the results produced by all of the expressions are collected into one big array\. You can use it to construct an array out of a known quantity of values (as in \fB[\.foo, \.bar, \.baz]\fR) or to "collect" all the results of a filter into an array (as in \fB[\.items[]\.name]\fR)
@@ -476,10 +598,10 @@ jq \'[ \.[] | \. * 2]\'
 Like JSON, \fB{}\fR is for constructing objects (aka dictionaries or hashes), as in: \fB{"a": 42, "b": 17}\fR\.
 .
 .P
-If the keys are "identifier\-like", then the quotes can be left off, as in \fB{a:42, b:17}\fR\. Keys generated by expressions need to be parenthesized, e\.g\., \fB{("a"+"b"):59}\fR\.
+If the keys are "identifier\-like", then the quotes can be left off, as in \fB{a:42, b:17}\fR\. Variable references as key expressions use the value of the variable as the key\. Key expressions other than constant literals, identifiers, or variable references, need to be parenthesized, e\.g\., \fB{("a"+"b"):59}\fR\.
 .
 .P
-The value can be any expression (although you may need to wrap it in parentheses if it\'s a complicated one), which gets applied to the {} expression\'s input (remember, all filters have an input and an output)\.
+The value can be any expression (although you may need to wrap it in parentheses if, for example, it contains colons), which gets applied to the {} expression\'s input (remember, all filters have an input and an output)\.
 .
 .IP "" 4
 .
@@ -568,6 +690,32 @@ produces
 .nf
 
 {"stedolan": ["JQ Primer", "More JQ"]}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Variable references as keys use the value of the variable as the key\. Without a value then the variable\'s name becomes the key and its value becomes the value,
+.
+.IP "" 4
+.
+.nf
+
+"f o o" as $foo | "b a r" as $bar | {$foo, $bar:$foo}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+produces
+.
+.IP "" 4
+.
+.nf
+
+{"foo":"f o o","b a r":"f o o"}
 
 jq \'{user, title: \.titles[]}\'
    {"user":"stedolan","titles":["JQ Primer", "More JQ"]}
@@ -582,7 +730,7 @@ jq \'{(\.user): \.titles}\'
 .IP "" 0
 .
 .SS "Recursive Descent: \.\."
-Recursively descends \fB\.\fR, producing every value\. This is the same as the zero\-argument \fBrecurse\fR builtin (see below)\. This is intended to resemble the XPath \fB//\fR operator\. Note that \fB\.\.a\fR does not work; use \fB\.\.|\.a\fR instead\. In the example below we use \fB\.\.|\.a?\fR to find all the values of object keys "a" in any object found "below" \fB\.\fR\.
+Recursively descends \fB\.\fR, producing every value\. This is the same as the zero\-argument \fBrecurse\fR builtin (see below)\. This is intended to resemble the XPath \fB//\fR operator\. Note that \fB\.\.a\fR does not work; use \fB\.\. | \.a\fR instead\. In the example below we use \fB\.\. | \.a?\fR to find all the values of object keys "a" in any object found "below" \fB\.\fR\.
 .
 .P
 This is particularly useful in conjunction with \fBpath(EXP)\fR (also see below) and the \fB?\fR operator\.
@@ -591,7 +739,7 @@ This is particularly useful in conjunction with \fBpath(EXP)\fR (also see below)
 .
 .nf
 
-jq \'\.\.|\.a?\'
+jq \'\.\. | \.a?\'
    [[{"a":1}]]
 => 1
 .
@@ -600,7 +748,13 @@ jq \'\.\.|\.a?\'
 .IP "" 0
 .
 .SH "BUILTIN OPERATORS AND FUNCTIONS"
-Some jq operator (for instance, \fB+\fR) do different things depending on the type of their arguments (arrays, numbers, etc\.)\. However, jq never does implicit type conversions\. If you try to add a string to an object you\'ll get an error message and no result\.
+Some jq operators (for instance, \fB+\fR) do different things depending on the type of their arguments (arrays, numbers, etc\.)\. However, jq never does implicit type conversions\. If you try to add a string to an object you\'ll get an error message and no result\.
+.
+.P
+Please note that all numbers are converted to IEEE754 double precision floating point representation\. Arithmetic and logical operators are working with these converted doubles\. Results of all such operations are also limited to the double precision\.
+.
+.P
+The only exception to this behaviour of number is a snapshot of original number literal\. When a number which originally was provided as a literal is never mutated until the end of the program then it is printed to the output in its original literal form\. This also includes cases when the original literal would be truncated when converted to the IEEE754 double precision floating point number\.
 .
 .SS "Addition: +"
 The operator \fB+\fR takes two filters, applies them both to the same input, and adds the results together\. What "adding" means depends on the types involved:
@@ -669,11 +823,11 @@ jq \'\. \- ["xml", "yaml"]\'
 .
 .IP "" 0
 .
-.SS "Multiplication, division, modulo: *, /, and %"
+.SS "Multiplication, division, modulo: *, /, %"
 These infix operators behave as expected when given two numbers\. Division by zero raises an error\. \fBx % y\fR computes x modulo y\.
 .
 .P
-Multiplying a string by a number produces the concatenation of that string that many times\. \fB"x" * 0\fR produces \fBnull\fR\.
+Multiplying a string by a number produces the concatenation of that string that many times\. \fB"x" * 0\fR produces \fB""\fR\.
 .
 .P
 Dividing a string by another splits the first using the second as separators\.
@@ -705,6 +859,27 @@ jq \'\.[] | (1 / \.)?\'
 .
 .IP "" 0
 .
+.SS "abs"
+The builtin function \fBabs\fR is defined naively as: \fBif \. < 0 then \- \. else \. end\fR\.
+.
+.P
+For numeric input, this is the absolute value\. See the section on the identity filter for the implications of this definition for numeric input\.
+.
+.P
+To compute the absolute value of a number as a floating point number, you may wish use \fBfabs\fR\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'map(abs)\'
+   [\-10, \-1\.1, \-1e\-1]
+=> [10,1\.1,1e\-1]
+.
+.fi
+.
+.IP "" 0
+.
 .SS "length"
 The builtin function \fBlength\fR gets the length of various different types of value:
 .
@@ -712,6 +887,9 @@ The builtin function \fBlength\fR gets the length of various different types of
 The length of a \fBstring\fR is the number of Unicode codepoints it contains (which will be the same as its JSON\-encoded length in bytes if it\'s pure ASCII)\.
 .
 .IP "\(bu" 4
+The length of a \fBnumber\fR is its absolute value\.
+.
+.IP "\(bu" 4
 The length of an \fBarray\fR is the number of elements\.
 .
 .IP "\(bu" 4
@@ -720,8 +898,18 @@ The length of an \fBobject\fR is the number of key\-value pairs\.
 .IP "\(bu" 4
 The length of \fBnull\fR is zero\.
 .
-.IP
-jq \'\.[] | length\' [[1,2], "string", {"a":2}, null] => 2, 6, 1, 0
+.IP "\(bu" 4
+It is an error to use \fBlength\fR on a \fBboolean\fR\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.[] | length\'
+   [[1,2], "string", {"a":2}, null, \-5]
+=> 2, 6, 1, 0, 5
+.
+.fi
 .
 .IP "" 0
 .
@@ -809,41 +997,99 @@ jq \'map(in([0,1]))\'
 .
 .IP "" 0
 .
-.SS "map(x), map_values(x)"
-For any filter \fBx\fR, \fBmap(x)\fR will run that filter for each element of the input array, and return the outputs in a new array\. \fBmap(\.+1)\fR will increment each element of an array of numbers\.
+.SS "map(f), map_values(f)"
+For any filter \fBf\fR, \fBmap(f)\fR and \fBmap_values(f)\fR apply \fBf\fR to each of the values in the input array or object, that is, to the values of \fB\.[]\fR\.
+.
+.P
+In the absence of errors, \fBmap(f)\fR always outputs an array whereas \fBmap_values(f)\fR outputs an array if given an array, or an object if given an object\.
+.
+.P
+When the input to \fBmap_values(f)\fR is an object, the output object has the same keys as the input object except for those keys whose values when piped to \fBf\fR produce no values at all\.
+.
+.P
+The key difference between \fBmap(f)\fR and \fBmap_values(f)\fR is that the former simply forms an array from all the values of \fB($x|f)\fR for each value, $x, in the input array or object, but \fBmap_values(f)\fR only uses \fBfirst($x|f)\fR\.
 .
 .P
-Similarly, \fBmap_values(x)\fR will run that filter for each element, but it will return an object when an object is passed\.
+Specifically, for object inputs, \fBmap_values(f)\fR constructs the output object by examining in turn the value of \fBfirst(\.[$k]|f)\fR for each key, $k, of the input\. If this expression produces no values, then the corresponding key will be dropped; otherwise, the output object will have that value at the key, $k\.
 .
 .P
-\fBmap(x)\fR is equivalent to \fB[\.[] | x]\fR\. In fact, this is how it\'s defined\. Similarly, \fBmap_values(x)\fR is defined as \fB\.[] |= x\fR\.
+Here are some examples to clarify the behavior of \fBmap\fR and \fBmap_values\fR when applied to arrays\. These examples assume the input is \fB[1]\fR in all cases:
 .
 .IP "" 4
 .
 .nf
 
-jq \'map(\.+1)\'
-   [1,2,3]
-=> [2,3,4]
+map(\.+1)          #=>  [2]
+map(\., \.)         #=>  [1,1]
+map(empty)        #=>  []
 
-jq \'map_values(\.+1)\'
-   {"a": 1, "b": 2, "c": 3}
-=> {"a": 2, "b": 3, "c": 4}
+map_values(\.+1)   #=>  [2]
+map_values(\., \.)  #=>  [1]
+map_values(empty) #=>  []
 .
 .fi
 .
 .IP "" 0
 .
-.SS "path(path_expression)"
-Outputs array representations of the given path expression in \fB\.\fR\. The outputs are arrays of strings (object keys) and/or numbers (array indices)\.
-.
 .P
-Path expressions are jq expressions like \fB\.a\fR, but also \fB\.[]\fR\. There are two types of path expressions: ones that can match exactly, and ones that cannot\. For example, \fB\.a\.b\.c\fR is an exact match path expression, while \fB\.a[]\.b\fR is not\.
+\fBmap(f)\fR is equivalent to \fB[\.[] | f]\fR and \fBmap_values(f)\fR is equivalent to \fB\.[] |= f\fR\.
 .
 .P
-\fBpath(exact_path_expression)\fR will produce the array representation of the path expression even if it does not exist in \fB\.\fR, if \fB\.\fR is \fBnull\fR or an array or an object\.
+In fact, these are their implementations\.
 .
-.P
+.IP "" 4
+.
+.nf
+
+jq \'map(\.+1)\'
+   [1,2,3]
+=> [2,3,4]
+
+jq \'map_values(\.+1)\'
+   {"a": 1, "b": 2, "c": 3}
+=> {"a": 2, "b": 3, "c": 4}
+
+jq \'map(\., \.)\'
+   [1,2]
+=> [1,1,2,2]
+
+jq \'map_values(\. // empty)\'
+   {"a": null, "b": true, "c": false}
+=> {"b":true}
+.
+.fi
+.
+.IP "" 0
+.
+.SS "pick(pathexps)"
+Emit the projection of the input object or array defined by the specified sequence of path expressions, such that if \fBp\fR is any one of these specifications, then \fB(\. | p)\fR will evaluate to the same value as \fB(\. | pick(pathexps) | p)\fR\. For arrays, negative indices and \fB\.[m:n]\fR specifications should not be used\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'pick(\.a, \.b\.c, \.x)\'
+   {"a": 1, "b": {"c": 2, "d": 3}, "e": 4}
+=> {"a":1,"b":{"c":2},"x":null}
+
+jq \'pick(\.[2], \.[0], \.[0])\'
+   [1,2,3,4]
+=> [1,null,3]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "path(path_expression)"
+Outputs array representations of the given path expression in \fB\.\fR\. The outputs are arrays of strings (object keys) and/or numbers (array indices)\.
+.
+.P
+Path expressions are jq expressions like \fB\.a\fR, but also \fB\.[]\fR\. There are two types of path expressions: ones that can match exactly, and ones that cannot\. For example, \fB\.a\.b\.c\fR is an exact match path expression, while \fB\.a[]\.b\fR is not\.
+.
+.P
+\fBpath(exact_path_expression)\fR will produce the array representation of the path expression even if it does not exist in \fB\.\fR, if \fB\.\fR is \fBnull\fR or an array or an object\.
+.
+.P
 \fBpath(pattern)\fR will produce array representations of the paths matching \fBpattern\fR if the paths exist in \fB\.\fR\.
 .
 .P
@@ -927,7 +1173,7 @@ jq \'setpath([0,"a"]; 1)\'
 .IP "" 0
 .
 .SS "delpaths(PATHS)"
-The builtin function \fBdelpaths\fR sets the \fBPATHS\fR in \fB\.\fR\. \fBPATHS\fR must be an array of paths, where each path is an array of strings and numbers\.
+The builtin function \fBdelpaths\fR deletes the \fBPATHS\fR in \fB\.\fR\. \fBPATHS\fR must be an array of paths, where each path is an array of strings and numbers\.
 .
 .IP "" 4
 .
@@ -941,11 +1187,11 @@ jq \'delpaths([["a","b"]])\'
 .
 .IP "" 0
 .
-.SS "to_entries, from_entries, with_entries"
+.SS "to_entries, from_entries, with_entries(f)"
 These functions convert between an object and an array of key\-value pairs\. If \fBto_entries\fR is passed an object, then for each \fBk: v\fR entry in the input, the output array includes \fB{"key": k, "value": v}\fR\.
 .
 .P
-\fBfrom_entries\fR does the opposite conversion, and \fBwith_entries(foo)\fR is a shorthand for \fBto_entries | map(foo) | from_entries\fR, useful for doing some operation to all keys and values of an object\. \fBfrom_entries\fR accepts key, Key, name, Name, value and Value as keys\.
+\fBfrom_entries\fR does the opposite conversion, and \fBwith_entries(f)\fR is a shorthand for \fBto_entries | map(f) | from_entries\fR, useful for doing some operation to all keys and values of an object\. \fBfrom_entries\fR accepts \fB"key"\fR, \fB"Key"\fR, \fB"name"\fR, \fB"Name"\fR, \fB"value"\fR, and \fB"Value"\fR as keys\.
 .
 .IP "" 4
 .
@@ -968,7 +1214,7 @@ jq \'with_entries(\.key |= "KEY_" + \.)\'
 .IP "" 0
 .
 .SS "select(boolean_expression)"
-The function \fBselect(foo)\fR produces its input unchanged if \fBfoo\fR returns true for that input, and produces no output otherwise\.
+The function \fBselect(f)\fR produces its input unchanged if \fBf\fR returns true for that input, and produces no output otherwise\.
 .
 .P
 It\'s useful for filtering lists: \fB[1,2,3] | map(select(\. >= 2))\fR will give you \fB[2,3]\fR\.
@@ -1026,8 +1272,24 @@ jq \'[1,2,empty,3]\'
 .
 .IP "" 0
 .
-.SS "error(message)"
-Produces an error, just like \fB\.a\fR applied to values other than null and objects would, but with the given message as the error\'s value\. Errors can be caught with try/catch; see below\.
+.SS "error, error(message)"
+Produces an error with the input value, or with the message given as the argument\. Errors can be caught with try/catch; see below\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'try error catch \.\'
+   "error message"
+=> "error message"
+
+jq \'try error("invalid value: \e(\.)") catch \.\'
+   42
+=> "invalid value: 42"
+.
+.fi
+.
+.IP "" 0
 .
 .SS "halt"
 Stops the jq program with no further outputs\. jq will exit with exit status \fB0\fR\.
@@ -1039,7 +1301,7 @@ Stops the jq program with no further outputs\. The input will be printed on \fBs
 The given \fBexit_code\fR (defaulting to \fB5\fR) will be jq\'s exit status\.
 .
 .P
-For example, \fB"Error: somthing went wrong\en"|halt_error(1)\fR\.
+For example, \fB"Error: something went wrong\en"|halt_error(1)\fR\.
 .
 .SS "$__loc__"
 Produces an object with a "file" key and a "line" key, with the filename and line number where \fB$__loc__\fR occurs, as values\.
@@ -1056,14 +1318,11 @@ jq \'try error("\e($__loc__)") catch \.\'
 .
 .IP "" 0
 .
-.SS "paths, paths(node_filter), leaf_paths"
+.SS "paths, paths(node_filter)"
 \fBpaths\fR outputs the paths to all the elements in its input (except it does not output the empty list, representing \. itself)\.
 .
 .P
-\fBpaths(f)\fR outputs the paths to any values for which \fBf\fR is true\. That is, \fBpaths(numbers)\fR outputs the paths to all numeric values\.
-.
-.P
-\fBleaf_paths\fR is an alias of \fBpaths(scalars)\fR; \fBleaf_paths\fR is \fIdeprecated\fR and will be removed in the next major release\.
+\fBpaths(f)\fR outputs the paths to any values for which \fBf\fR is \fBtrue\fR\. That is, \fBpaths(type == "number")\fR outputs the paths to all numeric values\.
 .
 .IP "" 4
 .
@@ -1073,7 +1332,7 @@ jq \'[paths]\'
    [1,[[],{"a":2}]]
 => [[0],[1],[1,0],[1,1],[1,1,"a"]]
 
-jq \'[paths(scalars)]\'
+jq \'[paths(type == "number")]\'
    [1,[[],{"a":2}]]
 => [[0],[1,1,"a"]]
 .
@@ -1081,12 +1340,15 @@ jq \'[paths(scalars)]\'
 .
 .IP "" 0
 .
-.SS "add"
+.SS "add, add(generator)"
 The filter \fBadd\fR takes as input an array, and produces as output the elements of the array added together\. This might mean summed, concatenated or merged depending on the types of the elements of the input array \- the rules are the same as those for the \fB+\fR operator (described above)\.
 .
 .P
 If the input is an empty array, \fBadd\fR returns \fBnull\fR\.
 .
+.P
+\fBadd(generator)\fR operates on the given generator rather than the input\.
+.
 .IP "" 4
 .
 .nf
@@ -1102,6 +1364,10 @@ jq \'add\'
 jq \'add\'
    []
 => null
+
+jq \'add(\.[]\.a)\'
+   [{"a":3}, {"a":5}, {"b":6}]
+=> 8
 .
 .fi
 .
@@ -1201,8 +1467,8 @@ jq \'flatten\'
 .
 .IP "" 0
 .
-.SS "range(upto), range(from;upto) range(from;upto;by)"
-The \fBrange\fR function produces a range of numbers\. \fBrange(4;10)\fR produces 6 numbers, from 4 (inclusive) to 10 (exclusive)\. The numbers are produced as separate outputs\. Use \fB[range(4;10)]\fR to get a range as an array\.
+.SS "range(upto), range(from; upto), range(from; upto; by)"
+The \fBrange\fR function produces a range of numbers\. \fBrange(4; 10)\fR produces 6 numbers, from 4 (inclusive) to 10 (exclusive)\. The numbers are produced as separate outputs\. Use \fB[range(4; 10)]\fR to get a range as an array\.
 .
 .P
 The one argument form generates numbers from 0 to the given number, with an increment of 1\.
@@ -1217,11 +1483,11 @@ The three argument form generates numbers \fBfrom\fR to \fBupto\fR with an incre
 .
 .nf
 
-jq \'range(2;4)\'
+jq \'range(2; 4)\'
    null
 => 2, 3
 
-jq \'[range(2;4)]\'
+jq \'[range(2; 4)]\'
    null
 => [2,3]
 
@@ -1229,15 +1495,15 @@ jq \'[range(4)]\'
    null
 => [0,1,2,3]
 
-jq \'[range(0;10;3)]\'
+jq \'[range(0; 10; 3)]\'
    null
 => [0,3,6,9]
 
-jq \'[range(0;10;\-1)]\'
+jq \'[range(0; 10; \-1)]\'
    null
 => []
 
-jq \'[range(0;\-5;\-1)]\'
+jq \'[range(0; \-5; \-1)]\'
    null
 => [0,\-1,\-2,\-3,\-4]
 .
@@ -1375,10 +1641,7 @@ objects
 The ordering for objects is a little complex: first they\'re compared by comparing their sets of keys (as arrays in sorted order), and if their keys are equal then the values are compared key by key\.
 .
 .P
-\fBsort\fR may be used to sort by a particular field of an object, or by applying any jq filter\.
-.
-.P
-\fBsort_by(foo)\fR compares two elements by comparing the result of \fBfoo\fR on each element\.
+\fBsort_by\fR may be used to sort by a particular field of an object, or by applying any jq filter\. \fBsort_by(f)\fR compares two elements by comparing the result of \fBf\fR on each element\. When \fBf\fR produces multiple values, it firstly compares the first values, and the second values if the first values are equal, and so on\.
 .
 .IP "" 4
 .
@@ -1389,8 +1652,12 @@ jq \'sort\'
 => [null,3,6,8]
 
 jq \'sort_by(\.foo)\'
-   [{"foo":4, "bar":10}, {"foo":3, "bar":100}, {"foo":2, "bar":1}]
-=> [{"foo":2, "bar":1}, {"foo":3, "bar":100}, {"foo":4, "bar":10}]
+   [{"foo":4, "bar":10}, {"foo":3, "bar":10}, {"foo":2, "bar":1}]
+=> [{"foo":2, "bar":1}, {"foo":3, "bar":10}, {"foo":4, "bar":10}]
+
+jq \'sort_by(\.foo, \.bar)\'
+   [{"foo":4, "bar":10}, {"foo":3, "bar":20}, {"foo":2, "bar":1}, {"foo":3, "bar":10}]
+=> [{"foo":2, "bar":1}, {"foo":3, "bar":10}, {"foo":3, "bar":20}, {"foo":4, "bar":10}]
 .
 .fi
 .
@@ -1542,9 +1809,25 @@ jq \'index(", ")\'
    "a,b, cd, efg, hijk"
 => 3
 
+jq \'index(1)\'
+   [0,1,2,1,3,1,4]
+=> 1
+
+jq \'index([1,2])\'
+   [0,1,2,3,1,4,2,5,1,2,6,7]
+=> 1
+
 jq \'rindex(", ")\'
    "a,b, cd, efg, hijk"
 => 12
+
+jq \'rindex(1)\'
+   [0,1,2,1,3,1,4]
+=> 5
+
+jq \'rindex([1,2])\'
+   [0,1,2,3,1,4,2,5,1,2,6,7]
+=> 8
 .
 .fi
 .
@@ -1660,6 +1943,30 @@ jq \'[\.[]|rtrimstr("foo")]\'
 .
 .IP "" 0
 .
+.SS "trim, ltrim, rtrim"
+\fBtrim\fR trims both leading and trailing whitespace\.
+.
+.P
+\fBltrim\fR trims only leading (left side) whitespace\.
+.
+.P
+\fBrtrim\fR trims only trailing (right side) whitespace\.
+.
+.P
+Whitespace characters are the usual \fB" "\fR, \fB"\en"\fR \fB"\et"\fR, \fB"\er"\fR and also all characters in the Unicode character database with the whitespace property\. Note that what considers whitespace might change in the future\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'trim, ltrim, rtrim\'
+   " abc "
+=> "abc", "abc ", " abc"
+.
+.fi
+.
+.IP "" 0
+.
 .SS "explode"
 Converts an input string into an array of the string\'s codepoint numbers\.
 .
@@ -1693,6 +2000,9 @@ jq \'implode\'
 .SS "split(str)"
 Splits an input string on the separator argument\.
 .
+.P
+\fBsplit\fR can also split on regex matches when called with two arguments (see the regular expressions section below)\.
+.
 .IP "" 4
 .
 .nf
@@ -1730,6 +2040,18 @@ jq \'join(" ")\'
 .SS "ascii_downcase, ascii_upcase"
 Emit a copy of the input string with its alphabetic characters (a\-z and A\-Z) converted to the specified case\.
 .
+.IP "" 4
+.
+.nf
+
+jq \'ascii_upcase\'
+   "useful but not for é"
+=> "USEFUL BUT NOT FOR é"
+.
+.fi
+.
+.IP "" 0
+.
 .SS "while(cond; update)"
 The \fBwhile(cond; update)\fR function allows you to repeatedly apply an update to \fB\.\fR until \fBcond\fR is false\.
 .
@@ -1748,6 +2070,24 @@ jq \'[while(\.<100; \.*2)]\'
 .
 .IP "" 0
 .
+.SS "repeat(exp)"
+The \fBrepeat(exp)\fR function allows you to repeatedly apply expression \fBexp\fR to \fB\.\fR until an error is raised\.
+.
+.P
+Note that \fBrepeat(exp)\fR is internally defined as a recursive jq function\. Recursive calls within \fBrepeat\fR will not consume additional memory if \fBexp\fR produces at most one output for each input\. See advanced topics below\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'[repeat(\.*2, error)?]\'
+   1
+=> [2]
+.
+.fi
+.
+.IP "" 0
+.
 .SS "until(cond; next)"
 The \fBuntil(cond; next)\fR function allows you to repeatedly apply the expression \fBnext\fR, initially to \fB\.\fR then to its own output, until \fBcond\fR is true\. For example, this can be used to implement a factorial function (see below)\.
 .
@@ -1766,7 +2106,7 @@ jq \'[\.,1]|until(\.[0] < 1; [\.[0] \- 1, \.[1] * \.[0]])|\.[1]\'
 .
 .IP "" 0
 .
-.SS "recurse(f), recurse, recurse(f; condition), recurse_down"
+.SS "recurse(f), recurse, recurse(f; condition)"
 The \fBrecurse(f)\fR function allows you to search through a recursive structure, and extract interesting data from all levels\. Suppose your input represents a filesystem:
 .
 .IP "" 4
@@ -1802,15 +2142,12 @@ recurse(\.children[]) | \.name
 When called without an argument, \fBrecurse\fR is equivalent to \fBrecurse(\.[]?)\fR\.
 .
 .P
-\fBrecurse(f)\fR is identical to \fBrecurse(f; \. != null)\fR and can be used without concerns about recursion depth\.
+\fBrecurse(f)\fR is identical to \fBrecurse(f; true)\fR and can be used without concerns about recursion depth\.
 .
 .P
 \fBrecurse(f; condition)\fR is a generator which begins by emitting \. and then emits in turn \.|f, \.|f|f, \.|f|f|f, \.\.\. so long as the computed value satisfies the condition\. For example, to generate all the integers, at least in principle, one could write \fBrecurse(\.+1; true)\fR\.
 .
 .P
-For legacy reasons, \fBrecurse_down\fR exists as an alias to calling \fBrecurse\fR without arguments\. This alias is considered \fIdeprecated\fR and will be removed in the next major release\.
-.
-.P
 The recursive calls in \fBrecurse\fR will not consume additional memory whenever \fBf\fR produces at most a single output for each input\.
 .
 .IP "" 4
@@ -1852,6 +2189,18 @@ jq \'walk( if type == "object" then with_entries( \.key |= sub( "^_+"; "") ) els
 .
 .IP "" 0
 .
+.SS "have_literal_numbers"
+This builtin returns true if jq\'s build configuration includes support for preservation of input number literals\.
+.
+.SS "have_decnum"
+This builtin returns true if jq was built with "decnum", which is the current literal number preserving numeric backend implementation for jq\.
+.
+.SS "$JQ_BUILD_CONFIGURATION"
+This builtin binding shows the jq executable\'s build configuration\. Its value has no particular format, but it can be expected to be at least the \fB\./configure\fR command\-line arguments, and may be enriched in the future to include the version strings for the build tooling used\.
+.
+.P
+Note that this can be overridden in the command\-line with \fB\-\-arg\fR and related options\.
+.
 .SS "$ENV, env"
 \fB$ENV\fR is an object representing the environment variables as set when the jq program started\.
 .
@@ -1893,7 +2242,7 @@ jq \'transpose\'
 .IP "" 0
 .
 .SS "bsearch(x)"
-bsearch(x) conducts a binary search for x in the input array\. If the input is sorted and contains x, then bsearch(x) will return its index in the array; otherwise, if the array is sorted, it will return (\-1 \- ix) where ix is an insertion point such that the array would still be sorted after the insertion of x at ix\. If the array is not sorted, bsearch(x) will return an integer that is probably of no interest\.
+\fBbsearch(x)\fR conducts a binary search for x in the input array\. If the input is sorted and contains x, then \fBbsearch(x)\fR will return its index in the array; otherwise, if the array is sorted, it will return (\-1 \- ix) where ix is an insertion point such that the array would still be sorted after the insertion of x at ix\. If the array is not sorted, \fBbsearch(x)\fR will return an integer that is probably of no interest\.
 .
 .IP "" 4
 .
@@ -1915,7 +2264,7 @@ jq \'bsearch(4) as $ix | if $ix < 0 then \.[\-(1+$ix)] = 4 else \. end\'
 .
 .IP "" 0
 .
-.SS "String interpolation \- \e(foo)"
+.SS "String interpolation: \e(exp)"
 Inside a string, you can put an expression inside parens after a backslash\. Whatever the expression returns will be interpolated into the string\.
 .
 .IP "" 4
@@ -1931,7 +2280,7 @@ jq \'"The input was \e(\.), which is one less than \e(\.+1)"\'
 .IP "" 0
 .
 .SS "Convert to/from JSON"
-The \fBtojson\fR and \fBfromjson\fR builtins dump values as JSON texts or parse JSON texts into values, respectively\. The tojson builtin differs from tostring in that tostring returns strings unmodified, while tojson encodes strings as JSON strings\.
+The \fBtojson\fR and \fBfromjson\fR builtins dump values as JSON texts or parse JSON texts into values, respectively\. The \fBtojson\fR builtin differs from \fBtostring\fR in that \fBtostring\fR returns strings unmodified, while \fBtojson\fR encodes strings as JSON strings\.
 .
 .IP "" 4
 .
@@ -1981,6 +2330,12 @@ Applies HTML/XML escaping, by mapping the characters \fB<>&\'"\fR to their entit
 Applies percent\-encoding, by mapping all reserved URI characters to a \fB%XX\fR sequence\.
 .
 .TP
+\fB@urid\fR:
+.
+.IP
+The inverse of \fB@uri\fR, applies percent\-decoding, by mapping all \fB%XX\fR sequences to their corresponding URI characters\.
+.
+.TP
 \fB@csv\fR:
 .
 .IP
@@ -2008,7 +2363,7 @@ The input is converted to base64 as specified by RFC 4648\.
 \fB@base64d\fR:
 .
 .IP
-The inverse of \fB@base64\fR, input is decoded as specified by RFC 4648\. Note: If the decoded string is not UTF\-8, the results are undefined\.
+The inverse of \fB@base64\fR, input is decoded as specified by RFC 4648\. Note\e: If the decoded string is not UTF\-8, the results are undefined\.
 .
 .P
 This syntax can be combined with string interpolation in a useful way\. You can follow a \fB@foo\fR token with a string literal\. The contents of the string literal will \fInot\fR be escaped\. However, all interpolations made inside that string literal will be escaped\. For instance,
@@ -2082,7 +2437,7 @@ The \fBnow\fR builtin outputs the current time, in seconds since the Unix epoch\
 Low\-level jq interfaces to the C\-library time functions are also provided: \fBstrptime\fR, \fBstrftime\fR, \fBstrflocaltime\fR, \fBmktime\fR, \fBgmtime\fR, and \fBlocaltime\fR\. Refer to your host operating system\'s documentation for the format strings used by \fBstrptime\fR and \fBstrftime\fR\. Note: these are not necessarily stable interfaces in jq, particularly as to their localization functionality\.
 .
 .P
-The \fBgmtime\fR builtin consumes a number of seconds since the Unix epoch and outputs a "broken down time" representation of Greenwhich Meridian time as an array of numbers representing (in this order): the year, the month (zero\-based), the day of the month (one\-based), the hour of the day, the minute of the hour, the second of the minute, the day of the week, and the day of the year \-\- all one\-based unless otherwise stated\. The day of the week number may be wrong on some systems for dates before March 1st 1900, or after December 31 2099\.
+The \fBgmtime\fR builtin consumes a number of seconds since the Unix epoch and outputs a "broken down time" representation of Greenwich Mean Time as an array of numbers representing (in this order): the year, the month (zero\-based), the day of the month (one\-based), the hour of the day, the minute of the hour, the second of the minute, the day of the week, and the day of the year \-\- all one\-based unless otherwise stated\. The day of the week number may be wrong on some systems for dates before March 1st 1900, or after December 31 2099\.
 .
 .P
 The \fBlocaltime\fR builtin works like the \fBgmtime\fR builtin, but using the local timezone setting\.
@@ -2091,7 +2446,7 @@ The \fBlocaltime\fR builtin works like the \fBgmtime\fR builtin, but using the l
 The \fBmktime\fR builtin consumes "broken down time" representations of time output by \fBgmtime\fR and \fBstrptime\fR\.
 .
 .P
-The \fBstrptime(fmt)\fR builtin parses input strings matching the \fBfmt\fR argument\. The output is in the "broken down time" representation consumed by \fBgmtime\fR and output by \fBmktime\fR\.
+The \fBstrptime(fmt)\fR builtin parses input strings matching the \fBfmt\fR argument\. The output is in the "broken down time" representation consumed by \fBmktime\fR and output by \fBgmtime\fR\.
 .
 .P
 The \fBstrftime(fmt)\fR builtin formats a time (GMT) with the given format\. The \fBstrflocaltime\fR does the same, but using the local timezone setting\.
@@ -2167,7 +2522,7 @@ Returns a list of all builtin functions in the format \fBname/arity\fR\. Since f
 .SH "CONDITIONALS AND COMPARISONS"
 .
 .SS "==, !="
-The expression \'a == b\' will produce \'true\' if the result of a and b are equal (that is, if they represent equivalent JSON documents) and \'false\' otherwise\. In particular, strings are never considered equal to numbers\. If you\'re coming from Javascript, jq\'s == is like Javascript\'s === \- considering values equal only when they have the same type as well as the same value\.
+The expression \'a == b\' will produce \'true\' if the results of evaluating a and b are equal (that is, if they represent equivalent JSON values) and \'false\' otherwise\. In particular, strings are never considered equal to numbers\. In checking for the equality of JSON objects, the ordering of keys is irrelevant\. If you\'re coming from JavaScript, please note that jq\'s \fB==\fR is like JavaScript\'s \fB===\fR, the "strict equality" operator\.
 .
 .P
 != is "not equal", and \'a != b\' returns the opposite value of \'a == b\'
@@ -2176,6 +2531,14 @@ The expression \'a == b\' will produce \'true\' if the result of a and b are equ
 .
 .nf
 
+jq \'\. == false\'
+   null
+=> false
+
+jq \'\. == {"b": {"d": (4 + 1e\-20), "c": 3}, "a":1}\'
+   {"a":1, "b": {"c": 3, "d": 4}}
+=> true
+
 jq \'\.[] == 1\'
    [1, 1\.0, "1", "banana"]
 => true, true, false, false
@@ -2184,11 +2547,14 @@ jq \'\.[] == 1\'
 .
 .IP "" 0
 .
-.SS "if\-then\-else"
+.SS "if\-then\-else\-end"
 \fBif A then B else C end\fR will act the same as \fBB\fR if \fBA\fR produces a value other than false or null, but act the same as \fBC\fR otherwise\.
 .
 .P
-Checking for false or null is a simpler notion of "truthiness" than is found in Javascript or Python, but it means that you\'ll sometimes have to be more explicit about the condition you want: you can\'t test whether, e\.g\. a string is empty using \fBif \.name then A else B end\fR, you\'ll need something more like \fBif (\.name | length) > 0 then A else B end\fR instead\.
+\fBif A then B end\fR is the same as \fBif A then B else \.  end\fR\. That is, the \fBelse\fR branch is optional, and if absent is the same as \fB\.\fR\. This also applies to \fBelif\fR with absent ending \fBelse\fR branch\.
+.
+.P
+Checking for false or null is a simpler notion of "truthiness" than is found in JavaScript or Python, but it means that you\'ll sometimes have to be more explicit about the condition you want\. You can\'t test whether, e\.g\. a string is empty using \fBif \.name then A else B end\fR; you\'ll need something like \fBif \.name == "" then A else B end\fR instead\.
 .
 .P
 If the condition \fBA\fR produces multiple results, then \fBB\fR is evaluated once for each result that is not false or null, and \fBC\fR is evaluated once for each false or null\.
@@ -2201,14 +2567,19 @@ More cases can be added to an if using \fBelif A then B\fR syntax\.
 .nf
 
 jq \'if \. == 0 then
+  "zero"
+elif \. == 1 then
+  "one"
+else
+  "many"
+end\'
+   2
+=> "many"
 .
 .fi
 .
 .IP "" 0
 .
-.P
-"zero" elif \. == 1 then "one" else "many" end\' 2 => "many"
-.
 .SS ">, >=, <=, <"
 The comparison operators \fB>\fR, \fB>=\fR, \fB<=\fR, \fB<\fR return whether their left argument is greater than, greater than or equal to, less than or equal to or less than their right argument (respectively)\.
 .
@@ -2227,8 +2598,8 @@ jq \'\. < 5\'
 .
 .IP "" 0
 .
-.SS "and/or/not"
-jq supports the normal Boolean operators and/or/not\. They have the same standard of truth as if expressions \- false and null are considered "false values", and anything else is a "true value"\.
+.SS "and, or, not"
+jq supports the normal Boolean operators \fBand\fR, \fBor\fR, \fBnot\fR\. They have the same standard of truth as if expressions \- \fBfalse\fR and \fBnull\fR are considered "false values", and anything else is a "true value"\.
 .
 .P
 If an operand of one of these operators produces multiple results, the operator itself will produce a result for each input\.
@@ -2237,7 +2608,7 @@ If an operand of one of these operators produces multiple results, the operator
 \fBnot\fR is in fact a builtin function rather than an operator, so it is called as a filter to which things can be piped rather than with special syntax, as in \fB\.foo and \.bar | not\fR\.
 .
 .P
-These three only produce the values "true" and "false", and so are only useful for genuine Boolean operations, rather than the common Perl/Python/Ruby idiom of "value_that_may_be_null or default"\. If you want to use this form of "or", picking between two values rather than evaluating a condition, see the "//" operator below\.
+These three only produce the values \fBtrue\fR and \fBfalse\fR, and so are only useful for genuine Boolean operations, rather than the common Perl/Python/Ruby idiom of "value_that_may_be_null or default"\. If you want to use this form of "or", picking between two values rather than evaluating a condition, see the \fB//\fR operator below\.
 .
 .IP "" 4
 .
@@ -2264,15 +2635,25 @@ jq \'[true, false | not]\'
 .IP "" 0
 .
 .SS "Alternative operator: //"
-A filter of the form \fBa // b\fR produces the same results as \fBa\fR, if \fBa\fR produces results other than \fBfalse\fR and \fBnull\fR\. Otherwise, \fBa // b\fR produces the same results as \fBb\fR\.
+The \fB//\fR operator produces all the values of its left\-hand side that are neither \fBfalse\fR nor \fBnull\fR\. If the left\-hand side produces no values other than \fBfalse\fR or \fBnull\fR, then \fB//\fR produces all the values of its right\-hand side\.
+.
+.P
+A filter of the form \fBa // b\fR produces all the results of \fBa\fR that are not \fBfalse\fR or \fBnull\fR\. If \fBa\fR produces no results, or no results other than \fBfalse\fR or \fBnull\fR, then \fBa // b\fR produces the results of \fBb\fR\.
 .
 .P
 This is useful for providing defaults: \fB\.foo // 1\fR will evaluate to \fB1\fR if there\'s no \fB\.foo\fR element in the input\. It\'s similar to how \fBor\fR is sometimes used in Python (jq\'s \fBor\fR operator is reserved for strictly Boolean operations)\.
 .
+.P
+Note: \fBsome_generator // defaults_here\fR is not the same as \fBsome_generator | \. // defaults_here\fR\. The latter will produce default values for all non\-\fBfalse\fR, non\-\fBnull\fR values of the left\-hand side, while the former will not\. Precedence rules can make this confusing\. For example, in \fBfalse, 1 // 2\fR the left\-hand side of \fB//\fR is \fB1\fR, not \fBfalse, 1\fR \-\- \fBfalse, 1 // 2\fR parses the same way as \fBfalse, (1 // 2)\fR\. In \fB(false, null, 1) | \. // 42\fR the left\-hand side of \fB//\fR is \fB\.\fR, which always produces just one value, while in \fB(false, null, 1) // 42\fR the left\-hand side is a generator of three values, and since it produces a value other \fBfalse\fR and \fBnull\fR, the default \fB42\fR is not produced\.
+.
 .IP "" 4
 .
 .nf
 
+jq \'empty // 42\'
+   null
+=> 42
+
 jq \'\.foo // 42\'
    {"foo": 19}
 => 19
@@ -2280,6 +2661,14 @@ jq \'\.foo // 42\'
 jq \'\.foo // 42\'
    {}
 => 42
+
+jq \'(false, null, 1) // 42\'
+   null
+=> 1
+
+jq \'(false, null, 1) | \. // 42\'
+   null
+=> 42, 42, 1
 .
 .fi
 .
@@ -2324,7 +2713,7 @@ For example:
 # Repeat an expression until it raises "break" as an
 # error, then stop repeating without re\-raising the error\.
 # But if the error caught is not "break" then re\-raise it\.
-try repeat(exp) catch \.=="break" then empty else error;
+try repeat(exp) catch if \.=="break" then empty else error
 .
 .fi
 .
@@ -2344,7 +2733,7 @@ label $out | \.\.\. break $out \.\.\.
 .IP "" 0
 .
 .P
-The \fBbreak $label_name\fR expression will cause the program to to act as though the nearest (to the left) \fBlabel $label_name\fR produced \fBempty\fR\.
+The \fBbreak $label_name\fR expression will cause the program to act as though the nearest (to the left) \fBlabel $label_name\fR produced \fBempty\fR\.
 .
 .P
 The relationship between the \fBbreak\fR and corresponding \fBlabel\fR is lexical: the label has to be "visible" from the break\.
@@ -2385,16 +2774,25 @@ The \fB?\fR operator, used as \fBEXP?\fR, is shorthand for \fBtry EXP\fR\.
 .
 .nf
 
-jq \'[\.[]|(\.a)?]\'
+jq \'[\.[] | \.a?]\'
    [{}, true, {"a":1}]
 => [null, 1]
+
+jq \'[\.[] | tonumber?]\'
+   ["1", "invalid", "3", 4]
+=> [1, 3, 4]
 .
 .fi
 .
 .IP "" 0
 .
-.SH "REGULAR EXPRESSIONS (PCRE)"
-jq uses the Oniguruma regular expression library, as do php, ruby, TextMate, Sublime Text, etc, so the description here will focus on jq specifics\.
+.SH "REGULAR EXPRESSIONS"
+jq uses the Oniguruma regular expression library, as do PHP, TextMate, Sublime Text, etc, so the description here will focus on jq specifics\.
+
+.
+.P
+Oniguruma supports several flavors of regular expression, so it is important to know that jq uses the "Perl NG" (Perl with named groups) flavor\.
+
 .
 .P
 The jq regex filters are defined so that they can be used using one of these patterns:
@@ -2403,17 +2801,31 @@ The jq regex filters are defined so that they can be used using one of these pat
 .
 .nf
 
-STRING | FILTER( REGEX )
-STRING | FILTER( REGEX; FLAGS )
-STRING | FILTER( [REGEX] )
-STRING | FILTER( [REGEX, FLAGS] )
+STRING | FILTER(REGEX)
+STRING | FILTER(REGEX; FLAGS)
+STRING | FILTER([REGEX])
+STRING | FILTER([REGEX, FLAGS])
 .
 .fi
 .
 .IP "" 0
 .
 .P
-where: * STRING, REGEX and FLAGS are jq strings and subject to jq string interpolation; * REGEX, after string interpolation, should be a valid PCRE regex; * FILTER is one of \fBtest\fR, \fBmatch\fR, or \fBcapture\fR, as described below\.
+where:
+.
+.IP "\(bu" 4
+STRING, REGEX, and FLAGS are jq strings and subject to jq string interpolation;
+.
+.IP "\(bu" 4
+REGEX, after string interpolation, should be a valid regular expression;
+.
+.IP "\(bu" 4
+FILTER is one of \fBtest\fR, \fBmatch\fR, or \fBcapture\fR, as described below\.
+.
+.IP "" 0
+.
+.P
+Since REGEX must evaluate to a JSON string, some characters that are needed to form a regular expression must be escaped\. For example, the regular expression \fB\es\fR signifying a whitespace character would be written as \fB"\e\es"\fR\.
 .
 .P
 FLAGS is a string consisting of one of more of the supported flags:
@@ -2425,7 +2837,7 @@ FLAGS is a string consisting of one of more of the supported flags:
 \fBi\fR \- Case insensitive search
 .
 .IP "\(bu" 4
-\fBm\fR \- Multi line mode (\'\.\' will match newlines)
+\fBm\fR \- Multi line mode (\fB\.\fR will match newlines)
 .
 .IP "\(bu" 4
 \fBn\fR \- Ignore empty matches
@@ -2434,7 +2846,7 @@ FLAGS is a string consisting of one of more of the supported flags:
 \fBp\fR \- Both s and m modes are enabled
 .
 .IP "\(bu" 4
-\fBs\fR \- Single line mode (\'^\' \-> \'\eA\', \'$\' \-> \'\eZ\')
+\fBs\fR \- Single line mode (\fB^\fR \-> \fB\eA\fR, \fB$\fR \-> \fB\eZ\fR)
 .
 .IP "\(bu" 4
 \fBl\fR \- Find longest possible matches
@@ -2445,23 +2857,33 @@ FLAGS is a string consisting of one of more of the supported flags:
 .IP "" 0
 .
 .P
-To match whitespace in an x pattern use an escape such as \es, e\.g\.
+To match a whitespace with the \fBx\fR flag, use \fB\es\fR, e\.g\.
 .
-.IP "\(bu" 4
-test( "a\esb", "x" )\.
+.IP "" 4
+.
+.nf
+
+jq \-n \'"a b" | test("a\e\esb"; "x")\'
+.
+.fi
 .
 .IP "" 0
 .
 .P
 Note that certain flags may also be specified within REGEX, e\.g\.
 .
-.IP "\(bu" 4
-jq \-n \'("test", "TEst", "teST", "TEST") | test( "(?i)te(?\-i)st" )\'
+.IP "" 4
+.
+.nf
+
+jq \-n \'("test", "TEst", "teST", "TEST") | test("(?i)te(?\-i)st")\'
+.
+.fi
 .
 .IP "" 0
 .
 .P
-evaluates to: true, true, false, false\.
+evaluates to: \fBtrue\fR, \fBtrue\fR, \fBfalse\fR, \fBfalse\fR\.
 .
 .SS "test(val), test(regex; flags)"
 Like \fBmatch\fR, but does not return match objects, only \fBtrue\fR or \fBfalse\fR for whether or not the regex matches the input\.
@@ -2565,17 +2987,88 @@ jq \'capture("(?<a>[a\-z]+)\-(?<n>[0\-9]+)")\'
 .SS "scan(regex), scan(regex; flags)"
 Emit a stream of the non\-overlapping substrings of the input that match the regex in accordance with the flags, if any have been specified\. If there is no match, the stream is empty\. To capture all the matches for each input string, use the idiom \fB[ expr ]\fR, e\.g\. \fB[ scan(regex) ]\fR\.
 .
+.IP "" 4
+.
+.nf
+
+jq \'scan("c")\'
+   "abcdefabc"
+=> "c", "c"
+.
+.fi
+.
+.IP "" 0
+.
 .SS "split(regex; flags)"
-For backwards compatibility, \fBsplit\fR splits on a string, not a regex\.
+Splits an input string on each regex match\.
+.
+.P
+For backwards compatibility, when called with a single argument, \fBsplit\fR splits on a string, not a regex\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'split(", *"; null)\'
+   "ab,cd, ef"
+=> ["ab","cd","ef"]
+.
+.fi
+.
+.IP "" 0
 .
 .SS "splits(regex), splits(regex; flags)"
 These provide the same results as their \fBsplit\fR counterparts, but as a stream instead of an array\.
 .
-.SS "sub(regex; tostring) sub(regex; string; flags)"
-Emit the string obtained by replacing the first match of regex in the input string with \fBtostring\fR, after interpolation\. \fBtostring\fR should be a jq string, and may contain references to named captures\. The named captures are, in effect, presented as a JSON object (as constructed by \fBcapture\fR) to \fBtostring\fR, so a reference to a captured variable named "x" would take the form: "(\.x)"\.
+.IP "" 4
+.
+.nf
+
+jq \'splits(", *")\'
+   "ab,cd,   ef, gh"
+=> "ab", "cd", "ef", "gh"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "sub(regex; tostring), sub(regex; tostring; flags)"
+Emit the string obtained by replacing the first match of regex in the input string with \fBtostring\fR, after interpolation\. \fBtostring\fR should be a jq string or a stream of such strings, each of which may contain references to named captures\. The named captures are, in effect, presented as a JSON object (as constructed by \fBcapture\fR) to \fBtostring\fR, so a reference to a captured variable named "x" would take the form: \fB"\e(\.x)"\fR\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'sub("[^a\-z]*(?<x>[a\-z]+)"; "Z\e(\.x)"; "g")\'
+   "123abc456def"
+=> "ZabcZdef"
+
+jq \'[sub("(?<a>\.)"; "\e(\.a|ascii_upcase)", "\e(\.a|ascii_downcase)")]\'
+   "aB"
+=> ["AB","aB"]
+.
+.fi
+.
+.IP "" 0
+.
+.SS "gsub(regex; tostring), gsub(regex; tostring; flags)"
+\fBgsub\fR is like \fBsub\fR but all the non\-overlapping occurrences of the regex are replaced by \fBtostring\fR, after interpolation\. If the second argument is a stream of jq strings, then \fBgsub\fR will produce a corresponding stream of JSON strings\.
+.
+.IP "" 4
 .
-.SS "gsub(regex; string), gsub(regex; string; flags)"
-\fBgsub\fR is like \fBsub\fR but all the non\-overlapping occurrences of the regex are replaced by the string, after interpolation\.
+.nf
+
+jq \'gsub("(?<x>\.)[^a]*"; "+\e(\.x)\-")\'
+   "Abcabc"
+=> "+A\-+a\-"
+
+jq \'[gsub("p"; "a", "b")]\'
+   "p"
+=> ["a","b"]
+.
+.fi
+.
+.IP "" 0
 .
 .SH "ADVANCED FEATURES"
 Variables are an absolute necessity in most programming languages, but they\'re relegated to an "advanced feature" in jq\.
@@ -2584,7 +3077,7 @@ Variables are an absolute necessity in most programming languages, but they\'re
 In most languages, variables are the only means of passing around data\. If you calculate a value, and you want to use it more than once, you\'ll need to store it in a variable\. To pass a value to another part of the program, you\'ll need that part of the program to define a variable (as a function parameter, object member, or whatever) in which to place the data\.
 .
 .P
-It is also possible to define functions in jq, although this is is a feature whose biggest use is defining jq\'s standard library (many jq functions such as \fBmap\fR and \fBfind\fR are in fact written in jq)\.
+It is also possible to define functions in jq, although this is is a feature whose biggest use is defining jq\'s standard library (many jq functions such as \fBmap\fR and \fBselect\fR are in fact written in jq)\.
 .
 .P
 jq has reduction operators, which are very powerful but a bit tricky\. Again, these are mostly used internally, to define some useful bits of jq\'s standard library\.
@@ -2627,7 +3120,7 @@ Suppose we have an array of blog posts, with "author" and "title" fields, and an
 .
 .nf
 
-{"posts": [{"title": "Frist psot", "author": "anon"},
+{"posts": [{"title": "First post", "author": "anon"},
            {"title": "A well\-written article", "author": "person1"}],
  "realnames": {"anon": "Anonymous Coward",
                "person1": "Person McPherson"}}
@@ -2643,7 +3136,7 @@ We want to produce the posts with the author field containing a real name, as in
 .
 .nf
 
-{"title": "Frist psot", "author": "Anonymous Coward"}
+{"title": "First post", "author": "Anonymous Coward"}
 {"title": "A well\-written article", "author": "Person McPherson"}
 .
 .fi
@@ -2657,7 +3150,7 @@ We use a variable, $names, to store the realnames object, so that we can refer t
 .
 .nf
 
-\&\.realnames as $names | \.posts[] | {title, author: $names[\.author]}
+\&.realnames as $names | \.posts[] | {title, author: $names[\.author]}
 .
 .fi
 .
@@ -2667,7 +3160,7 @@ We use a variable, $names, to store the realnames object, so that we can refer t
 The expression \fBexp as $x | \.\.\.\fR means: for each value of expression \fBexp\fR, run the rest of the pipeline with the entire original input, and with \fB$x\fR set to that value\. Thus \fBas\fR functions as something of a foreach loop\.
 .
 .P
-Just as \fB{foo}\fR is a handy way of writing \fB{foo: \.foo}\fR, so \fB{$foo}\fR is a handy way of writing \fB{foo:$foo}\fR\.
+Just as \fB{foo}\fR is a handy way of writing \fB{foo: \.foo}\fR, so \fB{$foo}\fR is a handy way of writing \fB{foo: $foo}\fR\.
 .
 .P
 Multiple variables may be declared using a single \fBas\fR expression by providing a pattern that matches the structure of the input (this is known as "destructuring"):
@@ -2676,7 +3169,7 @@ Multiple variables may be declared using a single \fBas\fR expression by providi
 .
 .nf
 
-\&\. as {realnames: $names, posts: [$first, $second]} | \.\.\.
+\&. as {realnames: $names, posts: [$first, $second]} | \.\.\.
 .
 .fi
 .
@@ -2692,7 +3185,7 @@ Variables are scoped over the rest of the expression that defines them, so
 .
 .nf
 
-\&\.realnames as $names | (\.posts[] | {title, author: $names[\.author]})
+\&.realnames as $names | (\.posts[] | {title, author: $names[\.author]})
 .
 .fi
 .
@@ -2741,6 +3234,87 @@ jq \'\.[] as [$a, $b] | {a: $a, b: $b}\'
 .
 .IP "" 0
 .
+.SS "Destructuring Alternative Operator: ?//"
+The destructuring alternative operator provides a concise mechanism for destructuring an input that can take one of several forms\.
+.
+.P
+Suppose we have an API that returns a list of resources and events associated with them, and we want to get the user_id and timestamp of the first event for each resource\. The API (having been clumsily converted from XML) will only wrap the events in an array if the resource has multiple events:
+.
+.IP "" 4
+.
+.nf
+
+{"resources": [{"id": 1, "kind": "widget", "events": {"action": "create", "user_id": 1, "ts": 13}},
+               {"id": 2, "kind": "widget", "events": [{"action": "create", "user_id": 1, "ts": 14}, {"action": "destroy", "user_id": 1, "ts": 15}]}]}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+We can use the destructuring alternative operator to handle this structural change simply:
+.
+.IP "" 4
+.
+.nf
+
+\&.resources[] as {$id, $kind, events: {$user_id, $ts}} ?// {$id, $kind, events: [{$user_id, $ts}]} | {$user_id, $kind, $id, $ts}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Or, if we aren\'t sure if the input is an array of values or an object:
+.
+.IP "" 4
+.
+.nf
+
+\&.[] as [$id, $kind, $user_id, $ts] ?// {$id, $kind, $user_id, $ts} | \.\.\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Each alternative need not define all of the same variables, but all named variables will be available to the subsequent expression\. Variables not matched in the alternative that succeeded will be \fBnull\fR:
+.
+.IP "" 4
+.
+.nf
+
+\&.resources[] as {$id, $kind, events: {$user_id, $ts}} ?// {$id, $kind, events: [{$first_user_id, $first_ts}]} | {$user_id, $first_user_id, $kind, $id, $ts, $first_ts}
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Additionally, if the subsequent expression returns an error, the alternative operator will attempt to try the next binding\. Errors that occur during the final alternative are passed through\.
+.
+.IP "" 4
+.
+.nf
+
+[[3]] | \.[] as [$a] ?// [$b] | if $a != null then error("err: \e($a)") else {$a,$b} end
+
+jq \'\.[] as {$a, $b, c: {$d, $e}} ?// {$a, $b, c: [{$d, $e}]} | {$a, $b, $d, $e}\'
+   [{"a": 1, "b": 2, "c": {"d": 3, "e": 4}}, {"a": 1, "b": 2, "c": [{"d": 3, "e": 4}]}]
+=> {"a":1,"b":2,"d":3,"e":4}, {"a":1,"b":2,"d":3,"e":4}
+
+jq \'\.[] as {$a, $b, c: {$d}} ?// {$a, $b, c: [{$e}]} | {$a, $b, $d, $e}\'
+   [{"a": 1, "b": 2, "c": {"d": 3, "e": 4}}, {"a": 1, "b": 2, "c": [{"d": 3, "e": 4}]}]
+=> {"a":1,"b":2,"d":3,"e":null}, {"a":1,"b":2,"d":null,"e":4}
+
+jq \'\.[] as [$a] ?// [$b] | if $a != null then error("err: \e($a)") else {$a,$b} end\'
+   [[3]]
+=> {"a":null,"b":3}
+.
+.fi
+.
+.IP "" 0
+.
 .SS "Defining Functions"
 You can give a filter a name using "def" syntax:
 .
@@ -2836,65 +3410,56 @@ jq \'def addvalue(f): f as $x | map(\. + $x); addvalue(\.[0])\'
 There are two types of symbols in jq: value bindings (a\.k\.a\., "variables"), and functions\. Both are scoped lexically, with expressions being able to refer only to symbols that have been defined "to the left" of them\. The only exception to this rule is that functions can refer to themselves so as to be able to create recursive functions\.
 .
 .P
-For example, in the following expression there is a binding which is visible "to the right" of it, \fB\.\.\. | \.*3 as $times_three | [\. + $times_three] | \.\.\.\fR, but not "to the left"\. Consider this expression now, \fB\.\.\. | (\.*3 as $times_three | [\.+ $times_three]) | \.\.\.\fR: here the binding \fB$times_three\fR is \fInot\fR visible past the closing parenthesis\.
+For example, in the following expression there is a binding which is visible "to the right" of it, \fB\.\.\. | \.*3 as $times_three | [\. + $times_three] | \.\.\.\fR, but not "to the left"\. Consider this expression now, \fB\.\.\. | (\.*3 as $times_three | [\. + $times_three]) | \.\.\.\fR: here the binding \fB$times_three\fR is \fInot\fR visible past the closing parenthesis\.
 .
-.SS "Reduce"
-The \fBreduce\fR syntax in jq allows you to combine all of the results of an expression by accumulating them into a single answer\. As an example, we\'ll pass \fB[3,2,1]\fR to this expression:
+.SS "isempty(exp)"
+Returns true if \fBexp\fR produces no outputs, false otherwise\.
 .
 .IP "" 4
 .
 .nf
 
-reduce \.[] as $item (0; \. + $item)
-.
-.fi
-.
-.IP "" 0
-.
-.P
-For each result that \fB\.[]\fR produces, \fB\. + $item\fR is run to accumulate a running total, starting from 0\. In this example, \fB\.[]\fR produces the results 3, 2, and 1, so the effect is similar to running something like this:
-.
-.IP "" 4
-.
-.nf
+jq \'isempty(empty)\'
+   null
+=> true
 
-0 | (3 as $item | \. + $item) |
-    (2 as $item | \. + $item) |
-    (1 as $item | \. + $item)
+jq \'isempty(\.[])\'
+   []
+=> true
 
-jq \'reduce \.[] as $item (0; \. + $item)\'
-   [10,2,5,3]
-=> 20
+jq \'isempty(\.[])\'
+   [1,2,3]
+=> false
 .
 .fi
 .
 .IP "" 0
 .
-.SS "isempty(exp)"
-Returns true if \fBexp\fR produces no outputs, false otherwise\.
+.SS "limit(n; expr)"
+The \fBlimit\fR function extracts up to \fBn\fR outputs from \fBexpr\fR\.
 .
 .IP "" 4
 .
 .nf
 
-jq \'isempty(empty)\'
-   null
-=> true
+jq \'[limit(3; \.[])]\'
+   [0,1,2,3,4,5,6,7,8,9]
+=> [0,1,2]
 .
 .fi
 .
 .IP "" 0
 .
-.SS "limit(n; exp)"
-The \fBlimit\fR function extracts up to \fBn\fR outputs from \fBexp\fR\.
+.SS "skip(n; expr)"
+The \fBskip\fR function skips the first \fBn\fR outputs from \fBexpr\fR\.
 .
 .IP "" 4
 .
 .nf
 
-jq \'[limit(3;\.[])]\'
+jq \'[skip(3; \.[])]\'
    [0,1,2,3,4,5,6,7,8,9]
-=> [0,1,2]
+=> [3,4,5,6,7,8,9]
 .
 .fi
 .
@@ -2904,15 +3469,19 @@ jq \'[limit(3;\.[])]\'
 The \fBfirst(expr)\fR and \fBlast(expr)\fR functions extract the first and last values from \fBexpr\fR, respectively\.
 .
 .P
-The \fBnth(n; expr)\fR function extracts the nth value output by \fBexpr\fR\. This can be defined as \fBdef nth(n; expr): last(limit(n + 1; expr));\fR\. Note that \fBnth(n; expr)\fR doesn\'t support negative values of \fBn\fR\.
+The \fBnth(n; expr)\fR function extracts the nth value output by \fBexpr\fR\. Note that \fBnth(n; expr)\fR doesn\'t support negative values of \fBn\fR\.
 .
 .IP "" 4
 .
 .nf
 
-jq \'[first(range(\.)), last(range(\.)), nth(\./2; range(\.))]\'
+jq \'[first(range(\.)), last(range(\.)), nth(5; range(\.))]\'
    10
 => [0,9,5]
+
+jq \'[first(empty), last(empty), nth(5; empty)]\'
+   null
+=> []
 .
 .fi
 .
@@ -2936,22 +3505,95 @@ jq \'[range(\.)]|[first, last, nth(5)]\'
 .
 .IP "" 0
 .
+.SS "reduce"
+The \fBreduce\fR syntax allows you to combine all of the results of an expression by accumulating them into a single answer\. The form is \fBreduce EXP as $var (INIT; UPDATE)\fR\. As an example, we\'ll pass \fB[1,2,3]\fR to this expression:
+.
+.IP "" 4
+.
+.nf
+
+reduce \.[] as $item (0; \. + $item)
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For each result that \fB\.[]\fR produces, \fB\. + $item\fR is run to accumulate a running total, starting from 0 as the input value\. In this example, \fB\.[]\fR produces the results \fB1\fR, \fB2\fR, and \fB3\fR, so the effect is similar to running something like this:
+.
+.IP "" 4
+.
+.nf
+
+0 | 1 as $item | \. + $item |
+    2 as $item | \. + $item |
+    3 as $item | \. + $item
+
+jq \'reduce \.[] as $item (0; \. + $item)\'
+   [1,2,3,4,5]
+=> 15
+
+jq \'reduce \.[] as [$i,$j] (0; \. + $i * $j)\'
+   [[1,2],[3,4],[5,6]]
+=> 44
+
+jq \'reduce \.[] as {$x,$y} (null; \.x += $x | \.y += [$y])\'
+   [{"x":"a","y":1},{"x":"b","y":2},{"x":"c","y":3}]
+=> {"x":"abc","y":[1,2,3]}
+.
+.fi
+.
+.IP "" 0
+.
 .SS "foreach"
-The \fBforeach\fR syntax is similar to \fBreduce\fR, but intended to allow the construction of \fBlimit\fR and reducers that produce intermediate results (see example)\.
+The \fBforeach\fR syntax is similar to \fBreduce\fR, but intended to allow the construction of \fBlimit\fR and reducers that produce intermediate results\.
+.
+.P
+The form is \fBforeach EXP as $var (INIT; UPDATE; EXTRACT)\fR\. As an example, we\'ll pass \fB[1,2,3]\fR to this expression:
+.
+.IP "" 4
+.
+.nf
+
+foreach \.[] as $item (0; \. + $item; [$item, \. * 2])
+.
+.fi
+.
+.IP "" 0
 .
 .P
-The form is \fBforeach EXP as $var (INIT; UPDATE; EXTRACT)\fR\. Like \fBreduce\fR, \fBINIT\fR is evaluated once to produce a state value, then each output of \fBEXP\fR is bound to \fB$var\fR, \fBUPDATE\fR is evaluated for each output of \fBEXP\fR with the current state and with \fB$var\fR visible\. Each value output by \fBUPDATE\fR replaces the previous state\. Finally, \fBEXTRACT\fR is evaluated for each new state to extract an output of \fBforeach\fR\.
+Like the \fBreduce\fR syntax, \fB\. + $item\fR is run for each result that \fB\.[]\fR produces, but \fB[$item, \. * 2]\fR is run for each intermediate values\. In this example, since the intermediate values are \fB1\fR, \fB3\fR, and \fB6\fR, the \fBforeach\fR expression produces \fB[1,2]\fR, \fB[2,6]\fR, and \fB[3,12]\fR\. So the effect is similar to running something like this:
+.
+.IP "" 4
+.
+.nf
+
+0 | 1 as $item | \. + $item | [$item, \. * 2],
+    2 as $item | \. + $item | [$item, \. * 2],
+    3 as $item | \. + $item | [$item, \. * 2]
+.
+.fi
+.
+.IP "" 0
 .
 .P
-This is mostly useful only for constructing \fBreduce\fR\- and \fBlimit\fR\-like functions\. But it is much more general, as it allows for partial reductions (see the example below)\.
+When \fBEXTRACT\fR is omitted, the identity filter is used\. That is, it outputs the intermediate values as they are\.
 .
 .IP "" 4
 .
 .nf
 
-jq \'[foreach \.[] as $item ([[],[]]; if $item == null then [[],\.[0]] else [(\.[0] + [$item]),[]] end; if $item == null then \.[1] else empty end)]\'
-   [1,2,3,4,null,"a","b",null]
-=> [[1,2,3,4],["a","b"]]
+jq \'foreach \.[] as $item (0; \. + $item)\'
+   [1,2,3,4,5]
+=> 1, 3, 6, 10, 15
+
+jq \'foreach \.[] as $item (0; \. + $item; [$item, \. * 2])\'
+   [1,2,3,4,5]
+=> [1,2], [2,6], [3,12], [4,20], [5,30]
+
+jq \'foreach \.[] as $item (0; \. + 1; {index: \., $item})\'
+   ["foo", "bar", "baz"]
+=> {"index":1,"item":"foo"}, {"index":2,"item":"bar"}, {"index":3,"item":"baz"}
 .
 .fi
 .
@@ -2990,13 +3632,13 @@ def repeat(exp):
 Some jq operators and functions are actually generators in that they can produce zero, one, or more values for each input, just as one might expect in other programming languages that have generators\. For example, \fB\.[]\fR generates all the values in its input (which must be an array or an object), \fBrange(0; 10)\fR generates the integers between 0 and 10, and so on\.
 .
 .P
-Even the comma operator is a generator, generating first the values generated by the expression to the left of the comma, then for each of those, the values generate by the expression on the right of the comma\.
+Even the comma operator is a generator, generating first the values generated by the expression to the left of the comma, then the values generated by the expression on the right of the comma\.
 .
 .P
 The \fBempty\fR builtin is the generator that produces zero outputs\. The \fBempty\fR builtin backtracks to the preceding generator expression\.
 .
 .P
-All jq functions can be generators just by using builtin generators\. It is also possible to define new generators using only recursion and the comma operator\. If the recursive call(s) is(are) "in tail position" then the generator will be efficient\. In the example below the recursive call by \fB_range\fR to itself is in tail position\. The example shows off three advanced topics: tail recursion, generator construction, and sub\-functions\.
+All jq functions can be generators just by using builtin generators\. It is also possible to construct new generators using only recursion and the comma operator\. If recursive calls are "in tail position" then the generator will be efficient\. In the example below the recursive call by \fB_range\fR to itself is in tail position\. The example shows off three advanced topics: tail recursion, generator construction, and sub\-functions\.
 .
 .IP "" 4
 .
@@ -3024,7 +3666,7 @@ Besides simple arithmetic operators such as \fB+\fR, jq also has most standard m
 Availability of standard math functions depends on the availability of the corresponding math functions in your operating system and C math library\. Unavailable math functions will be defined but will raise an error\.
 .
 .P
-One\-input C math functions: \fBacos\fR \fBacosh\fR \fBasin\fR \fBasinh\fR \fBatan\fR \fBatanh\fR \fBcbrt\fR \fBceil\fR \fBcos\fR \fBcosh\fR \fBerf\fR \fBerfc\fR \fBexp\fR \fBexp10\fR \fBexp2\fR \fBexpm1\fR \fBfabs\fR \fBfloor\fR \fBgamma\fR \fBj0\fR \fBj1\fR \fBlgamma\fR \fBlog\fR \fBlog10\fR \fBlog1p\fR \fBlog2\fR \fBlogb\fR \fBnearbyint\fR \fBpow10\fR \fBrint\fR \fBround\fR \fBsignificand\fR \fBsin\fR \fBsinh\fR \fBsqrt\fR \fBtan\fR \fBtanh\fR \fBtgamma\fR \fBtrunc\fR \fBy0\fR \fBy1\fR\.
+One\-input C math functions: \fBacos\fR \fBacosh\fR \fBasin\fR \fBasinh\fR \fBatan\fR \fBatanh\fR \fBcbrt\fR \fBceil\fR \fBcos\fR \fBcosh\fR \fBerf\fR \fBerfc\fR \fBexp\fR \fBexp10\fR \fBexp2\fR \fBexpm1\fR \fBfabs\fR \fBfloor\fR \fBgamma\fR \fBj0\fR \fBj1\fR \fBlgamma\fR \fBlog\fR \fBlog10\fR \fBlog1p\fR \fBlog2\fR \fBlogb\fR \fBnearbyint\fR \fBrint\fR \fBround\fR \fBsignificand\fR \fBsin\fR \fBsinh\fR \fBsqrt\fR \fBtan\fR \fBtanh\fR \fBtgamma\fR \fBtrunc\fR \fBy0\fR \fBy1\fR\.
 .
 .P
 Two\-input C math functions: \fBatan2\fR \fBcopysign\fR \fBdrem\fR \fBfdim\fR \fBfmax\fR \fBfmin\fR \fBfmod\fR \fBfrexp\fR \fBhypot\fR \fBjn\fR \fBldexp\fR \fBmodf\fR \fBnextafter\fR \fBnexttoward\fR \fBpow\fR \fBremainder\fR \fBscalb\fR \fBscalbln\fR \fByn\fR\.
@@ -3036,7 +3678,7 @@ Three\-input C math functions: \fBfma\fR\.
 See your system\'s manual for more information on each of these\.
 .
 .SH "I/O"
-At this time jq has minimal support for I/O, mostly in the form of control over when inputs are read\. Two builtins functions are provided for this, \fBinput\fR and \fBinputs\fR, that read from the same sources (e\.g\., \fBstdin\fR, files named on the command\-line) as jq itself\. These two builtins, and jq\'s own reading actions, can be interleaved with each other\.
+At this time jq has minimal support for I/O, mostly in the form of control over when inputs are read\. Two builtins functions are provided for this, \fBinput\fR and \fBinputs\fR, that read from the same sources (e\.g\., \fBstdin\fR, files named on the command\-line) as jq itself\. These two builtins, and jq\'s own reading actions, can be interleaved with each other\. They are commonly used in combination with the null input option \fB\-n\fR to prevent one input from being read implicitly\.
 .
 .P
 Two builtins provide minimal output capabilities, \fBdebug\fR, and \fBstderr\fR\. (Recall that a jq program\'s output values are always output as JSON texts on \fBstdout\fR\.) The \fBdebug\fR builtin can have application\-specific behavior, such as for executables that use the libjq C API but aren\'t the jq executable itself\. The \fBstderr\fR builtin outputs its input in raw mode to stder with no additional decoration, not even a newline\.
@@ -3047,14 +3689,83 @@ Most jq builtins are referentially transparent, and yield constant and repeatabl
 .SS "input"
 Outputs one new input\.
 .
+.P
+Note that when using \fBinput\fR it is generally be necessary to invoke jq with the \fB\-n\fR command\-line option, otherwise the first entity will be lost\.
+.
+.IP "" 4
+.
+.nf
+
+echo 1 2 3 4 | jq \'[\., input]\' # [1,2] [3,4]
+.
+.fi
+.
+.IP "" 0
+.
 .SS "inputs"
 Outputs all remaining inputs, one by one\.
 .
 .P
-This is primarily useful for reductions over a program\'s inputs\.
+This is primarily useful for reductions over a program\'s inputs\. Note that when using \fBinputs\fR it is generally necessary to invoke jq with the \fB\-n\fR command\-line option, otherwise the first entity will be lost\.
+.
+.IP "" 4
+.
+.nf
+
+echo 1 2 3 | jq \-n \'reduce inputs as $i (0; \. + $i)\' # 6
 .
-.SS "debug"
-Causes a debug message based on the input value to be produced\. The jq executable wraps the input value with \fB["DEBUG:", <input\-value>]\fR and prints that and a newline on stderr, compactly\. This may change in the future\.
+.fi
+.
+.IP "" 0
+.
+.SS "debug, debug(msgs)"
+These two filters are like \fB\.\fR but have as a side\-effect the production of one or more messages on stderr\.
+.
+.P
+The message produced by the \fBdebug\fR filter has the form
+.
+.IP "" 4
+.
+.nf
+
+["DEBUG:",<input\-value>]
+.
+.fi
+.
+.IP "" 0
+.
+.P
+where \fB<input\-value>\fR is a compact rendition of the input value\. This format may change in the future\.
+.
+.P
+The \fBdebug(msgs)\fR filter is defined as \fB(msgs | debug | empty), \.\fR thus allowing great flexibility in the content of the message, while also allowing multi\-line debugging statements to be created\.
+.
+.P
+For example, the expression:
+.
+.IP "" 4
+.
+.nf
+
+1 as $x | 2 | debug("Entering function foo with $x == \e($x)", \.) | (\.+1)
+.
+.fi
+.
+.IP "" 0
+.
+.P
+would produce the value 3 but with the following two lines being written to stderr:
+.
+.IP "" 4
+.
+.nf
+
+["DEBUG:","Entering function foo with $x == 1"]
+["DEBUG:",2]
+.
+.fi
+.
+.IP "" 0
 .
 .SS "stderr"
 Prints its input in raw and compact mode to stderr with no additional decoration, not even a newline\.
@@ -3078,7 +3789,7 @@ Several builtins are provided to make handling streams easier\.
 The examples below use the streamed form of \fB[0,[1]]\fR, which is \fB[[0],0],[[1,0],1],[[1,0]],[[1]]\fR\.
 .
 .P
-Streaming forms include \fB[<path>, <leaf\-value>]\fR (to indicate any scalar value, empty array, or empty object), and \fB[<path>]\fR (to indicate the end of an array or object)\. Future versions of jq run with \fB\-\-stream\fR and \fB\-seq\fR may output additional forms such as \fB["error message"]\fR when an input text fails to parse\.
+Streaming forms include \fB[<path>, <leaf\-value>]\fR (to indicate any scalar value, empty array, or empty object), and \fB[<path>]\fR (to indicate the end of an array or object)\. Future versions of jq run with \fB\-\-stream\fR and \fB\-\-seq\fR may output additional forms such as \fB["error message"]\fR when an input text fails to parse\.
 .
 .SS "truncate_stream(stream_expression)"
 Consumes a number as input and truncates the corresponding number of path elements from the left of the outputs of the given streaming expression\.
@@ -3087,9 +3798,9 @@ Consumes a number as input and truncates the corresponding number of path elemen
 .
 .nf
 
-jq \'[1|truncate_stream([[0],1],[[1,0],2],[[1,0]],[[1]])]\'
+jq \'truncate_stream([[0],1],[[1,0],2],[[1,0]],[[1]])\'
    1
-=> [[[0],2],[[0]]]
+=> [[0],2], [[0]]
 .
 .fi
 .
@@ -3129,13 +3840,13 @@ jq \'\. as $dot|fromstream($dot|tostream)|\.==$dot\'
 Assignment works a little differently in jq than in most programming languages\. jq doesn\'t distinguish between references to and copies of something \- two objects or arrays are either equal or not equal, without any further notion of being "the same object" or "not the same object"\.
 .
 .P
-If an object has two fields which are arrays, \fB\.foo\fR and \fB\.bar\fR, and you append something to \fB\.foo\fR, then \fB\.bar\fR will not get bigger, even if you\'ve previously set \fB\.bar = \.foo\fR\. If you\'re used to programming in languages like Python, Java, Ruby, Javascript, etc\. then you can think of it as though jq does a full deep copy of every object before it does the assignment (for performance it doesn\'t actually do that, but that\'s the general idea)\.
+If an object has two fields which are arrays, \fB\.foo\fR and \fB\.bar\fR, and you append something to \fB\.foo\fR, then \fB\.bar\fR will not get bigger, even if you\'ve previously set \fB\.bar = \.foo\fR\. If you\'re used to programming in languages like Python, Java, Ruby, JavaScript, etc\. then you can think of it as though jq does a full deep copy of every object before it does the assignment (for performance it doesn\'t actually do that, but that\'s the general idea)\.
 .
 .P
 This means that it\'s impossible to build circular values in jq (such as an array whose first element is itself)\. This is quite intentional, and ensures that anything a jq program can produce can be represented in JSON\.
 .
 .P
-All the assignment operators in jq have path expressions on the left\-hand side (LHS)\. The right\-hand side (RHS) procides values to set to the paths named by the LHS path expressions\.
+All the assignment operators in jq have path expressions on the left\-hand side (LHS)\. The right\-hand side (RHS) provides values to set to the paths named by the LHS path expressions\.
 .
 .P
 Values in jq are always immutable\. Internally, assignment works by using a reduction to compute new, replacement values for \fB\.\fR that have had all the desired assignments applied to \fB\.\fR, then outputting the modified value\. This might be made clear by this example: \fB{a:{b:{c:1}}} | (\.a\.b|=3), \.\fR\. This will output \fB{"a":{"b":3}}\fR and \fB{"a":{"b":{"c":1}}}\fR because the last sub\-expression, \fB\.\fR, sees the original value, not the modified value\.
@@ -3150,13 +3861,13 @@ Note that the LHS of assignment operators refers to a value in \fB\.\fR\. Thus \
 Note too that \fB\.a,\.b=0\fR does not set \fB\.a\fR and \fB\.b\fR, but \fB(\.a,\.b)=0\fR sets both\.
 .
 .SS "Update\-assignment: |="
-This is the "update" operator \'|=\'\. It takes a filter on the right\-hand side and works out the new value for the property of \fB\.\fR being assigned to by running the old value through this expression\. For instance, (\.foo, \.bar) |= \.+1 will build an object with the "foo" field set to the input\'s "foo" plus 1, and the "bar" field set to the input\'s "bar" plus 1\.
+This is the "update" operator \fB|=\fR\. It takes a filter on the right\-hand side and works out the new value for the property of \fB\.\fR being assigned to by running the old value through this expression\. For instance, \fB(\.foo, \.bar) |= \.+1\fR will build an object with the \fBfoo\fR field set to the input\'s \fBfoo\fR plus 1, and the \fBbar\fR field set to the input\'s \fBbar\fR plus 1\.
 .
 .P
 The left\-hand side can be any general path expression; see \fBpath()\fR\.
 .
 .P
-Note that the left\-hand side of \'|=\' refers to a value in \fB\.\fR\. Thus \fB$var\.foo |= \. + 1\fR won\'t work as expected (\fB$var\.foo\fR is not a valid or useful path expression in \fB\.\fR); use \fB$var | \.foo |= \. + 1\fR instead\.
+Note that the left\-hand side of \fB|=\fR refers to a value in \fB\.\fR\. Thus \fB$var\.foo |= \. + 1\fR won\'t work as expected (\fB$var\.foo\fR is not a valid or useful path expression in \fB\.\fR); use \fB$var | \.foo |= \. + 1\fR instead\.
 .
 .P
 If the right\-hand side outputs no values (i\.e\., \fBempty\fR), then the left\-hand side path will be deleted, as with \fBdel(path)\fR\.
@@ -3192,40 +3903,66 @@ jq \'\.foo += 1\'
 .IP "" 0
 .
 .SS "Plain assignment: ="
-This is the plain assignment operator\. Unlike the others, the input to the right\-hand\-side (RHS) is the same as the input to the left\-hand\-side (LHS) rather than the value at the LHS path, and all values output by the RHS will be used (as shown below)\.
+This is the plain assignment operator\. Unlike the others, the input to the right\-hand side (RHS) is the same as the input to the left\-hand side (LHS) rather than the value at the LHS path, and all values output by the RHS will be used (as shown below)\.
 .
 .P
-If the RHS of \'=\' produces multiple values, then for each such value jq will set the paths on the left\-hand side to the value and then it will output the modified \fB\.\fR\. For example, \fB(\.a,\.b)=range(2)\fR outputs \fB{"a":0,"b":0}\fR, then \fB{"a":1,"b":1}\fR\. The "update" assignment forms (see above) do not do this\.
+If the RHS of \fB=\fR produces multiple values, then for each such value jq will set the paths on the left\-hand side to the value and then it will output the modified \fB\.\fR\. For example, \fB(\.a,\.b) = range(2)\fR outputs \fB{"a":0,"b":0}\fR, then \fB{"a":1,"b":1}\fR\. The "update" assignment forms (see above) do not do this\.
 .
 .P
-This example should show the difference between \'=\' and \'|=\':
+This example should show the difference between \fB=\fR and \fB|=\fR:
 .
 .P
-Provide input \'{"a": {"b": 10}, "b": 20}\' to the programs:
+Provide input \fB{"a": {"b": 10}, "b": 20}\fR to the programs
 .
-.P
-\&\.a = \.b
+.IP "" 4
 .
-.P
-\&\.a |= \.b
+.nf
+
+\&.a = \.b
 .
-.P
-The former will set the "a" field of the input to the "b" field of the input, and produce the output {"a": 20, "b": 20}\. The latter will set the "a" field of the input to the "a" field\'s "b" field, producing {"a": 10, "b": 20}\.
+.fi
 .
-.P
-Another example of the difference between \'=\' and \'|=\':
+.IP "" 0
 .
 .P
-null|(\.a,\.b)=range(3)
+and
 .
-.P
-outputs \'{"a":0,"b":0}\', \'{"a":1,"b":1}\', and \'{"a":2,"b":2}\', while
+.IP "" 4
 .
-.P
-null|(\.a,\.b)|=range(3)
+.nf
+
+\&.a |= \.b
+.
+.fi
+.
+.IP "" 0
 .
 .P
-outputs just \'{"a":0,"b":0}\'\.
+The former will set the \fBa\fR field of the input to the \fBb\fR field of the input, and produce the output \fB{"a": 20, "b": 20}\fR\. The latter will set the \fBa\fR field of the input to the \fBa\fR field\'s \fBb\fR field, producing \fB{"a": 10, "b": 20}\fR\.
+.
+.IP "" 4
+.
+.nf
+
+jq \'\.a = \.b\'
+   {"a": {"b": 10}, "b": 20}
+=> {"a":20,"b":20}
+
+jq \'\.a |= \.b\'
+   {"a": {"b": 10}, "b": 20}
+=> {"a":10,"b":20}
+
+jq \'(\.a, \.b) = range(3)\'
+   null
+=> {"a":0,"b":0}, {"a":1,"b":1}, {"a":2,"b":2}
+
+jq \'(\.a, \.b) |= range(3)\'
+   null
+=> {"a":0,"b":0}
+.
+.fi
+.
+.IP "" 0
 .
 .SS "Complex assignments"
 Lots more things are allowed on the left\-hand side of a jq assignment than in most languages\. We\'ve already seen simple field accesses on the left hand side, and it\'s no surprise that array accesses work just as well:
@@ -3234,7 +3971,7 @@ Lots more things are allowed on the left\-hand side of a jq assignment than in m
 .
 .nf
 
-\&\.posts[0]\.title = "JQ Manual"
+\&.posts[0]\.title = "JQ Manual"
 .
 .fi
 .
@@ -3247,7 +3984,7 @@ What may come as a surprise is that the expression on the left may produce multi
 .
 .nf
 
-\&\.posts[]\.comments |= \. + ["this is great"]
+\&.posts[]\.comments |= \. + ["this is great"]
 .
 .fi
 .
@@ -3266,7 +4003,7 @@ This is a very powerful operation\. Suppose we wanted to add a comment to blog p
 .
 .nf
 
-\&\.posts[] | select(\.author == "stedolan")
+\&.posts[] | select(\.author == "stedolan")
 .
 .fi
 .
@@ -3286,6 +4023,74 @@ The paths provided by this operation point to each of the posts that "stedolan"
 .
 .IP "" 0
 .
+.SH "COMMENTS"
+You can write comments in your jq filters using \fB#\fR\.
+.
+.P
+A \fB#\fR character (not part of a string) starts a comment\. All characters from \fB#\fR to the end of the line are ignored\.
+.
+.P
+If the end of the line is preceded by an odd number of backslash characters, the following line is also considered part of the comment and is ignored\.
+.
+.P
+For example, the following code outputs \fB[1,3,4,7]\fR
+.
+.IP "" 4
+.
+.nf
+
+[
+  1,
+  # foo \e
+  2,
+  # bar \e\e
+  3,
+  4, # baz \e\e\e
+  5, \e
+  6,
+  7
+  # comment \e
+    comment \e
+    comment
+]
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Backslash continuing the comment on the next line can be useful when writing the "shebang" for a jq script:
+.
+.IP "" 4
+.
+.nf
+
+#!/bin/sh \-\-
+# total \- Output the sum of the given arguments (or stdin)
+# usage: total [numbers\.\.\.]
+# \e
+exec jq \-\-args \-MRnf \-\- "$0" "$@"
+
+$ARGS\.positional |
+reduce (
+  if \. == []
+    then inputs
+    else \.[]
+  end |
+  \. as $dot |
+  try tonumber catch false |
+  if not or isnan then
+    @json "total: Invalid number \e($dot)\.\en" | halt_error(1)
+  end
+) as $n (0; \. + $n)
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The \fBexec\fR line is considered a comment by jq, so it is ignored\. But it is not ignored by \fBsh\fR, since in \fBsh\fR a backslash at the end of the line does not continue the comment\. With this trick, when the script is invoked as \fBtotal 1 2\fR, \fB/bin/sh \-\- /path/to/total 1 2\fR will be run, and \fBsh\fR will then run \fBexec jq \-\-args \-MRnf \-\- /path/to/total 1 2\fR replacing itself with a \fBjq\fR interpreter invoked with the specified options (\fB\-M\fR, \fB\-R\fR, \fB\-n\fR, \fB\-\-args\fR), that evaluates the current file (\fB$0\fR), with the arguments (\fB$@\fR) that were passed to \fBsh\fR\.
+.
 .SH "MODULES"
 jq has a library/module system\. Modules are files whose names end in \fB\.jq\fR\.
 .
@@ -3293,16 +4098,16 @@ jq has a library/module system\. Modules are files whose names end in \fB\.jq\fR
 Modules imported by a program are searched for in a default search path (see below)\. The \fBimport\fR and \fBinclude\fR directives allow the importer to alter this path\.
 .
 .P
-Paths in the a search path are subject to various substitutions\.
+Paths in the search path are subject to various substitutions\.
 .
 .P
-For paths starting with "~/", the user\'s home directory is substituted for "~"\.
+For paths starting with \fB~/\fR, the user\'s home directory is substituted for \fB~\fR\.
 .
 .P
-For paths starting with "$ORIGIN/", the path of the jq executable is substituted for "$ORIGIN"\.
+For paths starting with \fB$ORIGIN/\fR, the directory where the jq executable is located is substituted for \fB$ORIGIN\fR\.
 .
 .P
-For paths starting with "\./" or paths that are "\.", the path of the including file is substituted for "\."\. For top\-level programs given on the command\-line, the current directory is used\.
+For paths starting with \fB\./\fR or paths that are \fB\.\fR, the path of the including file is substituted for \fB\.\fR\. For top\-level programs given on the command\-line, the current directory is used\.
 .
 .P
 Import directives can optionally specify a search path to which the default is appended\.
@@ -3314,49 +4119,49 @@ The default search path is the search path given to the \fB\-L\fR command\-line
 Null and empty string path elements terminate search path processing\.
 .
 .P
-A dependency with relative path "foo/bar" would be searched for in "foo/bar\.jq" and "foo/bar/bar\.jq" in the given search path\. This is intended to allow modules to be placed in a directory along with, for example, version control files, README files, and so on, but also to allow for single\-file modules\.
+A dependency with relative path \fBfoo/bar\fR would be searched for in \fBfoo/bar\.jq\fR and \fBfoo/bar/bar\.jq\fR in the given search path\. This is intended to allow modules to be placed in a directory along with, for example, version control files, README files, and so on, but also to allow for single\-file modules\.
 .
 .P
-Consecutive components with the same name are not allowed to avoid ambiguities (e\.g\., "foo/foo")\.
+Consecutive components with the same name are not allowed to avoid ambiguities (e\.g\., \fBfoo/foo\fR)\.
 .
 .P
 For example, with \fB\-L$HOME/\.jq\fR a module \fBfoo\fR can be found in \fB$HOME/\.jq/foo\.jq\fR and \fB$HOME/\.jq/foo/foo\.jq\fR\.
 .
 .P
-If "$HOME/\.jq" is a file, it is sourced into the main program\.
+If \fB\.jq\fR exists in the user\'s home directory, and is a file (not a directory), it is automatically sourced into the main program\.
 .
 .SS "import RelativePathString as NAME [<metadata>];"
-Imports a module found at the given path relative to a directory in a search path\. A "\.jq" suffix will be added to the relative path string\. The module\'s symbols are prefixed with "NAME::"\.
+Imports a module found at the given path relative to a directory in a search path\. A \fB\.jq\fR suffix will be added to the relative path string\. The module\'s symbols are prefixed with \fBNAME::\fR\.
 .
 .P
-The optional metadata must be a constant jq expression\. It should be an object with keys like "homepage" and so on\. At this time jq only uses the "search" key/value of the metadata\. The metadata is also made available to users via the \fBmodulemeta\fR builtin\.
+The optional metadata must be a constant jq expression\. It should be an object with keys like \fBhomepage\fR and so on\. At this time jq only uses the \fBsearch\fR key/value of the metadata\. The metadata is also made available to users via the \fBmodulemeta\fR builtin\.
 .
 .P
-The "search" key in the metadata, if present, should have a string or array value (array of strings); this is the search path to be prefixed to the top\-level search path\.
+The \fBsearch\fR key in the metadata, if present, should have a string or array value (array of strings); this is the search path to be prefixed to the top\-level search path\.
 .
 .SS "include RelativePathString [<metadata>];"
-Imports a module found at the given path relative to a directory in a search path as if it were included in place\. A "\.jq" suffix will be added to the relative path string\. The module\'s symbols are imported into the caller\'s namespace as if the module\'s content had been included directly\.
+Imports a module found at the given path relative to a directory in a search path as if it were included in place\. A \fB\.jq\fR suffix will be added to the relative path string\. The module\'s symbols are imported into the caller\'s namespace as if the module\'s content had been included directly\.
 .
 .P
-The optional metadata must be a constant jq expression\. It should be an object with keys like "homepage" and so on\. At this time jq only uses the "search" key/value of the metadata\. The metadata is also made available to users via the \fBmodulemeta\fR builtin\.
+The optional metadata must be a constant jq expression\. It should be an object with keys like \fBhomepage\fR and so on\. At this time jq only uses the \fBsearch\fR key/value of the metadata\. The metadata is also made available to users via the \fBmodulemeta\fR builtin\.
 .
 .SS "import RelativePathString as $NAME [<metadata>];"
-Imports a JSON file found at the given path relative to a directory in a search path\. A "\.json" suffix will be added to the relative path string\. The file\'s data will be available as \fB$NAME::NAME\fR\.
+Imports a JSON file found at the given path relative to a directory in a search path\. A \fB\.json\fR suffix will be added to the relative path string\. The file\'s data will be available as \fB$NAME::NAME\fR\.
 .
 .P
-The optional metadata must be a constant jq expression\. It should be an object with keys like "homepage" and so on\. At this time jq only uses the "search" key/value of the metadata\. The metadata is also made available to users via the \fBmodulemeta\fR builtin\.
+The optional metadata must be a constant jq expression\. It should be an object with keys like \fBhomepage\fR and so on\. At this time jq only uses the \fBsearch\fR key/value of the metadata\. The metadata is also made available to users via the \fBmodulemeta\fR builtin\.
 .
 .P
-The "search" key in the metadata, if present, should have a string or array value (array of strings); this is the search path to be prefixed to the top\-level search path\.
+The \fBsearch\fR key in the metadata, if present, should have a string or array value (array of strings); this is the search path to be prefixed to the top\-level search path\.
 .
 .SS "module <metadata>;"
 This directive is entirely optional\. It\'s not required for proper operation\. It serves only the purpose of providing metadata that can be read with the \fBmodulemeta\fR builtin\.
 .
 .P
-The metadata must be a constant jq expression\. It should be an object with keys like "homepage"\. At this time jq doesn\'t use this metadata, but it is made available to users via the \fBmodulemeta\fR builtin\.
+The metadata must be a constant jq expression\. It should be an object with keys like \fBhomepage\fR\. At this time jq doesn\'t use this metadata, but it is made available to users via the \fBmodulemeta\fR builtin\.
 .
 .SS "modulemeta"
-Takes a module name as input and outputs the module\'s metadata as an object, with the module\'s imports (including metadata) as an array value for the "deps" key\.
+Takes a module name as input and outputs the module\'s metadata as an object, with the module\'s imports (including metadata) as an array value for the \fBdeps\fR key and the module\'s defined functions as an array value for the \fBdefs\fR key\.
 .
 .P
 Programs can use this to query a module\'s metadata, which they could then use to, for example, search for, download, and install missing dependencies\.
@@ -3385,10 +4190,13 @@ color for arrays
 .IP "\(bu" 4
 color for objects
 .
+.IP "\(bu" 4
+color for object keys
+.
 .IP "" 0
 .
 .P
-The default color scheme is the same as setting \fB"JQ_COLORS=1;30:0;39:0;39:0;39:0;32:1;39:1;39"\fR\.
+The default color scheme is the same as setting \fBJQ_COLORS="0;90:0;39:0;39:0;39:0;32:1;39:1;39:1;34"\fR\.
 .
 .P
 This is not a manual for VT100/ANSI escapes\. However, each of these color specifications should consist of two numbers separated by a semi\-colon, where the first number is one of these:
@@ -3449,7 +4257,7 @@ Presumably\. Report them or discuss them at:
 .
 .nf
 
-https://github\.com/stedolan/jq/issues
+https://github\.com/jqlang/jq/issues
 .
 .fi
 .