Now PukiWiki version is "1.5.2"

diff --git a/INSTALL.txt b/INSTALL.txt
index dfdf787..660709f 100755 (executable)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,9 +1,9 @@
 名前
     PukiWiki  - 自由にページを追加・削除・編集できるWebページ構築スクリプト
 
-    Version 1.5.1
+    Version 1.5.2
     Copyright
-      2001-2016 PukiWiki Development Team
+      2001-2018 PukiWiki Development Team
       2001-2002 yu-ji (Based on PukiWiki 1.3 by yu-ji)
     License: GPL version 2 or (at your option) any later version
 

diff --git a/README.en.txt b/README.en.txt
index de5ddcf..152a71c 100644 (file)
--- a/README.en.txt
+++ b/README.en.txt
@@ -6,9 +6,9 @@ NAME
     PukiWiki - PHP scripts for Web pages which can be edited by anyone, 
                at any time, from anywhere. 
 
-        PukiWiki 1.5.1
+        PukiWiki 1.5.2
         Copyright
-          2001-2016 PukiWiki Developement Team
+          2001-2018 PukiWiki Developement Team
           2001-2002 yu-ji (Based on PukiWiki 1.3 by yu-ji)
         License: GPL version 2 or (at your option) any later version
         http://pukiwiki.osdn.jp/

diff --git a/README.txt b/README.txt
index edf06dc..7ba7174 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,9 +1,9 @@
 名前
     PukiWiki - 自由にページを追加・削除・編集できるWebページ構築スクリプト
 
-    Version 1.5.1
+    Version 1.5.2
     Copyright
-      2001-2016 PukiWiki Development Team
+      2001-2018 PukiWiki Development Team
       2001-2002 yu-ji (Based on PukiWiki 1.3 by yu-ji)
     License: GPL version 2 or (at your option) any later version
 

diff --git a/UPDATING.en.txt b/UPDATING.en.txt
index a0af40b..334eea1 100644 (file)
--- a/UPDATING.en.txt
+++ b/UPDATING.en.txt
@@ -12,10 +12,17 @@ http://pukiwiki.osdn.jp/?PukiWiki/Download
 INCOMPATIBILITY INFORMATION BETWEEN RELEASES
 ============================================
 
+PukiWiki 1.5.2: Incompatibility from PukiWiki 1.5.1
+
+   1. CSS file "skin/pukiwiki.css.php" has been renamed to "skin/pukiwiki.css".
+      (See BugTrack/2448, BugTrack/2367)
+
+
 PukiWiki 1.5.1: Incompatibility from PukiWiki 1.5.0
 
-   1. TrackBack implimentation and 'referer' function had been removed.
-      (See BugTrack2/62)
+   1. Default authentication method from AUTH_TYPE_BASIC to
+      AUTY_TYPE_FORM.
+      (See PukiWiki/Authentication)
 
 
 PukiWiki 1.5.0: Incompatibility from PukiWiki 1.4.7_notb

diff --git a/UPDATING.txt b/UPDATING.txt
index de043b6..85287bb 100644 (file)
--- a/UPDATING.txt
+++ b/UPDATING.txt
@@ -13,6 +13,11 @@ http://pukiwiki.osdn.jp/?PukiWiki/Download
 リリース間の互換性に関する記述
 ==============================
 
+PukiWiki 1.5.2: PukiWiki 1.5.1 との非互換点
+
+   1. CSSファイル skin/pukiwiki.css.php が skin/pukiwiki.css に変更されました。
+
+
 PukiWiki 1.5.1: PukiWiki 1.5.0 との非互換点
 
    1. PukiWiki内でアクセス制限を行う際のデフォルト認証方式がBasic認証から

diff --git a/lib/init.php b/lib/init.php
index 87863ae..59247ca 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // init.php
 // Copyright
-//   2002-2017 PukiWiki Development Team
+//   2002-2018 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -10,10 +10,10 @@
 
 // PukiWiki version / Copyright / Licence
 
-define('S_VERSION', '1.5.1');
+define('S_VERSION', '1.5.2');
 define('S_COPYRIGHT',
        '<strong>PukiWiki ' . S_VERSION . '</strong>' .
-       ' &copy; 2001-2016' .
+       ' &copy; 2001-2018' .
        ' <a href="http://pukiwiki.osdn.jp/">PukiWiki Development Team</a>'
 );
 
@@ -454,4 +454,3 @@ $line_rules = array_merge(array(
        '&amp;(#[0-9]+|#x[0-9a-f]+|' . get_html_entity_pattern() . ');' => '&$1;',
        "\r"          => '<br />' . "\n",       /* 行末にチルダは改行 */
 ), $line_rules);
-