Merge commit '895751fb07e382499b4afb8339a5bdd0ee9a2c2b'

4 files changed, 15 insertions, 37 deletions

diff --git a/hurd/console.mdwn b/hurd/console.mdwn
index c9f47afe..294a2897 100644
--- a/hurd/console.mdwn
+++ b/hurd/console.mdwn
@@ -104,7 +104,8 @@ The latest Hurd package in Debian has all that is needed to run (dunno about hur
 
 -- [[Main/JoachimNilsson]] - 17 Apr 2005
 
-Additional information about the console can be found in the [Hurd Console Tutorial](http://uwhug.org.uk/index.pl?Hurd_Console_Tutorial)
+Additional information about the console can be found in the [Hurd Console
+Tutorial](https://web.archive.org/web/20111025035056/http://uwhug.org.uk/index.pl?Hurd_Console_Tutorial).
 
 
 ## <a name="What_is_the_new_console_"> What is the new console? </a>
diff --git a/hurd/debugging/rpctrace.mdwn b/hurd/debugging/rpctrace.mdwn
index dbd4b30b..0c19da02 100644
--- a/hurd/debugging/rpctrace.mdwn
+++ b/hurd/debugging/rpctrace.mdwn
@@ -46,6 +46,8 @@ See `rpctrace --help` about how to use it.
         <youpi> hum, it hung, and killing it got a Mach panic (thread in unexpected
           state) ...
 
+    [[open_issues/gnumach_panic_thread_dispatch]]?
+
 * IRC, unknown channel, unknown date
 
         <antrik> hm... for a funny effect, try running rpctrace on
diff --git a/hurd/running/debian/qemu_image.mdwn b/hurd/running/debian/qemu_image.mdwn
index af22de13..1f42507b 100644
--- a/hurd/running/debian/qemu_image.mdwn
+++ b/hurd/running/debian/qemu_image.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2011, 2012, 2014 Free Software Foundation,
+[[!meta copyright="Copyright © 2011, 2012, 2014, 2016 Free Software Foundation,
 Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -16,7 +16,9 @@ Usage:
 
     $ wget http://people.debian.org/~sthibault/hurd-i386/debian-hurd.img.tar.gz
     $ tar -xz < debian-hurd.img.tar.gz
-    $ qemu -m 512 -drive cache=writeback,file=$(echo debian-hurd-*.img)
+    $ kvm -m 512 -drive cache=writeback,file=$(echo debian-hurd-*.img)
+
+Please also read the README file: <http://people.debian.org/~sthibault/hurd-i386/README>
 
 If you have troubles extracting the image, you can use
 the gz version <http://people.debian.org/~sthibault/hurd-i386/debian-hurd.img.gz>,
@@ -29,35 +31,3 @@ Just in case you were wondering: the *root* password is empty.
 
 [[!if test="destpage(hurd/running/qemu)" then="" else="For more detailed
 instructions, please see the [[hurd/running/QEMU]] page."]]
-
-
-[[!if test="!included()" then="#" else="###"]] IRC, freenode, #hurd, 2014-03-10
-
-    <mcsim> scp doesn't work either
-    <braunr> what ?
-    <braunr> why wouldn't it ?
-    <mcsim> scp -P5555 -r ./hurd/ root@localhost:/root/src/
-    <mcsim> root@localhost's password: 
-    <mcsim> The Hurd is not Linux. Make sure to read
-    <braunr> that shouldn't happen ...
-    <braunr> use tar maybe ?
-    <mcsim> the same with tar archive
-    <braunr> :/
-    <braunr> i don't know what to tell you
-    <braunr> i don't have that problem
-
-
-[[!if test="!included()" then="##" else="####"]] IRC, freenode, #hurd, 2014-03-11
-
-    <teythoon> braunr: mcsims scp problem is b/c youpis images echo stuff from
-      the .bashrc or something
-    <teythoon> i wish he'd change that, as it is a reoccuring problem
-    <teythoon> youpi: ^
-    <teythoon> (didn't realize you are around >,<)
-    <teythoon> now that /etc/issue is displayed, you can put the welcome text
-      there
-    <braunr> teythoon: i see
-    <teythoon> mcsim: your ssh trouble are rooted in the .bashrc printing some
-      stuff to stdout
-    <mcsim> teythoon: thank you. It works now
-    <teythoon> :)
diff --git a/hurd/running/nix.mdwn b/hurd/running/nix.mdwn
index b77404a4..66824cf0 100644
--- a/hurd/running/nix.mdwn
+++ b/hurd/running/nix.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2012, 2013, 2014 Free Software Foundation,
+[[!meta copyright="Copyright © 2012, 2013, 2014, 2016 Free Software Foundation,
 Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -11,7 +11,7 @@ License|/fdl]]."]]"""]]
 
 [[!meta title="Nix-based GNU/Hurd System, Guix"]]
 
-[[!toc]]
+[[!toc levels=2]]
 
 
 # Nix
@@ -510,3 +510,8 @@ Nix, and because of that, it uses per-package installation directories under
     <ph4n70m4s> Any idea why is this happening?
     <braunr> ph4n70m4s: something is trying to compile as an x86-64 object,
       while the hurd is i386 only
+
+
+## FOSDEM 2016
+
+  * {{$community/meetings/fosdem_2016#ragkousis_guix_hurd}}