Index: branches/testa-single-bookmark/php/content3.php
===================================================================
--- branches/testa-single-bookmark/php/content3.php	(revision 57)
+++ branches/testa-single-bookmark/php/content3.php	(revision 60)
@@ -47,6 +47,6 @@
         $ret = get_url_data( $num )['path'];
         break;
-    case 'setting':
-        $ret = get_url_data( $num )['setting_path'];
+    case 'conf':
+        $ret = get_url_data( $num )['conf_path'];
         break;
     case 'output':
@@ -72,5 +72,5 @@
         $cmd_line_items = array("find" , $top_path , "-regex", $regexp);
         break;
-    case 'setting':
+    case 'conf':
         $regexp = '".*[^~]"';
         $cmd_line_items = array("find" , $top_path , "-type", "f", "-regex" , $regexp);
@@ -102,5 +102,5 @@
 
 function restrict_filelist( $num, $path_info , $part ) {
-    if( $part === "setting" ){
+    if( $part === "conf" ){
         $pathinfox = new ns\PathInfo($part, $path_info["top_path"]);
     }
@@ -200,5 +200,5 @@
     global $exec_path;
 
-    $filelist_filename = array("data"=> "filelist.json", "setting"=> "setting-filelist.json", "output" => "output-filelist.json");
+    $filelist_filename = array("data"=> "filelist.json", "conf"=> "conf-filelist.json", "output" => "output-filelist.json");
     #    $storage_dir = dirname(__FILE__) . '/../storage';
     $storage_dir = dirname(__FILE__) . '/../storage-devconf';
@@ -382,5 +382,5 @@
     $list = array();
 
-    $fname = get_full_path( $num, 'setting_path' , 'site.tsv');
+    $fname = get_full_path( $num, 'conf_path' , 'site.tsv');
     if (($f = fopen( $fname , "r" )) !== FALSE) {
         while (($data = fgetcsv($f, 1000, "\t")) !== FALSE) {
@@ -422,5 +422,5 @@
 
 function get_settings_file( $name ){
-    $dir = get_item( 0 , "setting_path" );
+    $dir = get_item( 0 , "conf_path" );
     $path = implode( "/" , [$dir, $name] );