Merge branch 'master' into pr/258

2013-07-23 00:05:58 -04:00 · 2013-07-23 00:05:58 -04:00 · 68ade73dd1
commit 68ade73dd1
parent a17dcdbffb a71e09b1cf
1 changed files with 1 additions and 1 deletions
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@ -392,7 +392,7 @@ In python we might see::

 The same thing in Hy::

-  => (defn optional_arg [pos1 pos2 &optional keyword1 [keyword2 88]]
+  => (defn optional_arg [pos1 pos2 &optional keyword1 [keyword2 42]]
  ...  [pos1 pos2 keyword1 keyword2])
  => (optional_arg 1 2)
  [1 2 None 42]