Skip to content

Commit

Permalink
Merge pull request #20678 from bradcray/stage-docs-1.28
Browse files Browse the repository at this point in the history
Update docs buttons/versions to reflect staged 1.28 release

[rote, not reviewed]

This is the usual update to the docs button version numbers to
distinguish 1.28 (now staged in chapel-www) from 1.29 (main).
  • Loading branch information
bradcray authored Sep 13, 2022
2 parents 1dd1c47 + 6e30b48 commit 6d21412
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions doc/rst/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ def setup(app):
# 'version' adds a redundant version number onto the top of the sidebar
# automatically (rtd-theme). We also don't use |version| anywhere in rst

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

# The full version, including alpha/beta/rc tags.
#release = '1.28.0 (pre-release)'
release = '1.28.0'
release = '1.29.0 (pre-release)'
#release = '1.29.0'

# General information about the project.
project = u'Chapel Documentation'
Expand Down
2 changes: 1 addition & 1 deletion doc/util/versionButton.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function toggleDropDown() {
function dropSetup() {
var currentRelease = "1.27"; // what does the public have?
var stagedRelease = "1.28"; // is there a release staged but not yet public?
var nextRelease = "1.28"; // what's the next release? (on docs/main)
var nextRelease = "1.29"; // what's the next release? (on docs/main)
var button = document.getElementById("versionButton");
// Uses unicode down-pointing triangle
var arrow = " ▼";
Expand Down

0 comments on commit 6d21412

Please sign in to comment.