From 771b0d0ab1f3d58eeec700bb6c24fc293b870015 Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Tue, 9 Feb 2021 20:32:09 -0600
Subject: [PATCH] Version bump.

---
 CHANGELOG.md         | 4 ++++
 meson.build          | 2 +-
 src/conf/janetconf.h | 6 +++---
 src/core/io.c        | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5498ae77..6b084050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Unreleased - ???
+- Fix documentation typos
+- Fix peg integer reading combinators when used with capture tags.
+
 ## 1.15.0 - 2021-02-08
 - Fix `gtim` and `ltim` bytecode instructions on non-integer values.
 - Clean up output of flychecking to be the same as the repl.
diff --git a/meson.build b/meson.build
index a16f8095..a0c5ce06 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.15.0')
+  version : '1.15.1')
 
 # Global settings
 janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')
diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h
index c2e7ad22..09331b09 100644
--- a/src/conf/janetconf.h
+++ b/src/conf/janetconf.h
@@ -5,9 +5,9 @@
 
 #define JANET_VERSION_MAJOR 1
 #define JANET_VERSION_MINOR 15
-#define JANET_VERSION_PATCH 0
-#define JANET_VERSION_EXTRA ""
-#define JANET_VERSION "1.15.0"
+#define JANET_VERSION_PATCH 1
+#define JANET_VERSION_EXTRA "-dev"
+#define JANET_VERSION "1.15.1-dev"
 
 /* #define JANET_BUILD "local" */
 
diff --git a/src/core/io.c b/src/core/io.c
index 7294242d..072891d3 100644
--- a/src/core/io.c
+++ b/src/core/io.c
@@ -746,7 +746,7 @@ static const JanetReg io_cfuns[] = {
              "* r - allow reading from the file\n\n"
              "* w - allow writing to the file\n\n"
              "* a - append to the file\n\n"
-             "Following one fo the initial flags, 0 or more of the following flags can be appended:\n\n"
+             "Following one of the initial flags, 0 or more of the following flags can be appended:\n\n"
              "* b - open the file in binary mode (rather than text mode)\n\n"
              "* + - append to the file instead of overwriting it\n\n"
              "* n - error if the file cannot be opened instead of returning nil")