Permalink
Browse files

Typos fixed.

Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
  • Loading branch information...
1 parent f6133bd commit 2bc51f9179d12103d3e510a902e319b9447c8262 @srajiv committed with Rajiv Andrade Feb 1, 2010
Showing with 7 additions and 7 deletions.
  1. +1 −1 README
  2. +4 −4 man/man8/tpm_setactive.8
  3. +2 −2 src/tpm_mgmt/tpm_activate.c
View
2 README
@@ -43,7 +43,7 @@
BUILDING tpm-tools
-------- ---------
- $ sh ./bootstap.sh
+ $ sh ./bootstrap.sh
$ ./configure
$ make
# make install
View
@@ -32,8 +32,8 @@ tpm_setactive \- change TPM active states
.SH "DESCRIPTION"
.PP
\fBtpm_setactive\fR reports the status of the TPM's flags regarding the active state of the TPM. This is the default behavior and also accessible via the \fB\-\-status\fR option. Requesting a report of this status prompts for the owner password. The \fB\-\-active\fR option changes the TPM to the active state
-(via the TPM_PhysicalSetDeactivated API). This operation requires evidence of physical presence, is persistent and requires a reboot to take affect. The \fB\-\-inactive\fR
-option (via the TPM_PhysicalSetDeactivated API) changes the TPM to the inactive state. This operation requires evidence of physical presence, is persistent and requires a reboot to take affect. An inactive TPM is essentially off but still allows for a tpm_takeownership to occur. The \fB\-\-temp\fR option causes deactivation (via the TPM_SetTempDeactivated API) to happen immediately but only endure for the current boot cycle. The \fB\-\-status\fR, \fB\-\-active\fR, \fB\-\-inactive\fR, and \fB\-\-temp\fR options are mutually exclusive and the last one on the command line will be carried out.
+(via the TPM_PhysicalSetDeactivated API). This operation requires evidence of physical presence, is persistent and requires a reboot to take effect. The \fB\-\-inactive\fR
+option (via the TPM_PhysicalSetDeactivated API) changes the TPM to the inactive state. This operation requires evidence of physical presence, is persistent and requires a reboot to take effect. An inactive TPM is essentially off but still allows for a tpm_takeownership to occur. The \fB\-\-temp\fR option causes deactivation (via the TPM_SetTempDeactivated API) to happen immediately but only endure for the current boot cycle. The \fB\-\-status\fR, \fB\-\-active\fR, \fB\-\-inactive\fR, and \fB\-\-temp\fR options are mutually exclusive and the last one on the command line will be carried out.
.TP
\fB\-h\fR, \fB\-\-help\fR
@@ -52,10 +52,10 @@ Use TSS UNICODE encoding for passwords to comply with applications using TSS pop
Report the status of flags regarding the TPM active states.
.TP
\fB-a\fR, \fB\-\-active\fR
-Make the TPM active. Operation is persistent, requires phyiscal presence to authorize, and a reboot to take affect.
+Make the TPM active. Operation is persistent, requires phyiscal presence to authorize, and a reboot to take effect.
.TP
\fB-i\fR, \fB\-\-inactive\fR
-Make the TPM inactive. Operation is persistent, requires phyiscal presence to authorize, and a reboot to take affect.
+Make the TPM inactive. Operation is persistent, requires phyiscal presence to authorize, and a reboot to take effect.
.TP
\fB-t\fR, \fB\-\-temp\fR
Makes the TPM inactive for the current boot cycle only.
@@ -152,12 +152,12 @@ int main(int argc, char **argv)
case ACTIVATE:
if (tpmSetStatus(hTpm, TSS_TPMSTATUS_PHYSICALSETDEACTIVATED, FALSE) != TSS_SUCCESS)
goto out_close;
- logMsg(_("Action requires a reboot to take affect\n"));
+ logMsg(_("Action requires a reboot to take effect\n"));
break;
case DEACTIVATE:
if (tpmSetStatus(hTpm, TSS_TPMSTATUS_PHYSICALSETDEACTIVATED, TRUE) != TSS_SUCCESS)
goto out_close;
- logMsg(_("Action requires a reboot to take affect\n"));
+ logMsg(_("Action requires a reboot to take effect\n"));
break;
case TEMP_DEACTIVATE:
if (tpmSetStatus(hTpm, TSS_TPMSTATUS_SETTEMPDEACTIVATED, TRUE) != TSS_SUCCESS)

0 comments on commit 2bc51f9

Please sign in to comment.