1 files changed, 32 insertions, 20 deletions

diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 93af1bfb1b..e0d60e797e 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -1,30 +1,13 @@
 [general]
-; builds
-release_url=http://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
-bleeding_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip
-rc_url=http://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
-
-; voice files
-release_voice_url=http://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip
+; server information
+build_info_url=http://download.rockbox.org/build-info
+; genlang -- used to get list of strings (only really old builds)
 genlang_url=http://www.rockbox.org/genlang/?lang=%LANG%&t=%TARGET%&rev=%REVISION%&f=%FEATURES%
-
-; bootloader
-bootloader_info_url=http://download.rockbox.org/bootloader/bootloaders-info
-bootloader_url=http://download.rockbox.org/bootloader
-
 ; themes
 themes_url=http://themes.rockbox.org/
 themes_info_url=http://themes.rockbox.org/rbutilqt.php?target=%TARGET%&release=%RELEASE%&revision=%REVISION%&rbutilver=%RBUTILVER%
 
-; server information
-build_info_url=http://download.rockbox.org/build-info
-
-; fonts
-release_font_url=http://download.rockbox.org/release/%RELEASEVER%/rockbox-fonts-%RELEASEVER%.zip
-daily_font_url=http://download.rockbox.org/daily/fonts/rockbox-fonts.zip
-
 ; other
-manual_url=http://download.rockbox.org/manual/rockbox-%MODEL%%FORMAT%
 doom_url=http://download.rockbox.org/useful/rockdoom.zip
 duke3d_url=http://download.rockbox.org/useful/duke3d.zip
 quake_url=http://download.rockbox.org/useful/quake.zip
@@ -33,6 +16,35 @@ wolf3d_url=http://download.rockbox.org/useful/wolf3d.zip
 xworld_url=http://download.rockbox.org/useful/xworld.zip
 rbutil_url=http://download.rockbox.org/rbutil/
 
+[bootloader]
+info_url=http://download.rockbox.org/bootloader/bootloaders-info
+download_url=http://download.rockbox.org/bootloader
+
+[release]
+build_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
+voice_url=https://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip
+font_url=https://download.rockbox.org/release/%RELEASEVER%/rockbox-fonts-%RELEASEVER%.zip
+manual_url=https://download.rockbox.org/release/%RELEASEVER%/rockbox-%MODEL%%FORMAT%
+
+[release-candidate]
+build_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
+voice_url=https://download.rockbox.org/release-candidate/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip
+font_url=https://download.rockbox.org/release-candidate/%RELEASEVER%/rockbox-fonts-%RELEASEVER%.zip
+manual_url=https://download.rockbox.org/release-candidate/%RELEASEVER%/rockbox-%MODEL%%FORMAT%
+
+[development]
+build_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip
+voice_url=https://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip
+font_url=https://download.rockbox.org/daily/fonts/rockbox-fonts.zip
+; manual is only built daily, use that one instead.
+manual_url=https://download.rockbox.org/daily/manual/rockbox-%MODEL%%FORMAT%
+
+[daily]
+build_url=https://download.rockbox.org/daily/%MODEL%/rockbox-%MODEL%.zip
+voice_url=https://download.rockbox.org/daily/voices/%MODEL%-%VERSION%-%LANGUAGE%.zip
+font_url=https://download.rockbox.org/daily/fonts/rockbox-fonts.zip
+manual_url=https://download.rockbox.org/daily/manual/rockbox-%MODEL%%FORMAT%
+
 ; [platforms] is used to determine the order in the device tree.
 ; Only devices present in this section will get displayed!
 [platforms]