Merge commit 'c954f1095918874c73511ffc13f95eef518a8043'

Conflicts:
	community/meetings.mdwn

6 files changed, 20 insertions, 18 deletions

diff --git a/hurd/interface/fsys/02.mdwn b/hurd/interface/fsys/02.mdwn
index 63b84c48..e5223e38 100644
--- a/hurd/interface/fsys/02.mdwn
+++ b/hurd/interface/fsys/02.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 1992, 1993, 1994, 1995, 1996, 1997, 2002, 2009
-Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 1992, 1993, 1994, 1995, 1996, 1997, 2002, 2009,
+2014 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
@@ -29,5 +29,5 @@ Return a file to the root of the filesystem.  `flags` are as for
 [[`dir_lookup`|dir_lookup]] (but `O_CREAT` and `O_EXCL` are not meaningful).
 `do_retry`, `retry_name`, and `result` are as for [[`dir_lookup`|dir_lookup]].
 The port should be authenticated with `gen_uids` and `gen_gids` (except, of
-course, for `FS_RETRY_REAUTH` and `FS_RETRY_MAGICAL).  `dotdot_node` is an
+course, for `FS_RETRY_REAUTH` and `FS_RETRY_MAGICAL`).  `dotdot_node` is an
 unauthenticated port for the directory in which this root is located.
diff --git a/hurd/ng.mdwn b/hurd/ng.mdwn
index fbebb137..d9287c3d 100644
--- a/hurd/ng.mdwn
+++ b/hurd/ng.mdwn
@@ -82,9 +82,9 @@ _please move me somewhere better! [[SamMason]]_
 Summaries should obey the following structure:
 
 * if there is a consensus, it is clearly described
-* if controversial points remain, there are also described after the consenus
-* if no choice has been clearly made, all valid positions are descrbied
-* withdrawed and invalid positions (prooved wrong, unrealistic, contradictory
+* if controversial points remain, there are also described after the consensus
+* if no choice has been clearly made, all valid positions are described
+* withdrawn and invalid positions (proved wrong, unrealistic, contradictory
   to some design principle, etc.) should be described only very briefly, and
   developed in a separate article
 
diff --git a/hurd/running/chroot.mdwn b/hurd/running/chroot.mdwn
index 29b00a8f..38bab04e 100644
--- a/hurd/running/chroot.mdwn
+++ b/hurd/running/chroot.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2012 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2012, 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
@@ -41,14 +41,7 @@ socket creation
 will actually happen in the root filesystem. To make things work correctly the
 programs inside the chroot need to be able to access them:
 
-    # settrans chroot/servers/socket/1 /hurd/firmlink /servers/socket/1
+    # settrans -kp chroot/servers /hurd/firmlink /servers
+    # settrans -kp chroot/dev /hurd/firmlink /dev
     # settrans chroot/tmp /hurd/firmlink /tmp
     # settrans -c chroot/var/lib/dbus /hurd/firmlink /var/lib/dbus
-
-## Network
-
-Unless using a separate IP for the chroot, it is preferrable to share the
-[[translator/pfinet]] translator:
-
-    # settrans chroot/servers/socket/2 /hurd/firmlink /servers/socket/2
-    # settrans chroot/servers/socket/26 /hurd/firmlink /servers/socket/26
diff --git a/hurd/translator/mtab/discussion.mdwn b/hurd/translator/mtab/discussion.mdwn
index d663d4c5..6bb446a0 100644
--- a/hurd/translator/mtab/discussion.mdwn
+++ b/hurd/translator/mtab/discussion.mdwn
@@ -1964,6 +1964,9 @@ In context of [[open_issues/mig_portable_rpc_declarations]].
     <teythoon> right, so now at last I got the whole question :)
     <braunr> :)
     <teythoon> ugh, I just found the FS_RETRY_MAGICAL handler in the libc :-/
+
+[[interface/dir_lookup]].
+
     <braunr> ?
     <braunr> why "ugh" ?
     <teythoon> well, I'm inclined to think this is the bad kind of magic ;)
diff --git a/hurd/translator/procfs/jkoenig/discussion.mdwn b/hurd/translator/procfs/jkoenig/discussion.mdwn
index 54de54c2..628cb396 100644
--- a/hurd/translator/procfs/jkoenig/discussion.mdwn
+++ b/hurd/translator/procfs/jkoenig/discussion.mdwn
@@ -125,7 +125,9 @@ License|/fdl]]."]]"""]]
     <braunr> but when they do, they do
 
 
+<a name="self">
 # `/proc/self`
+</a>
 
 ## IRC, freenode, #hurd, around 2010-09
 
@@ -151,6 +153,8 @@ License|/fdl]]."]]"""]]
     <antrik> in either case, it can't hurt to bring this up again :-)
 
 [[mtab/discussion]], *IRC, freenode, #hurd, 2013-09-07*.
+Look at `[glibc]/hurd/lookup-retry.c` for how [[`FS_RETRY_MAGICAL`
+lookups|interface/dir_lookup]] work.
 
 
 # root group
diff --git a/hurd/translator/short-circuiting.mdwn b/hurd/translator/short-circuiting.mdwn
index 6f608fb2..438e8d80 100644
--- a/hurd/translator/short-circuiting.mdwn
+++ b/hurd/translator/short-circuiting.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2009, 2012 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2009, 2012, 2014 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
@@ -42,7 +43,8 @@ as translators at all.
 Translator short-circuiting is when a file system server implements the
 functionality of a passive translator itself, instead of actually starting
 it.  For instance, all the [[`symlink`|symlink]] translator does is return
-a `FS_RETRY_*` reply to the caller.  So instead of starting it, the file
+a [[`FS_RETRY_*`|interface/dir_lookup]] reply to the caller.
+So instead of starting it, the file
 system server can simply continue the file name look-up internally by
 appending the target of the symbolic link to the path being looked-up.