Merge branch 'master' of braunbox:~hurd-web/hurd-web

2 files changed, 34 insertions, 58 deletions

diff --git a/documentation.mdwn b/documentation.mdwn
index 8e336b42..6d89ac5c 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -8,11 +8,11 @@ License|/fdl]]."]]"""]]
 
 [[!meta title="Documentation"]]
 
+/!\ Some stuff is missing (see [[!taglink Documentation_Issues|open_issue_documentation]]).
+
 Are you interested in getting familiar with the GNU/Hurd system architecture,
 or specific components of it?  Here is a collection of texts to read.
 
-/!\ A lot of stuff is still missing (see the list of [[!taglink Documentation_Issues|open_issue_documentation]]).
-
 [[!toc levels=1]]
 
 ---
@@ -28,18 +28,20 @@ architecture.  Yes, really. You needn't go through all of these, but they're all
 * [[!wikipedia Advanced_Programming_in_the_Unix_Environment]] - May help you grasp UNIX & POSIX standards.
 * [Operating Systems](http://www.deitel.com/Books/OperatingSystems/OperatingSystems3e/tabid/1711/Default.aspx) - A well praised book on the subject.
 * [Operating System Concepts](https://www.os-book.com/OS9/) - Another well praised book.
-* [Modern Operating Systems](https://en.wikipedia.org/wiki/Modern_Operating_Systems) - This book has achieved world-wide praise. Of course [the Plan-9 people don't like it](http://harmful.cat-v.org/software/andy_tanenbaum).
+* [Modern Operating Systems](https://en.wikipedia.org/wiki/Modern_Operating_Systems) - This book has achieved world-wide praise. Of course [the cat-v.org people don't like it](http://harmful.cat-v.org/software/andy_tanenbaum).
 
 ## GNU/Hurd System Architecture
 You may want to start reading a [[quick overview|overview]] of how the GNU/Hurd system
 starts, and thus how it is structured. Also see our [[FAQ]]
 
 ### Capabilities
-  * Read up on [[Capabilities|capability]], [[!wikipedia Capability-based_security]],
-    and, [What is a Capability, Anyway?](https://archive.is/20130112225523/http://www.eros-os.org/essays/capintro.html)
+  * [[Capabilities|capability]]
+  * [[!wikipedia Capability-based_security]] (Wikipedia)
+  * [What is a Capability, Anyway?](https://archive.is/20130112225523/http://www.eros-os.org/essays/capintro.html)
+  * [Capability Theory by Sound Bytes](http://www.cap-lore.com/CapTheory/)
+  * [What Are Capabilities?](http://habitatchronicles.com/2017/05/what-are-capabilities/)
 
-    In the GNU/Hurd system, a capability is represented by a [[Mach
-    port|microkernel/mach/port]].
+In the Hurd, a capability is represented by a [[Mach port|microkernel/mach/port]].
 
 ---
 # Specific Components
@@ -61,67 +63,41 @@ from userlandish interfaces (Hurd) or from the microkernel itself (Mach).
 ---
 # Presentations
 
-## 2019
-
-  * FOSDEM: {{$community/meetings/fosdem_2019#thibault_hurd}}
-
-## 2018
-
-  * FOSDEM: {{$community/meetings/fosdem_2018#thibault_hurd}}
-
-## 2017
-
+* **2019**
+ * FOSDEM: {{$community/meetings/fosdem_2019#thibault_hurd}}
+* **2018**
+ * FOSDEM: {{$community/meetings/fosdem_2018#thibault_hurd}}
+* **2017**
   * FOSDEM: {{$community/meetings/fosdem_2017#ragkousis_guix_hurd}}
   * FOSDEM: {{$community/meetings/fosdem_2017#winter_hurd}}
-
-## 2016
-
+* **2016**
   * FOSDEM: {{$community/meetings/fosdem_2016#ragkousis_guix_hurd}}
   * FOSDEM: {{$community/meetings/fosdem_2016#thibault_hurd}}
-
-## 2015
-
+* **2015**
   * FOSDEM: {{$community/meetings/fosdem_2015#thibault_hurd}}
-  * Debconf 15: {{$community/meetings/debconf15#youpi_hurd}}
-
-## 2014
-
+  * Debconf: {{$community/meetings/debconf15#youpi_hurd}}
+* **2014**
   * FOSDEM: {{$community/meetings/fosdem_2014#thibault_hurd}}
-
-## 2013
-
+* **2013**
   * GNU Hackers Meeting in Paris: {{$community/meetings/ghm2013#thibault_hurd}}
-
   * FOSDEM: {{$community/meetings/fosdem_2013#thibault_hurd}}
-
-## 2011
-
+* **2011**
   * GNU Hackers Meeting in Paris: {{$community/meetings/ghm2011#thibault_hurd}}
-
-## 2010
-
+* **2010**
   * GNU Hackers Meeting in the Hague: {{$community/meetings/ghm2010#walfield_hurd}}
+  * Debconf: {{$community/meetings/debconf10#banck_hurd}}
+  * FOSDEM: {{$community/meetings/fosdem_2010#olaf_hurd1}}
+  * FOSDEM: {{$community/meetings/fosdem_2010#olaf_hurd2}}
+* **2004**
+  * Ognyan Kulev, [*presentation of the Hurd*](http://debian.fmi.uni-sofia.bg/~ogi/hurd/liofest-20040702-hurd.ppt) 
+at the seminar *LIO and friends*, in Bulgarian.
 
-  * Debconf 10: {{$community/meetings/debconf10#banck_hurd}}
-
-  * Fosdem 2010: {{$community/meetings/fosdem_2010#olaf_hurd1}}
-  * Fosdem 2010: {{$community/meetings/fosdem_2010#olaf_hurd2}}
-
-## 2004
-
-  * 2004-07-02
-
-    Ognyan Kulev, *presentation of the Hurd*, at the seminar *LIO and friends*,
-    <http://debian.fmi.uni-sofia.bg/~ogi/hurd/liofest-20040702-hurd.ppt>, in
-    Bulgarian.
+<!-- The above link is broken. My browser cannot load .ppt files so I do not know which wayback link should be used) -->
 
 ---
 # General
-
   * [[Media_Appearances]]
-
----
-# IRC Logs
+  * [IRC Logs](http://richtlijn.be/~larstiq/hurd/)
 
 The IRC logs contain wealth of information.  Many topics have been covered before in the IRC logs.  You can use wget to
 download all of the logs and grep for the information that you want (~100MB):
diff --git a/faq/asking_questions.mdwn b/faq/asking_questions.mdwn
index 912c78dc..38e844ad 100644
--- a/faq/asking_questions.mdwn
+++ b/faq/asking_questions.mdwn
@@ -15,14 +15,14 @@ License|/fdl]]."]]"""]]
 
 Before asking a question, first make an effort to find the answer to your
 question.  A lot of questions have been asked and answered before, so please
-spend some time trying to solve the problem on your own (e.g., [search the
-web](http://google.com/), search these web pages, etc.), and show us that you
+spend some time trying to solve the problem on your own (e.g. [search the
+web](http://duckduckgo.com/), search these web pages, etc.), and show us that you
 did so when you ask your question.
 
-When asking, (1) be details, and (2) demonstrate that you have made an effort,
-e.g., "I am having trouble frobbing the foo.  I searched the web and only found
+When asking, (1) be detailed, and (2) demonstrate that you made an effort,
+e.g. "I am having trouble frobbing the foo.  I searched the web and only found
 information regarding how to frob a bar, but that seems unrelated."  Provide as
-many relevant details as possible reproducing them as exactly as possible.
+many relevant details as possible, as well as how to reproduce the issue.
 
 This [document](http://www.catb.org/~esr/faqs/smart-questions.html) may help you
 understand some developers attitudes and social norms.