valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #45607 from onovy/typos

Browse Source 
Fixed few typos in docs
This commit is contained in:
Nicole Thomas 2018-01-23 17:34:12 -05:00 committed by GitHub
commit 9c4c22989f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/topics/cloud/aws.rst
View File

@ -1019,7 +1019,7 @@ so:-
- AndThirdSecurityGroup
Note that 'subnetid' takes precedence over 'subnetname', but 'securitygroupid'
and 'securitygroupname' are merged toghether to generate a single list for
and 'securitygroupname' are merged together to generate a single list for
SecurityGroups of instances.
Specifying interface properties

4
doc/topics/releases/2015.5.3.rst
View File

@ -1251,12 +1251,12 @@ Changes:
- **PR** `#24456`_: (*rallytime*) Back-port `#24441`_ to 2015.5
@ *2015-06-05T22:32:25Z*
- **PR** `#24441`_: (*arthurlogilab*) [doc] Alignement fix on external_auth documentation
- **PR** `#24441`_: (*arthurlogilab*) [doc] Alignment fix on external_auth documentation
| refs: `#24456`_
* ced558a Merge pull request `#24456`_ from rallytime/`bp-24441`_
* 7002855 yaml indentations should be 2 spaces
* 21b51ab [doc] Alignement fix on external_auth documentation
* 21b51ab [doc] Alignment fix on external_auth documentation
- **PR** `#24398`_: (*kiorky*) VirtualName for states.apt
| refs: `#24399`_