浏览代码

switched nicolas and jane

chootka 8 年之前
父节点
当前提交
ba2896d97b
共有 3 个文件被更改,包括 13 次插入12 次删除
  1. 1 0
      _site/participants/jane-coffin/index.html
  2. 6 6
      _site/program/index.html
  3. 6 6
      program/index.html

+ 1 - 0
_site/participants/jane-coffin/index.html

@@ -245,6 +245,7 @@
     <div class="profile">
 	<h3>Jane Coffin</h3>
 	<img src="jane_coffin_256px.png" />
+	<p><a href="https://www.internetsociety.org" target="_blank">Website</a> | <a href="https://twitter.com/jane_coffin" target="_blank">Twitter</a></p>
 	<p>Jane Coffin is responsible for development strategy at the Internet Society, where her work focuses on coordination of collaborative strategies for expanding Internet infrastructure, access, and related capacities in emerging economies.</p>
 
 	<p>Prior to joining ISOC, Jane worked on Internet and telecommunications policy issues for the Office of International Affairs at the National Telecommunications and Information Administration – U.S. Department of Commerce. She was an active participant in Internet discussions in the ITU, OAS-CITEL, and OECD, working closely with the five regional Internet registries (RIRs) and other Internet technical community stakeholders. She was very involved in policy discussions on open Internet standards and issues related to BGP, IPv4, IPv6, and MPLS. While at NTIA, Jane was an advocate for the deployment of Internet exchange points (IXPs) to increase international Internet connectivity (IIC), and was an ITU-T SG-3 IIC co-Rapporteur and an IIC coordinator in CITEL’s PCC.I. She was Vice-Chair of the Federal IPv6 Task Force, and a Vice-Chair of the ITU Council Child Online Protection Working Group.</p> 

+ 6 - 6
_site/program/index.html

@@ -494,9 +494,9 @@
 		<tr>
 			<td>10:30</td>
 			<td>
-				<a href="#"> <!--../participants/jane-coffin-->
-					<span class="title">TBD</span></br>
-					Jane Coffin
+				<a href="../participants/nicolas-maigret">
+					<span class="title">The Pirate Cinema</span></br>
+					Nicolas Maigret
 				</a>
 			</td>
 			<td class="workshop">
@@ -509,9 +509,9 @@
 		<tr>
 			<td>11:25</td>
 			<td>
-				<a href="../participants/nicolas-maigret">
-					<span class="title">The Pirate Cinema</span></br>
-					Nicolas Maigret
+				<a href="../participants/jane-coffin">
+					<span class="title">Internet Society &amp; Community Networking</span></br>
+					Jane Coffin
 				</a>
 			</td>
 			<td></td>

+ 6 - 6
program/index.html

@@ -256,9 +256,9 @@ order: 2
 		<tr>
 			<td>10:30</td>
 			<td>
-				<a href="../participants/jane-coffin">
-					<span class="title">Internet Society &amp; Community Networking</span></br>
-					Jane Coffin
+				<a href="../participants/nicolas-maigret">
+					<span class="title">The Pirate Cinema</span></br>
+					Nicolas Maigret
 				</a>
 			</td>
 			<td class="workshop">
@@ -271,9 +271,9 @@ order: 2
 		<tr>
 			<td>11:25</td>
 			<td>
-				<a href="../participants/nicolas-maigret">
-					<span class="title">The Pirate Cinema</span></br>
-					Nicolas Maigret
+				<a href="../participants/jane-coffin">
+					<span class="title">Internet Society &amp; Community Networking</span></br>
+					Jane Coffin
 				</a>
 			</td>
 			<td></td>