diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index c0b86ba8b12..08ac9389360 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -49,6 +49,7 @@ void print_help(void)
             "subset of the commands that gdb accepts.",
             "The commands currently are:",
             "  help                                   quit",
+            "  attach <wpid>                          detach",
             "  break [*<addr>]                        watch | rwatch *<addr>",
             "  delete break bpnum                     disable bpnum",
             "  enable bpnum                           condition <bpnum> [<expr>]",
diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index ba7291679c4..bf1234c2ff8 100644
--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@@ -568,11 +568,11 @@ static int dbg_winedbg_usage(BOOL advanced)
     dbg_printf("Usage:\n"
                "   winedbg cmdline         launch process 'cmdline' (as if you were starting\n"
                "                           it with wine) and run WineDbg on it\n"
-               "   winedbg <num>           attach to running process of pid <num> and run\n"
+               "   winedbg <num>           attach to running process of wpid <num> and run\n"
                "                           WineDbg on it\n"
                "   winedbg --gdb cmdline   launch process 'cmdline' (as if you were starting\n"
                "                           wine) and run gdb (proxied) on it\n"
-               "   winedbg --gdb <num>     attach to running process of pid <num> and run\n"
+               "   winedbg --gdb <num>     attach to running process of wpid <num> and run\n"
                "                           gdb (proxied) on it\n"
                "   winedbg file.mdmp       reload the minidump file.mdmp into memory and run\n"
                "                           WineDbg on it\n"
diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in
index 9e1731aa9b6..b5beba25483 100644
--- a/programs/winedbg/winedbg.man.in
+++ b/programs/winedbg/winedbg.man.in
@@ -3,15 +3,15 @@
 winedbg \- Wine debugger
 .SH SYNOPSIS
 .B winedbg
-.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " pid " ]"
+.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " wpid " ]"
 .PP
 .B winedbg --gdb
-.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " pid " ]"
+.RI "[ " options " ] [ " program_name " [ " program_arguments " ] | " wpid " ]"
 .PP
-.BI "winedbg --auto " pid
+.BI "winedbg --auto " wpid
 .PP
 .B winedbg --minidump
-.RI "[ " file.mdmp " ] " pid
+.RI "[ " file.mdmp " ] " wpid
 .PP
 .BI "winedbg " file.mdmp
 .SH DESCRIPTION
@@ -84,10 +84,10 @@ This is the name of an executable to start for a debugging
 session.  \fBwinedbg\fR will actually create a process with this
 executable. If \fIprograms_arguments\fR are also given, they will be
 used as arguments for creating the process to be debugged.
-.IP \fIpid\fR
-\fBwinedbg\fR will attach to the process which pid is \fIpid\fR (pids
-refer to Win32 pids, not Unix pids). Use the \fBinfo proc\fR command
-within \fBwinedbg\fR to list running processes and their Win32 pids.
+.IP \fIwpid\fR
+\fBwinedbg\fR will attach to the process which Windows pid is \fIwpid\fR.
+Use the \fBinfo proc\fR command within \fBwinedbg\fR to list running processes
+and their Windows pids.
 .IP \fBdefault\fR
 If nothing is specified, you will enter the debugger without any run
 nor attached process. You'll have to do the job yourself.
@@ -106,7 +106,7 @@ Aborts the debugger.
 .IP \fBquit\fR
 Exits the debugger.
 .IP \fBattach\ \fIN\fR
-Attach to a Wine process (\fIN\fR is its ID, numeric or hexadecimal).
+Attach to a Wine process (\fIN\fR is its Windows ID, numeric or hexadecimal).
 IDs can be obtained using the \fBinfo\ process\fR command.  Note the
 \fBinfo\ process\fR command returns hexadecimal values
 .IP 
@@ -346,7 +346,7 @@ Prints the values on top of the stack
 .IP \fBinfo\ map\fR
 Lists all virtual mappings used by the debugged program
 .IP \fBinfo\ map\ \fIN\fR
-Lists all virtual mappings used by the program of pid \fIN\fR
+Lists all virtual mappings used by the program of Windows pid \fIN\fR
 .IP \fBinfo\ wnd\fR
 Displays the window hierarchy starting from the desktop window
 .IP \fBinfo\ wnd\ \fIN\fR