Misc updates for 0.6.3

- Move user guide
- Update news/downloads/etc

diff --git a/html.ct b/html.ct
index 68be68379603b7c8ab2642cfa0babb6e9dd284be..6154d6fe16195742610d70adfe13a9d2d6dc2412 100644 (file)
--- a/html.ct
+++ b/html.ct
@@ -127,16 +127,23 @@ Content-Type: text/html; charset=UTF-8
           without any license fees or royalties.</p>
 <% } %>
 
-<% void print_manual(void) { %>
-       <div class="asciidoc">
-               <% print_file("manual.inc"); %>
-       </div>
-<% } %>
-
 <% void print_news(void) { %>
        <!-- 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>
@@ -177,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>
@@ -203,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>
@@ -240,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
@@ -300,18 +313,26 @@ Content-Type: text/html; charset=UTF-8
                                <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>
 
@@ -319,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>

diff --git a/html.h b/html.h
index 4ad29e0a1d45fa483619f70fccecd0b7b9949ba3..fbfb82c304f084954c37ba73b6741eb756baee9e 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,10 +1,11 @@
 /* Version information */
-#define VERSION        "0.6.1"
-#define VERSION_GRITS  "0.6.2"
-#define VERSION_WIN32  "0.6.1"
+#define VERSION        "0.6.3"
+#define VERSION_GRITS  "0.6.3"
+#define VERSION_WIN    "0.6.3"
+#define VERSION_MAC    "0.6.3"
 
-#define VERSION_DESC   "Version " VERSION " adds a Radar menu for quickly " \
-                      "jumping to a NEXRAD site and also fixes some bugs"
+#define VERSION_DESC   "Version " VERSION " adds support for Mac OS X and " \
+                      "provides an improved <a href=\"manual\">User Guide</a>"
 
 /* Link info */
 #define WIKI_INDEX   "/code/projects/aweather/wiki"

diff --git a/index.c b/index.c
index 304293d174754068b5a86e5bce5cb9672b2eedf0..543b53eb729c5d0d7a7e17f070b7de705accc1aa 100644 (file)
--- a/index.c
+++ b/index.c
@@ -11,8 +11,8 @@ const char desc[] =
 /* Page data */
 page_t header[] = {
        {"about",       "About",       print_about,        0.7, NULL},
-       {"manual",      "Manual",      print_manual,       0.5, NULL},
        {"news",        "News",        print_news,         0.3, NULL},
+       {"manual",      "Manual",      print_manual,       0.5, NULL},
        {"screenshots", "Screenshots", print_screenshots,  0.5, NULL},
        {"download",    "Download",    print_download,     0.7, NULL},
        {"development", "Development", print_development,  0.3, NULL},

diff --git a/mkfile b/mkfile
index 83df9326cb0b1b3ea52bfe5228ffc067456e8dfa..4b7a69fc904ee09174b440311efe51fe7799d41f 100644 (file)
--- a/mkfile
+++ b/mkfile
@@ -12,7 +12,7 @@ index.cgi: index.o html.o
 %.c: %.ct
        $CT -o $target $prereq 
 
-manual.inc: ../docs/manual.ad
+manual.inc: ../docs/userguide.ad
        asciidoc -s -a toc -a numbered -b xhtml11 -o- $prereq \
        | awk -f toc.awk > $target