Commit:    954780a6df35f56fb8414eafedccb98a926bdea0
Author:    philip <phi...@roshambo.org>         Wed, 28 May 2014 20:24:58 -0700
Parents:   2bea0e0d21b03bac9e77b24315df3f5588140b44
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=954780a6df35f56fb8414eafedccb98a926bdea0

Log:
Updated the China PHP Conference information, as requested by Xinchen Hui

Changed paths:
  M  archive/entries/2014-05-29-1.xml


Diff:
diff --git a/archive/entries/2014-05-29-1.xml b/archive/entries/2014-05-29-1.xml
index bb3bb3c..6db1d48 100644
--- a/archive/entries/2014-05-29-1.xml
+++ b/archive/entries/2014-05-29-1.xml
@@ -3,7 +3,7 @@
   <title>China PHP Conference 2014</title>
   <id>http://php.net/archive/2014.php#id2014-05-29-1</id>
   <published>2014-05-29T01:43:06+02:00</published>
-  <updated>2014-05-29T01:43:06+02:00</updated>
+  <updated>2014-05-29T04:43:06+02:00</updated>
   <default:finalTeaserDate 
xmlns="http://php.net/ns/news";>2014-08-03</default:finalTeaserDate>
   <category term="conferences" label="Conference announcement"/>
   <link href="http://php.net/conferences/index.php#id2014-05-29-1"; 
rel="alternate" type="text/html"/>
@@ -13,14 +13,15 @@
     <div xmlns="http://www.w3.org/1999/xhtml";>
      <p>2nd Annual China PHP Conference – August 2 to 3, Shanghai!</p>
      
-     <p>ThinkInLAMP will be hosting a 2-days event filled with high quality,
+     <p>ThinkInLAMP will be hosting a 2-day event filled with high quality,
      technical sessions about PHP Core, PHP High Performance, PHP Engineering,
-     and PHP more. During this session you will hear from Laruence Hui and his
-     &lt;PHP New Generation is coming!&gt; and an exclusive Q&amp;A with 
him.</p>
+     and more PHP. During this conference, you will hear from Xinchen Hui, a 
PHP
+     core developer.
+     </p>
      
-     <p>Don’t miss out on 2-great days sessions, delicious food, fantastic 
shows
+     <p>Don’t miss out on 2 great days of sessions, delicious food, fantastic 
shows,
      and countless networking opportunities to engage with speakers and
-     delegates. For tickets and more information: <a 
href="http://www.phpconchina.com";>www.phpconchina.com</a></p>
+     delegates. For tickets and more information, see: <a 
href="http://www.phpconchina.com/";>www.phpconchina.com</a></p>
      
      
     </div>


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to