Skip to content

Commit ceb0c80

Browse files
Merge pull request #3 from mattray/release/1.0.0
documentation and typo fixes
2 parents 8bc5396 + 3417b7e commit ceb0c80

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ Cisco Network Elements support a rich set of features to make network robust, ef
3030
* [General GitHub documentation](http://help.github.com/)
3131
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
3232
* \#chef-hacking IRC channel on irc.freenode.org
33-
* [chef-dev mailing list](http://lists.opscode.com/sympa/info/chef-dev)
33+
* [chef-dev mailing list](http://lists.chef.io/sympa/info/chef-dev)

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
## Overview
2828

29-
The `cisco-cookbook` allows a network administrator to manage Cisco Network Elements using Chef. This cookbook bundles a set of Chef Resources, providers, Sample Recipes and installation Tools for effective network management. The resources and capabilities provided by this cookbook will grow with contributions from Cisco, Chef inc, and the open source community.
29+
The `cisco-cookbook` allows a network administrator to manage Cisco Network Elements using Chef. This cookbook bundles a set of Chef Resources, providers, Sample Recipes and installation Tools for effective network management. The resources and capabilities provided by this cookbook will grow with contributions from Cisco, Chef Software Inc., and the open source community.
3030

3131
The Cisco Network Elements and Operating Systems managed by this cookbook are continuously expanding. Please refer to the [Limitations](#limitations) section for details on currently supported hardware and software. The Limitations section also provides details on compatible Chef client and Chef Server versions.
3232

@@ -47,7 +47,7 @@ The set of supported network element platforms is continuously expanding. Please
4747
The `cisco-cookbook` is installed on the Chef server. Please see [The Chef Server](https://docs.chef.io/server/) for information on Chef server setup. See Chef's [knife cookbook site](https://docs.chef.io/knife_cookbook_site.html) for general information on Chef cookbook installation.
4848

4949
#### Chef Client
50-
The Chef Client (agent) requires installation and setup on each device. Agent setup can be performed as a manual process or it may be automated. For more information please see the [README-agent-install.md](docs/README-agent-install.md) document for detailed instructions on agent installation and configuration on Cisco Nexus devices.
50+
The Chef Client (agent) requires installation and setup on each device. Agent setup can be performed as a manual process or it may be automated. For more information please see the [README-agent-install.md](docs/README-agent-install.md) document for detailed instructions on agent installation and configuration on Cisco Nexus devices.
5151

5252
##### Artifacts
5353

@@ -71,7 +71,7 @@ The cisco-cookbook has dependencies on a few ruby gems. These gems are already i
7171
Place a dependency on cisco-cookbook in your cookbook's metadata.rb
7272

7373
```ruby
74-
depends 'cisco-cookbook', '~> 0.1'
74+
depends 'cisco-cookbook', '~> 1.0'
7575
```
7676

7777
See the recipes directory for example usage of cisco providers and resources.
@@ -137,7 +137,7 @@ The `cisco_command_config` resource allows raw configurations to be managed by c
137137
* Order is important. Some dependent commands may fail if their associated `feature` configuration is not enabled first
138138
* Indentation counts! It implies sub-mode configuration. Use the switch's running-config as a guide and do not indent configurations that are not normally indented. Do not use tabs to indent.
139139
* Inline comments must be prefixed by ! or #
140-
* Negating a submode will also remove configuratons under that submode, without having to specify every submode config statement: `no router ospf RED` removes all configuration under router ospf RED
140+
* Negating a submode will also remove configurations under that submode, without having to specify every submode config statement: `no router ospf RED` removes all configuration under router ospf RED
141141
* Syntax does not auto-complete: use `Ethernet1/1`, not `Eth1/1`
142142
* If a CLI command is rejected during configuration, the resource will abort at that point and will not continue to issue any remaining CLI. For this reason it is recommended to limit the scope of each instance of this resource.
143143

@@ -164,7 +164,7 @@ end
164164
### cisco_interface
165165

166166
The `cisco_interface` resource is used to manage general configuration of all
167-
interface types, including ethernet, port-channel, loopback, and SVI (Vlan).
167+
interface types, including ethernet, port-channel, loopback, and SVI (vlan).
168168

169169
#### Examples
170170

@@ -291,14 +291,14 @@ end
291291
- `hello_interval` - The OSPF hello interval on this interface, in seconds.
292292
Default value: `10`.
293293

294-
- `message_digest` - Enable or disable message-digest authentication on
295-
on the interface. Available options are `true` and `false`. Default value:
296-
`false`.
294+
- `message_digest` - Enable or disable message-digest authentication on
295+
on the interface. Available options are `true` and `false`. Default value:
296+
`false`.
297297

298-
- `message_digest_algorithm_type` - OSPF message digest algorithm.
298+
- `message_digest_algorithm_type` - OSPF message digest algorithm.
299299
Default value: `md5`, which is currently the only supported value.
300300

301-
- `message_digest_encryption_type` - Encryption type for the message digest
301+
- `message_digest_encryption_type` - Encryption type for the message digest
302302
password. Available options are `'cleartext'`, `'3des'`, and `'cisco_type_7'`.
303303
Default value: `'cleartext'`.
304304

@@ -425,7 +425,7 @@ end
425425

426426
The `cisco_package` resource is a subclass of the Chef `yum_package` resource.
427427
Unlike `yum_package`, it will always install packages into the NX-OS native
428-
environment, even if the Chef agent is running within Guestshell.
428+
environment, even if the Chef agent is running within `guestshell`.
429429

430430
#### Examples
431431

@@ -764,12 +764,12 @@ Minimum Requirements:
764764

765765
Contributions to cisco-cookbook are welcome and encouraged. Please follow this general workflow for new contributions. See [CONTRIBUTING.md](CONTRIBUTING.md) for more information.
766766

767-
1. Fork the cisco-cookbook repository on [Github](https://github.com/chef-partners/cisco-cookbook)
767+
1. Fork the cisco-cookbook repository on [GitHub](https://github.com/cisco/cisco-network-chef-cookbook)
768768
2. Create a named feature branch (like `add_component_x`)
769769
3. Write your change
770770
4. Write tests for your change (if applicable)
771771
5. Run the tests, ensuring they all pass
772-
6. Submit a Pull Request using Github
772+
6. Submit a Pull Request using GitHub
773773

774774
--
775775

0 commit comments

Comments
 (0)