From: W. Trevor King <wking@tremily.us>
Date: Mon, 16 Jun 2014 23:07:04 +0000 (-0700)
Subject: Merge branch 'python'
X-Git-Tag: v0.1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e53be3544249c5fd528e589a02bb75a22fd58344;p=swc-setup-windows-installer.git

Merge branch 'python'

I'd usually wait for more interesting changes to queue up, but this
should help demonstrate my intended release process.

* python:
  Fix 'Add' -> 'Adds' to match 'The script' lead-in
---

e53be3544249c5fd528e589a02bb75a22fd58344
diff --cc README.md
index 1e9a12f,b308778..81498d2
--- a/README.md
+++ b/README.md
@@@ -8,25 -8,23 +8,25 @@@ The script
  * Installs [SQLite][] and makes it accessible from msysGit
  * Creates a `~/nano.rc` with links to syntax highlighting configs
  * Provides standard [nosetests][] behavior for msysGit
- * Add [R][]'s bin directory to the path (if we can find it)
+ * Adds [R][]'s bin directory to the path (if we can find it)
  
 -To use:
 +Building
 +========
  
 -1. Install [Python][], [IPython][], and [Nose][nose].  An easy way to
 -   do this is with the [Anaconda CE][Anaconda-CE] Python distribution.
 -2. [Install msysGit][msysgit-install]
 -3. Run `swc-windows-installer.py`.  You should be able to simply
 -   double click the file in Windows.
 +TODO
 +
 +For folks who don't want to build their own version, the most recent
 +version is also [available here][compiled].
 +
 +Using
 +=====
 +
 +Just have your students download and double-click the compiled
 +installer.
  
  [msysGit]: http://msysgit.github.io/
 -[msysgit-install]: https://github.com/msysgit/msysgit/releases
  [nano]: http://www.nano-editor.org/
  [SQLite]: http://www.sqlite.org/
 -[Python]: https://www.python.org/
 -[IPython]: http://ipython.org/
 -[Nose]: https://nose.readthedocs.org/en/latest/
  [nosetests]: https://nose.readthedocs.org/en/latest/usage.html
  [R]: http://www.r-project.org/
 -[Anaconda-CE]: http://continuum.io/anacondace.html
 +[compiled]: http://files.software-carpentry.org/SWCarpentryInstaller.exe