From 7009e56137158b80d479dab7861fe62da0239d08 Mon Sep 17 00:00:00 2001
From: hylom <hylom@users.sourceforge.jp>
Date: Tue, 30 Oct 2018 19:05:54 +0900
Subject: [PATCH] fix some typos

---
 src/newslash_web/lib/Newslash/Plugin/DefaultConfig.pm | 6 +++---
 src/newslash_web/templates/login/activation.html.tt2  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/newslash_web/lib/Newslash/Plugin/DefaultConfig.pm b/src/newslash_web/lib/Newslash/Plugin/DefaultConfig.pm
index faae9239..599f9ce9 100644
--- a/src/newslash_web/lib/Newslash/Plugin/DefaultConfig.pm
+++ b/src/newslash_web/lib/Newslash/Plugin/DefaultConfig.pm
@@ -8,9 +8,9 @@ my $defaults = {
 			       pid_file =>  '/var/run/newslash/newslash.pid',
 			     },
 
-		Site => { name => "newslash",
-                          admin_email => 'admin@example.com',
-			  root => "/",
+		Site => { admin_email => 'admin@example.com',
+			  name => "newslash",
+                          root => "/",
 			  base_url => "https://example.com",
 			  description => "this is newslash",
 			  img_path => "/img",
diff --git a/src/newslash_web/templates/login/activation.html.tt2 b/src/newslash_web/templates/login/activation.html.tt2
index d7acea3e..32283233 100644
--- a/src/newslash_web/templates/login/activation.html.tt2
+++ b/src/newslash_web/templates/login/activation.html.tt2
@@ -3,7 +3,6 @@
 [%- IF activation_succeed -%]
 <script type="text/x-template" id="password-message">
   <div class="alert-error" v-else-if="target == 'PASSWORD_NOT_MATCH'">確認用パスワードと一致しません。</div>
-アクセスしてください。</div>
   <div class="alert-error" v-else-if="target == 'SERVER_ERROR'">サーバーエラーが発生しました。</div>
 </script>
 
-- 
2.11.0