Commit:    42802e60cbda80bcd2e2cd3b54e233bc7338d0e1
Author:    Johanna Cherry <[email protected]>         Fri, 23 Sep 
2016 10:06:53 -0500
Parents:   a47d7534ac8c851fe141cc5fc4f09239bd5957b8
Branches:  master

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

Log:
Removing general conference announcement, adding just cfp for now via PR 
feedback.

Changed paths:
  M  archive/archive.xml
  M  archive/entries/2016-09-22-1.xml
  D  archive/entries/2016-09-22-2.xml


Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 4304c45..e12bc24 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,7 +9,6 @@
     <uri>http://php.net/contact</uri>
     <email>[email protected]</email>
   </author>
-  <xi:include href="entries/2016-09-22-2.xml"/>
   <xi:include href="entries/2016-09-22-1.xml"/>
   <xi:include href="entries/2016-09-16-2.xml"/>
   <xi:include href="entries/2016-09-16-1.xml"/>
diff --git a/archive/entries/2016-09-22-1.xml b/archive/entries/2016-09-22-1.xml
index a45b8f0..d57d1ff 100644
--- a/archive/entries/2016-09-22-1.xml
+++ b/archive/entries/2016-09-22-1.xml
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <entry xmlns="http://www.w3.org/2005/Atom"; 
xmlns:default="http://php.net/ns/news";>
-  <title>Announcing PHP UK Conference 2017</title>
-  <id>http://php.net/archive/2016.php#id2016-09-22-1</id>
-  <published>2016-09-22T08:00:00+00:00</published>
-  <updated>2016-09-22T08:00:00+00:00</updated>
-  <default:finalTeaserDate 
xmlns="http://php.net/ns/news";>2017-02-17</default:finalTeaserDate>
-  <category term="conferences" label="Conference announcement"/>
-  <link href="http://php.net/conferences/index.php#id2016-09-22-1"; 
rel="alternate" type="text/html"/>
+  <title>PHP UK Conference 2017 Call for Papers</title>
+  <id>http://php.net/archive/2016.php#id2016-09-22-2</id>
+  <published>2016-09-22T09:00:00+00:00</published>
+  <updated>2016-09-22T09:00:00+00:00</updated>
+  <default:finalTeaserDate 
xmlns="http://php.net/ns/news";>2017-10-17</default:finalTeaserDate>
+  <category term="cfp" label="Call for Papers"/>
+  <link href="http://php.net/conferences/index.php#id2016-09-22-2"; 
rel="alternate" type="text/html"/>
   <link href="http://phpconference.co.uk"; rel="via" type="text/html"/>
   <content type="xhtml">
     <div xmlns="http://www.w3.org/1999/xhtml";>
       <h4>
-        PHP UK Conference 2017 - February 16 &amp; 17 2017<br />
-        The Brewery Conference Centre in London
+        PHP UK Conference 2017 Call for Papers<br/>
+        Open until: October 17th 2016 6pm GMT
       </h4>
-      <p>The PHP UK team are pleased to announce the 12th annual PHP UK 
Conference; a 2-day event with 3 great tracks held at at The Brewery, in the 
heart of the City of London.</p>
-      <p>With over 700 delegates, speakers, and sponsors, PHP UK conference 
aims to deliver fantastic up-to-date content about PHP and related web 
technologies in a comfortable and professional setting. There are countless 
networking opportunities to engage with international speakers and delegates, 
which makes the event one you won't want to miss.</p>
-      <p>Tickets are on sale now at blind bird rates - book early to get the 
best price. Scholarship applications are open until February 1st.</p>
-      <p>Anyone is welcome to attend the conference, whether you're a 
professional, hobbyist, manager, or just starting out, there's something for 
everyone.</p>
-      <p>For tickets and more information visit our web site <a 
href="http://phpconference.co.uk";>phpconference.co.uk</a></p>
+      <p>The PHP UK Conference 2017 Call for Papers is now open!</p>
+      <p>We are looking for talks relating to any non-basic aspect of the PHP 
programming language, be it mainstream, advanced, niche or non-technical. We 
are looking for real 'wow' talks that are fresh and inspiring about cutting 
edge topics or new perspectives on common problems. The audience will be from 
all backgrounds varying in skill level from beginner to intermediate to 
advanced, so talks varying widely in topic and skill levels are required. Most 
of all we want speakers who have a deep knowledge about the topics they are 
proposing and can't wait to share that knowledge with a whole group of of eager 
listeners. Tell us what you're most passionate about and why we should be 
passionate about it as well.</p>
+      <ul>
+        <li>Inclusive and anonymous selection process</li>
+        <li>Full speaker package so you can attend the whole conference</li>
+        <li>Over 700 attendees from all over the world</li>
+      </ul>
+      <p>For more information and to submit a paper visit our web site <a 
href="http://phpconference.co.uk/speakers";>phpconference.co.uk/speakers</a></p>
+      <p>PHP UK Conference  will be held on February 16-17, 2017 at the 
Brewery Conference Centre in London.</p>
     </div>
   </content>
 </entry>
diff --git a/archive/entries/2016-09-22-2.xml b/archive/entries/2016-09-22-2.xml
deleted file mode 100644
index d57d1ff..0000000
--- a/archive/entries/2016-09-22-2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom"; 
xmlns:default="http://php.net/ns/news";>
-  <title>PHP UK Conference 2017 Call for Papers</title>
-  <id>http://php.net/archive/2016.php#id2016-09-22-2</id>
-  <published>2016-09-22T09:00:00+00:00</published>
-  <updated>2016-09-22T09:00:00+00:00</updated>
-  <default:finalTeaserDate 
xmlns="http://php.net/ns/news";>2017-10-17</default:finalTeaserDate>
-  <category term="cfp" label="Call for Papers"/>
-  <link href="http://php.net/conferences/index.php#id2016-09-22-2"; 
rel="alternate" type="text/html"/>
-  <link href="http://phpconference.co.uk"; rel="via" type="text/html"/>
-  <content type="xhtml">
-    <div xmlns="http://www.w3.org/1999/xhtml";>
-      <h4>
-        PHP UK Conference 2017 Call for Papers<br/>
-        Open until: October 17th 2016 6pm GMT
-      </h4>
-      <p>The PHP UK Conference 2017 Call for Papers is now open!</p>
-      <p>We are looking for talks relating to any non-basic aspect of the PHP 
programming language, be it mainstream, advanced, niche or non-technical. We 
are looking for real 'wow' talks that are fresh and inspiring about cutting 
edge topics or new perspectives on common problems. The audience will be from 
all backgrounds varying in skill level from beginner to intermediate to 
advanced, so talks varying widely in topic and skill levels are required. Most 
of all we want speakers who have a deep knowledge about the topics they are 
proposing and can't wait to share that knowledge with a whole group of of eager 
listeners. Tell us what you're most passionate about and why we should be 
passionate about it as well.</p>
-      <ul>
-        <li>Inclusive and anonymous selection process</li>
-        <li>Full speaker package so you can attend the whole conference</li>
-        <li>Over 700 attendees from all over the world</li>
-      </ul>
-      <p>For more information and to submit a paper visit our web site <a 
href="http://phpconference.co.uk/speakers";>phpconference.co.uk/speakers</a></p>
-      <p>PHP UK Conference  will be held on February 16-17, 2017 at the 
Brewery Conference Centre in London.</p>
-    </div>
-  </content>
-</entry>


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

Reply via email to