Index: apps/main_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/main_menu.c,v
retrieving revision 1.153
diff -u -r1.153 main_menu.c
--- apps/main_menu.c	15 Aug 2006 12:27:04 -0000	1.153
+++ apps/main_menu.c	17 Aug 2006 06:09:44 -0000
@@ -58,7 +58,7 @@
 
 bool show_credits(void)
 {
-    plugin_load("/.rockbox/rocks/credits.rock",NULL);
+    plugin_load("/.rockbox/plugins/credits.rock",NULL);
     return false;
 }
Index: apps/settings.h
===================================================================
RCS file: /cvsroot/rockbox/apps/settings.h,v
retrieving revision 1.232
diff -u -r1.232 settings.h
--- apps/settings.h	15 Aug 2006 12:27:05 -0000	1.232
+++ apps/settings.h	17 Aug 2006 06:09:47 -0000
@@ -38,7 +38,7 @@
 #define LANG_DIR "/langs"
 #define WPS_DIR ROCKBOX_DIR "/wps"
 #define THEME_DIR ROCKBOX_DIR "/themes"
-#define PLUGIN_DIR ROCKBOX_DIR"/rocks"
+#define PLUGIN_DIR ROCKBOX_DIR"/plugins"
 #define BACKDROP_DIR ROCKBOX_DIR"/backdrops"
 #define REC_BASE_DIR "/recordings"
 #define EQS_DIR ROCKBOX_DIR "/eqs"
Index: apps/plugins/chessbox.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/chessbox.c,v
retrieving revision 1.1
diff -u -r1.1 chessbox.c
--- apps/plugins/chessbox.c	24 Feb 2006 07:59:47 -0000	1.1
+++ apps/plugins/chessbox.c	17 Aug 2006 06:10:07 -0000
@@ -29,6 +29,6 @@
 /* this is the plugin entry point */
 enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 {
-    return run_overlay(api, parameter, "/.rockbox/rocks/chessbox.ovl", "ChessBox");
+    return run_overlay(api, parameter, "/.rockbox/plugins/chessbox.ovl", "ChessBox");
 }
 #endif
