Skip to content

Commit fcf9358

Browse files
authored
Merge pull request #21228 from bradcray/update-docs-menu-for-staged-1.29
Update docs menu/button to reflect staged release [rote, not reviewed] This is the usual post-branch, pre-release update to the docs button while capturing docs to chapel-www.
2 parents 246f517 + d9fdaed commit fcf9358

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: doc/rst/conf.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ def setup(app):
7676
# 'version' adds a redundant version number onto the top of the sidebar
7777
# automatically (rtd-theme). We also don't use |version| anywhere in rst
7878

79-
chplversion = '1.29' # TODO -- parse from `chpl --version`
79+
chplversion = '1.30' # TODO -- parse from `chpl --version`
8080
shortversion = chplversion.replace('-', '&#8209') # prevent line-break at hyphen, if any
8181
html_context = {"chplversion":chplversion}
8282

8383
# The full version, including alpha/beta/rc tags.
84-
#release = '1.29.0 (pre-release)'
85-
release = '1.29.0'
84+
release = '1.29.0 (pre-release)'
85+
#release = '1.29.0'
8686

8787
# General information about the project.
8888
project = u'Chapel Documentation'

Diff for: doc/util/versionButton.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function toggleDropDown() {
8989
function dropSetup() {
9090
var currentRelease = "1.28"; // what does the public have?
9191
var stagedRelease = "1.29"; // is there a release staged but not yet public?
92-
var nextRelease = "1.29"; // what's the next release? (on docs/main)
92+
var nextRelease = "1.30"; // what's the next release? (on docs/main)
9393
var button = document.getElementById("versionButton");
9494
// Uses unicode down-pointing triangle
9595
var arrow = " ▼";

0 commit comments

Comments
 (0)