diff --git a/xep-0258.xml b/xep-0258.xml
index 43fb420a..1eedf209 100644
--- a/xep-0258.xml
+++ b/xep-0258.xml
@@ -37,7 +37,13 @@
     <jid>Kurt.Zeilenga@Isode.COM</jid>
   </author>
   <revision>
-    <version>0.5 (draft)</version>
+    <version>0.6</version>
+    <date>2010-07-20</date>
+    <initials>kdz</initials>
+    <remark><p>Minor editorial changes.</p></remark>
+  </revision>
+  <revision>
+    <version>0.5</version>
     <date>2009-07-27</date>
     <initials>kdz</initials>
     <remark><p>Remove &LABEL;/&EQUIVALENTLABEL; type= attribute. Clarify label catalog discovery.  Clarify syntax of selector= attribute.</p></remark>
@@ -76,15 +82,15 @@
 
 <section1 topic='Introduction' anchor='intro'>
   <p>A security label, sometimes referred to as a confidentiality label, is
-     a structured representation of the sensitivity of a piece of information.  They are
-     used in conjunction with a clearance, a structured representation of what information
-     sensitivities a person (or other entity) is authorized to access, and a security
+     a structured representation of the sensitivity of a piece of information.  A security
+     label is used in conjunction with a clearance, a structured representation of what
+     information sensitivities a person (or other entity) is authorized to access, and a security
      policy to control access to each piece of information.  For instance, message could be
      labeled as "SECRET", and hence requiring the sender and the receiver to have a
      clearance granting access to "SECRET" information.  &X.841; provides a discussion of
      security labels, clearances, and security policy.</p>
   <p>Sensitivity-based authorization is used in networks which operate under a set of
-     information classification rules, such as in government defense agency networks.  The
+     information classification rules, such as in government military agency networks.  The
      standardized formats for security labels, clearances, and security policy are
      generalized and do have application in non-government networks.</p>
   <p>This document describes the use of security labels in &xmpp;.  The document specifies
@@ -625,7 +631,7 @@ And by opposing end them?
      security considerations are discussed through this document.</p>
   <p>Security labels generally should be securely bound to the object.  This may be
      accomplished through use of &xmppe2e; signing, or possibly other signing
-      mechanisms.</p>
+     mechanisms.</p>
   <p>Certain XMPP stanzas, such as &PRESENCE; stanzas, are not themselves subject
      to any sensitity-based authorization decisions, and may be forwarded throughout
      the XMPP network.  The content of these stanzas should not contain information