11 files changed, 26 insertions, 26 deletions

diff --git a/manual/getting_started/gigabeat_install.tex b/manual/getting_started/gigabeat_install.tex
index c248527c20..6519676256 100644
--- a/manual/getting_started/gigabeat_install.tex
+++ b/manual/getting_started/gigabeat_install.tex
@@ -2,7 +2,7 @@
 
 \begin{itemize}
 \item Download the Rockbox bootloader from
-  \url{http://download.rockbox.org/bootloader/gigabeat/}
+  \download{bootloader/gigabeat/}
 \item Starting at the root directory of your player browse into the directory
   \fname{GBSYSTEM} and from that into the subdirectory \fname{FWIMG}.
   These directories are hidden. Make sure that you have configured your browser
@@ -14,4 +14,4 @@
   without a copy of the original firmware from the original install CD.}
 \item Now copy the file \fname{FWIMG01.DAT} you downloaded to that directory.
   Make sure the spelling is correct.
-\end{itemize}
\ No newline at end of file
+\end{itemize}
diff --git a/manual/getting_started/h10_install.tex b/manual/getting_started/h10_install.tex
index 38e780a1ca..36e6969487 100644
--- a/manual/getting_started/h10_install.tex
+++ b/manual/getting_started/h10_install.tex
@@ -1,11 +1,11 @@
 \subsubsection{Installation}
 \begin{enumerate}
   \item Download 
