diff --git a/build_html.sh b/build_html.sh index ace7856af9..c818962da7 100755 --- a/build_html.sh +++ b/build_html.sh @@ -11,7 +11,7 @@ NUM_LANGUAGES="$(printf '%s' "$LANGUAGES" | wc -w)" # Write _redirects file mkdir -p build/html printf '/ /latest/ 302\n' > build/html/_redirects -printf '/latest/* /2.4/:splat 301\n' >> build/html/_redirects +printf '/latest/* /2.5/:splat 301\n' >> build/html/_redirects i=1 for lang in $LANGUAGES @@ -20,10 +20,10 @@ do if [ "$lang" = "en" ] then - printf '/:version/en/* /2.4/en/404.html 404\n' >> build/html/_redirects + printf '/:version/en/* /2.5/en/404.html 404\n' >> build/html/_redirects printf '/:version/* /:version/en/:splat 301\n' >> build/html/_redirects else - printf '/:version/%s/* /2.4/%s/404.html 404\n' "$lang" "$lang" >> build/html/_redirects + printf '/:version/%s/* /2.5/%s/404.html 404\n' "$lang" "$lang" >> build/html/_redirects printf '/:version/* /:version/%s/:splat 301 Language=%s\n' "$lang" "$(printf "%s" "$lang" | sed 's/_/-/g')" >> build/html/_redirects fi make versionedhtml SPHINXOPTS="-j $(nproc) -Dlanguage=$lang" diff --git a/source/conf.py b/source/conf.py index f27098da12..cdf26a9928 100644 --- a/source/conf.py +++ b/source/conf.py @@ -102,9 +102,9 @@ smv_tag_whitelist = r"^$" smv_branch_whitelist = r"^(main|(\d+)\.(\d+))$" smv_remote_whitelist = r"^origin$" -# Mark all branches in the form "N.M" as released except "2.5" -smv_released_pattern = r"^.*/(?!2\.5)(\d+)\.(\d+)$" -smv_latest_version = r"2.4" +# Mark all branches in the form "N.M" as released except "2.6" +smv_released_pattern = r"^.*/(?!2\.6)(\d+)\.(\d+)$" +smv_latest_version = r"2.5" smv_outputdir_format = "{config.version}/{config.language}" notfound_urls_prefix = "/2.4/en/"