From 0fb1d826987189005b3bedaf7660e93594950c85 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Wed, 20 Nov 1996 15:13:24 +0000
Subject: Added reference to pdf documentation and bbpy, correctly explained
 difference between aetools.Error and MacOS.Error for appletscript programs.

---
 Mac/Demo/applescript.html         |   7 +-
 Mac/Demo/cgi/cgitest.cgi.rsrc.hqx | 239 +++++++++++++++++++-------------------
 Mac/Demo/using.html               |  40 ++++---
 3 files changed, 148 insertions(+), 138 deletions(-)

diff --git a/Mac/Demo/applescript.html b/Mac/Demo/applescript.html
index 6d8688e..379ac60 100644
--- a/Mac/Demo/applescript.html
+++ b/Mac/Demo/applescript.html
@@ -157,10 +157,9 @@ AppleScript is basically a connectionless RPC protocol nothing happens
 when we create to talker object. Hence, if the destination application
 is not running we will not notice until we send our first
 command. There is another thing to note about errors returned by
-AppleScript calls: even though <CODE>MacOS.Error</CODE> is raised not
-all of the errors are actually <CODE>OSErr</CODE>-type errors, some
-are error codes returned by the server application. In that case, the
-error message will be incorrect. <p>
+AppleScript calls: <CODE>MacOS.Error</CODE> is raised for
+all of the errors that are known to be <CODE>OSErr</CODE>-type errors,
+server generated errors raise <CODE>aetools.Error</CODE>. <p>
 
 That concludes our simple example. Again, let me emphasize that
 scripting support in Python is not very complete at the moment, and
diff --git a/Mac/Demo/cgi/cgitest.cgi.rsrc.hqx b/Mac/Demo/cgi/cgitest.cgi.rsrc.hqx
index 9377d2c..9e00e3a 100644
--- a/Mac/Demo/cgi/cgitest.cgi.rsrc.hqx
+++ b/Mac/Demo/cgi/cgitest.cgi.rsrc.hqx
@@ -1,122 +1,121 @@
 (This file must be converted with BinHex 4.0)
 
