diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
| commit | 80cc38b16389849a6e06441ace4530f6b2497c3c (patch) | |
| tree | 1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /Documentation/sysctl | |
| parent | 3366dd9fa887ebbda4872e9554f853eaeda764be (diff) | |
| parent | 83a35e360433b58791bc9c4e288cace466d62e3a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"The usual stuff from trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
treewide: relase -> release
Documentation/cgroups/memory.txt: fix stat file documentation
sysctl/net.txt: delete reference to obsolete 2.4.x kernel
spinlock_api_smp.h: fix preprocessor comments
treewide: Fix typo in printk
doc: device tree: clarify stuff in usage-model.txt.
open firmware: "/aliasas" -> "/aliases"
md: bcache: Fixed a typo with the word 'arithmetic'
irq/generic-chip: fix a few kernel-doc entries
frv: Convert use of typedef ctl_table to struct ctl_table
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
doc: clk: Fix incorrect wording
Documentation/arm/IXP4xx fix a typo
Documentation/networking/ieee802154 fix a typo
Documentation/DocBook/media/v4l fix a typo
Documentation/video4linux/si476x.txt fix a typo
Documentation/virtual/kvm/api.txt fix a typo
Documentation/early-userspace/README fix a typo
Documentation/video4linux/soc-camera.txt fix a typo
lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
...
Diffstat (limited to 'Documentation/sysctl')
| -rw-r--r-- | Documentation/sysctl/net.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt index 98335b7a5337..6f1c201319de 100644 --- a/Documentation/sysctl/net.txt +++ b/Documentation/sysctl/net.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Documentation for /proc/sys/net/* kernel version 2.4.0-test11-pre4 | 1 | Documentation for /proc/sys/net/* |
| 2 | (c) 1999 Terrehon Bowden <terrehon@pacbell.net> | 2 | (c) 1999 Terrehon Bowden <terrehon@pacbell.net> |
| 3 | Bodo Bauer <bb@ricochet.net> | 3 | Bodo Bauer <bb@ricochet.net> |
| 4 | (c) 2000 Jorge Nerin <comandante@zaralinux.com> | 4 | (c) 2000 Jorge Nerin <comandante@zaralinux.com> |
| @@ -9,10 +9,10 @@ For general info and legal blurb, please look in README. | |||
| 9 | ============================================================== | 9 | ============================================================== |
| 10 | 10 | ||
| 11 | This file contains the documentation for the sysctl files in | 11 | This file contains the documentation for the sysctl files in |
| 12 | /proc/sys/net and is valid for Linux kernel version 2.4.0-test11-pre4. | 12 | /proc/sys/net |
| 13 | 13 | ||
| 14 | The interface to the networking parts of the kernel is located in | 14 | The interface to the networking parts of the kernel is located in |
| 15 | /proc/sys/net. The following table shows all possible subdirectories.You may | 15 | /proc/sys/net. The following table shows all possible subdirectories. You may |
| 16 | see only some of them, depending on your kernel's configuration. | 16 | see only some of them, depending on your kernel's configuration. |
| 17 | 17 | ||
| 18 | 18 | ||