Merge commit 'ce4899ded119f3607515cc54252c4bad7224f804'

Conflicts:
	community/gsoc/project_ideas/mtab.mdwn
	contributing.mdwn
	hurd/translator/eth-filter.mdwn
	hurd/translator/socketio.mdwn
	open_issues/exec.mdwn
	open_issues/gnumach_vm_object_resident_page_count.mdwn
	public_hurd_boxen.mdwn

4 files changed, 47 insertions, 29 deletions

diff --git a/faq/binary_compatibility.mdwn b/faq/binary_compatibility.mdwn
index 37050763..ba1ff22a 100644
--- a/faq/binary_compatibility.mdwn
+++ b/faq/binary_compatibility.mdwn
@@ -15,8 +15,8 @@ License|/fdl]]."]]"""]]
 
 [[!tag open_issue_documentation]]
 
-    <veganman> sothere's absolutelyno way,evenslowly to run i386 linuxcode
-      under hurd/i386? Ihave a small app, commercial, which I have to get
+    <veganman> so there's absolutely no way, even slowly to run i386 linux code
+      under hurd/i386? I have a small app, commercial, which I have to get
       running there
     <veganman> no source
     <braunr> no way
@@ -27,9 +27,9 @@ License|/fdl]]."]]"""]]
     <veganman> so, no magic linux lxemu on windows?
     <veganman> or linuxemu on plan9
     <pinotree> nope
-    <veganman> I remember somethingsilly, sonmone hadcompiled linux asauser
-      applicationon plan9 and inserted his own binaries as
-      acodeobject,toberunon plan9, for useon ibm hpc hatrdware
+    <veganman> I remember something silly, sonmone had compiled linux as a user
+      application on plan9 and inserted his own binaries as
+      a code object, to be run on plan9, for use on ibm hpc hardware
     <veganman> it was ron minich
     <veganman> 5e.iwp9.org/slides/linuxemu.pdf
     <veganman> I think that was it
diff --git a/faq/df.mdwn b/faq/df.mdwn
deleted file mode 100644
index 8af6009a..00000000
--- a/faq/df.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!meta copyright="Copyright © 2007, 2008, 2013 Free Software Foundation,
-Inc."]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-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]]."]]"""]]
-
-[[!tag faq/running]]
-
-[[!meta title="Why df doesn't work?"]]
-
-There is no `/etc/mtab` (due to dynamic translator startup, its content is hard
-to define actually, see
-[[the mtab GSoC project idea|community/gsoc/project_ideas/mtab]]),
-so just running `df` will yield the following error.
-
-    df: cannot read table of mounted file systems
-
-Pass `df` a path like `df /` or `df ./` to see the disk usage of that particular
-file system.
diff --git a/faq/libpthread_plugin.mdwn b/faq/libpthread_plugin.mdwn
new file mode 100644
index 00000000..bcbe9571
--- /dev/null
+++ b/faq/libpthread_plugin.mdwn
@@ -0,0 +1,21 @@
+[[!meta copyright="Copyright © 2013 Free Software Foundation, Inc."]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+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]]."]]"""]]
+
+[[!tag faq/open_issues]]
+
+[[!meta title="Getting Assertion `__pthread_threads' failed."]]
+
+Some applications don't link against libpthread, but load plugins which do link against libpthread. This means unexpectedly switch from mono-thread to multi-thread. This is not supported yet, thus the following error:
+
+    ./pthread/../sysdeps/generic/pt-mutex-timedlock.c:70: __pthread_mutex_timedlock_internal: Assertion `__pthread_threads' failed.
+
+This can be worked around by using
+
+export LD_PRELOAD=/lib/i386-gnu/libpthread.so.0.3
diff --git a/faq/so_many_years.mdwn b/faq/so_many_years.mdwn
new file mode 100644
index 00000000..8c5ce4a0
--- /dev/null
+++ b/faq/so_many_years.mdwn
@@ -0,0 +1,21 @@
+[[!meta copyright="Copyright © 2013 Free Software Foundation,
+Inc."]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+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]]."]]"""]]
+
+[[!tag faq/general faq/_important]]
+
+[[!meta title="How is it that the Hurd does not do foo and bar, after so many years of development?"]]
+
+
+Remember that what counts is years.people, not just years, so it
+can't be compared to e.g. Linux or BSD development so trivially. See
+[[how_many_developers|how many developers]] are working on the Hurd, it is
+actually impressive that so much has been done in the past couple of decades
+with so few people.