Merge pull request #28516 from rallytime/bp-28489

Back-port #28489 to 2015.8
This commit is contained in:
Mike Place 2015-11-03 07:05:54 -07:00
commit c6a6fe0089

View file

@ -280,7 +280,7 @@ project's wiki_:
.. code-block:: yaml
7zip:
9.20.00.0:
'9.20.00.0':
installer: salt://win/repo/7zip/7z920-x64.msi
full_name: 7-Zip 9.20 (x64 edition)
reboot: False
@ -294,7 +294,7 @@ Alternatively the ``uninstaller`` can also simply repeat the URL of the msi file
.. code-block:: yaml
7zip:
9.20.00.0:
'9.20.00.0':
installer: salt://win/repo/7zip/7z920-x64.msi
full_name: 7-Zip 9.20 (x64 edition)
reboot: False
@ -310,7 +310,7 @@ Only applies to salt: installer URLs.
.. code-block:: yaml
sqlexpress:
12.0.2000.8:
'12.0.2000.8':
installer: 'salt://win/repo/sqlexpress/setup.exe'
full_name: Microsoft SQL Server 2014 Setup (English)
reboot: False