Skip to content

Commit b6feb7a

Browse files
committed
Merge branch 'dev' of github.com:ansible-collections/ibm_zos_ims into release-v1.2.0-beta.2
2 parents a8d4a0b + ea2dac2 commit b6feb7a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docs/source/conf.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@
113113
scv_overflow = ("-D", "html_show_sphinx=False")
114114

115115
# Choosing to not generate documentation on any branch and rely solely on
116-
# Github tags. Branches are whitelisted with option 'scv_whitelist_branches'.
116+
# Github tags. Branches are a_listed with option 'scv_a_list_branches'.
117117
# In other words, filter out any branches that don't match the pattern.
118-
scv_whitelist_branches = (' ',)
118+
scv_a_list_branches = (' ',)
119119

120-
# Since all branches are whitelisted, a 'root_ref' must be specified to avoid
120+
# Since all branches are a_listed, a 'root_ref' must be specified to avoid
121121
# the error: "Root ref master not found in: v1.0.0 v1.1.0-beta1". The simplest
122122
# solution is to provide a known tagged branch to serve as the root_ref such
123123
# as 'v1.0.0'.
@@ -126,7 +126,7 @@
126126
# scv_root_ref = 'v1.0.0'
127127

128128
# Override root-ref to be the most recent committed tag. If no tags have docs
129-
# then this option is ignored and --root-ref is used. Since we whitelist the
129+
# then this option is ignored and --root-ref is used. Since we a_list the
130130
# master branch, we need to set a "root_ref" to avoid error
131131
# "Root ref master not found in: v1.0.0 v1.1.0-beta1", See also 'scv_root_ref'.
132132
# UPDATE: Able to avoid 'root_ref' by setting property 'scv_greatest_tag= True'
@@ -135,14 +135,14 @@
135135

136136
# Override root-ref to be the tag with the highest version number. If no tags
137137
# have docs then this option is ignored and --root-ref is used. Since we
138-
# whitelist the master branch, we need to set a root_ref.
138+
# a_list the master branch, we need to set a root_ref.
139139
# See also 'scv_root_ref
140140
scv_greatest_tag = True
141141

142142
# White list which Git tags documentation will be generated and linked into the
143143
# version selection box. This is currently a manual selection, until more
144144
# versions are released, there are no regular expressions used.
145-
scv_whitelist_tags = ('v1.0.1', 'v1.1.0')
145+
scv_a_list_tags = ('v1.0.1', 'v1.1.0')
146146

147147
# Sort versions by one or more values. Valid values are semver, alpha, and time.
148148
# Semantic is referred to as 'semver', this would ensure our latest VRM is

0 commit comments

Comments
 (0)