Index: apps/plugins/clock.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/clock.c,v
retrieving revision 1.32
diff -u -r1.32 clock.c
--- apps/plugins/clock.c	3 Aug 2006 20:17:14 -0000	1.32
+++ apps/plugins/clock.c	17 Aug 2006 06:10:15 -0000
@@ -612,7 +612,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 /* settings are saved to this location */
-static const char default_filename[] = "/.rockbox/rocks/.clock_settings";
+static const char default_filename[] = "/.rockbox/plugins/.clock_settings";
 
 /* names of contributors */
 const char* credits[] = {
Index: apps/plugins/viewers.config
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/viewers.config,v
retrieving revision 1.35
diff -u -r1.35 viewers.config
--- apps/plugins/viewers.config	9 Aug 2006 12:04:13 -0000	1.35
+++ apps/plugins/viewers.config	17 Aug 2006 06:10:15 -0000
@@ -1,7 +1,7 @@
 ch8,viewers/chip8,70 70 7f 7f 70 70
 txt,viewers/viewer,55 55 55 55 55 55
 nfo,viewers/viewer,55 55 55 55 55 55
-txt,rocks/text_editor, 55 55 55 55 55 55
+txt,plugins/text_editor, 55 55 55 55 55 55
 jpg,viewers/jpeg,18 24 3C 3C 24 18
 jpe,viewers/jpeg,18 24 3C 3C 24 18
 jpeg,viewers/jpeg,18 24 3C 3C 24 18
@@ -16,10 +16,10 @@
 mid,viewers/midiplay, 20 70 70 3F 00 00 
 rmi,viewers/midiplay, 20 70 70 3F 00 00
 rsp,viewers/searchengine, 0e 11 11 31 7e 60
-ss,rocks/sudoku, 55 55 55 55 55 55
+ss,plugins/sudoku, 55 55 55 55 55 55
 wav,viewers/wav2wv, 00 00 00 00 00 00
 wav,viewers/mp3_encoder, 00 00 00 00 00 00
 wav,viewers/wavplay,60 7F 05 35 3F 00
-bmp,rocks/rockpaint, 01 10 01 10 01 10
+bmp,plugins/rockpaint, 01 10 01 10 01 10
 m2v,viewers/mpegplayer,5D 7F 5D 7F 5D 7F
 iriver,viewers/iriver_flash,2A 7F 41 41 7F 2A
Index: apps/plugins/vu_meter.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/vu_meter.c,v
retrieving revision 1.24
diff -u -r1.24 vu_meter.c
--- apps/plugins/vu_meter.c	3 Aug 2006 20:17:21 -0000	1.24
+++ apps/plugins/vu_meter.c	17 Aug 2006 06:10:17 -0000
@@ -297,7 +297,7 @@
 }
 
 void load_settings(void) {
-    int fp = rb->open("/.rockbox/rocks/.vu_meter", O_RDONLY);
+    int fp = rb->open("/.rockbox/plugins/.vu_meter", O_RDONLY);
     if(fp>=0) {
             rb->read(fp, &settings, sizeof(struct saved_settings));
             rb->close(fp);
Index: apps/plugins/lib/configfile.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/lib/configfile.c,v
retrieving revision 1.5
diff -u -r1.5 configfile.c
--- apps/plugins/lib/configfile.c	30 May 2006 11:26:41 -0000	1.5
+++ apps/plugins/lib/configfile.c	17 Aug 2006 06:10:22 -0000
@@ -33,7 +33,7 @@
     int i;
     char buf[MAX_PATH];
 
-    cfg_rb->snprintf(buf, MAX_PATH, "/.rockbox/rocks/%s", filename);
+    cfg_rb->snprintf(buf, MAX_PATH, "/.rockbox/plugins/%s", filename);
     fd = cfg_rb->creat(buf, O_WRONLY);
     if(fd < 0)
         return fd*10 - 1;
@@ -78,7 +78,7 @@
     int file_version = -1;
     int tmp;
 
-    cfg_rb->snprintf(buf, MAX_PATH, "/.rockbox/rocks/%s", filename);
+    cfg_rb->snprintf(buf, MAX_PATH, "/.rockbox/plugins/%s", filename);
     fd = cfg_rb->open(buf, O_RDONLY);
     if(fd < 0)
         return fd*10 - 1;
Index: firmware/test/fat/test.sh
===================================================================
RCS file: /cvsroot/rockbox/firmware/test/fat/test.sh,v
retrieving revision 1.11
diff -u -r1.11 test.sh
--- firmware/test/fat/test.sh	18 Apr 2005 14:31:24 -0000	1.11
+++ firmware/test/fat/test.sh	17 Aug 2006 06:10:22 -0000
@@ -97,15 +97,15 @@
     for i in `seq 1 $LOOP`;
     do
         echo ---Test: $i/$LOOP ---
-        try mkfile "/rockbox rocks.$i" $SIZE
+        try mkfile "/rockbox plugins.$i" $SIZE
         check
-        try chkfile "/rockbox rocks.$i" $SIZE
+        try chkfile "/rockbox plugins.$i" $SIZE
         check
-        try del "/rockbox rocks.$i"
+        try del "/rockbox plugins.$i"
         check
-        try mkfile "/rockbox rocks.$i" $SIZE
+        try mkfile "/rockbox plugins.$i" $SIZE
         check
-        try ren "/rockbox rocks.$i" "/$i is a new long filename!"
+        try ren "/rockbox plugins.$i" "/$i is a new long filename!"
         check
     done
 
Index: firmware/test/fat/test16.sh
===================================================================
RCS file: /cvsroot/rockbox/firmware/test/fat/test16.sh,v
retrieving revision 1.2
diff -u -r1.2 test16.sh
--- firmware/test/fat/test16.sh	18 Apr 2005 18:48:13 -0000	1.2
+++ firmware/test/fat/test16.sh	17 Aug 2006 06:10:22 -0000
@@ -99,15 +99,15 @@
     for i in `seq 1 $LOOP`;
     do
         echo ---Test: $i/$LOOP ---
-        try mkfile "/q/rockbox rocks.$i" $SIZE
+        try mkfile "/q/rockbox pluginss.$i" $SIZE
         check
-        try chkfile "/q/rockbox rocks.$i" $SIZE
+        try chkfile "/q/rockbox plugins.$i" $SIZE
         check
-        try del "/q/rockbox rocks.$i"
+        try del "/q/rockbox plugins.$i"
         check
-        try mkfile "/q/rockbox rocks.$i" $SIZE
+        try mkfile "/q/rockbox plugins.$i" $SIZE
         check
-        try ren "/q/rockbox rocks.$i" "/q/$i is a new long filename!"
+        try ren "/q/rockbox plugins.$i" "/q/$i is a new long filename!"
         check
     done
 
Index: manual/plugins/firmware_flash.tex
===================================================================
RCS file: /cvsroot/rockbox/manual/plugins/firmware_flash.tex,v
retrieving revision 1.3
diff -u -r1.3 firmware_flash.tex
--- manual/plugins/firmware_flash.tex	1 Aug 2006 11:57:38 -0000	1.3
+++ manual/plugins/firmware_flash.tex	17 Aug 2006 06:10:23 -0000
@@ -7,6 +7,6 @@
 \par}
 
 Use when flashing Rockbox (see \reference{ref:FlashingRockboxReal}.
-In the ideal case, you'll need this tool only once. For safety reasons you may wish to delete \textbf{firmware\_flash.rock} from \textbf{/.rockbox/rocks} once flashing is complete.
+In the ideal case, you'll need this tool only once. For safety reasons you may wish to delete \textbf{firmware\_flash.rock} from \textbf{/.rockbox/plugins} once flashing is complete.
 
 
Index: tools/buildzip.pl
===================================================================
RCS file: /cvsroot/rockbox/tools/buildzip.pl,v
retrieving revision 1.53
diff -u -r1.53 buildzip.pl
--- tools/buildzip.pl	11 May 2006 10:31:32 -0000	1.53
+++ tools/buildzip.pl	17 Aug 2006 06:10:25 -0000
@@ -121,7 +121,7 @@
     }
 
     mkdir ".rockbox/langs", 0777;
-    mkdir ".rockbox/rocks", 0777;
+    mkdir ".rockbox/plugins", 0777;
     if($notplayer) {
         mkdir ".rockbox/codepages", 0777;
         mkdir ".rockbox/codecs", 0777;
@@ -145,7 +145,7 @@
         }
     }
 
