com web/php: Took the changes for Conferência PHPRS 2017, fixed some merge conflicts, and u pdated the actual content to be HTML instead of raw
text so it will render correctly.: arc hive/archive.xml archive/entries/2017-03-04 -1.xml

Commit: 421224fc94ec3e0bf3c0da8c1405e2fa447e3ea7 Author: Eli White <eli@eliw.com> Tue, 14 Mar 2017 21:51:17 -0400 Parents: 1736a7579926adeea430829440ad0976fd3bca38 f159dbbcb722291fb8d8c8e9184f9c535fffd43e Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=421224fc94ec3e0bf3c0da8c1405e2fa447e3ea7 Log: Took the changes for Conferência PHPRS 2017, fixed some merge conflicts, and updated the actual content to be HTML instead of raw text so it will render correctly. Changed paths: MM archive/archive.xml AM archive/entries/2017-03-04-1.xml Diff: diff --cc archive/archive.xml index 1fa7be7,c38da5c..0613b8e --- a/archive/archive.xml +++ b/archive/archive.xml @@@ -9,7 -9,7 +9,8 @@@ <uri>http://php.net/contact</uri> <email>php-webmaster@lists.php.net</email> </author> + <xi:include href="entries/2017-03-04-1.xml"/> + <xi:include href="entries/2017-03-03-1.xml"/> <xi:include href="entries/2017-02-24-1.xml"/> <xi:include href="entries/2017-02-21-1.xml"/> <xi:include href="entries/2017-02-17-1.xml"/> diff --cc archive/entries/2017-03-04-1.xml index 0000000,f41798d..e212239 mode 000000,100644..100644 --- a/archive/entries/2017-03-04-1.xml +++ b/archive/entries/2017-03-04-1.xml @@@ -1,0 -1,23 +1,22 @@@ + <?xml version="1.0" encoding="utf-8"?> + <entry xmlns="http://www.w3.org/2005/Atom" xmlns:default="http://php.net/ns/news"> + <title>Conferência PHPRS 2017</title> + <id>http://php.net/archive/2017.php#id2017-03-04-1</id> + <published>2017-03-04T16:33:51-03:00</published> + <updated>2017-03-04T16:33:51-03:00</updated> + <default:finalTeaserDate xmlns="http://php.net/ns/news">2017-05-12</default:finalTeaserDate> + <category term="conferences" label="Conference announcement"/> + <link href="http://php.net/conferences/index.php#id2017-03-04-1" rel="alternate" type="text/html"/> + <default:newsImage xmlns="http://php.net/ns/news" link="http://conf.phprs.com.br/" title="Logo Conferência PHPRS 2017">LogoNovoCentral.png</default:newsImage> + <link href="http://conf.phprs.com.br/" rel="via" type="text/html"/> + <content type="xhtml"> + <div xmlns="http://www.w3.org/1999/xhtml"> - An event for the PHP Developer community of Rio Grande do Sul, focused on professional growth, exchange of experiences and networking. Strengthening language and the labor market. ++ <p>An event for the PHP Developer community of Rio Grande do Sul, focused on professional growth, exchange of experiences and networking. Strengthening language and the labor market.</p> + - From May 12 to 13, 2017, in Porto Alegre / RS-Brazil, the first day will be held workshops and the second lectures. - - Check out the programming at http://conf.phprs.com.br/#schedule - Subscriptions at http://conf.phprs.com.br/#tickets. ++ <p>From May 12 to 13, 2017, in Porto Alegre / RS-Brazil, the first day will be held workshops and the second lectures.</p> + ++ <p>Check out the programming at <a href="http://conf.phprs.com.br/#schedule" title="Conferência PHPRS | 12 e 13 maio 2017">http://conf.phprs.com.br/#schedule</a> <br\> ++ Subscriptions at <a href="http://conf.phprs.com.br/#tickets" title="Conferência PHPRS | 12 e 13 maio 2017">http://conf.phprs.com.br/#tickets</a></p> + </div> + </content> + </entry>