diff --git a/cmd/config.go b/cmd/config.go
index 775d29da131..0bbd6b7c442 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -491,7 +491,7 @@ func (c *Config) prompt(s, choices string) (byte, error) {
 		if err != nil {
 			return 0, err
 		}
-		line = strings.TrimRight(line, "\r\n")
+		line = strings.TrimSpace(line)
 		if len(line) == 1 && strings.IndexByte(choices, line[0]) != -1 {
 			return line[0], nil
 		}
diff --git a/cmd/docs.gen.go b/cmd/docs.gen.go
index 5afb7d9ef26..aec4488e8f7 100644
--- a/cmd/docs.gen.go
+++ b/cmd/docs.gen.go
@@ -2331,27 +2331,28 @@ func init() {
 		0xAF, 0xBA, 0x5D, 0x93, 0x9C, 0x5C, 0xFE, 0xFA, 0x9F, 0xD2, 0x44, 0x45,
 		0xDB, 0x38, 0x04, 0x86, 0x58, 0x69, 0xA2, 0x9D, 0xCB, 0x08, 0x93, 0xF1,
 		0x13, 0xF1, 0x11, 0xE2, 0x0B, 0xCB, 0x29, 0xA6, 0x84, 0xD2, 0x9B, 0xA2,
-		0xAC, 0xA2, 0x9E, 0x42, 0xDA, 0x13, 0x5C, 0x75, 0x8A, 0x33, 0xBF, 0xDB,
-		0xCB, 0x8E, 0xF9, 0x04, 0x87, 0xE1, 0xE0, 0x2F, 0xE5, 0x6A, 0x8F, 0x48,
-		0x19, 0x2D, 0xE4, 0xFF, 0x7E, 0x8A, 0xF5, 0x10, 0xD9, 0x9E, 0xF9, 0x53,
-		0x43, 0x51, 0x6E, 0x27, 0x26, 0x6A, 0xC3, 0x14, 0x19, 0xCB, 0x5F, 0x02,
-		0x1D, 0x3F, 0xA5, 0x61, 0xC7, 0x3E, 0x38, 0x7A, 0x24, 0x40, 0x26, 0x8B,
-		0xAC, 0xA6, 0xBF, 0x9B, 0x14, 0x95, 0xC1, 0x4E, 0xDA, 0x96, 0x6F, 0x47,
-		0x9F, 0xE5, 0x4F, 0xD4, 0x1B, 0xC9, 0x15, 0xC8, 0x98, 0x5E, 0xE9, 0x84,
-		0x87, 0x19, 0x13, 0x8F, 0x56, 0x18, 0x75, 0x42, 0xB5, 0x27, 0xD6, 0x9A,
-		0x28, 0x39, 0x74, 0x0A, 0x32, 0x71, 0x01, 0x8F, 0x54, 0x7C, 0x52, 0x3F,
-		0xB8, 0x17, 0x4A, 0x29, 0x97, 0xDD, 0x67, 0xA3, 0x74, 0x82, 0x25, 0x76,
-		0xC2, 0xB7, 0x7C, 0x4F, 0x1C, 0x4E, 0xF5, 0xEC, 0xDF, 0x86, 0x43, 0xFF,
-		0xF1, 0xB5, 0xCB, 0x1B, 0x89, 0x2E, 0x3E, 0xFF, 0xF3, 0xB4, 0x5A, 0x85,
-		0x5F, 0x65, 0x1B, 0x73, 0x63, 0x6C, 0xD7, 0x1B, 0xFD, 0x57, 0x59, 0x39,
-		0x50, 0x56, 0x47, 0x16, 0x5D, 0xFC, 0x8A, 0xDB, 0xE9, 0x36, 0xB5, 0xAE,
-		0x6C, 0x10, 0xB7, 0x16, 0x45, 0x2B, 0xCD, 0x06, 0x78, 0x37, 0x4C, 0x2F,
-		0x3D, 0xC3, 0xA5, 0x87, 0x5F, 0xD8, 0xEB, 0xD2, 0x43, 0x84, 0xAF, 0x6F,
-		0xE4, 0xE1, 0x98, 0x94, 0xF5, 0x0B, 0x3C, 0xBD, 0x13, 0x13, 0xD0, 0x25,
-		0xC6, 0xEC, 0x2B, 0xC3, 0x36, 0xB1, 0x25, 0x27, 0x3F, 0xCD, 0x7A, 0xCE,
-		0x93, 0x7D, 0xDB, 0x11, 0x53, 0xF6, 0x65, 0x73, 0x75, 0x8A, 0x96, 0x79,
-		0x86, 0x6B, 0x02, 0x3D, 0x4A, 0x38, 0x41, 0xFF, 0xC9, 0x34, 0xA9, 0xFF,
-		0x13, 0x00, 0x00, 0xFF, 0xFF, 0xA2, 0xCF, 0xED, 0xD3, 0x0C, 0x94, 0x00,
-		0x00,
+		0xAC, 0xF2, 0x79, 0x1D, 0xC9, 0x24, 0x6A, 0x9A, 0x68, 0x12, 0xE5, 0xD1,
+		0x04, 0x8C, 0xCC, 0xA1, 0x84, 0x7D, 0xCA, 0x91, 0x82, 0x28, 0x4A, 0x41,
+		0xE9, 0x77, 0x7B, 0xD9, 0x85, 0x6C, 0x88, 0x81, 0x4B, 0x2C, 0x25, 0x76,
+		0x8F, 0x18, 0x1C, 0xAD, 0xFA, 0xFF, 0x7E, 0x3E, 0xF6, 0x10, 0x06, 0x9F,
+		0x39, 0x5F, 0x43, 0x51, 0x6E, 0x54, 0x26, 0xD2, 0xC4, 0x7C, 0x1A, 0xCB,
+		0x9F, 0x0D, 0x1D, 0xBF, 0xBB, 0x61, 0xC7, 0xBE, 0x4E, 0x7A, 0x24, 0x9A,
+		0x26, 0x0B, 0xC3, 0xA6, 0xBF, 0x33, 0xA4, 0xB3, 0x93, 0x86, 0xE8, 0xDB,
+		0xD1, 0x37, 0xFC, 0x13, 0xA9, 0x47, 0xDA, 0x06, 0x9A, 0xA7, 0x27, 0x3D,
+		0xE1, 0x15, 0xC7, 0xC4, 0xFD, 0x15, 0x46, 0x9D, 0x90, 0xF8, 0x89, 0xB5,
+		0x26, 0xB2, 0x0F, 0x9D, 0x82, 0x00, 0x5D, 0xC0, 0x23, 0x15, 0x9F, 0x54,
+		0x26, 0xEE, 0x85, 0x52, 0x4A, 0x7C, 0xF7, 0xD9, 0x28, 0x9D, 0x60, 0x89,
+		0x9D, 0x70, 0x44, 0xDF, 0x13, 0x87, 0x53, 0xA5, 0xFC, 0xB7, 0xE1, 0xD0,
+		0x7F, 0xA9, 0xED, 0xF2, 0x46, 0xA2, 0x3F, 0xD0, 0xFF, 0x3C, 0xAD, 0x83,
+		0xE1, 0x27, 0xDC, 0xC6, 0xAC, 0x1B, 0xDB, 0xF5, 0x46, 0xFF, 0x55, 0x56,
+		0x0E, 0x34, 0xDB, 0x91, 0xF9, 0x17, 0x3F, 0xF9, 0x76, 0xBA, 0x4D, 0xAD,
+		0x2B, 0x1B, 0x64, 0xB3, 0x45, 0x39, 0x4C, 0xB3, 0x01, 0x46, 0x0F, 0xD3,
+		0x4B, 0x6F, 0x76, 0xE9, 0x95, 0x18, 0xF6, 0xBA, 0xF4, 0x6A, 0xE1, 0xEB,
+		0x1B, 0x79, 0x38, 0x26, 0x92, 0xFD, 0x02, 0x4F, 0xEF, 0xC4, 0x04, 0x74,
+		0x89, 0x8B, 0xFB, 0xCA, 0xB0, 0x4D, 0x6C, 0xE9, 0x46, 0x80, 0x66, 0x3D,
+		0x67, 0xE0, 0xBE, 0xED, 0x88, 0x83, 0xFB, 0xB2, 0xB9, 0xEE, 0x45, 0xCB,
+		0x3C, 0xC3, 0x35, 0x81, 0xD2, 0x25, 0x9C, 0xA0, 0xFF, 0x64, 0x6A, 0xD7,
+		0xFF, 0x09, 0x00, 0x00, 0xFF, 0xFF, 0x26, 0x9F, 0x0E, 0x6D, 0x39, 0x94,
+		0x00, 0x00,
 	}
 }
diff --git a/cmd/init.go b/cmd/init.go
index e91c400184e..e7805f80165 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -177,5 +177,5 @@ func (c *Config) promptString(field string) string {
 	fmt.Fprintf(c.Stdout, "%s? ", field)
 	value, err := bufio.NewReader(c.Stdin).ReadString('\n')
 	panicOnError(err)
-	return strings.TrimRight(value, "\r\n")
+	return strings.TrimSpace(value)
 }
diff --git a/docs/REFERENCE.md b/docs/REFERENCE.md
index 5222677fb3c..e53dc0ef05c 100644
--- a/docs/REFERENCE.md
+++ b/docs/REFERENCE.md
@@ -971,8 +971,8 @@ the same *pass-name* will only invoke `pass` once.
 ### `promptString` *prompt*
 
 `promptString` takes a single argument is a string prompted to the user, and the
-return value is the user's response to that prompt. It is only available when
-generating the initial config file.
+return value is the user's response to that prompt with all leading and trailing
+space stripped. It is only available when generating the initial config file.
 
 #### `promptString` examples