Merge branch 'master' into ra-init

4 years ago · 6a818ebc92
parent 2654231c49 6049d42b5f
commit 6a818ebc92
1 changed files with 7 additions and 0 deletions
--- a/docs/cas.md
+++ b/docs/cas.md
@ -1,7 +1,14 @@
+<<<<<<< HEAD
 # Registration Authorities

 This document describes how to use an external registration authority (RA), aka
 certificate authority service (CAS) to sign X.509 certificates requests.
+=======
+# Certificate Authority Services
+
+This document describes how to use a certificate authority service or CAS to
+sign X.509 certificates requests.
+>>>>>>> master

 A CAS is a system that implements an API to sign certificate requests, the
 difference between CAS and KMS is that the latter can sign any data, while CAS