* gcc.sgml: Use 'bash$' as Cygwin prompt throughout.

	* gdb.sgml: Ditto.
	* pathnames.sgml: Ditto.  Fix the @ expansion example.

4 files changed, 18 insertions, 11 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index ee956bd19..a9f936d41 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-15  Corinna Vinschen  <corinna@vinschen.de>
+
+	* gcc.sgml: Use 'bash$' as Cygwin prompt throughout.
+	* gdb.sgml: Ditto.
+	* pathnames.sgml: Ditto.  Fix the @ expansion example.
+
 2008-12-13  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* pathnames.sgml: Convert some backslashes to slashes.
diff --git a/winsup/doc/gcc.sgml b/winsup/doc/gcc.sgml
index 60202d949..6a9d1055b 100644
--- a/winsup/doc/gcc.sgml
+++ b/winsup/doc/gcc.sgml
@@ -9,11 +9,11 @@ options.  Here's a simple example:</para>
 <example id="gcc-hello-world">
 <title>Building Hello World with GCC</title>
 <screen>
-<prompt>C:\&gt;</prompt> <userinput>gcc hello.c -o hello.exe</userinput>
-<prompt>C:\&gt;</prompt> <userinput>hello.exe</userinput>
+<prompt>bash$</prompt> <userinput>gcc hello.c -o hello.exe</userinput>
+<prompt>bash$</prompt> <userinput>hello.exe</userinput>
 Hello, World
 
-<prompt>C:\&gt;</prompt>
+<prompt>bash$</prompt>
 </screen>
 </example>
 
diff --git a/winsup/doc/gdb.sgml b/winsup/doc/gdb.sgml
index 1b26599c7..2a13e2b0f 100644
--- a/winsup/doc/gdb.sgml
+++ b/winsup/doc/gdb.sgml
@@ -20,8 +20,8 @@ your sources to objects.</para>
 
 <example id="gdb-g"><title>Compiling with -g</title>
 <screen>
-<prompt>$</prompt> gcc -g -O2 -c myapp.c
-<prompt>$</prompt> gcc -g myapp.c -o myapp
+<prompt>bash$</prompt> gcc -g -O2 -c myapp.c
+<prompt>bash$</prompt> gcc -g myapp.c -o myapp
 </screen>
 </example>
 
@@ -77,9 +77,9 @@ concerned:</para>
 
 <example id="gdb-cliargs"><title>Debugging with command line arguments</title>
 <screen>
-<prompt>$</prompt> myprog -t foo --queue 47
+<prompt>bash$</prompt> myprog -t foo --queue 47
 
-<prompt>$</prompt> gdb myprog
+<prompt>bash$</prompt> gdb myprog
 <prompt>(gdb)</prompt> run -t foo --queue 47
 </screen>
 </example>
diff --git a/winsup/doc/pathnames.sgml b/winsup/doc/pathnames.sgml
index d6f65921f..e2991544e 100644
--- a/winsup/doc/pathnames.sgml
+++ b/winsup/doc/pathnames.sgml
@@ -163,7 +163,7 @@ arguments:</para>
 <example id="pathnames-mount-ex">
 <title>Displaying the current set of mount points</title>
 <screen>
-<prompt>bash-3.2$</prompt> <userinput>mount</userinput>
+<prompt>bash$</prompt> <userinput>mount</userinput>
 f:/cygwin/bin on /usr/bin type system (binmode)
 f:/cygwin/lib on /usr/lib type system (binmode)
 f:/cygwin on / type system (binmode)
@@ -479,11 +479,11 @@ does not.  In the same situation the function call
 <filename>filename.exe</filename>.  The two files can be distinguished
 by examining their inodes, as demonstrated below.
 <screen>
-<prompt>C:/&gt;</prompt> <userinput>ls * </userinput>
+<prompt>bash$</prompt> <userinput>ls * </userinput>
 a      a.exe     b.exe
-<prompt>C:/&gt;</prompt> <userinput>ls -i a a.exe</userinput>
+<prompt>bash$</prompt> <userinput>ls -i a a.exe</userinput>
 445885548 a       435996602 a.exe
-<prompt>C:/&gt;</prompt> <userinput>ls -i b b.exe</userinput>
+<prompt>bash$</prompt> <userinput>ls -i b b.exe</userinput>
 432961010 b       432961010 b.exe
 </screen>
 If a shell script <filename>myprog</filename> and a program
@@ -577,6 +577,7 @@ In the following example compare the behaviors of the bash built-in
 <prompt>bash$</prompt> <userinput>echo  'This   is   "a     long"  line' > mylist</userinput>
 <prompt>bash$</prompt> <userinput>echo @mylist</userinput>
 @mylist
+<prompt>bash$</prompt> <userinput>cmd</userinput>
 <prompt>c:\&gt;</prompt> <userinput>c:\cygwin\bin\echo @mylist</userinput>
 This is a     long line
 </screen>