From c408f4f980d79b0682da4c3a7157e5810a99d619 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 25 Jan 2011 17:30:33 -0500
Subject: [PATCH] drop the suggested support of urlencoded 'userdata' Property

base64 encoding should be enough for the likely use case of this
Product Section property.
---
 doc/ovf/environment.xml   | 2 +-
 doc/ovf/ubuntu-server.ovf | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/ovf/environment.xml b/doc/ovf/environment.xml
index 3991f71a..98262754 100644
--- a/doc/ovf/environment.xml
+++ b/doc/ovf/environment.xml
@@ -34,7 +34,7 @@
         <!-- hostname: the hostname to set -->
         <Property oe:key="hostname" oe:value="ubuntuhost"/>
         <!--
-        The value for user-data can be either base64 encoded or url encoded.
+        The value for user-data is to be base64 encoded.
         it will be decoded, and then processed normally as user-data.
         The following represents '#!/bin/sh\necho "hi world"'
 
diff --git a/doc/ovf/ubuntu-server.ovf b/doc/ovf/ubuntu-server.ovf
index ab415285..e8e3b72a 100644
--- a/doc/ovf/ubuntu-server.ovf
+++ b/doc/ovf/ubuntu-server.ovf
@@ -39,10 +39,9 @@
       </Property>
       <Property ovf:key="user-data" ovf:type="string" ovf:userConfigurable="true" ovf:value="">
           <Label>Encoded user-data</Label>
-          <Description>This value can be either base64 encoded or url encoded.  It will be decoded, and then processed normally as user-data.</Description>
+          <Description>In order to fit into a xml attribute, this value is base64 encoded . It will be decoded, and then processed normally as user-data.</Description>
           <!--  The following represents '#!/bin/sh\necho "hi world"'
           ovf:value="IyEvYmluL3NoDQplY2hvICJoaSB3b3JsZCI="
-          ovf:value="%23!%2Fbin%2Fsh%0Aecho%20%22hi%20world%22"/>
         -->
       </Property>
       <Property ovf:key="password" ovf:type="string" ovf:userConfigurable="true" ovf:value="">