From a6d5aa05d045b2ee812684d0b0554e0adc012910 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Fri, 24 Apr 2015 20:48:29 +0100
Subject: [PATCH] slight tidy and example

Replaced one occurrence of gitter with slack and added an example bit torrent client after someone pointed out in the help section that there was not guide to demonstrate how to do so.
---
 seed_data/field-guides.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json
index 0d72f30919..74b9db9668 100644
--- a/seed_data/field-guides.json
+++ b/seed_data/field-guides.json
@@ -338,7 +338,7 @@
       "<p>You and your pair will pair program (code together on the same computer virtually) about half of the time, and work independently the other half of the time.</p>",
       "<p>Here are our recommended ways of collaborating:",
       "  <ul>",
-      "    <li>&#8226; Gitter has robust private messaging functionality. It's the main way our team communicates, and we recommend it over email.</li>",
+      "    <li>&#8226; Slack has robust private messaging functionality. It's the main way our team communicates, and we recommend it over email.</li>",
       "    <li>&#8226; Trello is great for managing projects. Work with your stakeholder to create Trello cards, and update these cards regularly as you make progress on them.</li>",
       "    <li>&#8226; Screen Hero or Team Viewer - These are the ideal way to pair program. Tools like TMUX are good, but difficult to use. We discourage you from using screen sharing tools where only one person has control of the keyboard and mouse - that isn't real pair programming.</li>",
       "    <li>&#8226; Write clear and readable code, commit messages, branch names, and pull request messages.</li>",
@@ -354,7 +354,7 @@
       "  <li>&#8226; Even if you end up using Windows or Mac OSX for development later, your server will almost certainly run Linux, so it's worth getting used to Linux.</li>",
       "  <li>&#8226; Even experienced developers encounter hangups when setting up a development environment. This virtual machine image will remove this tedious process.</li>",
       "</ul>",
-      "<p>Install a bit torrent client, then &thinsp;<a href=\"http://mgnet.me/ZOQk0rd\">download our virtual machine image</a>.</p>",
+      "<p>Install a bit torrent client, for example <a href="http://www.utorrent.com/">utorrent</a> then &thinsp;<a href=\"http://mgnet.me/ZOQk0rd\">download our virtual machine image</a>.</p>",
       "<p>Please note that even though Bit Torrent is often used to download content illegally, all the content on our image is open source and perfectly legal to redistribute.</p>",
       "<p>Once you've downloaded the file, &thinsp;<a href=\"https://www.virtualbox.org/field-guide/Downloads\">download VirtualBox &thinsp;</a>and follow &thinsp;<a href=\"http://techathlon.com/how-to-run-a-vmdk-file-in-oracle-virtualbox/\">this tutorial &thinsp;</a>to open the image in VirtualBox. You'll want to assign the virtual machine at least two gigabytes of ram.</p>",
       "<p>Now you have your own Linux development environment. You can shut it down when you're not using it and it will save its state. Please continue to seed the file in bit torrent so that other campers can download it as well. Enjoy!</p>",