diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 18:00:55 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 18:00:55 +0200 |
| commit | 9c455879f02606127686cde50552af53ccff8cb8 (patch) | |
| tree | 4ec210a90d7f0476ff4bf33fc7ab53fbaadb7b13 | |
| parent | a3a4c9a1fd7ab6d8d4dc5af3727d43bb22f1219c (diff) | |
| parent | c4f361a17f51e4897ac2faafc65ebc8349e19001 (diff) | |
| download | samba-9c455879f02606127686cde50552af53ccff8cb8.tar.gz samba-9c455879f02606127686cde50552af53ccff8cb8.tar.bz2 samba-9c455879f02606127686cde50552af53ccff8cb8.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into franky
| -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> |