From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 13 Dec 2019 04:43:45 +0000 (-0700)
Subject: Merge branch 'master' into pucked.
X-Git-Tag: mit-scheme-pucked-10.1.20~10
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=16e82b0126a7d98c28f91ff45aec45af0f2552d5;p=mit-scheme.git

Merge branch 'master' into pucked.
---

16e82b0126a7d98c28f91ff45aec45af0f2552d5
diff --cc doc/configure.ac
index eed1a5e75,d267558db..5d57477e1
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@@ -1,9 -1,9 +1,9 @@@
  dnl Process this file with autoconf to produce a configure script.
  
 -AC_INIT([MIT/GNU Scheme documentation],
 -	[10.1.90],
 -	[bug-mit-scheme@gnu.org],
 -	[mit-scheme-doc])
 +AC_INIT([MIT/GNU Scheme Pucked documentation],
- 	[10.1.12],
++	[10.1.14],
 +	[matt@birchwood-abbey.net],
 +	[mit-scheme-pucked-doc])
  AC_CONFIG_SRCDIR([ref-manual/scheme.texinfo])
  
  AC_COPYRIGHT(
diff --cc doc/ref-manual/scheme.texinfo
index bffa223fb,2630d6ed0..4707773c8
--- a/doc/ref-manual/scheme.texinfo
+++ b/doc/ref-manual/scheme.texinfo
@@@ -1,11 -1,10 +1,11 @@@
  \input texinfo @c -*-texinfo-*-
  @comment %**start of header
 -@setfilename mit-scheme-ref
 +@setfilename reference
 +@comment From automake's version.texi someday:
  @set EDITION 1.106
 -@set VERSION 10.1.90
 -@set UPDATED 2019-12-04
 -@settitle MIT/GNU Scheme @value{VERSION}
 +@set UPDATED 19 May 2018
- @set SCMVERS 10.1.12
++@set SCMVERS 10.1.14
 +@settitle MIT/GNU Scheme Pucked Reference Manual
  @comment %**end of header
  @setchapternewpage odd
  @finalout