-  \opt{iriverh10}{\url{http://download.rockbox.org/bootloader/iriver/H10_20GC.mi4}}
+  \opt{iriverh10}{\download{bootloader/iriver/H10_20GC.mi4}}
   \opt{iriverh10_5gb}{
     \begin{itemize}
-        \item \url{http://download.rockbox.org/bootloader/iriver/H10.mi4} if your \dap{} is UMS or
-        \item \url{http://download.rockbox.org/bootloader/iriver/H10_5GB-MTP/H10.mi4} if it is MTP.
+        \item \download{bootloader/iriver/H10.mi4} if your \dap{} is UMS or
+        \item \download{bootloader/iriver/H10_5GB-MTP/H10.mi4} if it is MTP.
     \end{itemize}}
     \item Connect your \playertype{} to the computer using UMS mode and the UMS trick%
         \opt{iriverh10_5gb}{ if necessary}.
diff --git a/manual/getting_started/iaudio_install.tex b/manual/getting_started/iaudio_install.tex
index fb573906f4..309753e9e4 100644
--- a/manual/getting_started/iaudio_install.tex
+++ b/manual/getting_started/iaudio_install.tex
@@ -10,7 +10,7 @@ Rockbox bootloader can therefore be very minimalistic, as it does not require
 \subsubsection{Installation}
 \begin{itemize}
 \item Download the Rockbox bootloader binary from 
-\url{http://download.rockbox.org/bootloader/iaudio/}.
+\download{bootloader/iaudio/}.
   \opt{iaudiox5}{Use the \fname{x5v\_fw.bin} file if your \dap{} is an X5V (without radio).
       If it is an X5 or X5L, use the \fname{x5\_fw.bin} file.}
   \opt{iaudiom5}{Use the \fname{m5\_fw.bin} file.}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index eb6e4a0e7f..241c41d3f2 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -8,7 +8,7 @@ before beginning there are a few important things to know.
 \opt{e200}{\fixme{NOTE: These instructions will not work on the
 ``Rhapsody'' version of the E200 series (also known as E200R). Please
 follow the instructions at
-\url{http://www.rockbox.org/wiki/SansaE200RInstallation}.}}
+\wikilink{SansaE200RInstallation}.}}
 
 \opt{ipodnano,ipodnano2g,ipodvideo,ipod6g,e200,c200,c200v2,e200v2,clipv1,clipv2,cowond2,fuze,fuzev2}{
 \begin{description}
@@ -417,18 +417,18 @@ to select which version you wish to install.
 
 \item[Release.] The release version is the latest stable release, free
    of known critical bugs. For a manual install, the current stable release of Rockbox is
-   available at \url{http://www.rockbox.org/download/}.
+   available at \url{https://www.rockbox.org/download/}.
 
 \item[Development Build.] The development build is built at each change to
   the Rockbox source code repository and represents the current state of Rockbox
   development. This means that the build could contain bugs but most of
   the time is safe to use. For a manual install, you can download the current build from
-  \url{http://build.rockbox.org/}.
+  \url{https://build.rockbox.org/}.
 
 \item[Archived Build.] In addition to the release version and the current build,
   there is also an archive of daily builds available for download. These are
   built once a day from the latest source code in the repository. For a manual install,
-  you can download archived builds from \url{http://www.rockbox.org/daily.shtml}.
+  you can download archived builds from \url{https://www.rockbox.org/daily.shtml}.
 
 \end{description}
 
@@ -615,7 +615,7 @@ by Rockbox, in the main directory of your \daps{} drive.
 \index{Speech}\index{Installation!Optional Steps}
 If you wish to use speech support you will also need a voice file. Voice files
 allow Rockbox to speak the user interface to you. Rockbox Utility can install
-an English voice file, or you can download it from \url{http://www.rockbox.org/daily.shtml}
+an English voice file, or you can download it from \url{https://www.rockbox.org/daily.shtml}
 and unzip it to the root of your \dap{}.
 Rockbox Utility can also aid you in the creation of voice files with different voices
 or in other languages if you have a suitable speech engine installed on your computer.
diff --git a/manual/getting_started/iriver_install.tex b/manual/getting_started/iriver_install.tex
index fbc53fec37..26dc845d1c 100644
--- a/manual/getting_started/iriver_install.tex
+++ b/manual/getting_started/iriver_install.tex
@@ -8,7 +8,7 @@
 
 \begin{enumerate}
   \item Download the firmware patcher \fname{fwpatcher.exe} from 
-  \url{http://download.rockbox.org/bootloader/iriver/} and save it to your desktop.
+  \download{bootloader/iriver/} and save it to your desktop.
     \note{The firmware patcher contains Unicode support, which is not supported by 
     all versions of Windows. If you have difficulty with the firmware patcher, try 
     downloading the alternate firmware patcher \fname{fwpatchernu.exe}, which is 
diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index 4d1798a4c7..947be98d9e 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -28,15 +28,15 @@ and filenames spelled out or spoken.
 \section{Getting more help}
 This manual is intended to be a comprehensive introduction to the Rockbox
 firmware. There is, however, more help available. The Rockbox website at
-\url{http://www.rockbox.org/} contains very extensive documentation and guides
+\url{https://www.rockbox.org/} contains very extensive documentation and guides
 written by members of the Rockbox community and this should be your first port
 of call when looking for further help.
 
 If you cannot find the information you are searching for on the Rockbox
 website there are a number of support channels you should have a look at.
-You can try the Rockbox forums located at \url{http://forums.rockbox.org/}.
+You can try the Rockbox forums located at \url{https://forums.rockbox.org/}.
 The mailing lists are another option, and can be found at
-\url{http://www.rockbox.org/mail/}. From that page you can subscribe to the
+\url{https://www.rockbox.org/mail/}. From that page you can subscribe to the
 lists and browse the archives. To search the list archives simply use
 the search field that is located on the left side of the website.
 Furthermore,  you can ask on IRC. The main channel for Rockbox is
@@ -44,7 +44,7 @@ Furthermore,  you can ask on IRC. The main channel for Rockbox is
 and users are usually around. Just join and ask your question (don't ask to
 ask!) -- if someone knows the answer you'll
 usually get an answer pretty quickly. More information including IRC logs
-can be found at \url{http://www.rockbox.org/irc/}. We also have a web client
+can be found at \url{https://www.rockbox.org/irc/}. We also have a web client
 so that you can join the Rockbox IRC channel without needing
 to install additional software onto your computer.
 
diff --git a/manual/getting_started/mpio_install.tex b/manual/getting_started/mpio_install.tex
index 6810f8f060..f4b43c230f 100644
--- a/manual/getting_started/mpio_install.tex
+++ b/manual/getting_started/mpio_install.tex
@@ -9,13 +9,13 @@
 \begin{enumerate}
    \item Download official Rockbox bootloader for MPIO \playertype{} from
    \opt{mpiohd200}{
-       \url {http://download.rockbox.org/bootloader/mpio/hd200}}%
+       \download{bootloader/mpio/hd200}}%
    \opt{mpiohd300}{
-       \url {http://download.rockbox.org/bootloader/mpio/hd300}}
+       \download{bootloader/mpio/hd300}}
    and save it to your desktop. The archive contains three files: bootloader.mpio, 
    bootloader.map and rockbox-info.txt. The first file is actual bootloader, two
    others can be used for debugging and are irrelevant for end user.
-   \item Download mkmpioboot utility from \url{http://download.rockbox.org/bootloader/mpio/mkmpioboot}
+   \item Download mkmpioboot utility from \download{bootloader/mpio/mkmpioboot}
    \item Process previously downloaded official firmware to include rockbox bootloader.
    Open terminal window and type the following command:
      \begin{code}[firstline=\opt{mpiohd200}{1}\opt{mpiohd300}{2},
diff --git a/manual/getting_started/mrobe100_install.tex b/manual/getting_started/mrobe100_install.tex
index 4c195e6248..9e141b1400 100644
--- a/manual/getting_started/mrobe100_install.tex
+++ b/manual/getting_started/mrobe100_install.tex
@@ -1,7 +1,7 @@
 \subsubsection{Installation}
 \begin{enumerate}
   \item Download 
-  {\url{http://download.rockbox.org/bootloader/olympus/mrobe100/pp5020.mi4}}
+  {\download{bootloader/olympus/mrobe100/pp5020.mi4}}
   \item Connect your \playertype{} to the computer.
   \item Rename the original \fname{pp5020.mi4} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.
     \warn{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}
diff --git a/manual/getting_started/samsungyh_install.tex b/manual/getting_started/samsungyh_install.tex
index 37c8c0ad82..e7d1f9212a 100644
--- a/manual/getting_started/samsungyh_install.tex
+++ b/manual/getting_started/samsungyh_install.tex
@@ -2,9 +2,9 @@
 \subsubsection{Installation}
 \begin{enumerate}
   \item Download 
-  \opt{samsungyh820}{\url{http://download.rockbox.org/bootloader/samsung/yh820/FW_YH820.mi4}}
-  \opt{samsungyh920}{\url{http://download.rockbox.org/bootloader/samsung/yh920/PP5020.mi4}}
-  \opt{samsungyh925}{\url{http://download.rockbox.org/bootloader/samsung/yh925/FW_YH925.mi4}}
+  \opt{samsungyh820}{\download{bootloader/samsung/yh820/FW_YH820.mi4}}
+  \opt{samsungyh920}{\download{bootloader/samsung/yh920/PP5020.mi4}}
+  \opt{samsungyh925}{\download{bootloader/samsung/yh925/FW_YH925.mi4}}
   \item Connect your \playertype{} to the computer using UMS mode.
   \item Rename the \originalfirmwarefilename{} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.
     \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}
diff --git a/manual/getting_started/vibe500_install.tex b/manual/getting_started/vibe500_install.tex
index 38956e8d11..36ad3d7f87 100644
--- a/manual/getting_started/vibe500_install.tex
+++ b/manual/getting_started/vibe500_install.tex
@@ -2,7 +2,7 @@
 \subsubsection{Installation}
 \begin{enumerate}
   \item Download 
-  \url{http://download.rockbox.org/bootloader/vibe500/jukebox.mi4}
+  \download{bootloader/vibe500/jukebox.mi4}
   \item Connect your \playertype{} to the computer using UMS mode.
   \item Rename the \fname{JUKEBOX.mi4} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}.
     \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.}
diff --git a/manual/getting_started/xduoox3_install.tex b/manual/getting_started/xduoox3_install.tex
index e4d49898f2..1a1e05d62e 100644
--- a/manual/getting_started/xduoox3_install.tex
+++ b/manual/getting_started/xduoox3_install.tex
@@ -5,10 +5,10 @@
 \begin{enumerate}
 
 \item Download the Rockbox bootloader from
-  \url{http://download.rockbox.org/bootloader/xduoo/X3-v11.bsdiff}
+  \download{bootloader/xduoo/X3-v11.bsdiff}
 
 \item Get a copy of the original \playertype{} v1.1 firmware from
-  \url{https://www.xduoo.net/firmware-download/} and extract the .rar file to obtain the
+  \url{httpss://www.xduoo.net/firmware-download/} and extract the .rar file to obtain the
   update image (called \fname{update.zip}).
 
 \item Compile bspatch in rbutil/bspatch/ (run make in the dir).