Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/web

Conflicts:
	faq/issues/got_a_db_prompt.mdwn

1 files changed, 16 insertions, 11 deletions

diff --git a/faq/issues/got_a_db_prompt.mdwn b/faq/issues/got_a_db_prompt.mdwn
index 38e21566..ad99c515 100644
--- a/faq/issues/got_a_db_prompt.mdwn
+++ b/faq/issues/got_a_db_prompt.mdwn
@@ -5,25 +5,30 @@ id="license" text="Permission is granted to copy, distribute and/or modify this
 document under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no Invariant
 Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled
-[[GNU Free Documentation License|/fdl]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
 
-[[!meta title="I've just gotten a db> prompt"]]
+[[!meta title="Help, I've just gotten a db> prompt"]]
 
-Something bad happened in the kernel (think of it as the equivalent of the Linux
-Oops). The `db>` prompt is actually the kernel debugger. You can then type the
-`trace` command, which will bring you something like:
+If you see a `db>` prompt on the console, something unexpected and bad happened
+inside the [[GNU Mach kernel|microkernel/mach/gnumach]], which it cannot
+recover from.  (Think of it as the equivalent of a [[!wikipedia
+Linux_kernel_oops]], for example.)  The `db>` prompt is actually the GNU Mach
+kernel debugger waiting for your commands.  For example, you can then reboot
+the system by issuing the `reboot` command, or if you want to help analyze the
+problem, start by typing in the `trace` command, which will display the
+function call trace leading to the crash:
 
     0x8007cf1(8088488,5e,40000008,2aa008,0)
     0x80071bc(0,0,0,0,0)
     0x8006831(24fe00,2000,b,800,0)
 
-Which is actually the function call trace, which can be decyphered by using:
+This can be decyphered by using:
 
     $ addr2line -i -f -e /boot/gnumach 0x8007cf1 0x80071bc 0x8006831
 
-You can then send us the whole result of both the `trace` and the `addr2line`
-commands, as well as
-the exact version of the gnumach kernel you were running, for further
-investigation. [[More information about the gnumach
+You can then [[send us|contact_us]] the whole results of the `trace` and the
+`addr2line` commands, as well as
+the exact version of the GNU Mach kernel you were running, for further
+investigation.  More information about the [[GNU Mach
 debugger|microkernel/mach/gnumach/debugging]] is available.