diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 13:25:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 13:25:02 -0400 |
| commit | e52e713ec30a31e9a4663d9aebbaae5ec07466a6 (patch) | |
| tree | 68f9680577ae68f3972a5ed73afed5d1c2794310 /Documentation/filesystems | |
| parent | bdf7cf1c83872a0586ce4c4da6889103cc36dbd3 (diff) | |
| parent | 2f3e4af471e38e0658e701973238ae4b5e50fcd6 (diff) | |
Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs
* 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
Create Documentation/security/, move LSM-, credentials-, and keys-related files from Documentation/ to Documentation/security/, add Documentation/security/00-INDEX, and update all occurrences of Documentation/<moved_file> to Documentation/security/<moved_file>.
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/nfs/idmapper.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/nfs/idmapper.txt b/Documentation/filesystems/nfs/idmapper.txt index b9b4192ea8b5..9c8fd6148656 100644 --- a/Documentation/filesystems/nfs/idmapper.txt +++ b/Documentation/filesystems/nfs/idmapper.txt | |||
| @@ -47,8 +47,8 @@ request-key will find the first matching line and corresponding program. In | |||
| 47 | this case, /some/other/program will handle all uid lookups and | 47 | this case, /some/other/program will handle all uid lookups and |
| 48 | /usr/sbin/nfs.idmap will handle gid, user, and group lookups. | 48 | /usr/sbin/nfs.idmap will handle gid, user, and group lookups. |
| 49 | 49 | ||
| 50 | See <file:Documentation/keys-request-keys.txt> for more information about the | 50 | See <file:Documentation/security/keys-request-keys.txt> for more information |
| 51 | request-key function. | 51 | about the request-key function. |
| 52 | 52 | ||
| 53 | 53 | ||
| 54 | ========= | 54 | ========= |