From 040226d1d5f8910d1fb99028c12f723aae68a512 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Wed, 26 Dec 2007 13:13:55 +0000
Subject: [PATCH] - added release tag for 2.3.6 to user doc - updated version
 number and strings after release

---
 bochs/configure.in              | 8 ++++----
 bochs/doc/docbook/user/user.dbk | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bochs/configure.in b/bochs/configure.in
index 90f57f4d1..d34f79c6a 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -2,15 +2,15 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.355 2007-12-24 09:52:40 vruppert Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.356 2007-12-26 13:13:55 vruppert Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
 dnl // Put Bochs version information right here so that it gets substituted
 dnl // into all the right places.
-VERSION="2.3.6"
-VER_STRING="2.3.6"
-REL_STRING="Build from CVS snapshot, on December 24, 2007"
+VERSION="2.3.6.cvs"
+VER_STRING="2.3.6.cvs"
+REL_STRING="Build from CVS snapshot, after release 2.3.6"
 
 changequote(<<, >>)
 changequote([, ])
diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk
index 7d7506fb5..c225834a5 100644
--- a/bochs/doc/docbook/user/user.dbk
+++ b/bochs/doc/docbook/user/user.dbk
@@ -1,7 +1,7 @@
 <!--
 ================================================================
 doc/docbook/user/user.dbk
-$Id: user.dbk,v 1.231 2007-10-23 21:59:04 sshwarts Exp $
+$Id: user.dbk,v 1.232 2007-12-26 13:13:55 vruppert Exp $
 
 This is the top level file for the Bochs Users Manual.
 ================================================================
@@ -1170,6 +1170,10 @@ The tag tells which release you want, and it can be one of the following:
       </row>
     </thead>
     <tbody>
+      <row>
+        <entry>2.3.6</entry>
+        <entry>REL_2_3_6_FINAL</entry>
+      </row>
       <row>
         <entry>2.3.5</entry>
         <entry>REL_2_3_5_FINAL</entry>