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/networking | |
| 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/networking')
| -rw-r--r-- | Documentation/networking/dns_resolver.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/dns_resolver.txt b/Documentation/networking/dns_resolver.txt index 04ca06325b08..7f531ad83285 100644 --- a/Documentation/networking/dns_resolver.txt +++ b/Documentation/networking/dns_resolver.txt | |||
| @@ -139,8 +139,8 @@ the key will be discarded and recreated when the data it holds has expired. | |||
| 139 | dns_query() returns a copy of the value attached to the key, or an error if | 139 | dns_query() returns a copy of the value attached to the key, or an error if |
| 140 | that is indicated instead. | 140 | that is indicated instead. |
| 141 | 141 | ||
| 142 | See <file:Documentation/keys-request-key.txt> for further information about | 142 | See <file:Documentation/security/keys-request-key.txt> for further |
| 143 | request-key function. | 143 | information about request-key function. |
| 144 | 144 | ||
| 145 | 145 | ||
| 146 | ========= | 146 | ========= |