Merge lp:~pyotago/practical-programming/iain into lp:practical-programming

[Iain Hewson]

changed convert parameter to class attribute as suggested in
reply to Fei's email

=== modified file 'gui_intro.tex'
--- gui_intro.tex	2012-05-02 03:39:49 +0000
+++ gui_intro.tex	2012-05-03 21:38:20 +0000
@@ -284,7 +284,7 @@
 \item Create a new function called \pythoninline{convert\_c\_to\_f} and
 devise appropriate doctests to test it.
 
-\item In the \pythoninline{convert} function, add a parameter called
+\item In the \pythoninline{convert} function, use a class attribute called
 \pythoninline{forwardConvert} which can be either \pythoninline{True}
 or \pythoninline{False}. Modify  \pythoninline{convert} to use an
 \pythoninline{if-else} statement to