From 582d1b4a0f47d7bef5d3196368b98481c6b373f6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 11 Jul 2005 12:53:17 +0000
Subject: [PATCH] note alternate instructions for 0pre6->7

---
 httemplate/docs/index.html     | 2 +-
 httemplate/docs/upgrade10.html | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 4a58441f7..7254d76f3 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -12,7 +12,7 @@
   <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
   <li><a href="upgrade-1.4.2.html">Upgrading from 1.4.1 to 1.4.2</a>
-  <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2?) to 1.5.0</a>
+  <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2) to 1.5.7</a>
 </ul>
 <h3>Configuration and setup</h3>
 <ul>
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index 7b6d2cc1d..1faaedee0 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,6 +1,12 @@
 <pre>
 this is incomplete
 
+NOTE: Version numbering has been simplified.  1.5.7 is the version after
+1.5.0pre6.  It is still a development version - releases with odd numbered 
+middle parts (NN in x.NN.x) are development versions, like Perl or Linux.
+
+If migrating from 1.5.0pre6, see README.1.5.7 instead
+
 install DBD::Pg 1.32, 1.41 or later (not 1.40) (or, if you're using a Perl version before 5.6, you could try installing DBD::Pg 1.22 with <a href="http://420.am/~ivan/DBD-Pg-1.22-fixvercmp.patch">this patch</a> and commenting out the "use DBD::Pg 1.32" at the top of DBIx/DBSchema/DBD/Pg.pm)
 install DBIx::DBSchema 0.26
 install Net::SSH 0.08
-- 
2.11.0