From 4612c6eb41b1196af4f9ca74143d55775a6083bf Mon Sep 17 00:00:00 2001
From: Aaron <aw9994@cs.ship.edu>
Date: Wed, 27 Apr 2011 22:06:46 -0400
Subject: [PATCH] which-python changes

---
 docs/scenarios/.DS_Store       | Bin 0 -> 6148 bytes
 docs/scenarios/gui.rst         |  15 ++++++++++++++-
 docs/starting/.DS_Store        | Bin 0 -> 6148 bytes
 docs/starting/which-python.rst |   4 ++--
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 docs/scenarios/.DS_Store
 create mode 100644 docs/starting/.DS_Store

diff --git a/docs/scenarios/.DS_Store b/docs/scenarios/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..afd2f3a3c381cfe62b4b1c0d507eb234d8026440
GIT binary patch
literal 6148
zcmeHKOHRW;41F$DKVs7*%Pd(Taf7HTNNnK(kQO1NKoO;4n`3Y&4!~`~^Vo_KLbeE1
zc4fbb=Q%TZQ)My$WVzp*0}B8%y5eZg@QZ1`de26lnGhx2;~8go#SU**Wse<+|EPej
z-5ht=;0cdtt>1QCl-q*6`q#LmpVrCP0w!3K-K=$o`}u=ACAS=6%XN?afc+r*OWAa(
zYet><4llUpZ!<6(o%u&==2N_rT@0{w?rpY?5f%!B0-?a+DZo8jZFX!JF%$>|LV-pB
zeLrM$#oVznOs@`xbOa!dnNG&GelTiH=9oKHhU}q<l@hH~{D>h|&V1&)+_5sWa)=*3
z#77oCp-38?_s<d?k{d=01ww(Y0!Mba(Ea~n`2623imOl{6gVgaWW2grE%`{kxAq=R
u_u7npOIK4~W!RLkk+x!Tbt^uhCu2U-1~GT644I+Dhd`1cLMZU33VZ`F%~wVM

literal 0
HcmV?d00001

diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst
index 22dcfc4..ce79e58 100644
--- a/docs/scenarios/gui.rst
+++ b/docs/scenarios/gui.rst
@@ -17,16 +17,29 @@ http://www.riverbankcomputing.co.uk/software/pyqt/download
 
 Cocoa
 :::::
+*Note: The Cocoa framework is only available on Mac OSX. Don't pick this if you're writing a cross-platform application!*
 
 PyObjC
 ------
-*Note: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.*
+PyObjC 2.0 is included in the default python installation of Mac OS X 10.5 Leopard.
+To install the latest version: ::
+    $ pip install pyobjc 
+or go to http://pyobjc.sourceforge.net/downloads.html
 
 WXPython
 ::::::::
 Install (Stable)
 ----
 *Go to http://www.wxpython.org/download.php#stable and download the appropriate package for your OS.*
+The simplest method to test if it works is to attempt to import it. ::
+    Aarons-MacBook:docs aaron$ python
+    Python 2.6.6 (r266:84374, Aug 31 2010, 11:00:51) 
+    [GCC 4.0.1 (Apple Inc. build 5493)] on darwin
+    >>> import wx
+    Traceback (most recent call last):
+      File "<stdin>", line 1, in <module>
+    ImportError: No module named wx
+If you don't get the above error, WXPython is installed.
 
 Gtk
 :::
diff --git a/docs/starting/.DS_Store b/docs/starting/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..31e3a026ae68c9cd2c17bee76325a94b19990fcc
GIT binary patch
literal 6148
zcmeHK%Sr=55Uh?l1aisI;~u?4@DG*{1+V%8<^>6ateE(^?Fae+{>@r7Ju0i~RYbZ&
zPxa1pP45<D9sq1|zdQp*00wlSDd;eDcMkP(a-V2vjum!zz$xyq@0jQ>cIn-RSYpNZ
z9<%*?|HI|BTFkfAoEehmf_~B@W2C+fv-db)hAn?HMjKS@^Y8!4e-WQ<O(Qxb-Lc*i
zS)KWI#hiA%N32<4!FG&WJd?Tpxt_g>Pw(Y=48uZ!P#_ct1wsKTz&%?w7&=B93WNfo
zz=r}_9}2p#%vd|7rGrhn0uXhKPR3Y=WpRp(Wyac(BQ$d=(W#cN80K{L7dfxYSUWl$
zmM<TcE5Bb}ELG?HMM{U2j?sn!p+H-KBYzxe|3Bwnrt^~Dro>Yy5DNS=1*|{4o=*5t
zd2jvpdD?3W`VC#CyjlT`aqAGk2dyK=Y0$?D#mp-+){dG*{fSPDgFq4_no!^u6nF!0
Cw?PyD

literal 0
HcmV?d00001

diff --git a/docs/starting/which-python.rst b/docs/starting/which-python.rst
index f94f4f2..ddb1e40 100644
--- a/docs/starting/which-python.rst
+++ b/docs/starting/which-python.rst
@@ -6,12 +6,12 @@ Which Python to use?
 
 2.x vs 3.x
 ::::::::::
-
+http://wiki.python.org/moin/Python2orPython3
 
 
 History
 -------
-
+Python2.0 was released October 16, 2000.  Python3.0 was released on December 3,2008 and breaks backwards compatibility.
 
 
 Today