X-Git-Url: http://pileus.org/git/?p=~andy%2Faweather-web;a=blobdiff_plain;f=html.ct;h=6154d6fe16195742610d70adfe13a9d2d6dc2412;hp=1603cf4e89bc910cdb92c765d3c9600480367c29;hb=2a1b9e35299ad8d2bb54882bcd5786953179af38;hpb=b426e9a12546f78de9880f27b84aa7d0401916c5

diff --git a/html.ct b/html.ct
index 1603cf4..6154d6f 100644
--- a/html.ct
+++ b/html.ct
@@ -131,6 +131,27 @@ Content-Type: text/html; charset=UTF-8
 	<!-- It's not really spring anymore :/ -->
 	<!-- <p class="quote">Now that it's spring again, progress on AWeather is continuing.</p> -->
 	<dl class="news">
+		<dt>2012-01-10</dt>
+		<dd>
+			AWeather 0.6.3 released: <ul>
+				<li>Added support for Mac OS X</li>
+				<li>Added an much improved <a href="manual">User Guide</a>,
+				    written by Jason Holmes</li>
+				<li>Miscellaneous bug fixes</li>
+			</ul>
+			<span style="font-size: smaller; font-style: italic;">
+				(p.s. AWeather 0.6.2 doesn't exist, you never
+				heard of it, and neither have I)</small>
+		</dd>
+
+		<dt>2011-11-25</dt>
+		<dd>
+			AWeather 0.6.1 released: <ul>
+				<li>Added a Radar menu to quickly jump to a NEXRAD/WSR-88D site</li>
+				<li>Fixed a bunch of 64-bit bugs</li>
+			</ul>
+		</dd>
+
 		<dt>2011-11-03</dt>
 		<dd>
 			AWeather 0.6 released: <ul>
@@ -163,7 +184,14 @@ Content-Type: text/html; charset=UTF-8
 				                   and <a href="<%= UBUNTU_HOME %>">Ubuntu</a> packages</li>
 			</ul>
 		</dd>
+	</dl>
+	<p class="note">See also: <a href="oldnews">Older news</a>,
+		                  <a href="<%= GW_AWEATHER %>">gitweb</a></p>
+<% } %>
 
+<% void print_oldnews(void) { %>
+	&lt; <a href="news">News</a>
+	<dl class="news">
 		<dt>2011-06-19</dt>
 		<dd>
 			AWeather 0.5 released: <ul>
@@ -189,14 +217,7 @@ Content-Type: text/html; charset=UTF-8
 			<li>Added an option to automatically refresh after a timeout</li>
 			<li>New fullscreen mode</li>
 		</ul></dd>
-	</dl>
-	<p class="note">See also: <a href="oldnews">Older news</a>,
-		                  <a href="<%= GW_AWEATHER %>">gitweb</a></p>
-<% } %>
 
-<% void print_oldnews(void) { %>
-	&lt; <a href="news">News</a>
-	<dl class="news">
 		<dt>2010-05-17</dt>
 		<dd>AWeather 0.4.1:<ul>
 			<li>Win32 fixes and improved debug support</li>
@@ -226,6 +247,12 @@ Content-Type: text/html; charset=UTF-8
 	</dl>
 <% } %>
 
+<% void print_manual(void) { %>
+	<div class="asciidoc">
+		<% print_file("manual.inc"); %>
+	</div>
+<% } %>
+
 <% void print_screenshots(void) { %>
 	<p>
 		AWeather provides a consistent user interface that allows the
@@ -268,7 +295,7 @@ Content-Type: text/html; charset=UTF-8
 			<dt>Source code</dt>
 			<dd>
 			<a href="files/aweather-<%= VERSION %>.tar.gz">aweather-<%= VERSION %>.tar.gz</a>,
-			<a href="../grits/grits-<%= VERSION %>.tar.gz">grits-<%= VERSION %>.tar.gz</a>,
+			<a href="../grits/grits-<%= VERSION_GRITS %>.tar.gz">grits-<%= VERSION_GRITS %>.tar.gz</a>,
 			<a href="files/rsl-1.40.tar.gz">rsl-1.40.tar.gz</a>
 			</dd>
 
@@ -279,24 +306,33 @@ Content-Type: text/html; charset=UTF-8
 			<dd><span class="code">apt-get install aweather</span> from Debian sid</dd>
 
 			<dt>Ubuntu</dt>
-			<dd><span class="code">apt-get install aweather</span> from Ubuntu Oneiric</dd>
+			<dd><span class="code">apt-get install aweather</span> from Ubuntu Oneiric,
+			    or the <a href="<%= UBUNTU_PPA %>">AWeather PPA</a></dd>
 			<!--
 				(Arch packages still have bugs)
 				<dt>Arch</dt>
 				<dd>Available from the AUR</dd>
 			-->
+			<!--
+				<dt>Slackware</dt>
+				<dd>Available in Slacky 13.37</dd>
+			-->
+			<!--
+				<dt>Mandriva</dt>
+				<dd>Available from contrib/cooker?</dd>
+			-->
 		</dl></li>
 		<li class="windows"><dl class="inline">
 			<dt>Windows</dt>
-			<dd><a href="files/aweather-<%= VERSION_WIN32 %>-gtk.exe">aweather-<%= VERSION_WIN32 %>-gtk.exe</a>
+			<dd><a href="files/aweather-<%= VERSION_WIN %>-gtk.exe">aweather-<%= VERSION_WIN %>-gtk.exe</a>
 				(Use this unless you know what you're doing)</dd>
 
 			<dt>Without GTK</dt>
-			<dd><a href="files/aweather-<%= VERSION_WIN32 %>.exe">aweather-<%= VERSION_WIN32 %>.exe</a></dd>
+			<dd><a href="files/aweather-<%= VERSION_WIN %>.exe">aweather-<%= VERSION_WIN %>.exe</a></dd>
 		</dl></li>
 		<li class="macos" style="padding-top: .8em; padding-bottom: .8em"><dl class="inline">
 			<dt>Mac OS X</dt>
-			<dd>Coming soon (Mac OS developer? <a href="/code/issues/1">Help out</a>)</dd>
+			<dd><a href="files/aweather-<%= VERSION_MAC %>.dmg">aweather-<%= VERSION_MAC %>.dmg</a></dd>
 		</dl></li>
 	</ul>
 
@@ -304,7 +340,7 @@ Content-Type: text/html; charset=UTF-8
 	<p class="note">Pre-releases, betas, and other hazardous software</p>
 	<div style="margin-left: 30px;">
 		<p>Check out the <a href="files">files</a> directory for any potential updates</p>
-		<p>Pre-releases are labeled with a -p0 and are mainly built for testing the Windows packages</p>
+		<p>Pre-releases are labeled with a -p0 and are mainly built for testing the Windows and Mac packages</p>
 	</div>
 
 	<h2>Development code</h2>