diff options
-rw-r--r-- | docs/UISIMULATOR | 2 | ||||
-rw-r--r-- | firmware/export/config/iriverh100.h | 2 | ||||
-rw-r--r-- | firmware/export/config/iriverh120.h | 2 | ||||
-rw-r--r-- | manual/getting_started/installation.tex | 2 | ||||
-rw-r--r-- | rbutil/ipodpatcher/main.c | 2 | ||||
-rw-r--r-- | rbutil/sansapatcher/main.c | 2 | ||||
-rw-r--r-- | tools/fwpatcher/iriver.c | 2 | ||||
-rw-r--r-- | tools/iriver.c | 2 | ||||
-rwxr-xr-x | tools/songdb.pl | 2 | ||||
-rw-r--r-- | tools/voicefont.c | 2 | ||||
-rw-r--r-- | tools/voicefont.h | 2 | ||||
-rw-r--r-- | tools/wavtrim.c | 2 | ||||
-rw-r--r-- | tools/wavtrim.h | 2 | ||||
-rw-r--r-- | utils/rockbox_api/index.tpl | 21 | ||||
-rw-r--r-- | utils/rockbox_api/section.tpl | 21 |
15 files changed, 23 insertions, 45 deletions
diff --git a/docs/UISIMULATOR b/docs/UISIMULATOR index 0a7888b7b6..eafbe74585 100644 --- a/docs/UISIMULATOR +++ b/docs/UISIMULATOR | |||
@@ -13,7 +13,7 @@ | |||
13 | source code tarball). | 13 | source code tarball). |
14 | 14 | ||
15 | All SVN details can be found here: | 15 | All SVN details can be found here: |
16 | http://www.rockbox.org/twiki/bin/view/Main/UsingSVN | 16 | http://www.rockbox.org/wiki/UsingSVN |
17 | 17 | ||
18 | 2. Build Uisimulator | 18 | 2. Build Uisimulator |
19 | 19 | ||
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 @@ | |||
136 | 136 | ||
137 | /* define current usage levels */ | 137 | /* define current usage levels */ |
138 | #define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ | 138 | #define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ |
139 | #define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */ | 139 | #define CURRENT_BACKLIGHT 23 /* from IriverBattery wiki page */ |
140 | #define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ | 140 | #define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ |
141 | #define CURRENT_RECORD 105 /* additional current while recording */ | 141 | #define CURRENT_RECORD 105 /* additional current while recording */ |
142 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ | 142 | #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 @@ | |||
141 | 141 | ||
142 | /* define current usage levels */ | 142 | /* define current usage levels */ |
143 | #define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ | 143 | #define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ |
144 | #define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */ | 144 | #define CURRENT_BACKLIGHT 23 /* from IriverBattery wiki page */ |
145 | #define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ | 145 | #define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ |
146 | #define CURRENT_RECORD 105 /* additional current while recording */ | 146 | #define CURRENT_RECORD 105 /* additional current while recording */ |
147 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ | 147 | #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. | |||
8 | \opt{e200}{\fixme{NOTE: These instructions will not work on the | 8 | \opt{e200}{\fixme{NOTE: These instructions will not work on the |
9 | ``Rhapsody'' version of the E200 series (also known as E200R). Please | 9 | ``Rhapsody'' version of the E200 series (also known as E200R). Please |
10 | follow the instructions at | 10 | follow the instructions at |
11 | \url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}} | 11 | \url{http://www.rockbox.org/wiki/SansaE200RInstallation}.}} |
12 | 12 | ||
13 | \opt{ipodnano,ipodnano2g,ipodvideo,ipod6g,e200,c200,c200v2,e200v2,clipv1,clipv2,cowond2,fuze,fuzev2}{ | 13 | \opt{ipodnano,ipodnano2g,ipodvideo,ipod6g,e200,c200,c200v2,e200v2,clipv1,clipv2,cowond2,fuze,fuzev2}{ |
14 | \begin{description} | 14 | \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) | |||
64 | printf("[INFO] *** WARNING FOR ROCKBOX USERS\n"); | 64 | printf("[INFO] *** WARNING FOR ROCKBOX USERS\n"); |
65 | printf("[INFO] *** You must convert this ipod to FAT32 format (aka a \"winpod\")\n"); | 65 | printf("[INFO] *** You must convert this ipod to FAT32 format (aka a \"winpod\")\n"); |
66 | printf("[INFO] *** if you want to run Rockbox. Rockbox WILL NOT work on this ipod.\n"); | 66 | printf("[INFO] *** if you want to run Rockbox. Rockbox WILL NOT work on this ipod.\n"); |
67 | printf("[INFO] *** See http://www.rockbox.org/twiki/bin/view/Main/IpodConversionToFAT32\n"); | 67 | printf("[INFO] *** See http://www.rockbox.org/wiki/IpodConversionToFAT32\n"); |
68 | printf("[INFO] ************************************************************************\n"); | 68 | printf("[INFO] ************************************************************************\n"); |
69 | } | 69 | } |
70 | 70 | ||
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[]) | |||
279 | printf("[ERR] *** OLD ROCKBOX INSTALLATION DETECTED, ABORTING.\n"); | 279 | printf("[ERR] *** OLD ROCKBOX INSTALLATION DETECTED, ABORTING.\n"); |
280 | printf("[ERR] *** You must reinstall the original Sansa firmware before running\n"); | 280 | printf("[ERR] *** You must reinstall the original Sansa firmware before running\n"); |
281 | printf("[ERR] *** sansapatcher for the first time.\n"); | 281 | printf("[ERR] *** sansapatcher for the first time.\n"); |
282 | printf("[ERR] *** See http://www.rockbox.org/twiki/bin/view/Main/SansaE200Install\n"); | 282 | printf("[ERR] *** See http://www.rockbox.org/wiki/SansaE200Install\n"); |
283 | printf("[ERR] ************************************************************************\n"); | 283 | printf("[ERR] ************************************************************************\n"); |
284 | res = 4; | 284 | res = 4; |
285 | } else { | 285 | } 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 @@ | |||
13 | * bottom of the COPYING file for details on this license. | 13 | * bottom of the COPYING file for details on this license. |
14 | * | 14 | * |
15 | * Original code from http://www.beermex.com/@spc/ihpfirm.src.zip | 15 | * Original code from http://www.beermex.com/@spc/ihpfirm.src.zip |
16 | * Details at http://www.rockbox.org/twiki/bin/view/Main/IriverToolsGuide | 16 | * Details at http://www.rockbox.org/wiki/IriverToolsGuide |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include <stdio.h> | 19 | #include <stdio.h> |
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 @@ | |||
13 | * bottom of the COPYING file for details on this license. | 13 | * bottom of the COPYING file for details on this license. |
14 | * | 14 | * |
15 | * Original code from http://www.beermex.com/@spc/ihpfirm.src.zip | 15 | * Original code from http://www.beermex.com/@spc/ihpfirm.src.zip |
16 | * Details at http://www.rockbox.org/twiki/bin/view/Main/IriverToolsGuide | 16 | * Details at http://www.rockbox.org/wiki/IriverToolsGuide |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include <stdio.h> | 19 | #include <stdio.h> |
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 @@ | |||
1 | #!/usr/bin/perl | 1 | #!/usr/bin/perl |
2 | # | 2 | # |
3 | # Rockbox song database docs: | 3 | # Rockbox song database docs: |
4 | # http://www.rockbox.org/twiki/bin/view/Main/DataBase | 4 | # http://www.rockbox.org/wiki/DataBase |
5 | # | 5 | # |
6 | 6 | ||
7 | use mp3info; | 7 | 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 @@ | |||
20 | * A tool to generate the Rockbox "voicefont", a collection of all the UI | 20 | * A tool to generate the Rockbox "voicefont", a collection of all the UI |
21 | * strings. | 21 | * strings. |
22 | * | 22 | * |
23 | * Details at http://www.rockbox.org/twiki/bin/view/Main/VoiceBuilding | 23 | * Details at http://www.rockbox.org/wiki/VoiceBuilding |
24 | * | 24 | * |
25 | ****************************************************************************/ | 25 | ****************************************************************************/ |
26 | 26 | ||
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 @@ | |||
20 | * A tool to generate the Rockbox "voicefont", a collection of all the UI | 20 | * A tool to generate the Rockbox "voicefont", a collection of all the UI |
21 | * strings. | 21 | * strings. |
22 | * | 22 | * |
23 | * Details at http://www.rockbox.org/twiki/bin/view/Main/VoiceBuilding | 23 | * Details at http://www.rockbox.org/wiki/VoiceBuilding |
24 | * | 24 | * |
25 | ****************************************************************************/ | 25 | ****************************************************************************/ |
26 | 26 | ||
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 @@ | |||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | 17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | * Details at http://www.rockbox.org/twiki/bin/view/Main/VoiceBuilding | 20 | * Details at http://www.rockbox.org/wiki/VoiceBuilding |
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | 23 | ||
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 @@ | |||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | 17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | * Details at http://www.rockbox.org/twiki/bin/view/Main/VoiceBuilding | 20 | * Details at http://www.rockbox.org/wiki/VoiceBuilding |
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | 23 | ||
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 @@ | |||
22 | </div> | 22 | </div> |
23 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/package.png' align='top'> <a class="menulink" href="http://www.rockbox.org/download/">releases</a><br> | 23 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/package.png' align='top'> <a class="menulink" href="http://www.rockbox.org/download/">releases</a><br> |
24 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/bomb.png' align='top'> <a class="menulink" href="http://build.rockbox.org">current build</a><br> | 24 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/bomb.png' align='top'> <a class="menulink" href="http://build.rockbox.org">current build</a><br> |
25 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/style.png' align='top'> <a class="menulink" href="http://www.rockbox.org/twiki/bin/view/Main/RockboxExtras">extras</a> | 25 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/style.png' align='top'> <a class="menulink" href="http://www.rockbox.org/wiki/RockboxExtras">extras</a> |
26 | <div class="submenu"> | 26 | <div class="submenu"> |
27 | Documentation | 27 | Documentation |
28 | 28 | ||
29 | </div> | 29 | </div> |
30 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/help.png' align='top'> <a class="menulink" href="http://www.rockbox.org/twiki/bin/view/Main/GeneralFAQ">FAQ</a><br> | 30 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/help.png' align='top'> <a class="menulink" href="http://www.rockbox.org/wiki/GeneralFAQ">FAQ</a><br> |
31 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/page_white_acrobat.png' align='top'> <a class="menulink" href="http://www.rockbox.org/manual.shtml">manual</a><br> | 31 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/page_white_acrobat.png' align='top'> <a class="menulink" href="http://www.rockbox.org/manual.shtml">manual</a><br> |
32 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/application_edit.png' align='top'> <a class="menulink" href="http://www.rockbox.org/twiki/">wiki</a><br> | 32 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/application_edit.png' align='top'> <a class="menulink" href="http://www.rockbox.org/wiki/">wiki</a><br> |
33 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/book_open.png' align='top'> <a class="menulink" href="http://www.rockbox.org/twiki/bin/view/Main/DocsIndex">docs index</a> | 33 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/book_open.png' align='top'> <a class="menulink" href="http://www.rockbox.org/wiki/DocsIndex">docs index</a> |
34 | <div class="submenu"> | 34 | <div class="submenu"> |
35 | Support | 35 | Support |
36 | </div> | 36 | </div> |
@@ -58,17 +58,6 @@ | |||
58 | <input value="Search" type=submit> | 58 | <input value="Search" type=submit> |
59 | <input type=hidden name=as_sitesearch value="www.rockbox.org"> | 59 | <input type=hidden name=as_sitesearch value="www.rockbox.org"> |
60 | </form> | 60 | </form> |
61 | <p><form action="https://www.paypal.com/cgi-bin/webscr" method="get"> | ||
62 | <input type="hidden" name="cmd" value="_xclick"> | ||
63 | <input type="hidden" name="business" value="bjorn@haxx.se"> | ||
64 | <input type="hidden" name="item_name" value="Donation to the Rockbox project"> | ||
65 | <input type="hidden" name="no_shipping" value="1"> | ||
66 | <input type="hidden" name="cn" value="Note to the Rockbox team"> | ||
67 | <input type="hidden" name="currency_code" value="USD"> | ||
68 | |||
69 | <input type="hidden" name="tax" value="0"> | ||
70 | <input type="image" src="http://www.rockbox.org/paypal-donate.gif" name="submit"> | ||
71 | </form> | ||
72 | </div> | 61 | </div> |
73 | </td> | 62 | </td> |
74 | <td class="plugincontent"> | 63 | <td class="plugincontent"> |
@@ -88,4 +77,4 @@ | |||
88 | </tr> | 77 | </tr> |
89 | </table> | 78 | </table> |
90 | </body> | 79 | </body> |
91 | </html> \ No newline at end of file | 80 | </html> |
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 @@ | |||
23 | </div> | 23 | </div> |
24 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/package.png' align='top'> <a class="menulink" href="http://www.rockbox.org/download/">releases</a><br> | 24 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/package.png' align='top'> <a class="menulink" href="http://www.rockbox.org/download/">releases</a><br> |
25 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/bomb.png' align='top'> <a class="menulink" href="http://build.rockbox.org">current build</a><br> | 25 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/bomb.png' align='top'> <a class="menulink" href="http://build.rockbox.org">current build</a><br> |
26 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/style.png' align='top'> <a class="menulink" href="http://www.rockbox.org/twiki/bin/view/Main/RockboxExtras">extras</a> | 26 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/style.png' align='top'> <a class="menulink" href="http://www.rockbox.org/wiki/RockboxExtras">extras</a> |
27 | <div class="submenu"> | 27 | <div class="submenu"> |
28 | Documentation | 28 | Documentation |
29 | 29 | ||
30 | </div> | 30 | </div> |
31 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/help.png' align='top'> <a class="menulink" href="http://www.rockbox.org/twiki/bin/view/Main/GeneralFAQ">FAQ</a><br> | 31 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/help.png' align='top'> <a class="menulink" href="http://www.rockbox.org/wiki/GeneralFAQ">FAQ</a><br> |
32 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/page_white_acrobat.png' align='top'> <a class="menulink" href="http://www.rockbox.org/manual.shtml">manual</a><br> | 32 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/page_white_acrobat.png' align='top'> <a class="menulink" href="http://www.rockbox.org/manual.shtml">manual</a><br> |
33 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/application_edit.png' align='top'> <a class="menulink" href="http://www.rockbox.org/twiki/">wiki</a><br> | 33 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/application_edit.png' align='top'> <a class="menulink" href="http://www.rockbox.org/wiki/">wiki</a><br> |
34 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/book_open.png' align='top'> <a class="menulink" href="http://www.rockbox.org/twiki/bin/view/Main/DocsIndex">docs index</a> | 34 | <img width=16 height=16 src='http://www.rockbox.org/silk_icons/book_open.png' align='top'> <a class="menulink" href="http://www.rockbox.org/wiki/DocsIndex">docs index</a> |
35 | <div class="submenu"> | 35 | <div class="submenu"> |
36 | Support | 36 | Support |
37 | </div> | 37 | </div> |
@@ -58,17 +58,6 @@ | |||
58 | <input value="Search" type=submit> | 58 | <input value="Search" type=submit> |
59 | <input type=hidden name=as_sitesearch value="www.rockbox.org"> | 59 | <input type=hidden name=as_sitesearch value="www.rockbox.org"> |
60 | </form> | 60 | </form> |
61 | <p><form action="https://www.paypal.com/cgi-bin/webscr" method="get"> | ||
62 | <input type="hidden" name="cmd" value="_xclick"> | ||
63 | <input type="hidden" name="business" value="bjorn@haxx.se"> | ||
64 | <input type="hidden" name="item_name" value="Donation to the Rockbox project"> | ||
65 | <input type="hidden" name="no_shipping" value="1"> | ||
66 | <input type="hidden" name="cn" value="Note to the Rockbox team"> | ||
67 | <input type="hidden" name="currency_code" value="USD"> | ||
68 | |||
69 | <input type="hidden" name="tax" value="0"> | ||
70 | <input type="image" src="http://www.rockbox.org/paypal-donate.gif" name="submit"> | ||
71 | </form> | ||
72 | </div> | 61 | </div> |
73 | </td> | 62 | </td> |
74 | <td class="plugincontent"> | 63 | <td class="plugincontent"> |
@@ -115,4 +104,4 @@ | |||
115 | </tr> | 104 | </tr> |
116 | </table> | 105 | </table> |
117 | </body> | 106 | </body> |
118 | </html> \ No newline at end of file | 107 | </html> |