Fix issues from comments on pull 984. Fix white space, add windows start script example and fix links to documentation.

Author: uugengiven

docs/deploying/azure.md

@@ -4,7 +4,7 @@ layout: docs
 ---
 
 If you've been following along with [Getting Started](../README.md), it's time to deploy so you can use it beyond just your local machine.
-[Azure](http://http://azure.microsoft.com/) is a somewhat easy and probably unsupported way to deploy hubot.
+[Azure](http://http://azure.microsoft.com/) is a way to deploy hubot as an alternative to [Heroku](/docs/deploying/heroku.md).
 
 You will need to install the azure-cli via npm after you have follow the initial instructions for your hubot.
 
@@ -16,22 +16,22 @@ Inside your new hubot directory, make sure you've created a git repository, and
     % git add .
     % git commit -m "Initial commit"
 
-Then create a GitHub repository for your hubot. This is where zzure will pull your code from instead of needing to deploy directly from your dev machine to Azure.
+Then [create a GitHub repository](https://help.github.com/articles/create-a-repo/) for your hubot. This is where Azure will pull your code from instead of needing to deploy directly from your dev machine to Azure.
 
     % git remote add origin _your GitHub repo_
-	% git push -u origin master
-	
-Create a linked Azure website. In Azure, create a website and select integrated source control. When it asks "where is your source control" select GitHub and link this website to your git repo that you created in the previous step. If you have downloaded the Azure PowerShell modules, you can also do this via PowerShell.
+    % git push -u origin master
+
+Once you have your GitHub repo, create an Azure website linked to your repo. In Azure, create a website and select integrated source control. When it asks "where is your source control" select GitHub and link this website to your git repo that you created in the previous step. If you have downloaded the Azure PowerShell modules, you can also do this via PowerShell.
 
     % $creds = Get-Credential
-	% New-AzureWebsite mynewhubot -github -githubrepository yourgithubaccount/yourhubotreponame -githubcredentials $creds
-	
+    % New-AzureWebsite mynewhubot -github -githubrepository yourgithubaccount/yourhubotreponame -githubcredentials $creds
+
 Once you have done this, Azure will deploy your site any time you commit and push to GitHub. Your hubot won't run quite right yet, though. Next, you need to configure the deployment to tell Azure how to run hubot.
-	
+
 First, run the follow command to add `deploy.cmd` to your hubot directory. This is the file that Azure uses to know how to deploy your node application.
 
     % azure site deploymentscript --node
-	
+
 Then, edit this file and look for the sections that give you steps 1, 2 and 3. You're going to add a 4th step:
 
     :: 4. Create Hubot file with a coffee extension
@@ -40,42 +40,38 @@ Then, edit this file and look for the sections that give you steps 1, 2 and 3. Y
 Now, create a new file in the base directory of hubot called `server.js` and put these two lines into it:
 
     require('coffee-script/register');
-	module.exports = require('hubot/bin/hubot.coffee');
-	
-Save this file. Then open up `external-scripts.json` and remove the following two lines, as these two bits aren't compatible with Azure.
+    module.exports = require('hubot/bin/hubot.coffee');
 
-    "hubot-heroku-keepalive",
-	"hubot-redit-brain",
-	
-Save this file then install coffee-script as a requirement to your local hubot. Azure requires this to run hubot properly.
+Save this file. Then open up `external-scripts.json` and remove the following two lines, as these two bits aren't compatible with Azure and then save the file.
 
-    % npm install coffee-script --save
+    "hubot-heroku-keepalive",
+    "hubot-redit-brain",
 
 Finally you will need to add the environment variables to the website to make sure it runs properly. You can either do it through the GUI (under configuration) or you can use the Azure PowerShell command line, as follows (example is showing slack as an adapter and mynewhubot as the website name).
 
     % $settings = New-Object Hashtable
-	% $settings["HUBOT_ADAPTER"] = "Slack"
-	% $settings["HUBOT_SLACK_TOKEN"] = "yourslackapikey"
-	% Set-AzureWebsite -AppSettings $settings mynewhubot
-	
+    % $settings["HUBOT_ADAPTER"] = "Slack"
+    % $settings["HUBOT_SLACK_TOKEN"] = "yourslackapikey"
+    % Set-AzureWebsite -AppSettings $settings mynewhubot
+
 Commit your changes in git and push to GitHub and Azure will automatically pick up the changes and deploy them to your website.
 
     % git commit -m "Add Azure settings for hubot"
-	% git push
-	
+    % git push
+
 Hubot now works just fine but doesn't have a brain. To add a brain that works with Azure, you will need to create an Azure storage account and account key. Then you can do the following in your base hubot directory.
 
     % npm install hubot-azure-scripts --save
 
 Then add the following line in `external-scripts.json` in the list with the other external scripts
 
     "hubot-azure-scripts/brain/azure-blob-brain"
-	
+
 Finally, add two more environment variables to your website. You can do this either via the GUI or the following PowerShell commands.
 
     % $settings = New-Object Hashtable
-	% $settings["HUBOT_BRAIN_AZURE_STORAGE_ACCOUNT"] = "your Azure storage account"
-	% $settings["HUBOT_BRAIN_AZURE_STORAGE_ACCESS_KEY"] = "your Azure storage account key"
-	% Set-AzureWebsite -AppSettings $settings mynewhubot
-	
-Now any scripts that require a brain will function. You should look up other scripts or write your own by looking at the [documentation](https://hubot.github.com/docs/scripting/). All of the normal scripts for hubot are compatible with hosting hubot on Azure.
+    % $settings["HUBOT_BRAIN_AZURE_STORAGE_ACCOUNT"] = "your Azure storage account"
+    % $settings["HUBOT_BRAIN_AZURE_STORAGE_ACCESS_KEY"] = "your Azure storage account key"
+    % Set-AzureWebsite -AppSettings $settings mynewhubot
+
+Now any scripts that require a brain will function. You should look up other scripts or write your own by looking at the [documentation](/docs/scripting.md). All of the normal scripts for hubot are compatible with hosting hubot on Azure.

docs/deploying/windows.md

@@ -10,8 +10,7 @@ There are 4 primary steps to deploying and running hubot on a Windows machine:
   * node and npm
   * a way to get source code updated on the server
   * setting up environment variables for hubot
-  * a way to start hubot, start it up if it crashes, and restart it when code
-    updates
+  * a way to start hubot, start it up if it crashes, and restart it when code updates
 
 ## node and npm
 
@@ -23,14 +22,14 @@ Your other option is to install directly from [NodeJS](https://nodejs.org/) and
 
 ## Updating code on the server
 
-To get the code on your server, you can follow the instructions at [Getting Started](https://hubot.github.com/docs/) on your local development machine or directly on the server. If you are building locally, push your hubot to GitHub and clone the repo onto your server. Don't clone the normal [github/hubot repository](http://github.com/github/hubot), make sure you're using the Yo Generator to build your own hubot.
+To get the code on your server, you can follow the instructions at [Getting Started](/docs/index.md) on your local development machine or directly on the server. If you are building locally, push your hubot to GitHub and clone the repo onto your server. Don't clone the normal [github/hubot repository](http://github.com/github/hubot), make sure you're using the Yo Generator to build your own hubot.
 
 ## Setting up environment vars
 
 You will want to set up your hubot environment variables on the server where it will run. You can do this by opening an administrative PowerShell and typing the following:
 
     [Environment]::SetEnvironmentVariable("HUBOT_ADAPTER", "Campfire", "Machine")
-	
+
 This is equivalent to going into the system menu -> selecting advanced system settings -> environment vars and adding a new system variable called HUBOT_ADAPTER with the value of Campfire.
 
 ## Starting, stopping, and restarting hubot
@@ -46,22 +45,21 @@ There are a few issues if you call it manually, though.
 * hubot dies, for any reason, and doesn't start again
 * it doesn't start up at boot automatically
 
-To fix this, you will want to create a .ps1 file with whatever name makes you happy that you will call from your hubot directory. It should contain the following:
+To fix this, you will want to create a .ps1 file with whatever name makes you happy that you will call from your hubot directory. There is a copy of this file in the `examples` directory. It should contain the following:
 
     Write-Host “Starting Hubot Watcher”
     While (1)
     {
         Write-Host “Starting Hubot
         Start-Process powershell -ArgumentList “.\bin\hubot –adapter slack” -wait
-	}
+    }
 
 Remember to allow local unsigned PowerShell scripts if you are using the .ps1 file to run hubot. Run this command in an Administrator PowerShell window.
 
     Set-ExecutionPolicy RemoteSigned
-	
+
 You can set this .ps1 as scheduled task on boot if you like or some other way to start your process. 
 
-	
 ## Expanding the documentation
 
 Not yet fleshed out. [Help contribute by submitting a pull request, please?](https://github.com/github/hubot/pull/new/master)

examples/hubot-start.ps1

@@ -0,0 +1,12 @@
+#Hubot PowerShell Start Script
+#Invoke from the PowerShell prompt or start via automated tools 
+
+$HubotPath = "drive:\path\to\hubot"
+$HubotAdapter = "Hubot adapter"
+
+Write-Host "Starting Hubot Watcher"
+While (1)
+{
+    Write-Host "Starting Hubot"
+    Start-Process powershell -ArgumentList "$HubotPath\bin\hubot –adapter $HubotAdapter" -wait
+}