Merge commit '45e529318e9963a4df0a900bd7b5bd29a6412183'

3 files changed, 34 insertions, 8 deletions

diff --git a/community/gsoc/project_ideas/object_lookups.mdwn b/community/gsoc/project_ideas/object_lookups.mdwn
index d67dbe20..d7a5831e 100644
--- a/community/gsoc/project_ideas/object_lookups.mdwn
+++ b/community/gsoc/project_ideas/object_lookups.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2013, 2014 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2013, 2014, 2016 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
@@ -265,7 +266,7 @@ In context of [[!message-id "20130918081345.GA13789@dalaran.sceen.net"]].
     <teythoon> let me push it somewhere, so I can show you the patches
     <braunr> ok
     <teythoon> braunr:
-      http://darnassus.sceen.net/gitweb/teythoon/gnumach.git/shortlog/refs/heads/feature-protected-payload-1
+      http://darnassus.sceen.net/cgit/teythoon/gnumach.git/shortlog/refs/heads/feature-protected-payload-1
     <braunr> teythoon: where should i look at ?
     <teythoon> the last commit
     <braunr> hm
@@ -290,7 +291,7 @@ In context of [[!message-id "20130918081345.GA13789@dalaran.sceen.net"]].
     <teythoon> right, I can see how that could work
     <braunr> mach_reply_port(); mach_port_set_payload(); mach_msg();
     <teythoon> braunr:
-      http://darnassus.sceen.net/gitweb/teythoon/gnumach.git/log/refs/heads/feature-protected-payload-2
+      http://darnassus.sceen.net/cgit/teythoon/gnumach.git/log/refs/heads/feature-protected-payload-2
     <teythoon> I think I found the right spot
     <braunr> teythoon: looks better indeed :)
     <teythoon> braunr: yes, thanks for the hint :)
@@ -378,11 +379,11 @@ In context of [[!message-id "20130918081345.GA13789@dalaran.sceen.net"]].
     <teythoon> no, no deb
     <braunr> ok
     <teythoon> braunr:
-      http://darnassus.sceen.net/gitweb/teythoon/gnumach.git/log/refs/heads/feature-protected-payload-3
+      http://darnassus.sceen.net/cgit/teythoon/gnumach.git/log/refs/heads/feature-protected-payload-3
     <teythoon>
-      http://darnassus.sceen.net/gitweb/teythoon/hurd.git/log/refs/heads/feature-protected-payload-1
+      http://darnassus.sceen.net/cgit/teythoon/hurd.git/log/refs/heads/feature-protected-payload-1
     <teythoon> braunr: in particular,
-      http://darnassus.sceen.net/gitweb/teythoon/hurd.git/blob/refs/heads/feature-protected-payload-1:/libports/manage-multithread.c#l161
+      http://darnassus.sceen.net/cgit/teythoon/hurd.git/blob/refs/heads/feature-protected-payload-1:/libports/manage-multithread.c#l161
 
 
 ## IRC, freenode, #hurd, 2013-11-27
@@ -396,13 +397,13 @@ In context of [[!message-id "20130918081345.GA13789@dalaran.sceen.net"]].
     <braunr> sure
     <teythoon> ok
     <teythoon> first, please look at this
-      http://darnassus.sceen.net/gitweb/teythoon/hurd.git/blob/refs/heads/feature-protected-payload-1:/libports/manage-multithread.c#l161
+      http://darnassus.sceen.net/cgit/teythoon/hurd.git/blob/refs/heads/feature-protected-payload-1:/libports/manage-multithread.c#l161
     <teythoon> in line 165, the msgh_local_port is restored
     <teythoon> b/c later some intrans function might use this for the object
       (re-)lookup
     <braunr> yes ok
     <teythoon>
-      http://darnassus.sceen.net/gitweb/teythoon/mig.git/commitdiff/64b7d34f90a41d017a9e1e8179c0533a97012f6f
+      http://darnassus.sceen.net/cgit/teythoon/mig.git/commitdiff/64b7d34f90a41d017a9e1e8179c0533a97012f6f
     <braunr> makes sense
     <teythoon> this makes mig payload aware
     <teythoon> we'd specify another intrans function that takes a label and
diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index c3e8529a..ad43b800 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -17,6 +17,7 @@ License|/fdl]]."]]"""]]
 
 # Past
 
+  * [[GNU Hackers Meeting, 2016, Rennes|ghm2016]]
   * [[FOSDEM_2016]]
   * [[DebConf15]]
   * [[FOSDEM_2015]]
diff --git a/community/meetings/ghm2016.mdwn b/community/meetings/ghm2016.mdwn
new file mode 100644
index 00000000..74f86ff6
--- /dev/null
+++ b/community/meetings/ghm2016.mdwn
@@ -0,0 +1,24 @@
+[[!meta copyright="Copyright © 2016 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]]."]]"""]]
+
+[[!meta title="GNU Hackers Meeting, 2016, Rennes"]]
+
+<https://www.gnu.org/ghm/2016/rennes/>
+<https://www.gnu.org/ghm/upcoming.html>
+
+  * {{$thibault_hurd}}
+
+[[!ymlfront data="""
+
+thibault_hurd:
+
+  "presentation by Samuel Thibault: [Latest news about GNU Hurd](https://www.gnu.org/ghm/2016/rennes/) ([slides](http://dept-info.labri.fr/~thibault/tmp/2016-08-18-ghm.pdf))"
+
+"""]]