5 files changed, 26 insertions, 56 deletions
diff --git a/inputmethod/canna-dict/DESCR b/inputmethod/canna-dict/DESCR
index 14268d78991..8faa0f48d82 100644
--- a/inputmethod/canna-dict/DESCR
+++ b/inputmethod/canna-dict/DESCR
@@ -1,13 +1 @@
-Canna is a Kana-Kanji conversion server.
-Support Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
-cannum front end and some others.
-
-  To use from Mule (CANNA version), in .emacs file:
-
-     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
-        (progn
-         (load-library "canna")
-         (canna) ))
-
-  Then kana-kanji conversion begin to `C-o' key. Show more detail
-Info, and/or documents.
+Dictionary part of Canna Japanese input method.
diff --git a/inputmethod/canna-lib/DESCR b/inputmethod/canna-lib/DESCR
index 14268d78991..0bd1d1289d2 100644
--- a/inputmethod/canna-lib/DESCR
+++ b/inputmethod/canna-lib/DESCR
@@ -1,13 +1 @@
-Canna is a Kana-Kanji conversion server.
-Support Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
-cannum front end and some others.
-
-  To use from Mule (CANNA version), in .emacs file:
-
-     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
-        (progn
-         (load-library "canna")
-         (canna) ))
-
-  Then kana-kanji conversion begin to `C-o' key. Show more detail
-Info, and/or documents.
+Library part of Canna Japanese input method.
diff --git a/inputmethod/canna-server-bin/DESCR b/inputmethod/canna-server-bin/DESCR
index 272e6a4babe..9b248ec6bde 100644
--- a/inputmethod/canna-server-bin/DESCR
+++ b/inputmethod/canna-server-bin/DESCR
@@ -1,17 +1 @@
-Canna is a Kana-Kanji conversion server.
-
-This package just contains the binary for the server; install
-the canna-server package for all files.
-
-Support Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
-cannum front end and some others.
-
-  To use from Mule (CANNA version), in .emacs file:
-
-     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
-        (progn
-         (load-library "canna")
-         (canna) ))
-
-  Then kana-kanji conversion begin to `C-o' key. Show more detail
-Info, and/or documents.
+Server part of Canna Japanese input method.
diff --git a/inputmethod/canna-server-bin/MESSAGE b/inputmethod/canna-server-bin/MESSAGE
new file mode 100644
index 00000000000..f1a3705d90a
--- /dev/null
+++ b/inputmethod/canna-server-bin/MESSAGE
@@ -0,0 +1,20 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/06/09 09:36:35 uebayasi Exp $
+
+If you want Canna server to boot automatically, 
+
+	1) Copy ${PREFIX}/etc/rc.d/canna to /etc/rc.d/.
+	2) Add the following line to /etc/rc.conf.
+
+		canna=YES	canna_flags="-u daemon"
+
+canna_flags="-u daemon" is not required, but recommended.  Note that our
+Canna package no longer uses setuid(2) to make the server run as user
+"daemon", owing to the implementation of "-u" option (3.6 and above).  See
+cannaserver(1M).
+
+Also note that by default cannaserver(1M) no longer allows connections
+through tcp port 5680.  You need to explicitly specify the port by the
+"-inet" option.
+
+===========================================================================
diff --git a/inputmethod/canna/DESCR b/inputmethod/canna/DESCR
index bd470e7e7eb..6bd33b62d41 100644
--- a/inputmethod/canna/DESCR
+++ b/inputmethod/canna/DESCR
@@ -1,13 +1,3 @@
-Canna is a Kana-Kanji conversion server.
-Support Mule (Multi-lingal extention Emacs), kinput2 X11 input method,
-cannum front end and some others.
-
-  To use from Mule (CANNA version), in .emacs file:
-
-     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
-        (progn
-         (load-library "canna")
-         (canna) ))
-
-  Then kana-kanji conversion begin to `C-o' key.  Show more detail
-Info, and/or documents.
+Canna is a Japanese input method server / client.  Canna supports
+Emacs/Mule (Multi-lingal extention Emacs), kinput2 X11 input methods,
+cannum front end, and some others.