diff --git a/CHANGELOG.md b/CHANGELOG.md index 823101a8..03e1380d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog All notable changes to this project will be documented in this file. +## Unreleased - ??? + ## 1.12.1 - 2020-09-07 - Make `zero?`, `one?`, `pos?`, and `neg?` polymorphic. - Add C++ support to jpm and improve C++ interop in janet.h. diff --git a/meson.build b/meson.build index 43688d06..10d414aa 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.12.1') + version : '1.12.2') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') diff --git a/src/core/array.c b/src/core/array.c index a7f92155..2bfec7d1 100644 --- a/src/core/array.c +++ b/src/core/array.c @@ -344,16 +344,16 @@ static const JanetReg array_cfuns[] = { { "array/concat", cfun_array_concat, JDOC("(array/concat arr & parts)\n\n" - "Concatenates a variadic number of arrays (and tuples) into the first argument " - "which must an array. If any of the parts are arrays or tuples, their elements will " + "Concatenates a variable number of arrays (and tuples) into the first argument " + "which must be an array. If any of the parts are arrays or tuples, their elements will " "be inserted into the array. Otherwise, each part in parts will be appended to arr in order. " "Return the modified array arr.") }, { "array/insert", cfun_array_insert, JDOC("(array/insert arr at & xs)\n\n" - "Insert all of xs into array arr at index at. at should be an integer " - "0 and the length of the array. A negative value for at will index from " + "Insert all xs into array arr at index at. at should be an integer between " + "0 and the length of the array. A negative value for at will index backwards from " "the end of the array, such that inserting at -1 appends to the array. " "Returns the array.") },