From bfdead43a85409efed0cd7b5f618b87e542c7bbe Mon Sep 17 00:00:00 2001
From: "benjamin.franksen" <benjamin.franksen@helmholtz-berlin.de>
Date: Fri, 31 Aug 2012 13:51:06 +0000
Subject: [PATCH] prepared release 2.1.10
---
configure/CONFIG | 2 +-
documentation/Installation.txt | 4 +++-
documentation/Notes.txt | 32 ++++++++++++++++++++++++++++++++
documentation/conf.py | 2 +-
4 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/configure/CONFIG b/configure/CONFIG
index adc40406..30e0ab23 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -30,4 +30,4 @@ EPICS_HAS_UNIT_TEST := $(shell $(PERL) -e\
ECHO := $(if $(findstring s,$(MAKEFLAGS)),$(NOP),@echo)
-SEQ_RELEASE = 2.1.9
+SEQ_RELEASE = 2.1.10
diff --git a/documentation/Installation.txt b/documentation/Installation.txt
index f7301181..f6315c4e 100644
--- a/documentation/Installation.txt
+++ b/documentation/Installation.txt
@@ -28,7 +28,7 @@ Releases are available here:
http://www-csr.bessy.de/control/SoftDist/sequencer/releases/
-The current stable release is `2.1.9`_. Please take a look at the
+The current stable release is `2.1.10`_. Please take a look at the
:ref:`VersioningPolicy` if you are unsure whether to upgrade to
a new release.
@@ -50,6 +50,7 @@ or by following the links here:
========= ===========================
Version Release Notes
--------- ---------------------------
+ `2.1.10`_ :ref:`Release_Notes_2.1.10`
`2.1.9`_ :ref:`Release_Notes_2.1.9`
`2.1.8`_ :ref:`Release_Notes_2.1.8`
`2.1.7`_ :ref:`Release_Notes_2.1.7`
@@ -103,6 +104,7 @@ patches.
You can also follow development by using the `repository browser`_.
.. _latest snapshot: http://www-csr.bessy.de/control/SoftDist/sequencer/releases/seq-snapshot-latest.tar.gz
+.. _2.1.10: http://www-csr.bessy.de/control/SoftDist/sequencer/releases/seq-2.1.10.tar.gz
.. _2.1.9: http://www-csr.bessy.de/control/SoftDist/sequencer/releases/seq-2.1.9.tar.gz
.. _2.1.8: http://www-csr.bessy.de/control/SoftDist/sequencer/releases/seq-2.1.8.tar.gz
.. _2.1.7: http://www-csr.bessy.de/control/SoftDist/sequencer/releases/seq-2.1.7.tar.gz
diff --git a/documentation/Notes.txt b/documentation/Notes.txt
index b452972e..3b6eefcc 100644
--- a/documentation/Notes.txt
+++ b/documentation/Notes.txt
@@ -1,6 +1,38 @@
Release Notes
=============
+.. _Release_Notes_2.1.10:
+
+Release 2.1.10
+--------------
+
+snc:
+
+ * avoid follow-up syntax error after lexical error,
+ say lexical error when there is one
+
+ * fix wrong assumption about delays not being nested
+
+ * added assertion and cast to unsigned to silence a warning
+ in the lemon parser template
+
+ * fixed a c99-ism in the parser template
+
+seq:
+
+ * revert seq() back to returning thread id of 1st state set
+ instead of void
+
+examples:
+
+ * added new cmdButtons example (thanks to Wesley Moore)
+
+docs:
+
+ * updated the README file
+
+ * fixed safe mode documentation (thanks to Eric Norum)
+
.. _Release_Notes_2.1.9:
Release 2.1.9
diff --git a/documentation/conf.py b/documentation/conf.py
index 0038565a..1432ac7f 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -52,7 +52,7 @@ copyright = u"""
# The short X.Y version.
version = '2.1'
# The full version, including alpha/beta/rc tags.
-release = '2.1.9'
+release = '2.1.10'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
--
GitLab