-:%'0RDA4PFh3ZBfGT,R*cFQ-!FR0bBe*6483!N!JI#T%Z!*!%!3!!!"e"!!!F33!
-!!FNf&#"8)'J!&#"3I4'`D"%!1J&R*K)[$%kk!J`-1J"DH4"MCfPdCA0d,Q0RD5j
-bFh*MD3)!!!"bFh*M8P0&4!#3"(*cFQ058d9%!*!BVPNQq`#3"Km+ra(!U'N"(8!
-4rr-6F!!3,[rc[G)4CK"40Vj9D`%"3N5pSEj9D`%"-&%b!@FH4"8-!!!FC4*`!"!
-Z3a8-!!!IBJC`!@!!!3%#,&T8,5j%[3%!'c`"CM!R96iD5S!J8`)S!,m!,L)!l3N
-#!3"!JbME0"1Tebm-6VS"#8TRD`%!TPG$1J!!!3!4!!!!!3IJ!)%'B!!!"q!!N!!
-"J!#3!!'!!*!!rri!N!$rrJ!3rrm!NIr!J*(rJ%#4rc!JJrr)%)2JIiq$rM!(Krm
-!"iIrJ!H(rq!($rrrj`rrrpm2rrrR(Frri"QqrrJGI'Bi24lDh$eZfY`pEYVFICj
-QhRrrrrjrrrrq!*!*$r!!!!r`!!!2m!!!$r!!!!r`!!(rri!"rrq!!IrrJ!2rri!
-$rrr!!rrri!Irrr!(rrrr"rrrr`rrrrm2rrrr$rrrrarrrrmIrrrr(rrrrcrrrrJ
-rrrrm2rrrr(rrrrjrrrrqIrrrr[q3&!#3"`T3i!!HK)!!"k%J!!!!3!#3""1!%i!
-"!#I!*r!R$Ji'$iB2jKUi'V!Im!#3"2q3)!!!!3!!!3!!%!+!!!3%3!"%##!!9I!
-3!&%J#!"3`r3!8-BD!"2m2`"6r"k!4r`V3%ri)5"Aq!q3!'rm2iK2r$q%cr`IJPr
-q$i&rrJq#(ri("#hr!`JVI`)3+cd')'PRQ%"T*r#!Irq"!!!J!J!!%!3!!!J)!!!
-%%!!!!L!!!!&!!!!!J!!!!3!!%!1!!!3(`!"%$q!!9Ir`!&(rq!"3rr`!82rq!"2
-rr`"6rrq!4rrr`%rrrq"Irrr`Irrrq(rrrrcrrrrqIrrrrhrrrriIrrrm2rrrq$r
-rrr!rrrrJIrrr`(rrri"rrrm!!$rq!!!Ir!!!$rJ!!!I`!!!$i!!!!F!!!!#!!!!
-!!J#3#!m!N!N2!*!&m2!!N!N2!!!!$``2!*!($`!2!!!!m-c!m!#3"Jm2$`99A`c
--c!m!N!B2$`!&!&c-c-c!m!#3"3m2!!"9h3$rrr`2!*!&$`m!!&AG$iGhIr$`!*!
-&$`"999AiGhH,r`m!N!32$`"999@)GhGlMr$`!!!!$`!&9999@hGhKlHr$`!!!!m
-!p99999YhGiGhIm$`!!!2$`99999AGhGhZi[m$`!!$r"9N!9hGlZ,Lrc!m!!2$&@
-3"AGhZlZlr-`2!2r-9C!&GhGlZiMmc-$`$q99N!9hGhH)Lrc-c-m2p9@3"9GhGlZ
-rr-c0m!!&9C!&9hGhHlr-c0m!!&&9&9@3"(GhGrr-cI!!!&&49499999hGhImc0m
-!!!"489848489GhGrr-h`!!!&89%9&9%9&9GrrmcI!!!!"9&4&4&4&49Irmc0m!!
-!!!99N!GFc-cI!*!*rGhGhFc0m!#3#3rGhGh-h`#3#rh-c-h`!*!,$pc-h`#3$Ih
-0m!#3$3rI!*!2m!#3#33!N"$r!*!6r`#3#[m!r`#3&2m!N!Ir!#X!r`#3$rm!!!$
-r!*!'r`!V+bX!r`#3$[m!r`$r!,#3"2m!+j!&!2m!N!hr!2m!!!#`!!#`+j!)!2m
-!N!cr!2m!N!5`X2Vk!!$rN!8V!2m!N![r!2m!N!5`X2Vk!2qI5*!%rrm!r`#3$2m
-!!,#3"[qI5*!%Rjrrr`$r!*!*r`$r!!#`N!BcRdL3"61Irrm!r`#3#2m!!!#`N!J
-c5*!%-dJc5$2r!2m!N!Ir!!$rX*!)-dL3"*p)N!6r+`$r!*!'r`$r!,#3#%L3"jm
-c-c2r+`$r!*!&rrm!X*!+5*!%Rc-c-jmcrbXV!2m!N!6r!#Z`N!T)N!3cRc13"2m
-V+bX!r`!!rrmV+l#3#NL3"6-c-jqIrbZ3"!$r!!$rr,#3#dL3"TqIRc2r+j!'r`$
-rrl#3$%L3"6-c-rrr+j!%q[m!N!5`N!a)N!DI-rmVN!6kr`#3",!&X,!&X*!*5*!
-'rrmV+b[kr`#3"E!&X!@`X!@`N!G)N!Er+bXVq[m!N!D`"E!&X,!&"E!&"E!&X%L
-3"Irr+b[kr`#3"V#`"E!&"E!&X,!&"E!&X,")52rrrbXVq[m!N!H`X!@`"3@`"3@
-`"3@`"E#`rrrr+bXVq[m!N!L`N"!VN!Akr`#3%[rkN!FV+b[kr`#3&2rkN!BV+rV
-r!*!@rrSVN!Akr`#3'2rk+bXVq[m!N"VrqL[kr`#3(2rkr`#3([m!N"*!#)!T3!)
-J"0![U$Bd,V*Z-6mL(m3UL$q3!!)J!8!!J!!!#)!T`!2J"r![q$rm2rjrrcrq(r`
-rq$r`!q!"`!#!!*!&J!!!m!$`!*!%m2!2$`#3"[$!m!#3"!m-r`m!!!$`99phm2!
-!!2m&KhU[$`!!m&9AL+r!m!rm99GkV-c2!2999AImcI!!"999ImcI!!"489&GcI!
-!!&9999hI!*!&rGh`!*!&$pm!N!I`!*!0!3#3"Im!!!$r!*!*r`$r!!$r!2m!N!c
-r!#X!r`#3#[m!+rrr!2m!N!Er!,#`X2p)52m!r`#3"Irr!,$M5%L*LIm!r`#3"2m
-!X,#`512MLImV!2m!!2rr+l#`X%K)LBNVN!6r!!$rX*!&5%Mr+b[jr`#3",#3"8M
-r+b[jr`#3",!&X!@`"E$j+rRr!*!&X*!(qIRr!*!+rrRjqIm!N!crqIm!N!lr!*!
-D"d&38%`!!3!!!!%!(rrq!"!!!`!4!)+!%3%#3"-cJL!9@5)3&@%$q"-a+SJ3!!!
-)%'rl#"!!!!J3$lJ)%!!!#"!2hkJ3!!!)%!(Vk"!!!!J3!IF)%1!!#"$KlmJ33!!
-)%I'qL"(`!!J4m$pS%rJ!#"2i2iJ6q!!)&U`hb"DX!!JAr!!)%!!!#"rrrrJIrri
-!(rrr!"rrri!Irrr!(rrri"rrrr!Irrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrr
-i(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrr
-i(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq!!!!J!!$rq3#I!!N!82!*!*r`#
-3"3m!"3#3"&!!!2(`!*!%$`!&!!!!"3!!!2%I!*!%$`"9!&8!99!!!2%4m!!!!!m
-&N!43"3!`!2%4(`!!!!m&"393!!8!!!$rrrr`!!!2!&8!93!&!$"38&!!m!!!$`#
-3$2!!!!m!!!939C!%8&8!!2!!!!m!N!c`!!!2!*!%999399!!!!$`!!!2!*!-m!!
-!$`#3"&99939999"3m!!!$`#3$2!!!!m!N!8&99"39993m!!!$`#3$2!!!!m!N!8
-&998&93!!m!!!$`!!99!!N!M`!!!2!!"98!!&99"9998!m!!!$`!!"3#3#I!!!!m
-!"999!!9399938!$`!!!2!!9993#3#2!!!!m!"999!!!!9999"9$`!!!2!&9999!
-!N!I`!!!2!&9999!!!&9999!!m!!!$`"99993!*!(m!!!$`9489&9!!"9"999!2!
-!!!m&89&493#3"r!!!!m&9C!%!*!(m!!!$`#3$2!!!!rrN!c`!!!!"!#3"2q3&!#
-3$2m!N",rr`#3#rm!!!#`!*!)X!#3"Im&r`#3#[m!!!#`!*!(X!#3"[m&"Im!N!R
-r!!#`X!!!X,!!!,#`X!#3"Im&"3Ar!*!)r`#`!,!!X!#`X!!!X!!!f!!!!2m&N!6
-r!*!(r`#`!,!!X,!!N!5`!*!'rj!(!*!'r`!!X,!!!,#`!!!!X!!!f!#`!,!!X!!
-!!2m!N!Er!*!Br`#3"[m!N!@`X!#`N!N!X,!!N!6r!*!'r`#3'2m!N!Er!*!)X*!
-&!,#`X!#3"rm!N!Er!*!Br`#3"[m!N!L`N!B!X*!'!,!!r`#3"[m!N"Mr!*!'r`#
-3#l#3"!#`!,#3"3$r!*!'r`#3'2m!N!Er!*!,X*!&!,#`X!#3"2m!N!Er!*!%X,#
-`!*!4r`#3"[m!N!5`X,!!N!5`N!3!X*!'!!$r!*!'r`#3"E!!N",r!*!'r`!!!,#
-3"3!!!,#`!,#3"3#`!!!!r`#3"[m!!!#`N!8!N"$r!*!'r`!!!,#3"3#3"V#3"J#
-`X!$r!*!'r`!!X*!(!*!2r`#3"[m!!,#3"`#3"E#3"`!!!2m!N!Er!!#`N!F!N!r
-r!*!'r`#`X!@`"E!&X,!!N!5`X!#`N!8!!2m!N!Er!,#`"E!&X!@`X!#3$[m!N!E
-r!,#3#3#3$[m!N!Er!*!Br`#3"[q3'J#3"N"rm%!B9949AN!#6rT!!N$b4J*'HNm
-#6cTIJPqb3!*rr[q3)!!!!)!2rj!&!!!2!*!%$r!!$`8&"3-2(`!2"38&!`rrm!m
-!N!E`$`"9N!43m!m!N!E`$`!!!&99!2!2!!93!!!!m!m!"9!&99$`$`"993!!!2!
-2!&99!&93m!m&9993!!$`$`9999"9!2!2!*!'m!rrN!E`!!!"!!$rN!X!N!Ar!*!
-*rrm!N!6r!,!!X!#`!0J!r`Ar!!!!r`#`!,!!X!$B!2q3"!!!r`#3$2m!!2m!!,#
-3#3$r!!$r!*!-r`!!r`#3"V#3"!!!r`!!r`!!!,#`!*!(r`!!r`!!!,#`!!#`N!3
-!r`!!r`!!X*!%!*!'r`!!r`!!X*!%!!#`X,!!r`!!r`#`N!B!N!Ar!!$r!,#3"J#
-`X!!!r`!!r`#3$2m!!2q3$J#3"!G849K8!*!&!3!!!3!!!!+!!!!%3!!!#+!!!"2
-3!!!L5!!!3B3!!)'#!!%(i3!#"##!"JJa3!S)%5!Arrm3,JJ"#%S%!36+"!%#Im3
-"!cr#!3BIiJ%-,rm"'#Yr!6!V*3&JDf@"`'XPJB"rri-!!M!(!!)B$3!#$"N!!JB
-a!!)$B3!#!F%!!J#"!!!"!!!!!i!!!!I!!!!2i!!!(r!!!$ri!!"rr!!!rri!!Ir
-r!!2rri!(rrr!$rrri"rrrr!rrrriIrrrr2rrrrjrrrrr2rrrrKrrrr`rrrri2rr
-rm$rrrq"rrrr!IrrrJ(rrr`!#2rm!!Krp!!)2q3!#"r%!!J2K!!)"`3!#!)%!!!!
-#!*!)$`#3$r$`!*!0$``2!*!0m-c3m!#3#`m-9982!*!,m-a3"F$`!*!*$`c-a9h
-G$`#3#I$-c-9GhF$`!*!($`c-a999A-`2!*!(m-c-a3!!A-c!m!#3"3rph-a3!!"
-9h-r2!*!&m2hFc&!!!!AFcpc`!!!!$`ArN!RG$`!!!2"9r-!!9Gc-c-c2hF$`!!m
--82c!!!AFc-c-cph-$`$rc&$m`!!&hFc-c-rGc-$`$q99rZ8!"9h-c-c2hFc-c`$
-e9IlP!!"Gc-c-cph-cI!!"9Aqj9!!AGc-c-rGc0m!!&&9rZ9999AFc-c2hFh`!!"
-48Il99999h-c-cphI!!!!89(qd9%9&Gh-c-rGm!!!"9&4rY94&49Gc-c2h`!!!!9
-48Il48489AFc-cr!!!!!&99Aqj99999hFc0m!N!I`!2hGhGhFcIm!N!I`!!rGhGh
-Fh`m!N!I`!!$pc-c0m!m!N!I`!!!2h-cI!!m!N!I`!!!!rFh`!!m!N!I`!!!!$pm
-!!!m!N!I`!*!%m!!!$`#3"J3!N"$r!*!Hr`$r!*!Fr`!V!2m!N"Vr!#XVqJ$r!*!
-Br`!VX*!%!2m!N"Er!#XVX!!!X#X!r`#3&2m!+j!%X,$kq[S!r`#3%[m!+j!&X,$
-kq[SV!2m!N"$r!#Z3",#3"LXV+`$r!*!1r`!VN!@`!*!%X#Z3"!$r!*!-rrrkqLX
-V+l!!N!@`X2SV+rmVr`#3#[m!rrVk+bXVX!#3"V$k+b[rqL[r!*!)r`#`rj!5q[S
-!r`#3"[m!X,$r+bX!!!#`X2SVN!Mrq[SV!2m!N!6r!#Z`!2mV+`#3",$k+j!)rrV
-k+bX!r`!!rrmV+l!!rbXV!*!%X2Vk+j!(rrVk+bXV!2m!!2rmX,#`rkZVX!!!!,#
-`qLZ3"rrkqLZ3"Im!!2q`X,$rUkZ`!*!%X2SVN!Irq[SV+b[kr`#3",#`X2qVUl#
-`!!!!X2Vk+j!'rrVk+b[kr`#3",!&X,$rUkZ`N!Ik+j!'rrVk+rVr!*!&X!@`"Iq
-V-l#3"rSVN!Erq[Vkr`#3"V!&X!ArUc-&X!8&X!@`q[SVN!Arq[Vr!*!'X,!&X!A
-rUc1`X!8&X!@`X2SVN!Arq[m!N!H`X!@`"IqV-`@`"3@`"E#`qLZ3"Irr!*!)X*!
-&rkZVX*!)q[SV+b[kr`#3$[m!!!$rqT!)+b[krrm!N!lr!*!%rrU3"b[kr`$r!*!
-1r`#3"Irk+j!&q[m!!2m!N!lr!*!'rrSV+b[kr`!!!2m!N!lr!*!(rrSVq[m!N!6
-r!*!1r`#3#2rkr`#3"Im!N!lr!*!*r`#3"[m!N!Y!!)!"3!)J""!)k""%,rTU#6N
-+'3`UL$qB#LJ*5!L)#!J!J!(!!q!(m!ri(r`rrRrr2riIr$ri2rJ,k!R)#)J)#!!
-!!)!!N!6`!*!'$`m!N!E``2!!N!32$-`2!*!%m-a982!!!!m-c-A-$`!!m2q3"2$
-`$rc`AFc-rFm!pI!&h-cpm!!&m!AFc2m!!&(a89h0m!!!9I99AGr`!!!!m2hGm2!
-!!!$`$pm!m!!!!2!!m!$`!!!!m!!!!2!!!!!"!*!*r`#3$[m!r`#3$2m!+`$r!*!
-+r`!V+bX!r`#3#2m!+bZ`X,!!r`#3"[m!+j!%X#XV!2m!N!6r!2q3#3$r!!$rrb[
-r!,$j+j!%rrNVr`!!rl$r!!#`q5XV+rrjr`#3",$r!!#`q5XV+rrr!*!%X!Ar"E!
-&X2NVqIm!N!@`X2q`N!6jqIrr!*!(r`$rqIRjr`$r!*!(r`!!rrRr!!$r!*!(r`!
-!!2m!!!$r!*!(r`#3"rm!N!B(3A4YF!!$!*!%,&"jG$J!!!!"4P*&4J!#!!%!J3!
-!!)!!!`#$5801)`!#!!%!J!!!!)%!!`##!!!!!3#3"!N!N!B"!3%!!!%!!!!G33!
-!(%%!!!(*!21aT"a)!!!!(!'k!!T#6N4-!!!!@NP$6L-!!`"Q8dPD43!!!*C'8N9
-'!!)!SQPMFb-!!`$'D@0X0!!#!2CTBf`i!!)"'QPMFc3!!J%qD@0c1!!#!@*3HA3
-i!!!"KP"[F(3!!!'5!)$rr`!!'rm!N!3",2rr!*!*J2rr!!!"9J#3"B(rr`!!#MN
-!N!@#rrm!!"-F!*!%rj!%!!!""!#3"B(rr`!!#Li!N!@!rrm!!"-4!*!&Jrrr!!!
-Ep!#3"!%Xrrm!!!%5!*!&J2rr!!!)BJ#3"B(rr`!!%88!N!@#rrm!!"SS!*!&J2r
-r!!!#@J#3"B(rr`!!#cd!N!@#rrm!!"3J!*!&J2rr!!!%AJ#3"B(rr`!!$8%!N!@
-#rrm!!"BN!*!&J2rr!!!)TJ#3"B(rr`!!%BN!N!@#rrm!!"TX!*!&J2rr!!!*+J#
-3"B(rr`!!%Jd!N!@#rrm!!"V`!*!+(#m!N!@"rrm!!"`d!*!%$NphEQ9b)(*PFfp
-eFQ0PTT!!:
+:%'0RDA4PFh3ZBfGT,R*cFQ-!FR0bBe*6483"!*!((`VqD`#3"!%!!!!G33!!(%%
+!!!(*0K3J9#"S!"3J8(d4X'J4!$S"CbB5,`a1ZJ)-$$S!@RN3BfGTG'9cG#jMCfN
+ZFR0bBfN#!!!!2j!)!*!%2j!)!*!BVRDb4!#3"Km+ra(!U'N"(8!4rr-6F!!3,[r
+c[G)4CK"40Vj9D`%"3N5pSEj9D`%"-&%b!@FH4"8-!!!FC4*`!"!Z3a8-!!!IBJC
+`!@!!!3%#,&T8,5j%[3%!'c`"CM!R96iD5S!J8`)S!,m!,L)!l3N#!3"!JbME0"1
+Tebm-6VS"#8TRD`%!TPG$1J!!!3!4!!!!!3IJ!)%'B!!!"q!!N!!"J!#3!!'!!*!
+!rri!N!$rrJ!3rrm!NIr!J*(rJ%#4rc!JJrr)%)2JIiq$rM!(Krm!"iIrJ!H(rq!
+($rrrj`rrrpm2rrrR(Frri"QqrrJGI'Bi24lDh$eZfY`pEYVFICjQhRrrrrjrrrr
+q!*!*$r!!!!r`!!!2m!!!$r!!!!r`!!(rri!"rrq!!IrrJ!2rri!$rrr!!rrri!I
+rrr!(rrrr"rrrr`rrrrm2rrrr$rrrrarrrrmIrrrr(rrrrcrrrrJrrrrm2rrrr(r
+rrrjrrrrqIrrrr[q3&!#3"`T3i!!HK)!!"k%J!!!!3!#3""1!%i!"!#I!*r!R$Ji
+'$iB2jKUi'V!Im!#3"2q3)!!!!3!!!3!!%!+!!!3%3!"%##!!9I!3!&%J#!"3`r3
+!8-BD!"2m2`"6r"k!4r`V3%ri)5"Aq!q3!'rm2iK2r$q%cr`IJPrq$i&rrJq#(ri
+("#hr!`JVI`)3+cd')'PRQ%"T*r#!Irq"!!!J!J!!%!3!!!J)!!!%%!!!!L!!!!&
+!!!!!J!!!!3!!%!1!!!3(`!"%$q!!9Ir`!&(rq!"3rr`!82rq!"2rr`"6rrq!4rr
+r`%rrrq"Irrr`Irrrq(rrrrcrrrrqIrrrrhrrrriIrrrm2rrrq$rrrr!rrrrJIrr
+r`(rrri"rrrm!!$rq!!!Ir!!!$rJ!!!I`!!!$i!!!!F!!!!#!!!!!!J#3#!m!N!N
+2!*!&m2!!N!N2!!!!$``2!*!($`!2!!!!m-c!m!#3"Jm2$`99A`c-c!m!N!B2$`!
+&!&c-c-c!m!#3"3m2!!"9h3$rrr`2!*!&$`m!!&AG$iGhIr$`!*!&$`"999AiGhH
+,r`m!N!32$`"999@)GhGlMr$`!!!!$`!&9999@hGhKlHr$`!!!!m!p99999YhGiG
+hIm$`!!!2$`99999AGhGhZi[m$`!!$r"9N!9hGlZ,Lrc!m!!2$&@3"AGhZlZlr-`
+2!2r-9C!&GhGlZiMmc-$`$q99N!9hGhH)Lrc-c-m2p9@3"9GhGlZrr-c0m!!&9C!
+&9hGhHlr-c0m!!&&9&9@3"(GhGrr-cI!!!&&49499999hGhImc0m!!!"48984848
+9GhGrr-h`!!!&89%9&9%9&9GrrmcI!!!!"9&4&4&4&49Irmc0m!!!!!99N!GFc-c
+I!*!*rGhGhFc0m!#3#3rGhGh-h`#3#rh-c-h`!*!,$pc-h`#3$Ih0m!#3$3rI!*!
+2m!#3#33!N"$r!*!6r`#3#[m!r`#3&2m!N!Ir!#X!r`#3$rm!!!$r!*!'r`!V+bX
+!r`#3$[m!r`$r!,#3"2m!+j!&!2m!N!hr!2m!!!#`!!#`+j!)!2m!N!cr!2m!N!5
+`X2Vk!!$rN!8V!2m!N![r!2m!N!5`X2Vk!2qI5*!%rrm!r`#3$2m!!,#3"[qI5*!
+%Rjrrr`$r!*!*r`$r!!#`N!BcRdL3"61Irrm!r`#3#2m!!!#`N!Jc5*!%-dJc5$2
+r!2m!N!Ir!!$rX*!)-dL3"*p)N!6r+`$r!*!'r`$r!,#3#%L3"jmc-c2r+`$r!*!
+&rrm!X*!+5*!%Rc-c-jmcrbXV!2m!N!6r!#Z`N!T)N!3cRc13"2mV+bX!r`!!rrm
+V+l#3#NL3"6-c-jqIrbZ3"!$r!!$rr,#3#dL3"TqIRc2r+j!'r`$rrl#3$%L3"6-
+c-rrr+j!%q[m!N!5`N!a)N!DI-rmVN!6kr`#3",!&X,!&X*!*5*!'rrmV+b[kr`#
+3"E!&X!@`X!@`N!G)N!Er+bXVq[m!N!D`"E!&X,!&"E!&"E!&X%L3"Irr+b[kr`#
+3"V#`"E!&"E!&X,!&"E!&X,")52rrrbXVq[m!N!H`X!@`"3@`"3@`"3@`"E#`rrr
+r+bXVq[m!N!L`N"!VN!Akr`#3%[rkN!FV+b[kr`#3&2rkN!BV+rVr!*!@rrSVN!A
+kr`#3'2rk+bXVq[m!N"VrqL[kr`#3(2rkr`#3([m!N"*!#)!T3!)J"0![U$Bd,V*
+Z-6mL(m3UL$q3!!)J!8!!J!!!#)!T`!2J"r![q$rm2rjrrcrq(r`rq$r`!q!"`!#
+!!*!&J!!!m!$`!*!%m2!2$`#3"[$!m!#3"!m-r`m!!!$`99phm2!!!2m&KhU[$`!
+!m&9AL+r!m!rm99GkV-c2!2999AImcI!!"999ImcI!!"489&GcI!!!&9999hI!*!
+&rGh`!*!&$pm!N!I`!*!0!3#3"Im!!!$r!*!*r`$r!!$r!2m!N!cr!#X!r`#3#[m
+!+rrr!2m!N!Er!,#`X2p)52m!r`#3"Irr!,$M5%L*LIm!r`#3"2m!X,#`512MLIm
+V!2m!!2rr+l#`X%K)LBNVN!6r!!$rX*!&5%Mr+b[jr`#3",#3"8Mr+b[jr`#3",!
+&X!@`"E$j+rRr!*!&X*!(qIRr!*!+rrRjqIm!N!crqIm!N!lr!*!D"d&38%`!!3!
+!!!%!(rrq!"!!!`!4!)+!%3%#3"-cJL!9@5)3&@%$q"-a+SJ3!!!)%'rl#"!!!!J
+3$lJ)%!!!#"!2hkJ3!!!)%!(Vk"!!!!J3!IF)%1!!#"$KlmJ33!!)%I'qL"(`!!J
+4m$pS%rJ!#"2i2iJ6q!!)&U`hb"DX!!JAr!!)%!!!#"rrrrJIrri!(rrr!"rrri!
+Irrr!(rrri"rrrr!Irrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJ
+Irrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJ
+Irrri(rrrq"rrrrJIrrri(rrrq!!!!J!!$rq3#I!!N!82!*!*r`#3"3m!"3#3"&!
+!!2(`!*!%$`!&!!!!"3!!!2%I!*!%$`"9!&8!99!!!2%4m!!!!!m&N!43"3!`!2%
+4(`!!!!m&"393!!8!!!$rrrr`!!!2!&8!93!&!$"38&!!m!!!$`#3$2!!!!m!!!9
+39C!%8&8!!2!!!!m!N!c`!!!2!*!%999399!!!!$`!!!2!*!-m!!!$`#3"&99939
+999"3m!!!$`#3$2!!!!m!N!8&99"39993m!!!$`#3$2!!!!m!N!8&998&93!!m!!
+!$`!!99!!N!M`!!!2!!"98!!&99"9998!m!!!$`!!"3#3#I!!!!m!"999!!93999
+38!$`!!!2!!9993#3#2!!!!m!"999!!!!9999"9$`!!!2!&9999!!N!I`!!!2!&9
+999!!!&9999!!m!!!$`"99993!*!(m!!!$`9489&9!!"9"999!2!!!!m&89&493#
+3"r!!!!m&9C!%!*!(m!!!$`#3$2!!!!rrN!c`!!!!"!#3"2q3&!#3$2m!N",rr`#
+3#rm!!!#`!*!)X!#3"Im&r`#3#[m!!!#`!*!(X!#3"[m&"Im!N!Rr!!#`X!!!X,!
+!!,#`X!#3"Im&"3Ar!*!)r`#`!,!!X!#`X!!!X!!!f!!!!2m&N!6r!*!(r`#`!,!
+!X,!!N!5`!*!'rj!(!*!'r`!!X,!!!,#`!!!!X!!!f!#`!,!!X!!!!2m!N!Er!*!
+Br`#3"[m!N!@`X!#`N!N!X,!!N!6r!*!'r`#3'2m!N!Er!*!)X*!&!,#`X!#3"rm
+!N!Er!*!Br`#3"[m!N!L`N!B!X*!'!,!!r`#3"[m!N"Mr!*!'r`#3#l#3"!#`!,#
+3"3$r!*!'r`#3'2m!N!Er!*!,X*!&!,#`X!#3"2m!N!Er!*!%X,#`!*!4r`#3"[m
+!N!5`X,!!N!5`N!3!X*!'!!$r!*!'r`#3"E!!N",r!*!'r`!!!,#3"3!!!,#`!,#
+3"3#`!!!!r`#3"[m!!!#`N!8!N"$r!*!'r`!!!,#3"3#3"V#3"J#`X!$r!*!'r`!
+!X*!(!*!2r`#3"[m!!,#3"`#3"E#3"`!!!2m!N!Er!!#`N!F!N!rr!*!'r`#`X!@
+`"E!&X,!!N!5`X!#`N!8!!2m!N!Er!,#`"E!&X!@`X!#3$[m!N!Er!,#3#3#3$[m
+!N!Er!*!Br`#3"[q3'J#3"N"rm%!B9949AN!#6rT!!N$b4J*'HNm#6cTIJPqb3!*
+rr[q3)!!!!)!2rj!&!!!2!*!%$r!!$`8&"3-2(`!2"38&!`rrm!m!N!E`$`"9N!4
+3m!m!N!E`$`!!!&99!2!2!!93!!!!m!m!"9!&99$`$`"993!!!2!2!&99!&93m!m
+&9993!!$`$`9999"9!2!2!*!'m!rrN!E`!!!"!!$rN!X!N!Ar!*!*rrm!N!6r!,!
+!X!#`!0J!r`Ar!!!!r`#`!,!!X!$B!2q3"!!!r`#3$2m!!2m!!,#3#3$r!!$r!*!
+-r`!!r`#3"V#3"!!!r`!!r`!!!,#`!*!(r`!!r`!!!,#`!!#`N!3!r`!!r`!!X*!
+%!*!'r`!!r`!!X*!%!!#`X,!!r`!!r`#`N!B!N!Ar!!$r!,#3"J#`X!!!r`!!r`#
+3$2m!!2q3$J#3"!G849K8!*!&!3!!!3!!!!+!!!!%3!!!#+!!!"23!!!L5!!!3B3
+!!)'#!!%(i3!#"##!"JJa3!S)%5!Arrm3,JJ"#%S%!36+"!%#Im3"!cr#!3BIiJ%
+-,rm"'#Yr!6!V*3&JDf@"`'XPJB"rri-!!M!(!!)B$3!#$"N!!JBa!!)$B3!#!F%
+!!J#"!!!"!!!!!i!!!!I!!!!2i!!!(r!!!$ri!!"rr!!!rri!!Irr!!2rri!(rrr
+!$rrri"rrrr!rrrriIrrrr2rrrrjrrrrr2rrrrKrrrr`rrrri2rrrm$rrrq"rrrr
+!IrrrJ(rrr`!#2rm!!Krp!!)2q3!#"r%!!J2K!!)"`3!#!)%!!!!#!*!)$`#3$r$
+`!*!0$``2!*!0m-c3m!#3#`m-9982!*!,m-a3"F$`!*!*$`c-a9hG$`#3#I$-c-9
+GhF$`!*!($`c-a999A-`2!*!(m-c-a3!!A-c!m!#3"3rph-a3!!"9h-r2!*!&m2h
+Fc&!!!!AFcpc`!!!!$`ArN!RG$`!!!2"9r-!!9Gc-c-c2hF$`!!m-82c!!!AFc-c
+-cph-$`$rc&$m`!!&hFc-c-rGc-$`$q99rZ8!"9h-c-c2hFc-c`$e9IlP!!"Gc-c
+-cph-cI!!"9Aqj9!!AGc-c-rGc0m!!&&9rZ9999AFc-c2hFh`!!"48Il99999h-c
+-cphI!!!!89(qd9%9&Gh-c-rGm!!!"9&4rY94&49Gc-c2h`!!!!948Il48489AFc
+-cr!!!!!&99Aqj99999hFc0m!N!I`!2hGhGhFcIm!N!I`!!rGhGhFh`m!N!I`!!$
+pc-c0m!m!N!I`!!!2h-cI!!m!N!I`!!!!rFh`!!m!N!I`!!!!$pm!!!m!N!I`!*!
+%m!!!$`#3"J3!N"$r!*!Hr`$r!*!Fr`!V!2m!N"Vr!#XVqJ$r!*!Br`!VX*!%!2m
+!N"Er!#XVX!!!X#X!r`#3&2m!+j!%X,$kq[S!r`#3%[m!+j!&X,$kq[SV!2m!N"$
+r!#Z3",#3"LXV+`$r!*!1r`!VN!@`!*!%X#Z3"!$r!*!-rrrkqLXV+l!!N!@`X2S
+V+rmVr`#3#[m!rrVk+bXVX!#3"V$k+b[rqL[r!*!)r`#`rj!5q[S!r`#3"[m!X,$
+r+bX!!!#`X2SVN!Mrq[SV!2m!N!6r!#Z`!2mV+`#3",$k+j!)rrVk+bX!r`!!rrm
+V+l!!rbXV!*!%X2Vk+j!(rrVk+bXV!2m!!2rmX,#`rkZVX!!!!,#`qLZ3"rrkqLZ
+3"Im!!2q`X,$rUkZ`!*!%X2SVN!Irq[SV+b[kr`#3",#`X2qVUl#`!!!!X2Vk+j!
+'rrVk+b[kr`#3",!&X,$rUkZ`N!Ik+j!'rrVk+rVr!*!&X!@`"IqV-l#3"rSVN!E
+rq[Vkr`#3"V!&X!ArUc-&X!8&X!@`q[SVN!Arq[Vr!*!'X,!&X!ArUc1`X!8&X!@
+`X2SVN!Arq[m!N!H`X!@`"IqV-`@`"3@`"E#`qLZ3"Irr!*!)X*!&rkZVX*!)q[S
+V+b[kr`#3$[m!!!$rqT!)+b[krrm!N!lr!*!%rrU3"b[kr`$r!*!1r`#3"Irk+j!
+&q[m!!2m!N!lr!*!'rrSV+b[kr`!!!2m!N!lr!*!(rrSVq[m!N!6r!*!1r`#3#2r
+kr`#3"Im!N!lr!*!*r`#3"[m!N!Y!!)!"3!)J""!)k""%,rTU#6N+'3`UL$qB#LJ
+*5!L)#!J!J!(!!q!(m!ri(r`rrRrr2riIr$ri2rJ,k!R)#)J)#!!!!)!!N!6`!*!
+'$`m!N!E``2!!N!32$-`2!*!%m-a982!!!!m-c-A-$`!!m2q3"2$`$rc`AFc-rFm
+!pI!&h-cpm!!&m!AFc2m!!&(a89h0m!!!9I99AGr`!!!!m2hGm2!!!!$`$pm!m!!
+!!2!!m!$`!!!!m!!!!2!!!!!"!*!*r`#3$[m!r`#3$2m!+`$r!*!+r`!V+bX!r`#
+3#2m!+bZ`X,!!r`#3"[m!+j!%X#XV!2m!N!6r!2q3#3$r!!$rrb[r!,$j+j!%rrN
+Vr`!!rl$r!!#`q5XV+rrjr`#3",$r!!#`q5XV+rrr!*!%X!Ar"E!&X2NVqIm!N!@
+`X2q`N!6jqIrr!*!(r`$rqIRjr`$r!*!(r`!!rrRr!!$r!*!(r`!!!2m!!!$r!*!
+(r`#3"rm!N!B(3A4YF!!$!*!%,&"jG$J!!!!"4P*&4J!#!!%!J3!!!)!!!`#$580
+1)`!#!!%!J!!!!)%!!`##!!!!!3#3"!N!N!B"!3%!!!%!!!!G33!!(%%!!!(*!21
+aT"a)!!!!(!'k!!T#6N4-!!!!@NP$6L-!!`"Q8dPD43!!!*C'8N9'!!)!SQPMFb-
+!!`$'D@0X0!!#!2CTBf`i!!)"'QPMFc3!!J%qD@0c1!!#!@*3HA3i!!!"KP"[F(3
+!!!'5!)$rr`!!'rm!N!3",2rr!*!*J2rr!!!"9J#3"B(rr`!!#MN!N!@#rrm!!"-
+F!*!%rj!%!!!""!#3"B(rr`!!#Li!N!@!rrm!!"-4!*!&Jrrr!!!Ep!#3"!%Xrrm
+!!!%5!*!&J2rr!!!)BJ#3"B(rr`!!%88!N!@#rrm!!"SS!*!&J2rr!!!#@J#3"B(
+rr`!!#cd!N!@#rrm!!"3J!*!&J2rr!!!%AJ#3"B(rr`!!$8%!N!@#rrm!!"BN!*!
+&J2rr!!!)TJ#3"B(rr`!!%BN!N!@#rrm!!"TX!*!&J2rr!!!*+J#3"B(rr`!!%Jd
+!N!@#rrm!!"V`!*!+(#m!N!@"rrm!!"`d!*!%$NphEQ9b)(*PFfpeFQ0PAq`:
diff --git a/Mac/Demo/using.html b/Mac/Demo/using.html
index fb1eb18..2d1ee32 100644
--- a/Mac/Demo/using.html
+++ b/Mac/Demo/using.html
@@ -1,9 +1,9 @@
 <HTML>
 <HEAD>
-<TITLE>Using Python on the Macintosh</TITLE>
+<TITLE>Using Python 1.4 on the Macintosh</TITLE>
 </HEAD>
 <BODY>
-<H1>Using Python on the Macintosh</H1>
+<H1>Using Python 1.4 on the Macintosh</H1>
 <HR>
 
 This document is an introduction to using Python on the Apple
@@ -13,6 +13,13 @@ HREF="http://www.python.org/doc/tut/tut.html">Python Tutorial</A> by
 Guido van Rossum. This guide more-or-less replaces chapter two of the
 tutorial, and provides some additional material. <p>
 
+The tutorial, along with other indispensible documentation like the
+library reference and such, is also available in a number of different
+formats at <a href="ftp://ftp.python.org/pub/python/doc">
+ftp://ftp.python.org/pub/python/doc</a>. The Adobe Acrobat <code>.pdf</code>
+files are probably a good choice for reading or printing the documents
+from your mac. <p>
+
 There is currently no good tutorial for the mac-specific features of
 Python, but to whet your appetite: it has interfaces to many MacOS
 toolboxes (quickdraw, sound, quicktime, open scripting, etc) and
@@ -21,15 +28,12 @@ numbers, image manipulation, etc). Some <A HREF="index.html">
 annotated sample programs</A> are available to give you an idea of
 Python's power. <P>
 
-The document refers to Python 1.3.3 or higher, some of the features
-(like setting applet options) will not work in earlier versions of
-Python. <p>
-
 <h2>Invoking the interpreter</h2>
 
 The name of the interpreter may differ on different installations: it
 may be called <CODE>Python</CODE>, <CODE>PythonPPC</CODE> (for powerpc
-macs) or <CODE>Python68K</CODE> (indeed, for 68K macs). It will always
+macs), <CODE>PythonCFM68K</CODE> or<CODE>Python68K</CODE> (both for 68K macs). 
+It will always
 be recognizable by the "16 ton" icon, though. You start the
 interpreter in interactive mode by double-clicking its icon: <p>
 
@@ -84,6 +88,12 @@ the interpreter will close the window and quit as soon as the script
 is done executing, see below under <A HREF="#startup">startup
 options</A> for a way to change this. <p>
 
+<blockquote>
+There is a BBEdit extension available that allows you to run Python
+scripts more-or-less straight from your bbedit source window. Check
+out the <code>Mac:Tools:BBPy</code> folder.
+</blockquote>
+
 It is a good idea to have the names of all your scripts end in
 <CODE>.py</CODE>. While this is not necessary for standalone scripts
 it is needed for modules, and it is probably a good idea to start the
@@ -300,10 +310,11 @@ sub-dialog.
 
 An applet is a fullblown application written in Python, similar to an
 AppleScript applet (and completely different from a Java
-applet). Applets are currently only supported on PowerPC macintoshes,
+applet). Applets are currently supported on PowerPC macintoshes and on
+68K macintoshes if you use the CFM68K version of the interpreter,
 and are created using the <CODE>mkapplet</CODE> program. You create an
-applet by dropping the python source script onto mkapplet.  The
-<CODE>Demo</CODE> folder contains an example of a more involved applet
+applet by dropping the python source script onto mkapplet.
+<a href="example2.html">Example 2</a> is a more involved applet
 with its own resource file, etc. <p>
 
 Note that while an applet behaves as a fullblown Macintosh application
@@ -324,7 +335,7 @@ defaults. <p>
 Actually, not only applets but also the interpreter itself can have
 non-default settings for path and options. If you make a copy of the
 interpreter and drop this copy onto EditPythonPrefs you will have an
-interpreter that has a different set of default settings.
+interpreter that has a different set of default settings. <p>
 
 <h2>Where to go from here</h2>
 
@@ -339,7 +350,8 @@ There are some <A HREF="index.html">annotated sample programs</A>
 available that show some mac-specific issues, like use of various
 toolboxes and creation of Python applets. <p>
 
-Finally, the <CODE>Demo</CODE> folder in the Macintosh distribution
+Finally, the <CODE>Demo</CODE> and <CODE>Mac:Demo</CODE>
+folders in the Macintosh distribution
 contains a number of other example programs. Most of these are only
 very lightly documented, but they may help you to understand some
 aspects of using Python. <p>
@@ -385,7 +397,7 @@ Python attempts to keep its preferences file up-to-date even when you
 move the Python folder around, etc. If this fails the effect will be
 that Python cannot start or, worse, that it does work but it cannot find
 any standard modules. In this case, start Python examine <code>sys.path</code>.
-If it is incorrect remove the Python preferences file from the system
+If it is incorrect remove any Python preferences file from the system
 folder and start the interpreter <em>while the interpreter sits in the main
 Python folder</em>. This will regenerate the preferences file. <p>
 
@@ -395,7 +407,7 @@ The next section to check out is the <a href="index.html">annotated sample progr
 
 <HR>
 <A HREF="http://www.cwi.nl/~jack">Jack Jansen</A>,
-<A HREF="mailto:jack@cwi.nl">jack@cwi.nl</A>, 05-Sep-1996.
+<A HREF="mailto:jack@cwi.nl">jack@cwi.nl</A>, 20-Nov-1996.
 
 </BODY>
 </HTML>
-- 
cgit v0.12