From d219b0b2ca75f949f5b3092ff3e05c017bfc1ae0 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 20 Jan 2013 01:15:58 +0000
Subject: Revise angel menu and prompts

git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5773 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 pttbbs/mbbsd/angel.c | 4 +---
 pttbbs/mbbsd/menu.c  | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pttbbs/mbbsd/angel.c b/pttbbs/mbbsd/angel.c
index cf63e03a..df54d91a 100644
--- a/pttbbs/mbbsd/angel.c
+++ b/pttbbs/mbbsd/angel.c
@@ -329,9 +329,7 @@ do_changeangel(int force) {
 
     mvouts(b_lines - 3, 0, "\n"
            "請注意若未呼叫過目前的小天使就申請更換，很可能會再換到同個天使\n");
-    getdata(b_lines - 1, 0,
-	    "更換小天使後就無法換回了喔！ 是否要更換小天使？ [y/N]",
-	    buf, 3, LCECHO);
+    getdata(b_lines - 1, 0, "確定要更換小天使？ [y/N]", buf, 3, LCECHO);
     if (buf[0] == 'y') {
 	log_filef(BBSHOME "/log/changeangel.log",LOG_CREAT,
                   "%s 小主人 %s 換掉 %s 小天使\n",
diff --git a/pttbbs/mbbsd/menu.c b/pttbbs/mbbsd/menu.c
index efee47b9..e522d34b 100644
--- a/pttbbs/mbbsd/menu.c
+++ b/pttbbs/mbbsd/menu.c
@@ -682,7 +682,10 @@ static const commands_t maillist[] = {
 static const commands_t angelmenu[] = {
     {a_angelmsg, PERM_ANGEL,"Leave message 留言給小主人"},
     {a_angelreport, 0,      "Report        線上天使狀態報告"},
+#ifdef ANGEL_ALLOW_MENU_RELOAD
+    // This will corrupt perf data; let's do that weekly.
     {a_angelreload, PERM_SYSOP,"OReload    重整天使資訊"},
+#endif
     {NULL, 0, NULL}
 };
 
-- 
cgit v1.2.3