diff --git a/builtin/providers/aws/resource_aws_autoscaling_group.go b/builtin/providers/aws/resource_aws_autoscaling_group.go
index 4032a08d6..8560d6157 100644
--- a/builtin/providers/aws/resource_aws_autoscaling_group.go
+++ b/builtin/providers/aws/resource_aws_autoscaling_group.go
@@ -254,7 +254,7 @@ func resource_aws_autoscaling_group_update_state(
 	return s, nil
 }
 
-// Returns a single group by it's ID
+// Returns a single group by its ID
 func resource_aws_autoscaling_group_retrieve(id string, autoscalingconn *autoscaling.AutoScaling) (*autoscaling.AutoScalingGroup, error) {
 	describeOpts := autoscaling.DescribeAutoScalingGroups{
 		Names: []string{id},
diff --git a/builtin/providers/aws/resource_aws_eip.go b/builtin/providers/aws/resource_aws_eip.go
index 6fff7fd3e..bb8e9afc1 100644
--- a/builtin/providers/aws/resource_aws_eip.go
+++ b/builtin/providers/aws/resource_aws_eip.go
@@ -176,7 +176,7 @@ func resource_aws_eip_update_state(
 	return s, nil
 }
 
-// Returns a single address by it's ID
+// Returns a single address by its ID
 func resource_aws_eip_retrieve_address(id string, vpc bool, ec2conn *ec2.EC2) (*ec2.Address, error) {
 	// Get the full address description for saving to state for
 	// use in other resources
diff --git a/builtin/providers/aws/resource_aws_elb.go b/builtin/providers/aws/resource_aws_elb.go
index ef5f459a9..036968c62 100644
--- a/builtin/providers/aws/resource_aws_elb.go
+++ b/builtin/providers/aws/resource_aws_elb.go
@@ -24,7 +24,7 @@ func resource_aws_elb_create(
 	rs := s.MergeDiff(d)
 
 	// The name specified for the ELB. This is also our unique ID
-	// we save to state if the creation is succesful (amazon verifies
+	// we save to state if the creation is successful (amazon verifies
 	// it is unique)
 	elbName := rs.Attributes["name"]
 
@@ -54,7 +54,7 @@ func resource_aws_elb_create(
 		return nil, fmt.Errorf("Error creating ELB: %s", err)
 	}
 
-	// Assign the elb's unique identifer for use later
+	// Assign the elb's unique identifier for use later
 	rs.ID = elbName
 	log.Printf("[INFO] ELB ID: %s", elbName)
 
@@ -288,7 +288,7 @@ func resource_aws_elb_update_state(
 	return s, nil
 }
 
-// retrieves an ELB by it's ID
+// retrieves an ELB by its ID
 func resource_aws_elb_retrieve_balancer(id string, elbconn *elb.ELB) (*elb.LoadBalancer, error) {
 	describeElbOpts := &elb.DescribeLoadBalancer{
 		Names: []string{id},
diff --git a/builtin/providers/aws/resource_aws_launch_configuration.go b/builtin/providers/aws/resource_aws_launch_configuration.go
index e3a7a03d3..a48738dcf 100644
--- a/builtin/providers/aws/resource_aws_launch_configuration.go
+++ b/builtin/providers/aws/resource_aws_launch_configuration.go
@@ -166,7 +166,7 @@ func resource_aws_launch_configuration_update_state(
 	return s, nil
 }
 
-// Returns a single group by it's ID
+// Returns a single group by its ID
 func resource_aws_launch_configuration_retrieve(id string, autoscalingconn *autoscaling.AutoScaling) (*autoscaling.LaunchConfiguration, error) {
 	describeOpts := autoscaling.DescribeLaunchConfigurations{
 		Names: []string{id},
diff --git a/builtin/providers/digitalocean/resource_digitalocean_droplet.go b/builtin/providers/digitalocean/resource_digitalocean_droplet.go
index d39cc8a66..4fb83b816 100644
--- a/builtin/providers/digitalocean/resource_digitalocean_droplet.go
+++ b/builtin/providers/digitalocean/resource_digitalocean_droplet.go
@@ -300,7 +300,7 @@ func resource_digitalocean_droplet_update_state(
 	return s, nil
 }
 
-// retrieves an ELB by it's ID
+// retrieves an ELB by its ID
 func resource_digitalocean_droplet_retrieve(id string, client *digitalocean.Client) (*digitalocean.Droplet, error) {
 	// Retrieve the ELB properties for updating the state
 	droplet, err := client.RetrieveDroplet(id)
diff --git a/builtin/provisioners/remote-exec/resource_provisioner.go b/builtin/provisioners/remote-exec/resource_provisioner.go
index 6a5ce1405..5b5ed9bae 100644
--- a/builtin/provisioners/remote-exec/resource_provisioner.go
+++ b/builtin/provisioners/remote-exec/resource_provisioner.go
@@ -100,7 +100,7 @@ func (p *ResourceProvisioner) generateScript(c *terraform.ResourceConfig) (strin
 }
 
 // collectScripts is used to collect all the scripts we need
-// to execute in preperation for copying them.
+// to execute in preparation for copying them.
 func (p *ResourceProvisioner) collectScripts(c *terraform.ResourceConfig) ([]io.ReadCloser, error) {
 	// Check if inline
 	_, ok := c.Config["inline"]
diff --git a/command/apply.go b/command/apply.go
index 41d44db14..b9ba93ce2 100644
--- a/command/apply.go
+++ b/command/apply.go
@@ -62,7 +62,7 @@ func (c *ApplyCommand) Run(args []string) int {
 	}
 
 	// If we don't specify a backup path, default to state out with
-	// the extention
+	// the extension
 	if backupPath == "" {
 		backupPath = stateOutPath + DefaultBackupExtention
 	}
@@ -225,7 +225,7 @@ Options:
 
   -backup=path           Path to backup the existing state file before
                          modifying. Defaults to the "-state-out" path with
-                         ".backup" extention. Set to "-" to disable backup.
+                         ".backup" extension. Set to "-" to disable backup.
 
   -no-color              If specified, output won't contain any color.
 
diff --git a/command/plan.go b/command/plan.go
index 5b77f956b..42106e2a1 100644
--- a/command/plan.go
+++ b/command/plan.go
@@ -60,7 +60,7 @@ func (c *PlanCommand) Run(args []string) int {
 	}
 
 	// If we don't specify a backup path, default to state out with
-	// the extention
+	// the extension
 	if backupPath == "" {
 		backupPath = statePath + DefaultBackupExtention
 	}
@@ -153,7 +153,7 @@ Options:
 
   -backup=path        Path to backup the existing state file before
                       modifying. Defaults to the "-state-out" path with
-                      ".backup" extention. Set to "-" to disable backup.
+                      ".backup" extension. Set to "-" to disable backup.
 
   -destroy            If set, a plan will be generated to destroy all resources
                       managed by the given configuration and state.
diff --git a/command/refresh.go b/command/refresh.go
index a3f536bd0..2d45108bd 100644
--- a/command/refresh.go
+++ b/command/refresh.go
@@ -52,7 +52,7 @@ func (c *RefreshCommand) Run(args []string) int {
 	}
 
 	// If we don't specify a backup path, default to state out with
-	// the extention
+	// the extension
 	if backupPath == "" {
 		backupPath = stateOutPath + DefaultBackupExtention
 	}
@@ -142,7 +142,7 @@ Options:
 
   -backup=path        Path to backup the existing state file before
                       modifying. Defaults to the "-state-out" path with
-                      ".backup" extention. Set to "-" to disable backup.
+                      ".backup" extension. Set to "-" to disable backup.
 
   -no-color           If specified, output won't contain any color.
 
diff --git a/config/loader_libucl.go b/config/loader_libucl.go
index 2471a9b77..ca4c395a3 100644
--- a/config/loader_libucl.go
+++ b/config/loader_libucl.go
@@ -46,7 +46,7 @@ func (t *libuclConfigurable) Config() (*Config, error) {
 	// Start building up the actual configuration. We start with
 	// variables.
 	// TODO(mitchellh): Make function like loadVariablesLibucl so that
-	// duplicates aren't overriden
+	// duplicates aren't overridden
 	config := new(Config)
 	if len(rawConfig.Variable) > 0 {
 		config.Variables = make([]*Variable, 0, len(rawConfig.Variable))
@@ -481,7 +481,7 @@ func loadProvisionersLibucl(o *libucl.Object, connInfo map[string]interface{}) (
 			return nil, err
 		}
 
-		// Delete the "connection" section, handle seperately
+		// Delete the "connection" section, handle separately
 		delete(config, "connection")
 
 		rawConfig, err := NewRawConfig(config)
@@ -502,7 +502,7 @@ func loadProvisionersLibucl(o *libucl.Object, connInfo map[string]interface{}) (
 		}
 
 		// Inherit from the resource connInfo any keys
-		// that are not explicitly overriden.
+		// that are not explicitly overridden.
 		if connInfo != nil && subConnInfo != nil {
 			for k, v := range connInfo {
 				if _, ok := subConnInfo[k]; !ok {
diff --git a/depgraph/graph.go b/depgraph/graph.go
index 4d66a9397..ae3e51e6b 100644
--- a/depgraph/graph.go
+++ b/depgraph/graph.go
@@ -287,7 +287,7 @@ func (g *Graph) Walk(fn WalkFunc) error {
 		}
 
 		// Spawn off a goroutine to execute our callback once
-		// all our dependencies are satisified.
+		// all our dependencies are satisfied.
 		go func(current *Noun) {
 			seenMapL.RLock()
 			closeCh := seenMap[current]
diff --git a/helper/diff/resource_builder.go b/helper/diff/resource_builder.go
index 206f9875d..6f479ed4e 100644
--- a/helper/diff/resource_builder.go
+++ b/helper/diff/resource_builder.go
@@ -37,7 +37,7 @@ type ResourceBuilder struct {
 	// Sometimes attributes in here are also computed. For example, an
 	// "availability_zone" might be optional, but will be chosen for you
 	// by AWS. In that case, specify it both here and in ComputedAttrs.
-	// This will make sure that the absense of the configuration won't
+	// This will make sure that the absence of the configuration won't
 	// cause a diff by setting it to the empty string.
 	Attrs map[string]AttrType
 
diff --git a/helper/multierror/error.go b/helper/multierror/error.go
index 5bfe2b14d..ae21e4366 100644
--- a/helper/multierror/error.go
+++ b/helper/multierror/error.go
@@ -28,8 +28,8 @@ func (e *Error) GoString() string {
 }
 
 // ErrorAppend is a helper function that will append more errors
-// onto a Error in order to create a larger multi-error. If the
-// original error is not a Error, it will be turned into one.
+// onto an Error in order to create a larger multi-error. If the
+// original error is not an Error, it will be turned into one.
 func ErrorAppend(err error, errs ...error) *Error {
 	if err == nil {
 		err = new(Error)
diff --git a/helper/resource/map.go b/helper/resource/map.go
index 153bf56e4..524f33c1c 100644
--- a/helper/resource/map.go
+++ b/helper/resource/map.go
@@ -81,7 +81,7 @@ func (m *Map) Apply(
 	return result, err
 }
 
-// Diff peforms a diff on the proper resource type.
+// Diff performs a diff on the proper resource type.
 func (m *Map) Diff(
 	s *terraform.ResourceState,
 	c *terraform.ResourceConfig,
diff --git a/helper/resource/wait.go b/helper/resource/wait.go
index 0c5a55e26..8c5ec4b27 100644
--- a/helper/resource/wait.go
+++ b/helper/resource/wait.go
@@ -69,7 +69,7 @@ func (conf *StateChangeConf) WaitForState() (interface{}, error) {
 				return
 			}
 
-			// If we're waiting for the absense of a thing, then return
+			// If we're waiting for the absence of a thing, then return
 			if result == nil && conf.Target == "" {
 				return
 			}
diff --git a/helper/ssh/communicator.go b/helper/ssh/communicator.go
index 4aa865817..24981e6f3 100644
--- a/helper/ssh/communicator.go
+++ b/helper/ssh/communicator.go
@@ -185,7 +185,7 @@ func (c *SSHCommunicator) Upload(path string, input io.Reader) error {
 	target_dir := filepath.Dir(path)
 	target_file := filepath.Base(path)
 
-	// On windows, filepath.Dir uses backslash seperators (ie. "\tmp").
+	// On windows, filepath.Dir uses backslash separators (ie. "\tmp").
 	// This does not work when the target host is unix.  Switch to forward slash
 	// which works for unix and windows
 	target_dir = filepath.ToSlash(target_dir)
diff --git a/plugin/client.go b/plugin/client.go
index f72ab52c0..7589092ef 100644
--- a/plugin/client.go
+++ b/plugin/client.go
@@ -284,7 +284,7 @@ func (c *Client) Start() (addr net.Addr, err error) {
 	}()
 
 	// Make sure after we exit we read the lines from stdout forever
-	// so they dont' block since it is an io.Pipe
+	// so they don't block since it is an io.Pipe
 	defer func() {
 		go func() {
 			for _ = range linesCh {
diff --git a/terraform/resource.go b/terraform/resource.go
index e634d6d91..8d8339c45 100644
--- a/terraform/resource.go
+++ b/terraform/resource.go
@@ -10,7 +10,7 @@ import (
 )
 
 // ResourceProvisionerConfig is used to pair a provisioner
-// with it's provided configuration. This allows us to use singleton
+// with its provided configuration. This allows us to use singleton
 // instances of each ResourceProvisioner and to keep the relevant
 // configuration instead of instantiating a new Provisioner for each
 // resource.
diff --git a/website/Gruntfile.js b/website/Gruntfile.js
index 538cf7979..cf24c632c 100644
--- a/website/Gruntfile.js
+++ b/website/Gruntfile.js
@@ -30,7 +30,7 @@ grunt.initConfig({
 
 });
 
-// CSS Compliation task
+// CSS Compilation task
 grunt.registerTask('default', ['watch']);
 
 };
diff --git a/website/source/docs/commands/apply.html.markdown b/website/source/docs/commands/apply.html.markdown
index 6338c4697..58adc9104 100644
--- a/website/source/docs/commands/apply.html.markdown
+++ b/website/source/docs/commands/apply.html.markdown
@@ -22,7 +22,7 @@ execute a pre-determined set of actions.
 The command-line flags are all optional. The list of available flags are:
 
 * `-backup=path` - Path to the backup file. Defaults to `-state-out` with
-  the ".backup" extention. Disabled by setting to "-".
+  the ".backup" extension. Disabled by setting to "-".
 
 * `-no-color` - Disables output with coloring.
 
diff --git a/website/source/docs/commands/plan.html.markdown b/website/source/docs/commands/plan.html.markdown
index 360b1e6f7..64fd6073e 100644
--- a/website/source/docs/commands/plan.html.markdown
+++ b/website/source/docs/commands/plan.html.markdown
@@ -22,7 +22,7 @@ for the configuration and state file to refresh.
 The command-line flags are all optional. The list of available flags are:
 
 * `-backup=path` - Path to the backup file. Defaults to `-state-out` with
-  the ".backup" extention. Disabled by setting to "-".
+  the ".backup" extension. Disabled by setting to "-".
 
 * `-destroy` - If set, generates a plan to destroy all the known resources.
 
diff --git a/website/source/docs/commands/refresh.html.markdown b/website/source/docs/commands/refresh.html.markdown
index 8ee3a3fc1..27d56fc7f 100644
--- a/website/source/docs/commands/refresh.html.markdown
+++ b/website/source/docs/commands/refresh.html.markdown
@@ -25,7 +25,7 @@ for the configuration and state file to refresh.
 The command-line flags are all optional. The list of available flags are:
 
 * `-backup=path` - Path to the backup file. Defaults to `-state-out` with
-  the ".backup" extention. Disabled by setting to "-".
+  the ".backup" extension. Disabled by setting to "-".
 
 * `-no-color` - Disables output with coloring
 
diff --git a/website/source/docs/configuration/outputs.html.md b/website/source/docs/configuration/outputs.html.md
index e5daae12c..cc5bae9a5 100644
--- a/website/source/docs/configuration/outputs.html.md
+++ b/website/source/docs/configuration/outputs.html.md
@@ -32,7 +32,7 @@ output "address" {
 }
 ```
 
-## Decription
+## Description
 
 The `output` block configures a single output variable. Multiple
 output variables can be configured with multiple output blocks.
diff --git a/website/source/docs/configuration/providers.html.md b/website/source/docs/configuration/providers.html.md
index f2f4204ee..1ed33b795 100644
--- a/website/source/docs/configuration/providers.html.md
+++ b/website/source/docs/configuration/providers.html.md
@@ -35,7 +35,7 @@ provider "aws" {
 }
 ```
 
-## Decription
+## Description
 
 The `provider` block configures the provider of the given `NAME`.
 Multiple provider blocks can be used to configure multiple providers.
diff --git a/website/source/docs/configuration/resources.html.md b/website/source/docs/configuration/resources.html.md
index 1e1d3d1c2..aa0a1bec8 100644
--- a/website/source/docs/configuration/resources.html.md
+++ b/website/source/docs/configuration/resources.html.md
@@ -28,7 +28,7 @@ resource "aws_instance" "web" {
 }
 ```
 
-## Decription
+## Description
 
 The `resource` block creates a resource of the given `TYPE` (first
 parameter) and `NAME` (second parameter). The combination of the type
diff --git a/website/source/docs/configuration/variables.html.md b/website/source/docs/configuration/variables.html.md
index 706dc81a0..924738d4c 100644
--- a/website/source/docs/configuration/variables.html.md
+++ b/website/source/docs/configuration/variables.html.md
@@ -31,7 +31,7 @@ variable "images" {
 }
 ```
 
-## Decription
+## Description
 
 The `variable`  block configures a single input variable for
 a Terraform configuration. Multiple variables blocks can be used to
diff --git a/website/source/docs/providers/heroku/r/app.html.markdown b/website/source/docs/providers/heroku/r/app.html.markdown
index 9d8cf1a8d..ce85fc411 100644
--- a/website/source/docs/providers/heroku/r/app.html.markdown
+++ b/website/source/docs/providers/heroku/r/app.html.markdown
@@ -49,6 +49,6 @@ The following attributes are exported:
    deploying new versions of the app.
 * `web_url` - The web (HTTP) URL that the application can be accessed
    at by default.
-* `heroku_hostname` - A hostname for the the Heroku application, suitable
+* `heroku_hostname` - A hostname for the Heroku application, suitable
    for pointing DNS records.
 
diff --git a/website/source/stylesheets/_header.less b/website/source/stylesheets/_header.less
index 26cfb3c44..2e7803e93 100755
--- a/website/source/stylesheets/_header.less
+++ b/website/source/stylesheets/_header.less
@@ -228,7 +228,7 @@ body.page-sub{
         margin-top: 8px;
     }
 
-    //homepage has more space at this width to accomodate chevrons
+    //homepage has more space at this width to accommodate chevrons
     .page-home{
         #header{
             .main-links.navbar-nav{
diff --git a/website/version.txt b/website/version.txt
index 34f5f7af2..7f73c6b29 100644
--- a/website/version.txt
+++ b/website/version.txt
@@ -1,3 +1,3 @@
-Just increment this number if you have to to deploy the website:
+Just increment this number if you have to deploy the website:
 
 2