Index: branches/comu/data/conf/conf.php
===================================================================
--- branches/comu/data/conf/conf.php	(revision 15)
+++ branches/comu/data/conf/conf.php	(revision 249)
@@ -11,4 +11,10 @@
 require_once($CONF_PHP_PATH ."/../install.inc");
 require_once($CONF_PHP_PATH ."/core.php" );
+
+//--------------------------------------------------------------------------------------------------------
+/** ¥Õ¥í¥ó¥Èɽ¼¨´ØÏ¢ **/
+define("SAMPLE_ADDRESS1", "»Ô¶èĮ¼̾¡ÊÎ㡧ÅìµþÅÔÀéÂåÅĶè¿ÀÅÄ¿ÀÊÝÄ®¡Ë");
+define("SAMPLE_ADDRESS2", "ÈÖÃÏ¡¦¥Ó¥ë̾¡ÊÎ㡧1-3-5¡Ë");
+//--------------------------------------------------------------------------------------------------------
 
 //--------------------------------------------------------------------------------------------------------
@@ -60,5 +66,5 @@
 /** ¥¢¥Ã¥×¥Ç¡¼¥È´ÉÍýÍÑ **/
 // ¥¢¥Ã¥×¥Ç¡¼¥È´ÉÍýÍÑ¥Õ¥¡¥¤¥ë³ÊǼ¾ì½ê¡¡
-define("UPDATE_HTTP", "http://www.lockon.co.jp/share/test/");
+define("UPDATE_HTTP", "http://www.lockon.co.jp/share/");
 
 // ¥¢¥Ã¥×¥Ç¡¼¥È´ÉÍýÍÑCSV1¹ÔÊÕ¤ê¤ÎºÇÂçʸ»ú¿ô
@@ -86,5 +92,5 @@
 
 // EC-CUBE¥Ð¡¼¥¸¥ç¥ó¾ðÊó
-define("ECCUBE_VERSION", "1.0.2a-beta");
+define("ECCUBE_VERSION", "1.1.1");
 
 // ·èºÑ¥â¥¸¥å¡¼¥ëÉÕͿʸ¸À
@@ -101,7 +107,4 @@
 //°ìÈÌ¥µ¥¤¥È¥¨¥é¡¼
 define("FAVORITE_ERROR", 13);
-
-//¤ª¤¹¤¹¤á¾¦ÉÊ¿ô
-define ("RECOMMEND_PRODUCT_MAX", 6);
 
 /** ¥°¥é¥Õ´ØÏ¢ **/
@@ -142,5 +145,5 @@
 define("DEFAULT_PASSWORD", "UAhgGR3L");
 //¤ª¤¹¤¹¤á¾¦ÉÊ¿ô
-define ("RECOMMEND_PRODUCT_MAX", 4);
+define ("RECOMMEND_PRODUCT_MAX", 5);
 
 //Ê̤ΤªÆϤ±ÀèºÇÂçÅÐÏ¿¿ô
@@ -177,4 +180,6 @@
 define ("ADMIN_MODE", 0);								// ´ÉÍý¥â¡¼¥É 1:Í­¸ú¡¡0:̵¸ú(ǼÉÊ»þ)
 define ("DAILY_BATCH_MODE", false);						// Çä¾å½¸·×¥Ð¥Ã¥Á¥â¡¼¥É(true:¥Ð¥Ã¥Á¤Ç½¸·×¤¹¤ë ¢¨Í×cronÀßÄê¡¢false:¥ê¥¢¥ë¥¿¥¤¥à¤Ç½¸·×¤¹¤ë)
+define ("MAX_LOG_QUANTITY", 5);							// ¥í¥°¥Õ¥¡¥¤¥ëºÇÂç¿ô(¥í¥°¥Æ¡¼¥·¥ç¥ó)
+define ("MAX_LOG_SIZE", "10000");						// 1¤Ä¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ëºÇÂçÍÆÎÌ(byte)
 
 define ("FORGOT_MAIL", 0);								// ¥Ñ¥¹¥ï¡¼¥É˺¤ì¤Î³Îǧ¥á¡¼¥ë¤òÁ÷ÉÕ¤¹¤ë¤«Èݤ«¡£(0:Á÷¿®¤·¤Ê¤¤¡¢1:Á÷¿®¤¹¤ë)
@@ -182,5 +187,4 @@
 define ("LINE_LIMIT_SIZE", 60);							// ʸ»ú¿ô¤¬Â¿¤¹¤®¤ë¤È¤­¤Ë¶¯À©²þ¹Ô¤¹¤ë¥µ¥¤¥º(Ⱦ³Ñ)
 define ("BIRTH_MONTH_POINT", 0);						// ÃÂÀ¸Æü·î¥Ý¥¤¥ó¥È
-define ("INPUT_DELIV_FEE", true);						// ÇÛÁ÷ÎÁ¤ÎÀßÄê²èÌÌ(true:¤¢¤ê¡¢false:¤Ê¤·)
 
 /* ¥¯¥ì¥¸¥Ã¥È¥í¡¼¥ó(¥»¥ó¥È¥é¥ë¥Õ¥¡¥¤¥Ê¥ó¥¹) */
@@ -251,4 +255,7 @@
 define ("CATEGORY_HEAD", ">");							// ¿Æ¥«¥Æ¥´¥êɽ¼¨Ê¸»ú
 define ("START_BIRTH_YEAR", 1901);						// À¸Ç¯·îÆüÁªÂò³«»Ïǯ
+// ²Á³Ê̾¾Î
+define("NORMAL_PRICE_TITLE","Ä̾ï²Á³Ê");
+define("SALE_PRICE_TITLE","ÈÎÇä²Á³Ê");
 
 /* ¥·¥¹¥Æ¥à¥Ñ¥¹ */
@@ -287,5 +294,4 @@
 define ("URL_LOGOUT", URL_DIR . "admin/logout.php");					// ¥í¥°¥¢¥¦¥È¥Ú¡¼¥¸
 define ("URL_SYSTEM_CSV", URL_DIR . "admin/system/member_csv.php");		// ¥·¥¹¥Æ¥à´ÉÍýCSV½ÐÎÏ¥Ú¡¼¥¸
-define ("URL_SYSTEM_TOP", URL_DIR . "admin/system/index.php");			// ¥·¥¹¥Æ¥à´ÉÍýTOP¥Ú¡¼¥¸
 define ("URL_ADMIN_CSS", URL_DIR . "admin/css/");						// ´ÉÍý¥Ú¡¼¥¸ÍÑCSSÊݴɥǥ£¥ì¥¯¥È¥ê
 define ("URL_CAMPAIGN_TOP", URL_DIR . "admin/contents/campaign.php");	// ¥­¥ã¥ó¥Ú¡¼¥óÅÐÏ¿¥Ú¡¼¥¸
@@ -555,7 +561,4 @@
 	4 => "mail_templates/contact_mail.tpl",
 );
-
-// ¼õÃí¥¹¥Æ¡¼¥¿¥¹Êѹ¹¤ÎºÝ¤Ë¥Ý¥¤¥ó¥ÈÅù¤ò²Ã»»¤¹¤ë¥¹¥Æ¡¼¥¿¥¹ÈÖ¹æ¡ÊȯÁ÷ºÑ¤ß¡Ë
-define("ODERSTATUS_COMMIT", 5);
 
 /* ÅÔÆ»Éܸ©ÇÛÎó */