Merge pull request #158 from alex/typo-fixes

Fixed a ton of typos in docs and comments
This commit is contained in:
Jack Pearkes 2014-08-07 08:38:02 -04:00
commit f57a2f968c
29 changed files with 37 additions and 37 deletions

View File

@ -254,7 +254,7 @@ func resource_aws_autoscaling_group_update_state(
return s, nil 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) { func resource_aws_autoscaling_group_retrieve(id string, autoscalingconn *autoscaling.AutoScaling) (*autoscaling.AutoScalingGroup, error) {
describeOpts := autoscaling.DescribeAutoScalingGroups{ describeOpts := autoscaling.DescribeAutoScalingGroups{
Names: []string{id}, Names: []string{id},

View File

@ -176,7 +176,7 @@ func resource_aws_eip_update_state(
return s, nil 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) { 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 // Get the full address description for saving to state for
// use in other resources // use in other resources

View File

@ -24,7 +24,7 @@ func resource_aws_elb_create(
rs := s.MergeDiff(d) rs := s.MergeDiff(d)
// The name specified for the ELB. This is also our unique ID // 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) // it is unique)
elbName := rs.Attributes["name"] elbName := rs.Attributes["name"]
@ -54,7 +54,7 @@ func resource_aws_elb_create(
return nil, fmt.Errorf("Error creating ELB: %s", err) 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 rs.ID = elbName
log.Printf("[INFO] ELB ID: %s", elbName) log.Printf("[INFO] ELB ID: %s", elbName)
@ -288,7 +288,7 @@ func resource_aws_elb_update_state(
return s, nil 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) { func resource_aws_elb_retrieve_balancer(id string, elbconn *elb.ELB) (*elb.LoadBalancer, error) {
describeElbOpts := &elb.DescribeLoadBalancer{ describeElbOpts := &elb.DescribeLoadBalancer{
Names: []string{id}, Names: []string{id},

View File

@ -166,7 +166,7 @@ func resource_aws_launch_configuration_update_state(
return s, nil 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) { func resource_aws_launch_configuration_retrieve(id string, autoscalingconn *autoscaling.AutoScaling) (*autoscaling.LaunchConfiguration, error) {
describeOpts := autoscaling.DescribeLaunchConfigurations{ describeOpts := autoscaling.DescribeLaunchConfigurations{
Names: []string{id}, Names: []string{id},

View File

@ -300,7 +300,7 @@ func resource_digitalocean_droplet_update_state(
return s, nil 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) { func resource_digitalocean_droplet_retrieve(id string, client *digitalocean.Client) (*digitalocean.Droplet, error) {
// Retrieve the ELB properties for updating the state // Retrieve the ELB properties for updating the state
droplet, err := client.RetrieveDroplet(id) droplet, err := client.RetrieveDroplet(id)

View File

@ -100,7 +100,7 @@ func (p *ResourceProvisioner) generateScript(c *terraform.ResourceConfig) (strin
} }
// collectScripts is used to collect all the scripts we need // 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) { func (p *ResourceProvisioner) collectScripts(c *terraform.ResourceConfig) ([]io.ReadCloser, error) {
// Check if inline // Check if inline
_, ok := c.Config["inline"] _, ok := c.Config["inline"]

View File

@ -62,7 +62,7 @@ func (c *ApplyCommand) Run(args []string) int {
} }
// If we don't specify a backup path, default to state out with // If we don't specify a backup path, default to state out with
// the extention // the extension
if backupPath == "" { if backupPath == "" {
backupPath = stateOutPath + DefaultBackupExtention backupPath = stateOutPath + DefaultBackupExtention
} }
@ -225,7 +225,7 @@ Options:
-backup=path Path to backup the existing state file before -backup=path Path to backup the existing state file before
modifying. Defaults to the "-state-out" path with 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. -no-color If specified, output won't contain any color.

View File

@ -60,7 +60,7 @@ func (c *PlanCommand) Run(args []string) int {
} }
// If we don't specify a backup path, default to state out with // If we don't specify a backup path, default to state out with
// the extention // the extension
if backupPath == "" { if backupPath == "" {
backupPath = statePath + DefaultBackupExtention backupPath = statePath + DefaultBackupExtention
} }
@ -153,7 +153,7 @@ Options:
-backup=path Path to backup the existing state file before -backup=path Path to backup the existing state file before
modifying. Defaults to the "-state-out" path with 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 -destroy If set, a plan will be generated to destroy all resources
managed by the given configuration and state. managed by the given configuration and state.

View File

@ -52,7 +52,7 @@ func (c *RefreshCommand) Run(args []string) int {
} }
// If we don't specify a backup path, default to state out with // If we don't specify a backup path, default to state out with
// the extention // the extension
if backupPath == "" { if backupPath == "" {
backupPath = stateOutPath + DefaultBackupExtention backupPath = stateOutPath + DefaultBackupExtention
} }
@ -142,7 +142,7 @@ Options:
-backup=path Path to backup the existing state file before -backup=path Path to backup the existing state file before
modifying. Defaults to the "-state-out" path with 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. -no-color If specified, output won't contain any color.

View File

@ -46,7 +46,7 @@ func (t *libuclConfigurable) Config() (*Config, error) {
// Start building up the actual configuration. We start with // Start building up the actual configuration. We start with
// variables. // variables.
// TODO(mitchellh): Make function like loadVariablesLibucl so that // TODO(mitchellh): Make function like loadVariablesLibucl so that
// duplicates aren't overriden // duplicates aren't overridden
config := new(Config) config := new(Config)
if len(rawConfig.Variable) > 0 { if len(rawConfig.Variable) > 0 {
config.Variables = make([]*Variable, 0, len(rawConfig.Variable)) config.Variables = make([]*Variable, 0, len(rawConfig.Variable))
@ -481,7 +481,7 @@ func loadProvisionersLibucl(o *libucl.Object, connInfo map[string]interface{}) (
return nil, err return nil, err
} }
// Delete the "connection" section, handle seperately // Delete the "connection" section, handle separately
delete(config, "connection") delete(config, "connection")
rawConfig, err := NewRawConfig(config) rawConfig, err := NewRawConfig(config)
@ -502,7 +502,7 @@ func loadProvisionersLibucl(o *libucl.Object, connInfo map[string]interface{}) (
} }
// Inherit from the resource connInfo any keys // Inherit from the resource connInfo any keys
// that are not explicitly overriden. // that are not explicitly overridden.
if connInfo != nil && subConnInfo != nil { if connInfo != nil && subConnInfo != nil {
for k, v := range connInfo { for k, v := range connInfo {
if _, ok := subConnInfo[k]; !ok { if _, ok := subConnInfo[k]; !ok {

View File

@ -287,7 +287,7 @@ func (g *Graph) Walk(fn WalkFunc) error {
} }
// Spawn off a goroutine to execute our callback once // Spawn off a goroutine to execute our callback once
// all our dependencies are satisified. // all our dependencies are satisfied.
go func(current *Noun) { go func(current *Noun) {
seenMapL.RLock() seenMapL.RLock()
closeCh := seenMap[current] closeCh := seenMap[current]

View File

@ -37,7 +37,7 @@ type ResourceBuilder struct {
// Sometimes attributes in here are also computed. For example, an // Sometimes attributes in here are also computed. For example, an
// "availability_zone" might be optional, but will be chosen for you // "availability_zone" might be optional, but will be chosen for you
// by AWS. In that case, specify it both here and in ComputedAttrs. // 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. // cause a diff by setting it to the empty string.
Attrs map[string]AttrType Attrs map[string]AttrType

View File

@ -28,8 +28,8 @@ func (e *Error) GoString() string {
} }
// ErrorAppend is a helper function that will append more errors // ErrorAppend is a helper function that will append more errors
// onto a Error in order to create a larger multi-error. If the // onto an Error in order to create a larger multi-error. If the
// original error is not a Error, it will be turned into one. // original error is not an Error, it will be turned into one.
func ErrorAppend(err error, errs ...error) *Error { func ErrorAppend(err error, errs ...error) *Error {
if err == nil { if err == nil {
err = new(Error) err = new(Error)

View File

@ -81,7 +81,7 @@ func (m *Map) Apply(
return result, err 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( func (m *Map) Diff(
s *terraform.ResourceState, s *terraform.ResourceState,
c *terraform.ResourceConfig, c *terraform.ResourceConfig,

View File

@ -69,7 +69,7 @@ func (conf *StateChangeConf) WaitForState() (interface{}, error) {
return 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 == "" { if result == nil && conf.Target == "" {
return return
} }

View File

@ -185,7 +185,7 @@ func (c *SSHCommunicator) Upload(path string, input io.Reader) error {
target_dir := filepath.Dir(path) target_dir := filepath.Dir(path)
target_file := filepath.Base(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 // This does not work when the target host is unix. Switch to forward slash
// which works for unix and windows // which works for unix and windows
target_dir = filepath.ToSlash(target_dir) target_dir = filepath.ToSlash(target_dir)

View File

@ -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 // 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() { defer func() {
go func() { go func() {
for _ = range linesCh { for _ = range linesCh {

View File

@ -10,7 +10,7 @@ import (
) )
// ResourceProvisionerConfig is used to pair a provisioner // 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 // instances of each ResourceProvisioner and to keep the relevant
// configuration instead of instantiating a new Provisioner for each // configuration instead of instantiating a new Provisioner for each
// resource. // resource.

View File

@ -30,7 +30,7 @@ grunt.initConfig({
}); });
// CSS Compliation task // CSS Compilation task
grunt.registerTask('default', ['watch']); grunt.registerTask('default', ['watch']);
}; };

View File

@ -22,7 +22,7 @@ execute a pre-determined set of actions.
The command-line flags are all optional. The list of available flags are: 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 * `-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. * `-no-color` - Disables output with coloring.

View File

@ -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: 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 * `-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. * `-destroy` - If set, generates a plan to destroy all the known resources.

View File

@ -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: 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 * `-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 * `-no-color` - Disables output with coloring

View File

@ -32,7 +32,7 @@ output "address" {
} }
``` ```
## Decription ## Description
The `output` block configures a single output variable. Multiple The `output` block configures a single output variable. Multiple
output variables can be configured with multiple output blocks. output variables can be configured with multiple output blocks.

View File

@ -35,7 +35,7 @@ provider "aws" {
} }
``` ```
## Decription ## Description
The `provider` block configures the provider of the given `NAME`. The `provider` block configures the provider of the given `NAME`.
Multiple provider blocks can be used to configure multiple providers. Multiple provider blocks can be used to configure multiple providers.

View File

@ -28,7 +28,7 @@ resource "aws_instance" "web" {
} }
``` ```
## Decription ## Description
The `resource` block creates a resource of the given `TYPE` (first The `resource` block creates a resource of the given `TYPE` (first
parameter) and `NAME` (second parameter). The combination of the type parameter) and `NAME` (second parameter). The combination of the type

View File

@ -31,7 +31,7 @@ variable "images" {
} }
``` ```
## Decription ## Description
The `variable` block configures a single input variable for The `variable` block configures a single input variable for
a Terraform configuration. Multiple variables blocks can be used to a Terraform configuration. Multiple variables blocks can be used to

View File

@ -49,6 +49,6 @@ The following attributes are exported:
deploying new versions of the app. deploying new versions of the app.
* `web_url` - The web (HTTP) URL that the application can be accessed * `web_url` - The web (HTTP) URL that the application can be accessed
at by default. 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. for pointing DNS records.

View File

@ -228,7 +228,7 @@ body.page-sub{
margin-top: 8px; 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{ .page-home{
#header{ #header{
.main-links.navbar-nav{ .main-links.navbar-nav{

View File

@ -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 2