From 88f8f229e8505f853235815ededb0e6874e71df4 Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Fri, 16 Feb 2024 11:40:28 -0500 Subject: [PATCH 1/4] Update latest to 2.4 --- source/conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/conf.py b/source/conf.py index cf6797a296..2ca133eafa 100644 --- a/source/conf.py +++ b/source/conf.py @@ -57,7 +57,7 @@ # General information about the project. project = "Mixxx" -copyright = "2011-2021, The Mixxx Development Team" +copyright = "2011-2024, The Mixxx Development Team" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -102,11 +102,11 @@ 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.4" +# Mark all branches in the form "N.M" as released except "2.5" smv_released_pattern = r"^.*/(?!2\.4)(\d+)\.(\d+)$" -smv_latest_version = r"2.3" +smv_latest_version = r"2.4" smv_outputdir_format = "{config.version}/{config.language}" -notfound_urls_prefix = "/2.3/en/" +notfound_urls_prefix = "/2.4/en/" # Directories in which to search for additional message catalogs (see language), # relative to the source directory. The directories on this path are searched From 2dc28105f495395e7ba038bbf4e5cb2ee091baa5 Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Fri, 16 Feb 2024 12:02:28 -0500 Subject: [PATCH 2/4] also update build_html --- build_html.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_html.sh b/build_html.sh index e973552a44..ace7856af9 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.3/:splat 301\n' >> build/html/_redirects +printf '/latest/* /2.4/: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.3/en/404.html 404\n' >> build/html/_redirects + printf '/:version/en/* /2.4/en/404.html 404\n' >> build/html/_redirects printf '/:version/* /:version/en/:splat 301\n' >> build/html/_redirects else - printf '/:version/%s/* /2.3/%s/404.html 404\n' "$lang" "$lang" >> build/html/_redirects + printf '/:version/%s/* /2.4/%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" From ed25ff5d857f33600275fe94224c60b6a6871ad1 Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Fri, 16 Feb 2024 12:03:50 -0500 Subject: [PATCH 3/4] lint --- source/chapters/appendix/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/chapters/appendix/changelog.rst b/source/chapters/appendix/changelog.rst index 3cc4445d4e..4529f26d8f 100644 --- a/source/chapters/appendix/changelog.rst +++ b/source/chapters/appendix/changelog.rst @@ -472,7 +472,7 @@ Controller Backend * Log warning if deprecated control is used `#11972 `__ * ControlObject alias improvements `#11973 `__ * Keyboard mapping: Repeat certain control actions if key is held `#12474 `__ -* Keyboard mapping: Return triggers doubleclick, move Preview functions to P / Shift+P `#12639 `__ +* Keyboard mapping: Return triggers double-click, move Preview functions to P / Shift+P `#12639 `__ * Keyboard mapping: Various fixes `#12730 `__ * Update keyboard sheet `#12578 `__ * Logging: Add support for ``QT_MESSAGE_PATTERN`` environment variable From 89a1ceaa7993ed72fcaff456330d1d8863eea32e Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Tue, 20 Feb 2024 10:36:39 -0500 Subject: [PATCH 4/4] Mark 2.5 as unreleased, not 2.4 --- source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/conf.py b/source/conf.py index 2ca133eafa..af354e8a3d 100644 --- a/source/conf.py +++ b/source/conf.py @@ -103,7 +103,7 @@ 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\.4)(\d+)\.(\d+)$" +smv_released_pattern = r"^.*/(?!2\.5)(\d+)\.(\d+)$" smv_latest_version = r"2.4" smv_outputdir_format = "{config.version}/{config.language}" notfound_urls_prefix = "/2.4/en/"