diff --git a/mozilla/webtools/addons/public/htdocs/faq.php b/mozilla/webtools/addons/public/htdocs/faq.php
index c84c5f56e6e..d635c355b95 100644
--- a/mozilla/webtools/addons/public/htdocs/faq.php
+++ b/mozilla/webtools/addons/public/htdocs/faq.php
@@ -11,6 +11,47 @@
 startProcessing('faq.tpl','faq',$compileId);
 require_once('includes.php');
 
+/**
+ * Form a properly formatted string for comparison based on applications table
+ * data.
+ * @param string $major
+ * @param string $minor
+ * @param string $release
+ * @param string $subver
+ * @return string $version
+ */
+function buildAppVersion ($major,$minor,$release,$subver) {
+
+    // This is our final version string.
+    $version = '';
+
+    // By default, we cat major and minor versions, because we assume they
+    // exist and are always numeric.  And they typically are, for now... :\
+    $version = $major.'.'.$minor;
+
+    // If we have a release and it's not a final version, add the release.
+    if (isset($release) && (empty($subver) || isset($subver) && $subver != 'final' && $subver != '+')) {
+
+        // Only add the '.' if it's numeric.
+        if (preg_match('/^\*|\w+$/',$release)) {
+            $version = $version.'.'.$release;
+        } else {
+            $version = $version.$release;
+        }
+    }
+
+    // If we have a subversion and it's not 'final', append it depending on its type.
+    if (!empty($subver) && $subver != 'final') {
+        if (preg_match('/^\*|\w+$/',$subver)) {
+            $version  = $version.'.'.$subver;
+        } else {
+            $version  = $version.$subver;
+        }
+    }
+
+    return $version;
+}
+
 $db->query("
     SELECT
         `title`,
@@ -26,6 +67,36 @@ $db->query("
 
 $faq = $db->record;
 
+$sql = "
+    SELECT 
+        `AppName`,
+        `GUID`,
+        `Version`,
+        `major`,
+        `minor`,
+        `release`,
+        `SubVer`
+    FROM
+        `applications`
+    WHERE
+        `public_ver`='YES'
+    ORDER BY
+        Appname, Version
+";
+
+$db->query($sql,SQL_ALL,SQL_ASSOC);
+
+if (is_array($db->record)) {
+    foreach ($db->record as $row) {
+        $appVersions[] = array(
+            'displayVersion'    => $row['Version'],
+            'versionNumber'     => buildAppVersion($row['major'],$row['minor'],$row['release'],$row['SubVer']),
+            'appName'           => $row['AppName'],
+            'guid'              => $row['GUID']
+        );
+    }
+}
+
 $links = array(
     array(  'href'  => './faq.php',
             'title' => 'Frequently Asked Questions', 
@@ -42,6 +113,7 @@ $tpl->assign(
             'links'     => $links,
             'sidebar'   => 'inc/nav.tpl',
             'content'   => 'faq.tpl',
-            'title'     => 'Frequently Asked Questions')
+            'title'     => 'Frequently Asked Questions',
+            'appVersions' => $appVersions   )
 );
 ?>
diff --git a/mozilla/webtools/addons/public/tpl/addon.tpl b/mozilla/webtools/addons/public/tpl/addon.tpl
index c47d4443958..edaad26b530 100644
--- a/mozilla/webtools/addons/public/tpl/addon.tpl
+++ b/mozilla/webtools/addons/public/tpl/addon.tpl
@@ -16,7 +16,7 @@ released on {$addon->VersionDateAdded|date_format}
 </p>
 
 
-<p>{$addon->Description}</p>
+<p>{$addon->Description|nl2br}</p>
 
 <p class="requires">
 Works with:
@@ -84,6 +84,9 @@ Works with:
         <a href="{$config.webpath}/{$app}/{$addon->ID}/history">Other Versions</a>
     </div>
 
+<h2>Developer Comments</h2>
+<p>{$addon->devomments|nl2br}</p>
+
 <h3 id="user-comments">User Comments</h3>
 
 <p><strong><a href="{$config.webpath}/addcomment.php?aid={$addon->ID}&amp;app={$app}">Add your own comment &#187;</a></strong></p>
diff --git a/mozilla/webtools/addons/public/tpl/faq.tpl b/mozilla/webtools/addons/public/tpl/faq.tpl
index 034f3f0bc13..658b62588d3 100644
--- a/mozilla/webtools/addons/public/tpl/faq.tpl
+++ b/mozilla/webtools/addons/public/tpl/faq.tpl
@@ -1,6 +1,53 @@
+<div id="mbody">
 
 <h1>Frequently Asked Questions</h1>
 
+<h2>What is Mozilla Update?</h2>
+<p>Mozilla Update is the place to get updates and extras for
+your <a href="http://www.mozilla.org/">Mozilla</a> products.  This service
+has undergone <a href="./update.php">several changes</a> that we hope
+will make the site better.  We have re-enabled access to the developers area
+and look forward to serving the extension and theme developer community in the
+future!  We will be posting frequent 
+<a href="./update.php">status updates</a> as to our progress with the 
+UMO service.  The best is yet to come!</p>
+
+<h2>How do I get involved?</h2>
+<p class="first">We are looking for volunteers to help us with UMO. We are in need of PHP
+developers to help with redesigning the site, and people to review extensions
+and themes that get submitted to UMO. We especially need Mac and Thunderbird
+users. If you are interested in being a part of this exciting project, please
+join us in <kbd>#umo</kbd> on <kbd>irc.mozilla.org</kbd> to start getting a feeling for what's up or for a more informal chat.
+</p>
+
+<h2>What can I find here?</h2>
+<dl>
+<dt>Extensions</dt>
+<dd>Extensions are small add-ons that add new functionality to your Firefox
+web browser or Thunderbird email client.  They can add anything from
+toolbars to completely new features.  Browse extensions for:
+<a href="{$config.webpath}/firefox/extensions/">Firefox</a>, 
+<a href="{$config.webpath}/thunderbird/extensions/">Thunderbird</a>,
+<a href="{$config.webpath}/mozilla/extensions/">Mozilla Suite</a>
+</dd>
+
+<dt>Themes</dt>
+<dd>Themes allow you to change the way your Mozilla program looks. 
+New graphics and colors. Browse themes for: 
+<a href="{$config.webpath}/firefox/themes/">Firefox</a>, 
+<a href="{$config.webpath}/thunderbird/themes/">Thunderbird</a>,
+<a href="{$config.webpath}/mozilla/themes/">Mozilla Suite</a>
+</dd>
+
+<dt>Plugins</dt>
+<dd>Plugins are programs that also add funtionality to your browser to
+deliver specific content like videos, games, and music.  Examples of Plugins
+are Macromedia Flash Player, Adobe Acrobat, and Sun Microsystem's Java
+Software.  Browse plug-ins for:
+<a href="{$config.webpath}/{$app}/plugins/">Firefox &amp; Mozilla Suite</a>
+</dd>
+	</dl>
+
 <dl>
 {section name=faq loop=$faq}
 <dt>{$faq[faq].title}</dt>
@@ -8,3 +55,27 @@
 {/section}
 </dl>
 
+<h2>Valid App Versions for Addon Developers</h2>
+
+<table class="appversions">
+<tr>
+    <th>Application Name</th>
+    <th>Display Version</th>
+    <th>install.rdf Version</th>
+    <th>GUID</th>
+</tr>
+
+{foreach item=app from=$appVersions}
+<tr>
+<td>{$app.appName}</td>
+<td>{$app.displayVersion}</td>
+<td>{$app.versionNumber}</td>
+<td>{$app.guid}</td></tr>
+{/foreach}
+</table>
+
+
+<h2>I see this error when trying to upload my extension or theme: "The Name for your extension or theme already exists in the Update database."</h2>
+<p>This is typically caused by mismatching GUIDs or a duplicate record.  If there is a duplicate record, chances are you should submit an update instead of trying to create a new extension or theme.  If you cannot see the existing record, then it is owned by another author, and you should consider renaming your extension/theme.</p>
+
+</div>
diff --git a/mozilla/webtools/addons/public/tpl/policy.tpl b/mozilla/webtools/addons/public/tpl/policy.tpl
index 66a0c6796b2..2687626c800 100644
--- a/mozilla/webtools/addons/public/tpl/policy.tpl
+++ b/mozilla/webtools/addons/public/tpl/policy.tpl
@@ -1,21 +1,7 @@
 
 <h2>Policy</h2>
 
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
-<p>Stuff goes here.</p>
+<p>For more on the AMO policy, see our <a href="http://wiki.mozilla.org/Update:Policy">draft policy</a> or <a href="{$config.webpath}/support.php">contact us</a>.
+
+<p>To sum it up in once sentence: do what is right for the web.  The rest is details.  Seriously.</p>
 
diff --git a/mozilla/webtools/addons/public/tpl/search.tpl b/mozilla/webtools/addons/public/tpl/search.tpl
index e2ec6371f26..4ff8b97622d 100644
--- a/mozilla/webtools/addons/public/tpl/search.tpl
+++ b/mozilla/webtools/addons/public/tpl/search.tpl
@@ -122,7 +122,7 @@ Next Page &raquo;
     {/if}
 
     <p class="first">By <a href="{$config.webpath}/{$app}/{$results[r]->UserID}/author/">{$results[r]->UserName}</a></p>
-    <p class="first">{$results[r]->Description}</p>
+    <p class="first">{$results[r]->Description|nl2br}</p>
     <div class="baseline">Last Update:  {$results[r]->DateUpdated|date_format} | Downloads Last 7 Days: {$results[r]->downloadcount} | Total Downloads: {$results[r]->TotalDownloads}</DIV>
 </div>
 {/section}