Skip to content

Commit 37b0308

Browse files
authored
Merge pull request #414 from puppetlabs/CONT-370_reinstate-lost-docs
Fix puppet strings formatting
2 parents 3696f61 + 71be2ba commit 37b0308

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

lib/puppet/type/sqlserver_features.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636

3737
newproperty(:features, array_matching: :all) do
3838
desc "Specifies features to install, uninstall, or upgrade. The list of top-level features include
39-
BC, Conn, SSMS, ADV_SSMS, SDK, IS and MDS.
40-
41-
The 'Tools' feature is deprecated. Instead specify 'BC', 'SSMS', 'ADV_SSMS', 'Conn', and 'SDK' explicitly."
39+
BC, Conn, SSMS, ADV_SSMS, SDK, IS and MDS. The 'Tools' feature is deprecated. Instead specify 'BC', 'SSMS', 'ADV_SSMS', 'Conn', and 'SDK' explicitly."
4240
newvalues(:Tools, :BC, :Conn, :SSMS, :ADV_SSMS, :SDK, :IS, :MDS, :BOL, :DREPLAY_CTLR, :DREPLAY_CLT, :DQC)
4341
munge do |value|
4442
if PuppetX::Sqlserver::ServerHelper.is_super_feature(value)

lib/puppet/type/sqlserver_instance.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626

2727
newproperty(:features, array_matching: :all) do
2828
desc "Specifies features to install, uninstall, or upgrade. The list of top-level features include
29-
SQLEngine, Replication, FullText, DQ AS, and RS.
30-
31-
The 'SQL' feature is deprecated. Instead specify 'DQ', 'FullText', 'Replication', and 'SQLEngine' explicitly."
29+
SQLEngine, Replication, FullText, DQ AS, and RS. The 'SQL' feature is deprecated. Instead specify 'DQ', 'FullText', 'Replication', and 'SQLEngine' explicitly."
3230
newvalues(:SQL, :SQLEngine, :Replication, :FullText, :DQ, :AS, :RS, :POLYBASE, :ADVANCEDANALYTICS)
3331
munge do |value|
3432
if PuppetX::Sqlserver::ServerHelper.is_super_feature(value)

0 commit comments

Comments
 (0)