Commit: b2edeba2dd1a092bff63ad877b97fb3bd48ecbdc Author: Stelian Mocanita <[email protected]> Thu, 23 Feb 2017 19:53:59 -0600 Committer: Stelian Mocanita <[email protected]> Mon, 27 Feb 2017 10:41:44 +0100 Parents: 2e2070e8330d3abb1630e56c704c7423bf8f6baa Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=b2edeba2dd1a092bff63ad877b97fb3bd48ecbdc Log: resolving merge issues and updating the posting date of the Madison PHP Conference announcement Changed paths: M archive/archive.xml D archive/entries/2017-02-03-1.xml A archive/entries/2017-02-24-1.xml Diff: diff --git a/archive/archive.xml b/archive/archive.xml index 76879c3..b5179fd 100644 --- a/archive/archive.xml +++ b/archive/archive.xml @@ -9,6 +9,7 @@ <uri>http://php.net/contact</uri> <email>[email protected]</email> </author> + <xi:include href="entries/2017-02-21-1.xml"/> <xi:include href="entries/2017-02-17-1.xml"/> <xi:include href="entries/2017-02-16-1.xml"/> diff --git a/archive/entries/2017-02-03-1.xml b/archive/entries/2017-02-03-1.xml deleted file mode 100644 index d443b4c..0000000 --- a/archive/entries/2017-02-03-1.xml +++ /dev/null @@ -1,25 +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>Madison PHP Conference 2017</title> - <id>http://php.net/archive/2017.php#id2017-02-03-1</id> - <published>2017-02-03T16:59:19+00:00</published> - <updated>2017-02-03T16:59:19+00:00</updated> - <default:finalTeaserDate xmlns="http://php.net/ns/news";>2017-09-22</default:finalTeaserDate> - <category term="conferences" label="Conference announcement"/> - <category term="cfp" label="Call for Papers"/> - <link href="http://php.net/conferences/index.php#id2017-02-03-2"; rel="alternate" type="text/html"/> - <default:newsImage xmlns="http://php.net/ns/news"; link="http://www.madisonphpconference.com/"; title="Madison PHP Conference Logo">madison-php-2016-conf-logo.png</default:newsImage> - <link href="http://2017.madisonphpconference.com/"; rel="via" type="text/html"/> - <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml";> - <p>Join us on Friday, September 22nd, 2017 for a full day of tutorials followed by three tracks of amazing talks on Saturday, September 23rd, 2017. Now in its fifth year, Madison PHP Conference in Madison, Wisconsin, USA focuses on PHP, related web technologies, and professional development - everything you need to energize your career. This event is organized by the locally-run <a href="http://www.madisonphp.com";>Madison PHP user group</a> and is designed to offer something for attendees at all skill levels. <a href="http://www.madisonphpconference.com";>Madison PHP Conference 2017</a> will be two days of networking, learning, sharing, and great fun!</p> - <p>The <a href="http://cfp.madisonphpconference.com";>Call for Papers</a> will be open until April 30th, 2017. Madison PHP Conference offers reimbursement for travel and accommodations. To view the full speaker package and to submit a talk, please visit: <a href="http://cfp.madisonphpconference.com";>http://cfp.madisonphpconference.com</a>.</p> - <p>Have you ever thought about giving a talk at a user group or at a conference but weren't sure what to talk about? Weren't sure how to format your slides? Weren't sure where to even start? Learn some tips for finding a topic, creating your talk, and engaging your audience at our speaker's workshop:<br /> - <strong>Speaking at a Conference or User Group</strong><br /> - Thursday, March 30, 2017 - 7:00 PM<br /> - RSVP: <a href="https://www.meetup.com/madisonphp/events/233865912/";>https://www.meetup.com/madisonphp/events/233865912/</a> - </p> - - </div> - </content> -</entry> diff --git a/archive/entries/2017-02-24-1.xml b/archive/entries/2017-02-24-1.xml new file mode 100644 index 0000000..9fd1a75 --- /dev/null +++ b/archive/entries/2017-02-24-1.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<entry xmlns="http://www.w3.org/2005/Atom"; xmlns:default="http://php.net/ns/news";> + <title>Madison PHP Conference 2017</title> + <id>http://php.net/archive/2017.php#id2017-02-24-1</id> + <published>2017-02-24T16:59:19+00:00</published> + <updated>2017-02-24T16:59:19+00:00</updated> + <default:finalTeaserDate xmlns="http://php.net/ns/news";>2017-09-22</default:finalTeaserDate> + <category term="conferences" label="Conference announcement"/> + <category term="cfp" label="Call for Papers"/> + <link href="http://php.net/conferences/index.php#id2017-02-24-1"; rel="alternate" type="text/html"/> + <default:newsImage xmlns="http://php.net/ns/news"; link="http://www.madisonphpconference.com/"; title="Madison PHP Conference Logo">madison-php-2016-conf-logo.png</default:newsImage> + <link href="http://2017.madisonphpconference.com/"; rel="via" type="text/html"/> + <content type="xhtml"> + <div xmlns="http://www.w3.org/1999/xhtml";> + <p>Join us on Friday, September 22nd, 2017 for a full day of tutorials followed by three tracks of amazing talks on Saturday, September 23rd, 2017. Now in its fifth year, Madison PHP Conference in Madison, Wisconsin, USA focuses on PHP, related web technologies, and professional development - everything you need to energize your career. This event is organized by the locally-run <a href="http://www.madisonphp.com";>Madison PHP user group</a> and is designed to offer something for attendees at all skill levels. <a href="http://www.madisonphpconference.com";>Madison PHP Conference 2017</a> will be two days of networking, learning, sharing, and great fun!</p> + <p>The <a href="http://cfp.madisonphpconference.com";>Call for Papers</a> will be open until April 30th, 2017. Madison PHP Conference offers reimbursement for travel and accommodations. To view the full speaker package and to submit a talk, please visit: <a href="http://cfp.madisonphpconference.com";>http://cfp.madisonphpconference.com</a>.</p> + <p>Have you ever thought about giving a talk at a user group or at a conference but weren't sure what to talk about? Weren't sure how to format your slides? Weren't sure where to even start? Learn some tips for finding a topic, creating your talk, and engaging your audience at our speaker's workshop:<br /> + <strong>Speaking at a Conference or User Group</strong><br /> + Thursday, March 30, 2017 - 7:00 PM<br /> + RSVP: <a href="https://www.meetup.com/madisonphp/events/233865912/";>https://www.meetup.com/madisonphp/events/233865912/</a> + </p> + + </div> + </content> +</entry> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
