summaryrefslogtreecommitdiffstats
path: root/Documentation/sysctl
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
commit0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch)
tree5085c389f09da78182b899d19fe1068b619a69dd /Documentation/sysctl
parent273767781288c35c9d679e908672b9996cda4c34 (diff)
Merge with 2.3.10.
Diffstat (limited to 'Documentation/sysctl')
-rw-r--r--Documentation/sysctl/README2
-rw-r--r--Documentation/sysctl/fs.txt2
-rw-r--r--Documentation/sysctl/kernel.txt21
-rw-r--r--Documentation/sysctl/sunrpc.txt2
-rw-r--r--Documentation/sysctl/vm.txt2
5 files changed, 19 insertions, 10 deletions
diff --git a/Documentation/sysctl/README b/Documentation/sysctl/README
index cf062682a..fccc16512 100644
--- a/Documentation/sysctl/README
+++ b/Documentation/sysctl/README
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/ kernel version 2.2.5
+Documentation for /proc/sys/ kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
'Why', I hear you ask, 'would anyone even _want_ documentation
diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index b88d5ed5c..ed53d96c7 100644
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/fs/* kernel version 2.2.5
+Documentation for /proc/sys/fs/* kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
For general info and legal blurb, please look in README.
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 8f65d6037..01fbbc9c4 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/kernel/* kernel version 2.2.5
+Documentation for /proc/sys/kernel/* kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
For general info and legal blurb, please look in README.
@@ -76,12 +76,21 @@ to decide what to do with it.
domainname & hostname:
-These files can be controlled to set the domainname and
-hostname of your box. For the classic darkstar.frop.org
-a simple:
+These files can be used to set the NIS/YP domainname and the
+hostname of your box in exactly the same way as the commands
+domainname and hostname, i.e.:
# echo "darkstar" > /proc/sys/kernel/hostname
-# echo "frop.org" > /proc/sys/kernel/domainname
-would suffice to set your hostname and domainname.
+# echo "mydomain" > /proc/sys/kernel/domainname
+has the same effect as
+# hostname "darkstar" > /proc/sys/kernel/hostname
+# domainname "mydomain" > /proc/sys/kernel/domainname
+
+Note, however, that the classic darkstar.frop.org has the
+hostname "darkstar" and DNS (Internet Domain Name Server)
+domainname "frop.org", not to be confused with the NIS (Network
+Information Service) or YP (Yellow Pages) domainname. These two
+domain names are in general different. For a detailed discussion
+see the hostname(1) man page.
==============================================================
diff --git a/Documentation/sysctl/sunrpc.txt b/Documentation/sysctl/sunrpc.txt
index 4a52862c5..ae1ecac6f 100644
--- a/Documentation/sysctl/sunrpc.txt
+++ b/Documentation/sysctl/sunrpc.txt
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/sunrpc/* kernel version 2.2.5
+Documentation for /proc/sys/sunrpc/* kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
For general info and legal blurb, please look in README.
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index 470c001d3..5fe4af170 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/vm/* kernel version 2.2.5
+Documentation for /proc/sys/vm/* kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
For general info and legal blurb, please look in README.