From 3db30899d6e64844cfe06ce940ca74524fea2c0c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Mon, 20 Jun 2011 14:52:49 +0200
Subject: [PATCH] We're out of PromoDVDs.

---
 app/views/order/new.rhtml | 18 +++++++++---------
 shared                    |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/order/new.rhtml b/app/views/order/new.rhtml
index 36b0395..7e2f891 100644
--- a/app/views/order/new.rhtml
+++ b/app/views/order/new.rhtml
@@ -10,8 +10,7 @@
 
 <div>
 
-  <p><b>Note: We're nearly out of stock of PromoDVDs and will not be able
-  to fulfill every order that we receive.</b></p>
+  <h2>Note: We're out of stock of openSUSE 11.4 PromoDVDs. Next production is planned for openSUSE 12.1 in November.</h2>
 
   <p> Join the fast-growing community putting openSUSE into more
     hands by ordering the latest openSUSE PromoDVD for your group,
@@ -121,7 +120,7 @@
 <p>
 
   <b>Cost:</b>The PromoDVDs, material and shipment is sponsored by
-  Novell. We cannot take care of <b>customs</b> for you, this is
+  SUSE. We cannot take care of <b>customs</b> for you, this is
   something you might need to pay - depending on the amount of media
   and your local custom situation.
 
@@ -145,17 +144,18 @@
     <tr><td>Country </td><td><%= f.text_field :country, :class => "mandatory" %></td></tr>
     <tr><td>Phone number </td><td><%= f.text_field :phone, :class => "mandatory" %></td></tr>
     <tr><td>E-Mail Address </td><td><%= f.text_field :email, :class => "mandatory" %></td></tr>
-    <tr><td>Amount of DVDs </td><td><%= f.text_field :amount, :class => "mandatory" %></td></tr>
+    <tr><td>Amount of DVDs (<b>We are out of 11.4 DVDs now!</b>)</td><td><%= f.text_field :amount, :class => "mandatory" %></td></tr>
     <tr><td>What additional promotional material do you need (if available)?  </td><td><%= f.text_field :material %></td></tr>
     <tr><td>Deadline (use the ISO format YYYY-MM-DD, e.g. 2011-03-31 or NONE) </td><td><%= f.text_field :deadline, :class => "mandatory" %></td></tr>
     <tr><td colspan=2><%= submit_tag("Send request now") %></td></tr>
   </table>
   <p>
-    All data is used only for sending DVDs and will not be spread to third parties.
-    We store the data to inform the users if a new version is available. All
-    requests have to be screened to fulfill the US export embargo. More information
-    about the embargo and a list of countries at wikipedia
-    <a href='http://en.wikipedia.org/wiki/United_States_embargoes'>http://en.wikipedia.org/wiki/United_States_embargoes</a>.
+    All data is used only for sending openSUSE promotional material
+    and will not be spread to third parties.  We store the data to
+    inform the users if a new version is available. All requests have
+    to be screened to fulfill the US export embargo. More information
+    about the embargo and a list of countries at wikipedia <a
+    href='http://en.wikipedia.org/wiki/United_States_embargoes'>http://en.wikipedia.org/wiki/United_States_embargoes</a>.
 
   </p>
 <% end %>
diff --git a/shared b/shared
index f5ad21d..f1e9091 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit f5ad21da3907082b5a43ddc1d8eda171f1015b8d
+Subproject commit f1e90916a5a9431b32cc3f4887796f6a420f9f46
-- 
2.1.4