From 354dabae53beae5590066ae239b86ec7c1c0879d Mon Sep 17 00:00:00 2001
From: Henrique Lorenzi <hlorenzi12@gmail.com>
Date: Tue, 16 Aug 2016 22:44:56 -0300
Subject: [PATCH] prepare for release

---
 README.md   | 10 +++++-----
 src/main.rs |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 46423eb4..203bf95b 100644
--- a/README.md
+++ b/README.md
@@ -4,21 +4,21 @@ and assembles files based on that.
 This can be useful if you'd like to test out a new virtual machine's bytecode,
 or even if you're eager to write programs for the new processor architecture 
 you just implemented in FPGA!  
-Check out the wiki for usage instructions.
+Check out the Releases section for pre-built binaries.  
+Check out the Wiki for usage instructions.
 
 ```
 Usage:
 	customasm [options] <def_file> <asm_file> [<out_file>]
-	customasm -v | --version
-	customasm -h | --help
+	customasm -v | -h
 	
 Options:
+	-h, --help                      Display this information.
+	-v, --version                   Display version information.
 	-q, --quiet                     Do not print progress to stdout.
 	-f <format>, --format=<format>  The format of the output file. Can be one of:
 	                                    binary, binstr, hexstr, bindump, hexdump.
 	                                    [default: hexdump]
-	-v, --version                   Display version information.
-	-h, --help                      Display help.
 ```
 
 The idea is that, given this definition file:
diff --git a/src/main.rs b/src/main.rs
index d76e25da..fd4f1eb7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,16 +10,15 @@ use std::process::exit;
 const USAGE: &'static str = "
 Usage:
 	customasm [options] <def_file> <asm_file> [<out_file>]
-	customasm -v | --version
-	customasm -h | --help
+	customasm -v | -h
 	
 Options:
+	-h, --help                      Display this information.
+	-v, --version                   Display version information.
 	-q, --quiet                     Do not print progress to stdout.
 	-f <format>, --format=<format>  The format of the output file. Can be one of:
 	                                    binary, binstr, hexstr, bindump, hexdump.
 	                                    [default: hexdump]
-	-v, --version                   Display version information.
-	-h, --help                      Display help.
 ";
 
 
@@ -37,7 +36,7 @@ fn main()
 {
 	let args = docopt::Docopt::new(USAGE)
 		.map(|d| d.help(true))
-		.map(|d| d.version(Some(format!("customasm v{}", env!("CARGO_PKG_VERSION")))))
+		.map(|d| d.version(Some(format!("{} v{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")))))
 		.and_then(|d| d.parse())
 		.unwrap_or_else(|e| e.exit());