cccheck.1: fix a typo

[mono.git] / man / certmgr.1

diff --git a/man/certmgr.1 b/man/certmgr.1
index daf573d2a06a8f4ed3e561e2b4a4fd052aa995d5..b80ffd0457f9fad271952beb31a7389830f52319 100644 (file)
--- a/man/certmgr.1
+++ b/man/certmgr.1
@@ -1,8 +1,10 @@
 .\" 
 .\" certmgr manual page.
 .\" Copyright 2004-2005 Novell
+.\" Copyright 2010 Pablo Ruiz
 .\" Author:
 .\"   Sebastien Pouliot <sebastien@ximian.com>
+.\"   Pablo Ruiz Garcia <pruiz@netway.org>
 .\"
 .TH Mono "certmgr"
 .SH NAME
@@ -18,13 +20,35 @@ revocation lists (CRL) or certificate trust lists (CTL) to/from a
 certificate store. Certificate stores are used to build and validate 
 certificate chains for Authenticode(r) code signing validation and SSL 
 server certificates.
+.SH STORES
+The 
+.I store
+represents the certificate store to use.   It can be one of the
+following:
+.TP
+.I "My"
+This is the personal certificate store.
+.TP
+.I "AddressBook"
+This is the store for other people.
+.TP
+.I "CA"
+This is a store for intermediate certificate authorities.
+.TP
+.I "Trust"
+This is for trusted roots.
+.TP
+.I "Disallowed"
+This is for untrusted roots
 .SH ACTIONS
 .TP
 .I "-list"
 List the certificates, CTL or CTL in the specified store.
 .TP
 .I "-add"
-Add a certificate, CRL or CTL to specified store.
+Add a certificate, CRL or CTL to specified store. If filename it's a pkcs12 
+or pfx file, and it contains a private key, it will be imported to local key
+pair container.
 .TP
 .I "-del"
 Remove a certificate, CRL or CTL from specified store. You must specify the 
@@ -44,6 +68,11 @@ This action assume an certificate (-c) object type and will import the
 certificates in appropriate stores (i.e. server certificate in the 
 OtherPeople store, the root certificate in the Trust store, any other 
 intermediate certificates in the IntermediateCA store).
+.TP
+.I "-importKey"
+Allows importing a private key from a pkcs12 file into a local key pair
+store. (Usefull when you already have the key's corresponding certificate
+installed at the specific store.)
 
 .SH OBJECT TYPES
 .TP
@@ -66,6 +95,9 @@ Use the machine's certificate stores (instead of the default user's stores).
 .I "-v"
 More details displayed on the console.
 .TP
+.I "-p password"
+Use the specify password when accessing a pkcs12 file.
+.TP
 .I "-help", "-h", "-?", "/?"
 Display help about this tool.
 
@@ -88,6 +120,9 @@ The filenames either starts with
 (subject key identifier).
 .TP
 The rest of the filename is the base64-encoded value (tbp or ski).
+.TP
+Private key data is stored under
+.I ~/.config/.mono/keypairs/
 
 .SH EXAMPLES
 .TP
@@ -124,22 +159,24 @@ machine.config file must be updated so the OID for MD2 is known at runtime.
 
 To correct this insert the following XML snippet inside the <configuration>
 element of your machine.config file.
-  <mscorlib>\r
-    <cryptographySettings>\r
-      <cryptoNameMapping>\r
-        <cryptoClasses>\r
-          <cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />\r
-        </cryptoClasses>\r
-        <nameEntry name="MD2" class="monoMD2" />\r
-      </cryptoNameMapping>\r
-      <oidMap>\r
-        <oidEntry OID="1.2.840.113549.2.2" name="MD2" />\r
-      </oidMap>\r
-    </cryptographySettings>\r
+  <mscorlib>
+    <cryptographySettings>
+      <cryptoNameMapping>
+        <cryptoClasses>
+          <cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+        </cryptoClasses>
+        <nameEntry name="MD2" class="monoMD2" />
+      </cryptoNameMapping>
+      <oidMap>
+        <oidEntry OID="1.2.840.113549.2.2" name="MD2" />
+      </oidMap>
+    </cryptographySettings>
   </mscorlib>
 
 .SH AUTHOR
 Written by Sebastien Pouliot
+
+Minor additions by Pablo Ruiz García
 .SH COPYRIGHT
 Copyright (C) 2004-2005 Novell.
 .SH MAILING LISTS