This commit was generated by cvs2svn to compensate for changes in r74853,

which included commits to RCS files with non-trunk default branches.

2 files changed, 38 insertions, 21 deletions

diff --git a/usr.bin/ee/README b/usr.bin/ee/README
index e150700..8850af2 100644
--- a/usr.bin/ee/README
+++ b/usr.bin/ee/README
@@ -15,7 +15,6 @@
 
       This software may be distributed under the terms of Larry Wall's 
       Artistic license, a copy of which is included in this distribution. 
-      (see doc/Artistic).
 
       This notice must be included with this software and any 
       derivatives. 
@@ -68,19 +67,17 @@ terminal's capabilities.
 While ee is based on curses, I have included here the source code to 
 new_curse, a subset of curses developed for use with ee.  'curses' often  
 will have a defect that reduces the usefulness of the editor relying upon 
-it.  This is unused by the FreeBSD version of ee (the existing ncurses
-library works just fine) but is included in the doc subdirectory for
-reference purposes should anyone wish to port ee to a platform for
-which the existing curses libraries are insufficient.
+it.  
 
-The files doc/new_curse.[ch] contain a subset of the 'curses' library
-used by applications to handle screen output.  Unfortunately, curses 
+The file new_curse.c contains a subset of 'curses', a package for 
+applications to use to handle screen output.  Unfortunately, curses 
 varies from system to system, so I developed new_curse to provide 
 consistent behavior across systems.  It works on both SystemV and BSD 
 systems, and while it can sometimes be slower than other curses packages, 
 it will get the information on the screen painted correctly more often 
-than vendor supplied curses.  Again, FreeBSD does not have this problem
-but you may find it useful on other platforms.
+than vendor supplied curses.  Unless problems occur during the building 
+of ee, it is recommended that you use new_curse rather than the curses 
+supplied with your system.
 
 If you experience problems with data being displayed improperly, check 
 your terminal configuration, especially if you're using a terminal 
@@ -93,7 +90,10 @@ else (like the terminal emulator being used).
 
 Both ee and new_curse were developed using K&R C (also known as "classic 
 C"), but it can also be compiled with ANSI C.  You should be able to 
-build ee by simply typing "make".
+build ee by simply typing "make".  A make file which takes into account 
+the characteristics of your system will be created, and then ee will be 
+built.  If there are problems encountered, you will be notified about 
+them. 
 
 ee is the result of several conflicting design goals.  While I know that it 
 solves the problems of some users, I also have no doubt that some will decry 
diff --git a/usr.bin/ee/ee.i18n.guide b/usr.bin/ee/ee.i18n.guide
index 0850c2e..eef836a 100644
--- a/usr.bin/ee/ee.i18n.guide
+++ b/usr.bin/ee/ee.i18n.guide
@@ -1,18 +1,23 @@
-Easy Editor ("ee") provides the ability to translate the messages displayed to 
-the user and the commands entered.  This is done via message catalogs, 
-following X/Open standards.  ee only supports eight bit characters.
+Easy Editor ("ee") provides the ability to translate the messages 
+displayed to the user and the commands entered.  This is done via message 
+catalogs, following X/Open standards.  ee supports eight bit characters, 
+as well as 16-bit characters.  The Chinese Big 5 code set is the 16-bit 
+code set that ee was modified to handle, as it is relatively easy to 
+support since two byte characters also take up two columns on the screen, 
+thereby simplifying the screen position calculations.  Other multibyte 
+code sets may function, but have not been tested. 
 
 (The name ee.i18n.guide is for "ee internationalization guide".  The i18n 
 abbreviation is used because there are 18 characters between the first 
-letter ("i") and last ("n") of "internationalization".)
+letter ("i") and last ("n") of "internationalization".) 
 
-All of the messages, warnings, information, and commands, are contained in the 
-message catalog.  Each numbered entry represents an individual string used by 
-ee.  Some strings contain formatting information for formatted print 
-statements, which are of the form "%s", or "%d", these must be preserved in 
-the translation, or the correct information will not be displayed.  For those 
-strings containing multiple formatting codes, the order of each item must be 
-preserved as well.
+All of the messages, warnings, information, and commands, are contained 
+in the message catalog.  Each numbered entry represents an individual 
+string used by ee.  Some strings contain formatting information for 
+formatted print statements, which are of the form "%s", or "%d", these 
+must be preserved in the translation, or the correct information will not 
+be displayed.  For those strings containing multiple formatting codes, 
+the order of each item must be preserved as well. 
 
 Message		content 
 1 		title for modes, or settings menu
@@ -93,6 +98,18 @@ Message		content
 154 - 158	info window entries for emacs key bindings info
 159		string for turning on emacs key bindings in the init file
 160		string for turning off emacs key bindings in the init file
+161		fifth line of usage statement
+162		error message when unable to save configuration file
+163		positive feedback about saving the configuration file
+164 - 167	menu items for saving editor configuration
+168		error message when unable to save configuration file
+169		error message for ree when not specifying the file
+180		self-explanatory
+181 - 182	indicators of more information in menu (for when scrolling 
+		 menus because menu contents won't fit vertically on screen)
+183		menu entry for modes menu for 16 bit characters
+184 - 185	strings for initialization to turn on or off 16 bit 
+		character handling
 
 Care should be taken when translating commands and initialization keywords 
 because the algorithm used for detecting uniqueness of entered commands