From ec3eb61a94d96f5e9e725b8e79d6fa645dd42e01 Mon Sep 17 00:00:00 2001
From: John Reese <john@noswap.com>
Date: Mon, 29 Apr 2013 13:03:45 -0700
Subject: [PATCH] Readme cleanup and message option reorg

---
 README.md | 32 +++++++++++++++++---------------
 push.cpp  |  8 ++++----
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index e20f010..fd30a73 100644
--- a/README.md
+++ b/README.md
@@ -214,19 +214,10 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
 
 ### Notifications
 
-*   `message_sound = ""`
+*   `message_content = "{message}"`
 
-    If you're using Pushover.net, you can specify a <a href="https://pushover.net/api#sounds">specific sound</a> for the notifications.
-
-*   `message_uri_title` = ""`
-
-    If you're using Pushover.net, you can specify a title for the <strong>message_uri</strong> option.
-
-*   `message_uri = ""`
-
-    URI that will be sent with the push notification.  This could be a web address or a
-    local scheme to access a mobile application.  Keyword expansion is performed on this
-    value.
+    Message content that will be sent for the push notification.  Keyword expansion is
+    performed on this value.
 
 *   `message_length = 100`
 
@@ -243,16 +234,27 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
     Title that will be provided for the push notification.  Keyword expansion is performed
     on this value.
 
-*   `message_content = "{message}"`
+*   `message_uri = ""`
 
-    Message content that will be sent for the push notification.  Keyword expansion is
-    performed on this value.
+    URI that will be sent with the push notification.  This could be a web address or a
+    local scheme to access a mobile application.  Keyword expansion is performed on this
+    value.
+
+*   `message_uri_title` = ""`
+
+    If you're using Pushover.net, you can specify a title for the `message_uri` option.
 
 *   `message_priority = ""`
 
     Priority level that will be used for the push notification.
     Currently supported only by Pushover.net.
 
+*   `message_sound = ""`
+
+    Notification sound to play with the push notification.
+    Currently only supported by Pushover.net.  Must be chosen from their list of
+    [supported sounds](https://pushover.net/api#sounds).
+
 
 ### Conditions
 
diff --git a/push.cpp b/push.cpp
index f3dfe4f..8d706ee 100644
--- a/push.cpp
+++ b/push.cpp
@@ -111,13 +111,13 @@ class CPushMod : public CModule
 			defaults["target"] = "";
 
 			// Notification settings
-			defaults["message_sound"] = "";
-			defaults["message_uri"] = "";
-			defaults["message_uri_title"] = "";
+			defaults["message_content"] = "{message}";
 			defaults["message_length"] = "100";
 			defaults["message_title"] = "{title}";
-			defaults["message_content"] = "{message}";
+			defaults["message_uri"] = "";
+			defaults["message_uri_title"] = "";
 			defaults["message_priority"] = "0";
+			defaults["message_sound"] = "";
 
 			// Notification conditions
 			defaults["away_only"] = "no";