Skip to content

Commit

Permalink
Merge pull request #407 from johnsyweb/fix-documentation
Browse files Browse the repository at this point in the history
Fix documentation
  • Loading branch information
igalic committed Jan 3, 2014
2 parents 961cece + 85afc5c commit e667d52
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The provider updates fix a number of bugs, from lowercase privileges to
deprecation warnings.

Last, the new hiera integration functionality should make it easier to
externalize all your grantts, users, and, databases. Another great set of
externalize all your grants, users, and, databases. Another great set of
community submissions helped to make this release.

Features:
Expand All @@ -37,7 +37,7 @@ privileges could cause Puppet to incorrectly reapply the permissions on
each run.

Fixes:
- Mysql_grant now sorts privileges in the type and provider for comparision.
- Mysql_grant now sorts privileges in the type and provider for comparison.
- Comment and test tweak for PE3.1.

2013-10-14 - Version 2.0.0
Expand All @@ -54,7 +54,7 @@ Please remain on 1.0.0 if you don't have time to fully test this in dev.

* mysql::server, mysql::client, and mysql::bindings are the primary interface
classes.
* mysql::server takes an `options_override` parameter to set my.cnf options,
* mysql::server takes an `override_options` parameter to set my.cnf options,
with the hash format: { 'section' => { 'thing' => 'value' }}
* mysql attempts backwards compatibility by forwarding all parameters to
mysql::server.
Expand Down Expand Up @@ -113,7 +113,7 @@ Please remain on 1.0.0 if you don't have time to fully test this in dev.

* mysql::server, mysql::client, and mysql::bindings are the primary interface
classes.
* mysql::server takes an `options_override` parameter to set my.cnf options,
* mysql::server takes an `override_options` parameter to set my.cnf options,
with the hash format: { 'section' => { 'thing' => 'value' }}
* mysql attempts backwards compatibility by forwarding all parameters to
mysql::server.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The MySQL module installs, configures, and manages the MySQL service.
##Module Description

The MySQL module manages both the installation and configuration of MySQL as
well as extends Pupppet to allow management of MySQL resources, such as
well as extends Puppet to allow management of MySQL resources, such as
databases, users, and grants.

##Backwards Compatibility
Expand All @@ -35,7 +35,7 @@ this to true it will attempt to map your previous parameters into the new
###WARNING

This may fail. It may eat your MySQL server. PLEASE test it before running it
live. Even if it's just a no-op and a manual comparision. Please be careful!
live. Even if it's just a no-op and a manual comparison. Please be careful!

##Setup

Expand Down Expand Up @@ -313,7 +313,7 @@ Array of databases to specifically backup.

#####`file_per_database`

Should a seperate file be used per database.
Should a separate file be used per database.

#####`ensure`

Expand Down

0 comments on commit e667d52

Please sign in to comment.