From ac2fe747ab95d84f6d2e43f806ca96b0c611d172 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Mon, 7 Nov 2011 17:51:57 +0000 Subject: [PATCH] Fix documentation typos Fix the typos from r25290 which were also present in the RST documentation. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25446 dc483132-0cff-0310-8789-dd5450dbe970 --- .../krb_admins/admin_commands/kadmin_local.rst | 12 ++++++------ doc/rst_source/krb_admins/admin_commands/kadmind.rst | 8 ++++---- .../krb_admins/admin_commands/kdb5_util.rst | 4 ++-- doc/rst_source/krb_admins/admin_commands/kprop.rst | 2 +- doc/rst_source/krb_admins/admin_commands/krb5kdc.rst | 2 +- doc/rst_source/krb_admins/conf_files/kdc_conf.rst | 4 ++-- doc/rst_source/krb_users/user_commands/ksu.rst | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/rst_source/krb_admins/admin_commands/kadmin_local.rst b/doc/rst_source/krb_admins/admin_commands/kadmin_local.rst index 4b5b607a3..b40511aba 100644 --- a/doc/rst_source/krb_admins/admin_commands/kadmin_local.rst +++ b/doc/rst_source/krb_admins/admin_commands/kadmin_local.rst @@ -6,7 +6,7 @@ kadmin, kadmin.local =========================== -SYNOPSYS +SYNOPSIS -------------- .. _kadmin_synopsys: @@ -242,7 +242,7 @@ add_principal maximum renewable life of tickets for the principal **-kvno** *kvno* - explicity set the key version number. + explicitly set the key version number. **-policy** *policy* policy used by this principal. @@ -417,7 +417,7 @@ delete_principal ERRORS:: - KADM5_AUTH_DELETE (reequires "delete" privilege) + KADM5_AUTH_DELETE (requires "delete" privilege) KADM5_UNK_PRINC (principal does not exist) .. _delete_principal_end: @@ -547,7 +547,7 @@ list_principals If no expression is provided, all principal names are printed. If the expression does not contain an "@" character, an "@" character followed by the local realm is appended to the expression. - .. note:: Requires the *list* priviledge. + .. note:: Requires the *list* privilege. Aliases:: @@ -762,7 +762,7 @@ list_policies All policy names matching the expression are printed. If no expression is provided, all existing policy names are printed. - .. note:: Requires the *list* priviledge. + .. note:: Requires the *list* privilege. Alias:: @@ -884,7 +884,7 @@ kadm5.dict file containing dictionary of strings explicitly disallo HISTORY ------------- -The *kadmin* prorgam was originally written by Tom Yu at MIT, as an interface to the OpenVision Kerberos administration program. +The *kadmin* program was originally written by Tom Yu at MIT, as an interface to the OpenVision Kerberos administration program. SEE ALSO diff --git a/doc/rst_source/krb_admins/admin_commands/kadmind.rst b/doc/rst_source/krb_admins/admin_commands/kadmind.rst index a7ac5927b..ed0ae02bb 100644 --- a/doc/rst_source/krb_admins/admin_commands/kadmind.rst +++ b/doc/rst_source/krb_admins/admin_commands/kadmind.rst @@ -12,15 +12,15 @@ DESCRIPTION ----------- This command starts the KADM5 administration server. If the database is db2, the administration server runs on the master Kerberos server, -which stores the KDC prinicpal database and the KADM5 policy database. If the database is LDAP, the administration server and +which stores the KDC principal database and the KADM5 policy database. If the database is LDAP, the administration server and the KDC server need not run on the same machine. *kadmind* accepts remote requests to administer the information in these databases. Remote requests are sent, for example, by kadmin(8) and the kpasswd(1) command, both of which are clients of *kadmind*. *kadmind* requires a number of configuration files to be set up in order for it to work: :ref:`kdc.conf` - The KDC configuration file contains configuration informatin for the KDC and the KADM5 system. *kadmind* understands a number - of variable settings in this file, some of whch are mandatory and some of which are optional. + The KDC configuration file contains configuration information for the KDC and the KADM5 system. *kadmind* understands a number + of variable settings in this file, some of which are mandatory and some of which are optional. See the CONFIGURATION VALUES section below. *keytab* @@ -126,7 +126,7 @@ Ordering is important. The first matching entry is the one which will control wildcarded using the asterisk ( \* ) character. **operation-mask** - Specifies what operations may or may not be peformed by a principal matching a particular entry. This is a string of one or + Specifies what operations may or may not be performed by a principal matching a particular entry. This is a string of one or more of the following list of characters or their upper-case counterparts. If the character is upper-case, then the operation is disallowed. If the character is lower-case, then the operation is permitted. diff --git a/doc/rst_source/krb_admins/admin_commands/kdb5_util.rst b/doc/rst_source/krb_admins/admin_commands/kdb5_util.rst index bef200a44..1fb2b0c0c 100644 --- a/doc/rst_source/krb_admins/admin_commands/kdb5_util.rst +++ b/doc/rst_source/krb_admins/admin_commands/kdb5_util.rst @@ -126,11 +126,11 @@ COMMANDS The key data in the database will not be changed. **-rev** - dumps in reverse order. This may recover principals that do not dump normally, in cases where database corruption has occured. + dumps in reverse order. This may recover principals that do not dump normally, in cases where database corruption has occurred. **-recurse** causes the dump to walk the database recursively (btree only). This may recover principals that do not dump normally, - in cases where database corruption has occured. + in cases where database corruption has occurred. In cases of such corruption, this option will probably retrieve more principals than the *-rev* option will. .. _kdb5_util_dump_end: diff --git a/doc/rst_source/krb_admins/admin_commands/kprop.rst b/doc/rst_source/krb_admins/admin_commands/kprop.rst index 98451c96a..46c0e5b2c 100644 --- a/doc/rst_source/krb_admins/admin_commands/kprop.rst +++ b/doc/rst_source/krb_admins/admin_commands/kprop.rst @@ -20,7 +20,7 @@ DESCRIPTION ------------- *kprop* is used to propagate a Kerberos V5 database dump file from the master Kerberos server to a slave Kerberos server, -which is specfied by *slave_host*. This is done by transmitting the dumped database file to the slave server over an encrypted, secure channel. +which is specified by *slave_host*. This is done by transmitting the dumped database file to the slave server over an encrypted, secure channel. The dump file must be created by :ref:`kdb5_util(8)`. OPTIONS diff --git a/doc/rst_source/krb_admins/admin_commands/krb5kdc.rst b/doc/rst_source/krb_admins/admin_commands/krb5kdc.rst index e79aec79f..beed157fc 100644 --- a/doc/rst_source/krb_admins/admin_commands/krb5kdc.rst +++ b/doc/rst_source/krb_admins/admin_commands/krb5kdc.rst @@ -78,7 +78,7 @@ EXAMPLE The KDC may service requests for multiple realms (maximum 32 realms). The realms are listed on the command line. Per-realm options that can be specified on the command line pertain for each realm -that follows it and are superceded by subsequent definitions of the same option. +that follows it and are superseded by subsequent definitions of the same option. For example:: krb5kdc -p 2001 -r REALM1 -p 2002 -r REALM2 -r REALM3 diff --git a/doc/rst_source/krb_admins/conf_files/kdc_conf.rst b/doc/rst_source/krb_admins/conf_files/kdc_conf.rst index 8949937bd..bdf56bf32 100644 --- a/doc/rst_source/krb_admins/conf_files/kdc_conf.rst +++ b/doc/rst_source/krb_admins/conf_files/kdc_conf.rst @@ -30,7 +30,7 @@ The following relation is defined in the [kdcdefaults] section: **host_based_services** This relation lists the services that will get host-based referral processing even if the server principal is not marked as host-based by the client. **kdc_max_dgram_reply_size** - Specifes the maximum packet size that can be sent over UDP. The default value is 4096 bytes. + Specifies the maximum packet size that can be sent over UDP. The default value is 4096 bytes. **kdc_ports** This relation lists the ports on which the Kerberos server should listen for UDP requests by default. This list is a comma separated list of integers. If this relation is not specified, the compiled-in default is 88,750, the first being the assigned Kerberos port and the second which was used by Kerberos V4. **kdc_tcp_ports** @@ -123,7 +123,7 @@ For each realm, the following tags may be specified in the [realms] subsection: **master_key_type** (Key type string.) Specifies the master key's key type. The default value for this is des3-cbc-sha1. For a list of all possible values, see :ref:`Supported_Encryption_Types_and_Salts`. **max_life** - (Delta time string.) Specifes the maximum time period for which a ticket may be valid in this realm. The default value is 24 hours. + (Delta time string.) Specifies the maximum time period for which a ticket may be valid in this realm. The default value is 24 hours. **max_renewable_life** (Delta time string.) Specifies the maximum time period during which a valid ticket may be renewed in this realm. The default value is 0. **no_host_referral** diff --git a/doc/rst_source/krb_users/user_commands/ksu.rst b/doc/rst_source/krb_users/user_commands/ksu.rst index 4c51a2b6f..ea97c0ca9 100644 --- a/doc/rst_source/krb_users/user_commands/ksu.rst +++ b/doc/rst_source/krb_users/user_commands/ksu.rst @@ -252,7 +252,7 @@ INSTALLATION INSTRUCTIONS *ksu* can be compiled with the following 4 flags (see the Imakefile): **GET_TGT_VIA_PASSWD** - In case no appropriate tickets are found in the source cache, the user will be prompted for a Kerberos password. The password is then used to get a ticket granting ticket from the Kerberos server. The danger of configuring *ksu* with this macro is if the source user is loged in remotely and does not have a secure channel, the password may get exposed. + In case no appropriate tickets are found in the source cache, the user will be prompted for a Kerberos password. The password is then used to get a ticket granting ticket from the Kerberos server. The danger of configuring *ksu* with this macro is if the source user is logged in remotely and does not have a secure channel, the password may get exposed. **PRINC_LOOK_AHEAD** During the resolution of the default principal name, *PRINC_LOOK_AHEAD* enables *ksu* to find principal names in the *.k5users* file as described in the *OPTIONS* section (see *-n* option). -- 2.26.2