From 53705a858284c25b9c8c2f7145eb8c253f1b4714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 5 Mar 2014 12:41:27 -0800
Subject: [PATCH] Updated Language Conventions (markdown)

---
 Language-Conventions.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Language-Conventions.md b/Language-Conventions.md
index 7f6c354..a828c2a 100644
--- a/Language-Conventions.md
+++ b/Language-Conventions.md
@@ -1,4 +1,5 @@
 * "keyserver" not "key server", see http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00
 * "sign" texts and files, but "certify" keys, see http://tools.ietf.org/html/rfc4880
 * Use contacts and recipients where possible and avoid usage of the word "key".
-* "passphrase" instead of "pass phrase"
\ No newline at end of file
+* "passphrase" not "pass phrase"
+* ASCII "Armor" not "Armour"
\ No newline at end of file