PR libcpp/15500:

	* doc/cpp.texi (Implementation-defined behavior): Mention
	-finput-charset.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134441 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 11 insertions, 4 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 270b12e159c..81d4f5d1ea2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-18  Tom Tromey  <tromey@redhat.com>
+
+	PR libcpp/15500:
+	* doc/cpp.texi (Implementation-defined behavior): Mention
+	-finput-charset.
+
 2008-04-18  Ian Lance Taylor  <iant@google.com>
 
 	* fold-const.c (pointer_may_wrap_p): New static function.
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index 1963ebcf1f5..b98aef2bd68 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -11,7 +11,7 @@
 @copying
 @c man begin COPYRIGHT
 Copyright @copyright{} 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996,
-1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -3857,9 +3857,10 @@ and stick to it.
 @item The mapping of physical source file multi-byte characters to the
 execution character set.
 
-Currently, CPP requires its input to be ASCII or UTF-8.  The execution
-character set may be controlled by the user, with the
-@option{-fexec-charset} and @option{-fwide-exec-charset} options.
+The input character set can be specified using the
+@option{-finput-charset} option, while the execution character set may
+be controlled using the @option{-fexec-charset} and
+@option{-fwide-exec-charset} options.
 
 @item Identifier characters.
 @anchor{Identifier characters}