diff --git a/docs/UISIMULATOR b/docs/UISIMULATOR index 0a7888b7b6..eafbe74585 100644 --- a/docs/UISIMULATOR +++ b/docs/UISIMULATOR @@ -13,7 +13,7 @@ source code tarball). All SVN details can be found here: - http://www.rockbox.org/twiki/bin/view/Main/UsingSVN + http://www.rockbox.org/wiki/UsingSVN 2. Build Uisimulator diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h index ac314c5342..33d79cb194 100644 --- a/firmware/export/config/iriverh100.h +++ b/firmware/export/config/iriverh100.h @@ -136,7 +136,7 @@ /* define current usage levels */ #define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ -#define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */ +#define CURRENT_BACKLIGHT 23 /* from IriverBattery wiki page */ #define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ #define CURRENT_RECORD 105 /* additional current while recording */ #define CURRENT_REMOTE 8 /* additional current when remote connected */ diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h index bf97ee3c09..2c3a67330a 100644 --- a/firmware/export/config/iriverh120.h +++ b/firmware/export/config/iriverh120.h @@ -141,7 +141,7 @@ /* define current usage levels */ #define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ -#define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */ +#define CURRENT_BACKLIGHT 23 /* from IriverBattery wiki page */ #define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ #define CURRENT_RECORD 105 /* additional current while recording */ #define CURRENT_REMOTE 8 /* additional current when remote connected */ diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex index 831dab1fe2..5766c222eb 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/twiki/bin/view/Main/SansaE200RInstallation}.}} +\url{http://www.rockbox.org/wiki/SansaE200RInstallation}.}} \opt{ipodnano,ipodnano2g,ipodvideo,ipod6g,e200,c200,c200v2,e200v2,clipv1,clipv2,cowond2,fuze,fuzev2}{ \begin{description} diff --git a/rbutil/ipodpatcher/main.c b/rbutil/ipodpatcher/main.c index e82fbf53f3..634bb250c0 100644 --- a/rbutil/ipodpatcher/main.c +++ b/rbutil/ipodpatcher/main.c @@ -64,7 +64,7 @@ void print_macpod_warning(void) printf("[INFO] *** WARNING FOR ROCKBOX USERS\n"); printf("[INFO] *** You must convert this ipod to FAT32 format (aka a \"winpod\")\n"); printf("[INFO] *** if you want to run Rockbox. Rockbox WILL NOT work on this ipod.\n"); - printf("[INFO] *** See http://www.rockbox.org/twiki/bin/view/Main/IpodConversionToFAT32\n"); + printf("[INFO] *** See http://www.rockbox.org/wiki/IpodConversionToFAT32\n"); printf("[INFO] ************************************************************************\n"); } diff --git a/rbutil/sansapatcher/main.c b/rbutil/sansapatcher/main.c index 29c2f915bb..acf2fb070a 100644 --- a/rbutil/sansapatcher/main.c +++ b/rbutil/sansapatcher/main.c @@ -279,7 +279,7 @@ int main(int argc, char* argv[]) printf("[ERR] *** OLD ROCKBOX INSTALLATION DETECTED, ABORTING.\n"); printf("[ERR] *** You must reinstall the original Sansa firmware before running\n"); printf("[ERR] *** sansapatcher for the first time.\n"); - printf("[ERR] *** See http://www.rockbox.org/twiki/bin/view/Main/SansaE200Install\n"); + printf("[ERR] *** See http://www.rockbox.org/wiki/SansaE200Install\n"); printf("[ERR] ************************************************************************\n"); res = 4; } else { diff --git a/tools/fwpatcher/iriver.c b/tools/fwpatcher/iriver.c index e24df8c768..0843d9c383 100644 --- a/tools/fwpatcher/iriver.c +++ b/tools/fwpatcher/iriver.c @@ -13,7 +13,7 @@ * bottom of the COPYING file for details on this license. * * Original code from http://www.beermex.com/@spc/ihpfirm.src.zip - * Details at http://www.rockbox.org/twiki/bin/view/Main/IriverToolsGuide + * Details at http://www.rockbox.org/wiki/IriverToolsGuide * ****************************************************************************/ #include diff --git a/tools/iriver.c b/tools/iriver.c index 4c949c6627..b9ccd2378f 100644 --- a/tools/iriver.c +++ b/tools/iriver.c @@ -13,7 +13,7 @@ * bottom of the COPYING file for details on this license. * * Original code from http://www.beermex.com/@spc/ihpfirm.src.zip - * Details at http://www.rockbox.org/twiki/bin/view/Main/IriverToolsGuide + * Details at http://www.rockbox.org/wiki/IriverToolsGuide * ****************************************************************************/ #include diff --git a/tools/songdb.pl b/tools/songdb.pl index fba8c2a355..052c3728dc 100755 --- a/tools/songdb.pl +++ b/tools/songdb.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # # Rockbox song database docs: -# http://www.rockbox.org/twiki/bin/view/Main/DataBase +# http://www.rockbox.org/wiki/DataBase # use mp3info; diff --git a/tools/voicefont.c b/tools/voicefont.c index f4318b3b26..30a82ae5eb 100644 --- a/tools/voicefont.c +++ b/tools/voicefont.c @@ -20,7 +20,7 @@ * A tool to generate the Rockbox "voicefont", a collection of all the UI * strings. * - * Details at http://www.rockbox.org/twiki/bin/view/Main/VoiceBuilding + * Details at http://www.rockbox.org/wiki/VoiceBuilding * ****************************************************************************/ diff --git a/tools/voicefont.h b/tools/voicefont.h index dad7589c26..233f594bd1 100644 --- a/tools/voicefont.h +++ b/tools/voicefont.h @@ -20,7 +20,7 @@ * A tool to generate the Rockbox "voicefont", a collection of all the UI * strings. * - * Details at http://www.rockbox.org/twiki/bin/view/Main/VoiceBuilding + * Details at http://www.rockbox.org/wiki/VoiceBuilding * ****************************************************************************/ diff --git a/tools/wavtrim.c b/tools/wavtrim.c index c2d0351362..560d88dcab 100644 --- a/tools/wavtrim.c +++ b/tools/wavtrim.c @@ -17,7 +17,7 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * Details at http://www.rockbox.org/twiki/bin/view/Main/VoiceBuilding + * Details at http://www.rockbox.org/wiki/VoiceBuilding * ****************************************************************************/ diff --git a/tools/wavtrim.h b/tools/wavtrim.h index 233f80f046..c65e3e2c93 100644 --- a/tools/wavtrim.h +++ b/tools/wavtrim.h @@ -17,7 +17,7 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * Details at http://www.rockbox.org/twiki/bin/view/Main/VoiceBuilding + * Details at http://www.rockbox.org/wiki/VoiceBuilding * ****************************************************************************/ diff --git a/utils/rockbox_api/index.tpl b/utils/rockbox_api/index.tpl index d993c053f8..ca8f602fd2 100644 --- a/utils/rockbox_api/index.tpl +++ b/utils/rockbox_api/index.tpl @@ -22,15 +22,15 @@ releases
current build
- extras + extras
Documentation
- FAQ
+ FAQ
manual
- wiki
- docs index + wiki
+ docs index
Support
@@ -58,17 +58,6 @@ -

- - - - - - - - - -
@@ -88,4 +77,4 @@ - \ No newline at end of file + diff --git a/utils/rockbox_api/section.tpl b/utils/rockbox_api/section.tpl index 18ebc326db..6fb019538b 100644 --- a/utils/rockbox_api/section.tpl +++ b/utils/rockbox_api/section.tpl @@ -23,15 +23,15 @@ releases
current build
- extras + extras
Documentation
- FAQ
+ FAQ
manual
- wiki
- docs index + wiki
+ docs index
Support
@@ -58,17 +58,6 @@ -

- - - - - - - - - -
@@ -115,4 +104,4 @@ - \ No newline at end of file +