-    $c= 'find apps "(" -name "*.rock" -o -name "*.ovl" ")" ! -empty -exec cp {} .rockbox/rocks/ \;';
+    $c= 'find apps "(" -name "*.rock" -o -name "*.ovl" ")" ! -empty -exec cp {} .rockbox/plugins/ \;';
     print `$c`;
 
     open VIEWERS, "$ROOT/apps/plugins/viewers.config" or
@@ -176,11 +176,11 @@
 
             # print STDERR "$ext $plugin $dir $name $r\n";
 
-            if(-e ".rockbox/rocks/$name") {
-                if($dir ne "rocks") {
-                    # target is not 'rocks' but the plugins are always in that
+            if(-e ".rockbox/plugins/$name") {
+                if($dir ne "plugins") {
+                    # target is not 'plugins' but the plugins are always in that
                     # dir at first!
-                    `mv .rockbox/rocks/$name .rockbox/$r`;
+                    `mv .rockbox/plugins/$name .rockbox/$r`;
                 }
                 print VIEWERS $line;
             }
@@ -190,10 +190,10 @@
                 print VIEWERS $line;
             }
 
-            if(-e ".rockbox/rocks/$oname") {
+            if(-e ".rockbox/plugins/$oname") {
                 # if there's an "overlay" file for the .rock, move that as
                 # well
-                `mv .rockbox/rocks/$oname .rockbox/$dir`;
+                `mv .rockbox/plugins/$oname .rockbox/$dir`;
             }
         }
     }
@@ -202,8 +202,8 @@
     `cp $ROOT/apps/tagnavi.config .rockbox/`;
       
     if($notplayer) {
-        `cp $ROOT/apps/plugins/sokoban.levels .rockbox/rocks/`; # sokoban levels
-        `cp $ROOT/apps/plugins/snake2.levels .rockbox/rocks/`; # snake2 levels
+        `cp $ROOT/apps/plugins/sokoban.levels .rockbox/plugins/`; # sokoban levels
+        `cp $ROOT/apps/plugins/snake2.levels .rockbox/plugins/`; # snake2 levels
     }
 
     if($image) {