diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index ee9e89f92..cb1909fab 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-20  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
+
+	* Makefile.in: Remove unused cygwin-ug and cygwin-api-int 
+	targets from default build.
+	* how-using.texinfo: Add information about 8-bit character 
+	display to FAQ.
+	* setup2.sgml: Add information about 8-bit character display
+	to "Setting up Cygwin".
+
 2004-01-15  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
 
 	* setup-net.sgml: Add "internet-setup" id anchor.
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index d3e7772e2..09c006cab 100644
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -37,10 +37,8 @@ TOCLEAN:=faq.txt ./*.html readme.txt doctool.o doctool.exe *.junk \
 .SUFFIXES:
 
 all : \
-	cygwin-ug/cygwin-ug.html \
 	cygwin-ug-net/cygwin-ug-net.html \
 	cygwin-ug-net.html \
-	cygwin-api-int/cygwin-api-int.html \
 	cygwin-api/cygwin-api.html \
 	$(DOC) \
 	$(HTMLDOC)
diff --git a/winsup/doc/how-using.texinfo b/winsup/doc/how-using.texinfo
index fdb31bd8d..eb5499dc2 100644
--- a/winsup/doc/how-using.texinfo
+++ b/winsup/doc/how-using.texinfo
@@ -325,7 +325,15 @@ add the following lines to your @code{~/.inputrc} file:
 @end example
 
 These are options to the @code{readline} library, which you can read
-about in the @code{bash(1)} man page.
+about in the @code{bash(1)} and @code{readline(3)} man pages. Other
+tools that do not use @code{readline} for display, such as
+less and ls, require additional settings, which could be put in your
+@code{~/.bashrc}:
+@example
+alias less='/bin/less -r'
+alias ls='/bin/ls -F --color=tty --show-control-chars'
+@end example
+
 
 @subsection Why don't cursor keys work under Win95/Win98?
 
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index 592a25dc2..a5a5c1663 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -145,8 +145,8 @@ be read if <envar>HOME</envar> is defined before starting bash.
 <para>
 <filename>.profile</filename> (other names are also valid, see the bash man
 page) contains bash commands.  It is executed when bash is started as login
-shell, e.g. from the command <command>bash --login</command> (the provided
-.bat file does not set the switch).  This is a useful place to define and
+shell, e.g. from the command <command>bash --login</command>.
+This is a useful place to define and
 export environment variables and bash functions that will be used by bash
 and the programs invoked by bash.  It is a good place to redefine
 <envar>PATH</envar> if needed.  We recommend adding a ":." to the end of
@@ -177,24 +177,29 @@ shells. You can source it from <filename>.profile</filename>.
 
 <para>
 <filename>.inputrc</filename> controls how programs using the readline
-library (including bash) behave.  It is loaded automatically.  The
-full details are in the <filename>readline.info</filename>. 
-Due to a bug in the current readline version, 
-<filename>.inputrc</filename> cannot contain \r,
-even on text mounted systems.
+library (including <command>bash</command>) behave.  It is loaded
+automatically.  For full details see the <literal>Function and Variable
+Index</literal> section of the GNU <systemitem>readline</systemitem> manual.
 Consider the following settings:
 <screen>
+# Ignore case while completing
+set completion-ignore-case on
 # Make Bash 8bit clean
 set meta-flag on
 set convert-meta off
 set output-meta on
-# Ignore case while completing
-set completion-ignore-case on
 </screen>
-The first three commands allow bash to display 8-bit characters,
-useful for languages with accented characters.  The last line makes
-filename completion case insensitive, which can be convenient in a
-Windows environment.
+The first command makes filename completion case insensitive, which can
+be convenient in a Windows environment.  The next three commands allow
+<command>bash</command> to display 8-bit characters, useful for
+languages with accented characters.  Note that tools that do not use
+<systemitem>readline</systemitem> for display, such as
+<command>less</command> and <command>ls</command>, require additional
+settings, which could be put in your <filename>.bashrc</filename>:
+<screen>
+alias less='/bin/less -r'
+alias ls='/bin/ls -F --color=tty --show-control-chars'
+</screen>
 </para>
 
 </sect1>