From 5b9e63e4af339bc5867603f14441b4b4cbb9e175 Mon Sep 17 00:00:00 2001 From: Alanscut Date: Tue, 14 Jan 2020 11:48:43 +0800 Subject: fix typos --- configure.ac | 4 ++-- docs/content/manual/v1.3/manual.yml | 2 +- docs/content/manual/v1.4/manual.yml | 2 +- jq.1.prebuilt | 2 +- src/builtin.c | 4 ++-- src/compile.h | 2 +- tests/jq.test | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 68097b91..bc6f096d 100644 --- a/configure.ac +++ b/configure.ac @@ -228,8 +228,8 @@ AC_MSG_RESULT($have___thread) AC_C_BIGENDIAN( AC_DEFINE([IEEE_MC68k], 1, [machine is bigendian]), AC_DEFINE([IEEE_8087], 1, [machine is littleendian]), - AC_MSG_ERROR(unknown endianess), - AC_MSG_ERROR(universial endianess not supported) + AC_MSG_ERROR(unknown endianness), + AC_MSG_ERROR(universial endianness not supported) ) dnl Oniguruma diff --git a/docs/content/manual/v1.3/manual.yml b/docs/content/manual/v1.3/manual.yml index b2e387d7..3e63f76d 100644 --- a/docs/content/manual/v1.3/manual.yml +++ b/docs/content/manual/v1.3/manual.yml @@ -1232,7 +1232,7 @@ sections: - title: Complex assignments body: | Lots more things are allowed on the left-hand side of a jq assignment - than in most langauges. We've already seen simple field accesses on + 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: diff --git a/docs/content/manual/v1.4/manual.yml b/docs/content/manual/v1.4/manual.yml index 206bf2e1..25e28c31 100644 --- a/docs/content/manual/v1.4/manual.yml +++ b/docs/content/manual/v1.4/manual.yml @@ -1634,7 +1634,7 @@ sections: - title: Complex assignments body: | Lots more things are allowed on the left-hand side of a jq assignment - than in most langauges. We've already seen simple field accesses on + 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: diff --git a/jq.1.prebuilt b/jq.1.prebuilt index f6035b9b..c98be3ae 100644 --- a/jq.1.prebuilt +++ b/jq.1.prebuilt @@ -58,7 +58,7 @@ Use the \fBapplication/json\-seq\fR MIME type scheme for separating JSON texts i \fB\-\-stream\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\. +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[[1,0],"b"]\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\. diff --git a/src/builtin.c b/src/builtin.c index 139bdfe6..25af2864 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -1465,7 +1465,7 @@ static jv f_gmtime(jq_state *jq, jv a) { jv_free(a); tmp = gmtime_r(&secs, &tm); if (tmp == NULL) - return jv_invalid_with_msg(jv_string("errror converting number of seconds since epoch to datetime")); + return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime")); a = tm2jv(tmp); return jv_array_set(a, 5, jv_number(jv_number_value(jv_array_get(jv_copy(a), 5)) + (fsecs - floor(fsecs)))); } @@ -1480,7 +1480,7 @@ static jv f_gmtime(jq_state *jq, jv a) { jv_free(a); tmp = gmtime(&secs); if (tmp == NULL) - return jv_invalid_with_msg(jv_string("errror converting number of seconds since epoch to datetime")); + return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime")); a = tm2jv(tmp); return jv_array_set(a, 5, jv_number(jv_number_value(jv_array_get(jv_copy(a), 5)) + (fsecs - floor(fsecs)))); } diff --git a/src/compile.h b/src/compile.h index f9e8cd55..cccd661d 100644 --- a/src/compile.h +++ b/src/compile.h @@ -87,7 +87,7 @@ void block_free(block); // Here's some horrible preprocessor gunk so that code -// sequences can be contructed as BLOCK(block1, block2, block3) +// sequences can be constructed as BLOCK(block1, block2, block3) #define BLOCK_1(b1) (b1) #define BLOCK_2(b1,b2) (block_join((b1),(b2))) diff --git a/tests/jq.test b/tests/jq.test index 1e0ce071..2d5c36b8 100644 --- a/tests/jq.test +++ b/tests/jq.test @@ -322,7 +322,7 @@ null 1 # -# Check that various builtins evalute all arguments where appropriate, +# Check that various builtins evaluate all arguments where appropriate, # doing cartesian products where appropriate. # @@ -1715,4 +1715,4 @@ false . |= try . catch . 1 -1 \ No newline at end of file +1 -- cgit v1.2.3