diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 18:03:45 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 18:03:45 +0200 |
commit | 7979cae206cd1e1e352f32fba6165aa3b56f4add (patch) | |
tree | b6d25f20786fbd47a0a98d81784988e5d9f30c11 /docs-xml/manpages-3 | |
parent | 47b26ef57c57cfe2b6c9acf90af785c0b2e73404 (diff) | |
parent | 9c455879f02606127686cde50552af53ccff8cb8 (diff) | |
download | samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.tar.gz samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.tar.bz2 samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wmi
Diffstat (limited to 'docs-xml/manpages-3')
-rw-r--r-- | docs-xml/manpages-3/cifs.upcall.8.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml index 3c1bb247fa..5faf0f7102 100644 --- a/docs-xml/manpages-3/cifs.upcall.8.xml +++ b/docs-xml/manpages-3/cifs.upcall.8.xml @@ -62,7 +62,11 @@ to be run that way.</para> <refsect1> <title>CONFIGURATION FOR KEYCTL</title> - <para>cifs.upcall is designed to be called from the kernel via the request-key callout program. This requres that request-key be told where and how to call this program. The current cifs.upcall program handles two different key types:</para> + <para>cifs.upcall is designed to be called from the kernel via the + request-key callout program. This requires that request-key be told + where and how to call this program. The current cifs.upcall program + handles two different key types: + </para> <variablelist> <varlistentry> |