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

Conflicts:
	faq/issues/got_a_db_prompt.mdwn

3 files changed, 25 insertions, 20 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.
diff --git a/faq/support/0-drivers.mdwn b/faq/support/0-drivers.mdwn
index 1c6f58dc..54b2d744 100644
--- a/faq/support/0-drivers.mdwn
+++ b/faq/support/0-drivers.mdwn
@@ -15,7 +15,8 @@ Currently, for disks Mach integrates drivers from Linux 2.0 through some
 limits hardware support a lot, of course.  For network boards, we use the
 [[DDE]] toolkit to run linux 2.6.32 drivers in userland processes,
 which provides both long-term support for new hardware and safety against driver
-bugs. Xen is also supported, both blkfront and netfront.
+bugs.  [[microkernel/mach/gnumach/ports/Xen]] is also supported, both blkfront
+and netfront.
 
 Note however that we have of course not tested all drivers, we obviously don't
 even have all kinds of hardware. So we can not promise that they will all
diff --git a/faq/support/0-software.mdwn b/faq/support/0-software.mdwn
index 9c33a4db..e58e0bd8 100644
--- a/faq/support/0-software.mdwn
+++ b/faq/support/0-software.mdwn
@@ -11,16 +11,15 @@ License|/fdl]]."]]"""]]
 
 [[!meta title="What software is available for GNU?"]]
 
-As of March 2013, 78% of Debian packages have been ported on the Hurd. Of
-course, bug testing and fixing is welcome, as we have obviously not tested all
-of them.
+As of March 2013, 78% of all [Debian](http://www.debian.org/)
+[packages](http://packages.debian.org/) are available for [[Debian
+GNU/Hurd|hurd/running/debian]].  Of course, testing and bug fixing is welcome,
+as we have obviously not tested all of them.
 
-Most packages from [Debian](http://www.debian.org/)
-[GNU/Linux](http://www.gnu.org/gnu/linux-and-gnu.html)
-which aren't Linux-specific (see [Packages That Won't Be
+Generally, packages
+that aren't Linux-specific (see [Packages That Won't Be
 Ported](http://www.debian.org/ports/hurd/hurd-devel-debian))
-are expected to work on GNU/Hurd too. See the database in
-<http://packages.debian.org/>. Notably, [Xorg](http://www.x.org/),
+are expected to work on GNU/Hurd too.  Notably, [X.Org](http://www.x.org/),
 [GNOME](http://www.gnome.org/), [KDE](http://www.kde.org/),
 [Firefox](http://www.mozilla.org/firefox) work. See
 the [[hurd/porting/guidelines]] document for some common build problems and their