Updated instructions in HACKING to include svn-python bindings; typo fixes and rewording in README

Author: codebykat

HACKING

@@ -2,30 +2,33 @@ YOU WANT TO CONTRIBUTE BUT YOU DON'T KNOW HOW? NO MORE SUCH EXCUSES
 
 0. Install Trac
 
-On Mac OS X this is as easy as:
+In most cases this can be done via easy_install:
 
- # easy_install Trac
+	 # easy_install Trac==0.12
+
+If you run into problems, see Trac documentation [1][2].
+
+You will also need to install the Subversion python bindings.  Some systems have packages for it (e.g. python-subversion on Debian)[3], but on OSX this means compiling them from source[4].
 
 1. Create a test Trac install somewhere:
 
- $ trac-admin <trac-name> initenv
+	$ trac-admin <trac-name> initenv
 
 The default offered values are good.
 
-This will create a <trac-name> directory with the Trac install in the
-current directory.
+This will create a <trac-name> directory with the Trac install in the current directory.
 
 2. Create a local SVN repo:
 
- $ svnadmin create <repo-name>
+	$ svnadmin create <repo-name>
 
 3. Checkout the repo and add a dummy file:
 
- $ svn co file://<full-path-to-svn-repo> # including leading slash, e.g. file:///home/username/svn-repo/
+	$ svn co file://<full-path-to-svn-repo> # including leading slash, e.g. file:///home/username/svn-repo/
 
 4. Add the repo in the trac.ini:
 
- $ $EDITOR <trac-name>/conf/trac.ini
+	$ $EDITOR <trac-name>/conf/trac.ini
 
 Change:
 
@@ -34,26 +37,37 @@ repository_type = svn
 
 5. Create htpasswd file for Trac auth:
 
- $ htpasswd -c <auth-file-name> <desired-username>
+	$ htpasswd -c <auth-file-name> <desired-username>
 
 Remember the file location.
 
 6. Add yourself as admin:
 
- $ $ trac-admin <trac-name> permission add <username> TRAC_ADMIN
+	$ trac-admin <trac-name> permission add <username> TRAC_ADMIN
 
 6. Run trac server:
 
- $ tracd -s -r --port 8000 --basic-auth='<trac-name>,<full-path-to-auth-file-name>,<whatever-you-want>' <path-to-trac-folder> # see http://trac.edgewall.org/wiki/TracStandalone
+	$ tracd -s -r --port 8000 --basic-auth='<trac-name>,<full-path-to-auth-file-name>,<whatever-you-want>' <path-to-trac-folder> # see http://trac.edgewall.org/wiki/TracStandalone
 
 You should now have a working vanilla Trac at http://localhost:8000/, where you can log in and be an admin.
 
-7. Checkout the plugin in R/W mode
+7. Checkout the plugin in R/W mode:
+
+	$ git clone git@github.com:Automattic/vip-trac-code-comments.git
+
+8. From the plugin directory, deploy the plugin in development mode:
+
+	$ python setup.py develop -mxd <path-to-trac>/plugins
+
+9. Restart Trac.  Then in the Admin section in Trac, go to Plugins and enable all the components of the TracCodeComments plugin and also the CodeComments macro.
+
+10. For debugging, you probably also want to enable logging in Trac by setting the log_type option to "file" in trac.ini.
 
- $ git clone git@github.com:Automattic/vip-trac-code-comments.git
 
-8. Deploy the plugin in development mode
 
- $ python setup.py develop -mxd <path-to-trac>/plugins
+# Footnotes
 
-9. Go to the Admin section in Trac, then Plugins and enable all the components of the TracCodeComments plugin and also the CodeComments macro
+[1] http://trac.edgewall.org/wiki/0.12/TracInstall
+[2] http://trac.edgewall.org/wiki/TracDev/DevelopmentEnvironmentSetup
+[3] http://trac.edgewall.org/wiki/TracSubversion#GettingSubversion
+[4] http://stackoverflow.com/questions/14538468/how-to-install-python-subversion-bindings-needed-by-hg-convert-on-mac-os-x-10-8/16950786#16950786

README.md

@@ -10,7 +10,7 @@ This plugin allows you to leave comments on top of files, changesets, and
 attachments. Once you've added all of your comments, you can send them to
 tickets. These include links to these comments and their description.
 
-It's Github, in your Trac.
+It's GitHub, in your Trac.
 
 Installation
 ------------
@@ -55,23 +55,23 @@ Contributing
 
 We'd love your help!
 
-If you are a developer, feel free to fork the project here, on github and
+If you are a developer, feel free to fork the project here on GitHub, and
 submit a pull request with your changes.
 
 If you are a designer and have UI suggestions, [open an issue](https://github.com/Automattic/trac-code-comments-plugin/issues), and we'll make sure to address your concerns.
 
-If you want to help with copy, or just wanna say how great or sucky we are
+If you want to help with copy, or just wanna say how great or awful we are,
 [creating an issue](https://github.com/Automattic/trac-code-comments-plugin/issues) is the way to go.
 
-You can find help with setting up a local development environment in the [`HACKING`](https://github.com/Automattic/trac-code-comments-plugin/blob/master/HACKING) file in this repostitory.
+You can find help with setting up a local development environment in the [`HACKING`](https://github.com/Automattic/trac-code-comments-plugin/blob/master/HACKING) file in this repository.
 
 Roadmap
 -------
 
 Nobody can predict the future, but here are some features on the roadmap:
 
-* Line-level comments for changesets and diff atatchments, too
-* E-mail notifictaions
+* Line-level comments for changesets and diff attachments, too
+* E-mail notifications
 
 License
 -------