Commit:    2e26165e68c939cef431fd0152d9a86f90d4625e
Author:    Hannes Magnusson <[email protected]>         Fri, 4 Dec 2015 14:46:54 
-0800
Parents:   6622899ded76956e788ba3361e51ad3ba9e2a2e0
Branches:  master

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

Log:
Revert "Adding in announcement for php[cruise]"

This reverts commit 0928a0313f85b5ce282c78a99803fd5e4aa3f93d.

Changed paths:
  M  archive/archive.xml
  D  archive/entries/2015-12-04-1.xml
  D  images/news/phpcruise.2015.png


Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index c6bf8d8..3013b3f 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/2015-12-04-1.xml"/>
   <xi:include href="entries/2015-12-03-1.xml"/>
   <xi:include href="entries/2015-11-26-2.xml"/>
   <xi:include href="entries/2015-11-26-1.xml"/>
diff --git a/archive/entries/2015-12-04-1.xml b/archive/entries/2015-12-04-1.xml
deleted file mode 100644
index d3e712e..0000000
--- a/archive/entries/2015-12-04-1.xml
+++ /dev/null
@@ -1,30 +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[cruise]</title>
-  <id>http://php.net/archive/2015.php#id2015-12-04-1</id>
-  <published>2015-12-04T18:25:10+00:00</published>
-  <updated>2015-12-04T18:25:10+00:00</updated>
-  <default:finalTeaserDate 
xmlns="http://php.net/ns/news";>2016-07-17</default:finalTeaserDate>
-  <category term="conferences" label="Conference announcement"/>
-  <link href="http://php.net/conferences/index.php#id2015-12-04-1"; 
rel="alternate" type="text/html"/>
-  <default:newsImage xmlns="http://php.net/ns/news"; 
link="https://cruise.phparch.com/"; 
title="php[cruise]">phpcruise.2015.png</default:newsImage>
-  <link href="https://cruise.phparch.com/"; rel="via" type="text/html"/>
-  <content type="xhtml">
-    <div xmlns="http://www.w3.org/1999/xhtml";>
-     <p>
-     It’s been a long time coming … Back in 2004 php[architect] ran a 
conference-cruise, and ever
-     since we’ve heard people asking for us to repeat the event.  We figured 
that 12 years was
-     long enough of a wait.  Therefore we’d like to announce <a 
href="https://cruise.phparch.com";>php[cruise] happening in 2016</a>!
-     This 7 day long conference-cruise will be a unique event for the PHP 
community.
-     Completely immersive and giving you, the attendee, a hands-on experience 
not to be matched!
-     </p><p>
-     You can learn more about the conference, the cruise, <a 
href="https://cruise.phparch.com/pricing/";>how the pricing is structured</a>,
-     and what talks we will be having by <a 
href="https://cruise.phparch.com";>exploring our website</a>.  And please if you 
have
-     any questions don’t hesitate to contact us.
-     </p><p>
-     Our Early Bird Sale runs just until December 31st, 2015 - <a 
href="https://cruise.phparch.com/registration/";>So buy tickets soon</a> to
-     save yourself a spot at this limited space event.
-     </p>&gt;
-    </div>
-  </content>
-</entry>
diff --git a/images/news/phpcruise.2015.png b/images/news/phpcruise.2015.png
deleted file mode 100644
index 13b8c70..0000000
Binary files a/images/news/phpcruise.2015.png and /dev/null differ


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

Reply via email to