From b141abc41f74f51ec79f24df9b90c9d8c3678682 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Sat, 14 May 2005 08:06:18 +0000
Subject: [PATCH] Umm, add the new programmer types to the texinfo
 documentation as well.

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@465 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 avrdude/bootstrap        | 12 ++++++------
 avrdude/doc/avrdude.texi | 12 +++++++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/avrdude/bootstrap b/avrdude/bootstrap
index e1f76105..248c0586 100755
--- a/avrdude/bootstrap
+++ b/avrdude/bootstrap
@@ -1,11 +1,11 @@
 #! /bin/sh
 
-# autoconf-2.57 is required
+# autoconf-2.59 is required
 
 : ${AUTOHEADER="autoheader${AC_VER}"}
 : ${AUTOCONF="autoconf${AC_VER}"}
 
-# automake-1.7.x is required
+# automake-1.9.x is required
 
 : ${ACLOCAL="aclocal${AM_VER}"}
 : ${AUTOMAKE="automake${AM_VER}"}
@@ -14,9 +14,9 @@
 
 AUTOCONF_VER=`(${AUTOCONF} --version 2>/dev/null | head -n 1 | \
               cut -d ' ' -f 4) 2>/dev/null`
-if [ "$AUTOCONF_VER" != "2.57" ]
+if [ "$AUTOCONF_VER" != "2.59" ]
 then
-	echo "You need to use autoconf version 2.57."
+	echo "You need to use autoconf version 2.59."
 	echo "You are using `${AUTOCONF} --version | head -n 1`."
 	exit 1
 fi
@@ -25,9 +25,9 @@ fi
 
 AUTOMAKE_VER=`(${AUTOMAKE} --version | head -n 1 | \
               cut -d ' ' -f 4 | cut -d '.' -f -2) 2>/dev/null`
-if [ "$AUTOMAKE_VER" != "1.7" ]
+if [ "$AUTOMAKE_VER" != "1.9" ]
 then
-	echo "You need to use automake version 1.7 (preferrably 1.7.3)."
+	echo "You need to use automake version 1.9."
 	echo "You are using `${AUTOMAKE} --version | head -n 1`."
 	exit 1
 fi
diff --git a/avrdude/doc/avrdude.texi b/avrdude/doc/avrdude.texi
index 4cc305f1..ee739fc0 100644
--- a/avrdude/doc/avrdude.texi
+++ b/avrdude/doc/avrdude.texi
@@ -374,6 +374,13 @@ Atmel Butterfly Development Board
 @itemx dt006
 Dontronics DT006
 
+@item jtagmkII
+@itemx jtag2
+Atmel JTAG ICE mkII (default speed 19200 Bd)
+
+@itemx jtag2fast
+Atmel JTAG ICE mkII, running at 115200 Bd
+
 @itemx pavr
 Jason Kyle's pAVR Serial Programmer
 
@@ -390,7 +397,10 @@ Steve Bolt's Programmer
 STK200
 
 @itemx stk500
-Atmel STK500                  
+Atmel STK500
+
+@itemx stk500v2
+Atmel STK500, running a verrsion 2.x firmware
 
 @end table