From 3748be64914217e2f757f5de6cb466da31e73ecb Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Fri, 8 May 2015 11:45:29 -0400
Subject: [PATCH] Remove references to -var

---
 builtin/credential/github/cli.go          | 6 +++---
 builtin/credential/userpass/cli.go        | 6 +++---
 website/source/docs/auth/userpass.html.md | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/builtin/credential/github/cli.go b/builtin/credential/github/cli.go
index fae0b1f206..6c8ec4e31b 100644
--- a/builtin/credential/github/cli.go
+++ b/builtin/credential/github/cli.go
@@ -37,9 +37,9 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (string, error) {
 func (h *CLIHandler) Help() string {
 	help := `
 The GitHub credential provider allows you to authenticate with GitHub.
-To use it, specify the "token" var with the "-var" flag. The value should
-be a personal access token for your GitHub account. You can generate a personal
-access token on your account settings page on GitHub.
+To use it, specify the "token" parameter. The value should be a personal access
+token for your GitHub account. You can generate a personal access token on your
+account settings page on GitHub.
 
     Example: vault auth -method=github token=<token>
 
diff --git a/builtin/credential/userpass/cli.go b/builtin/credential/userpass/cli.go
index 740bfb3874..08cee9e57f 100644
--- a/builtin/credential/userpass/cli.go
+++ b/builtin/credential/userpass/cli.go
@@ -45,11 +45,11 @@ func (h *CLIHandler) Help() string {
 	help := `
 The "userpass" credential provider allows you to authenticate with
 a username and password. To use it, specify the "username" and "password"
-vars with the "-var" flag.
+parameters.
 
     Example: vault auth -method=userpass \
-      -var="username=<user>"
-      -var="password=<password>"
+      username=<user> \
+      password=<password>
 
 	`
 
diff --git a/website/source/docs/auth/userpass.html.md b/website/source/docs/auth/userpass.html.md
index 3c3fd9f5de..f3bf83d461 100644
--- a/website/source/docs/auth/userpass.html.md
+++ b/website/source/docs/auth/userpass.html.md
@@ -23,8 +23,8 @@ passwords from an external source.
 
 ```
 $ vault auth -method=userpass \
-  -var="username=foo" \
-  -var="password=bar"
+  username=foo \
+  password=bar
 ...
 ```