Merge pull request #158 from alex/typo-fixes
Fixed a ton of typos in docs and comments
This commit is contained in:
commit
f57a2f968c
|
@ -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},
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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},
|
||||
|
|
|
@ -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},
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -30,7 +30,7 @@ grunt.initConfig({
|
|||
|
||||
});
|
||||
|
||||
// CSS Compliation task
|
||||
// CSS Compilation task
|
||||
grunt.registerTask('default', ['watch']);
|
||||
|
||||
};
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue