Some lines in the release notes started with a "[% terms" item but didn't

have [%+ on them, so the words would get crunched together, like "thisBugzilla".

diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 35d586bde183d1e5cd32e14c2243ba7a3e7718d8..0bb2646ba9eb32c24d042ee08e01daf7f5430a56 100644 (file)
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -365,8 +365,8 @@
 <h3><a name="v34_feat_see">"See Also" Field</a></h3>
 
 <p>We have added a new standard field called "See Also" to 
-  [% terms.Bugzilla %]. In this field, you can put URLs to multiple 
-  [% terms.bugs %] in any [% terms.Bugzilla %] installation, to indicate
+  [%+ terms.Bugzilla %]. In this field, you can put URLs to multiple 
+  [%+ terms.bugs %] in any [% terms.Bugzilla %] installation, to indicate
   that those [% terms.bugs %] are related to this one. It also supports
   adding URLs to [% terms.bugs %] in 
   <a href="http://launchpad.net/">Launchpad</a>.</p>
@@ -438,7 +438,7 @@
   <li>You can now use any custom drop-down field as an axis for a tabular
     or graphical report.</li>
   <li>The <kbd>X-Bugzilla-Type</kbd> header in emails sent by 
-    [% terms.Bugzilla %] is now "new" for [% terms.bug %]mail sent for
+    [%+ terms.Bugzilla %] is now "new" for [% terms.bug %]mail sent for
     newly-filed [% terms.bugs %], and "changed" for emails having to do
     with updated [% terms.bugs %].</li>
   <li>Mails sent by the "Whining" system now contain the header
@@ -460,7 +460,7 @@
     "crypt" function. This allows passwords longer than eight characters
     to actually be effective. Each user's password will be converted to
     SHA-256 the first time they log in after you upgrade to 
-    [% terms.Bugzilla %] 3.4 or later.</li>
+    [%+ terms.Bugzilla %] 3.4 or later.</li>
   <li>If you are using database replication with [% terms.Bugzilla %],
     many more scripts now take advantage of the read-only slave (the 
     "shadowdb"). It may be safe to open up <kbd>show_bug.cgi</kbd>
@@ -675,7 +675,7 @@
     can be used when updating [% terms.abug %]).
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=476678">[% terms.Bug %] 476678</a>)</li>
   <li>For installations using the <code>shadowdb</code> parameter, 
-    [% terms.Bugzilla %] was accidentally writing to the "tokens" table
+    [%+ terms.Bugzilla %] was accidentally writing to the "tokens" table
     in the shadow database (instead of the master database) when using the
     "Change Several [% terms.Bugs %] at Once" page.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=476943">[% terms.Bug  %] 476943</a>)</li>
@@ -1184,7 +1184,7 @@
     prepare for the fact that it will be moved into an extension at
     some point in the future.</li>
   <li>The <code>shutdownhtml</code> parameter now works even when 
-    [% terms.Bugzilla %]'s database server is down.</li>
+    [%+ terms.Bugzilla %]'s database server is down.</li>
 </ul>
 
 <h3>Enhancements for Localizers (or Localized Installations)</h3>
@@ -1539,7 +1539,7 @@
     debugging issues with SMTP.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=384497">[% terms.Bug %] 384497</a>)</li>
   <li>If you are a "global watcher" (you get all mails from every 
-    [% terms.bug %]), you can now see that in your Email Preferences.
+    [%+ terms.bug %]), you can now see that in your Email Preferences.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=365302">[% terms.Bug %] 365302</a>)</li>
   <li>The Status and Resolution of [% terms.bugs %] are now correctly
     localized in CSV search results.
@@ -1803,10 +1803,10 @@
   the &quot;Preferences&quot; screen.</p>
 
 <h3><a name="v30_feat_afn"></a>Attachments and Flags on New 
-  [% terms.Bugs %]</h3>
+  [%+ terms.Bugs %]</h3>
 
 <p>You can now add an attachment while you are filing a new 
-  [% terms.bug %].</p>
+  [%+ terms.bug %].</p>
 
 <p>You can also set flags on the [% terms.bug %] and on attachments, while
   filing a new [% terms.bug %].</p>
@@ -1837,7 +1837,7 @@
   <li>There is now navigation and a search box a the <em>top</em> of
     each page, in addition to the bar at the bottom of the page.</li>
   <li>A re-designed &quot;Format for Printing&quot; page for 
-    [% terms.bugs %].</li>
+    [%+ terms.bugs %].</li>
   <li>The layout of <kbd>show_bug.cgi</kbd> (the [% terms.bug %] editing 
     page) has been changed, and the attachment table has been redesigned.</li>
 </ul>
@@ -1860,7 +1860,7 @@
   Skins Documentation</a> for more details.</p>
 
 <p>We currently don't have any alternate skins shipping with
-  [% terms.Bugzilla %]. If you write an alternate skin, please
+  [%+ terms.Bugzilla %]. If you write an alternate skin, please
   let us know!</p>
 
 <h3><a name="v30_feat_sbu"></a>Unchangeable Fields Appear
@@ -1888,9 +1888,9 @@
 <h3><a name="v30_feat_df"></a>No More Double-Filed [% terms.Bugs %]</h3>
 
 <p>Users of [% terms.Bugzilla %] will sometimes accidentally submit 
-  [% terms.abug %] twice, either by going back in their web browser, 
+  [%+ terms.abug %] twice, either by going back in their web browser, 
   or just by refreshing a page. In the past, this could file the same 
-  [% terms.bug %] twice (or even three times) in a row, irritating 
+  [%+ terms.bug %] twice (or even three times) in a row, irritating 
   developers and confusing users.</p>
 
 <p>Now, if you try to submit [% terms.abug %] twice from the same screen 
@@ -2264,7 +2264,7 @@ sub y { $var++ }</pre>
 
 <p>For more information about how to use 
   <a href="http://search.cpan.org/perldoc?DBI">DBI</a> with 
-  [% terms.Bugzilla %], see the 
+  [%+ terms.Bugzilla %], see the 
   <a href="http://www.bugzilla.org/docs/developer.html#sql-sendreceive">Developer's
   Guide Section About DBI</a></p>