From 9cf315ef90d0cfeb8bb7a38873eea07a8f0dffec Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 7 Jul 2015 14:50:10 +0200
Subject: [PATCH] Document the nameopt change

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 CHANGES           | 4 ++++
 doc/apps/x509.pod | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 88b3d67273..057909ea47 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,10 @@
  _______________
 
  Changes between 1.0.2 and 1.1.0  [xx XXX xxxx]
+  *) Changed the default name options in the "ca", "crl", "req" and "x509"
+     to be "oneline" instead of "compat".
+     [Richard Levitte]
+
   *) Remove SSL_OP_TLS_BLOCK_PADDING_BUG. This is SSLeay legacy, we're
      not aware of clients that still exhibit this bug, and the workaround
      hasn't been working properly for a while.
diff --git a/doc/apps/x509.pod b/doc/apps/x509.pod
index 062a919f3f..a0127fe0f6 100644
--- a/doc/apps/x509.pod
+++ b/doc/apps/x509.pod
@@ -442,7 +442,7 @@ a B<-> to turn the option off. Only the first four will normally be used.
 
 =item B<compat>
 
-use the old format. This is equivalent to specifying no name options at all.
+use the old format.
 
 =item B<RFC2253>
 
@@ -455,7 +455,7 @@ B<sep_comma_plus>, B<dn_rev> and B<sname>.
 a oneline format which is more readable than RFC2253. It is equivalent to
 specifying the  B<esc_2253>, B<esc_ctrl>, B<esc_msb>, B<utf8>, B<dump_nostr>,
 B<dump_der>, B<use_quote>, B<sep_comma_plus_space>, B<space_eq> and B<sname>
-options.
+options.  This is the I<default> of no name options are given explicitely.
 
 =item B<multiline>
 
-- 
2.40.0