X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=man%2Fsn.1;h=0480582ab468c239cc554445998bdd1ad8d6e98b;hb=ffd819fde74bc12062d39156b3d3805fc47e7a58;hp=f82855af10e9a9a1a578826bb7f38496f2650f4f;hpb=4a2ab0336e97f3591eebbb881a1471d3051946c9;p=mono.git

diff --git a/man/sn.1 b/man/sn.1
index f82855af10e..0480582ab46 100644
--- a/man/sn.1
+++ b/man/sn.1
@@ -7,12 +7,15 @@
 .\"
 .TH Mono "sn"
 .SH NAME
-sn \- Digitally sign/verify/compare strongname on CLR assemblies.
+sn \- Digitally sign/verify/compare strongnames on CLR assemblies.
 .SH SYNOPSIS
 .PP
 .B sn [-q | -quiet] [options] [parameters]
 .SH DESCRIPTION
-Digitally sign, verify or compare, CLR assemblies using strongnames. 
+Digitally sign, verify or compare CLR assemblies using strongnames.
+.PP
+You can use the sn command to create "snk files" using the -k option
+described below.
 .SH CONFIGURATION OPTIONS
 Configuration options are stored in the machine.config configuration file
 under /configuration/strongNames.
@@ -31,7 +34,7 @@ strongNames/verificationSettings in machine.config.
 .TP
 .I "-Vr assembly [userlist]"
 Exempt the specified assembly from verification for the specified user list.
-Currently not supported by sn, you must edit machine.config manually if you
+Currently not supported by sn. You must edit machine.config manually if you
 require this.
 .TP
 .I "-Vu assembly"
@@ -51,14 +54,14 @@ Import the specified strongname file into the specified container.
 .TP
 .I "-pc container publickey"
 Export the public key from the specified CSP container to the specified file.
-.SH CONVERTION OPTIONS
+.SH CONVERSION OPTIONS
 .TP
 .I "-e assembly output.pub"
 Export the assembly public key to the specified output file.
 .TP
 .I "-p keypair.snk output.pub"
-Export the public key from the specified strongname key file (SNK) to the 
-specified output file.
+Export the public key from the specified strongname key file (SNK) or from
+a PKCS#12/PFX password protected file to the specified output file.
 .TP
 .I "-o input output.txt"
 Convert the input file to a CSV file (using decimal).
@@ -80,13 +83,13 @@ want to continue using 1024 bits keys. Note that there's no good reason,
 even if it's possible, to use length lesser than 1024 bits.
 .TP
 .I "-R assembly keypair.snk"
-Resign the specified assembly using the specified strongname keypair file 
-(SNK). You can only sign an assembly with the private key (SNK) that match 
-the public key inside the assembly (unless it's public key token has been
-remapped in machine.config).
+Re-sign the specified assembly using the specified strongname keypair file 
+(SNK) or a PKCS#12/PFX password protected file. You can only sign an 
+assembly with the private key that match the public key inside the assembly
+(unless it's public key token has been remapped in machine.config).
 .TP
 .I "-Rc assembly container"
-Resign the specified assembly using the specified strongname container.
+Re-sign the specified assembly using the specified strongname container.
 .TP
 .I "-t file"
 Show the public key from the specified file.
@@ -117,7 +120,7 @@ Display configuration related help about this tool.
 Display Cryptographic Service Provider related help about this tool.
 .TP
 .I "-h convert", "-? convert"
-Display convertion related help about this tool.
+Display conversion related help about this tool.
 .TP
 .I "-h sn", "-? sn"
 Display strongname related help about this tool.
@@ -127,9 +130,9 @@ Strongnames configuration is kept in "machine.config" file. Currently two
 features can be configured.
 .TP
 .I "/configuration/strongNames/pubTokenMapping"
-This mechanism let Mono remap a public key token, like the ECMA token, to
-another public key for verification. This is useful in two scenarios. First 
-assemblies signed with the "ECMA key" needs to be verified by the "runtime"
+This mechanism lets Mono remap a public key token, like the ECMA token, to
+another public key for verification. This is useful in two scenarios. First,
+assemblies signed with the "ECMA key" need to be verified by the "runtime"
 key (as the ECMA key isn't a public key). Second, many assemblies are signed
 with private keys that Mono can't use (e.g. System.Security.dll assembly).
 A new key cannot be used because it should change thr strongname (a new key