diff options
| -rw-r--r-- | mbbsd/Makefile | 1 | ||||
| -rw-r--r-- | mbbsd/admin.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mbbsd/Makefile b/mbbsd/Makefile index abfa1e0a..66c642af 100644 --- a/mbbsd/Makefile +++ b/mbbsd/Makefile @@ -16,6 +16,7 @@ OBJS= admin.o announce.o args.o assess.o bbs.o board.o cache.o cal.o card.o\ screen.o stuff.o talk.o term.o topsong.o user.o brc.o vice.o vote.o\ xyz.o voteboard.o syspost.o var.o passwd.o calendar.o go.o +MERGEBBS=1 .if defined(MERGEBBS) CFLAGS+= -DMERGEBBS OBJS+= merge.o diff --git a/mbbsd/admin.c b/mbbsd/admin.c index b5386cbc..f5ea06b5 100644 --- a/mbbsd/admin.c +++ b/mbbsd/admin.c @@ -961,7 +961,7 @@ scan_register_form(char *regfile, int automode, int neednum) }; char *reason[] = { "輸入真實姓名", - "詳細填寫您的「學校以及『科系』『年級』」或「服務單位(詳細至職稱)」", + "詳細填寫您的「(畢業)學校及『系』『級』」或「服務單位(含所屬縣市及職稱)」" "填寫完整的住址資料 (含縣市名稱, 台北市請含行政區域）", "詳填連絡電話 (含區域碼, 中間不用加 \"-\", \"(\", \")\"等符號", "確實填寫註冊申請表", |