From 47475c15809648d8f76d545a903cc6d83108439b Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Fri, 3 Nov 2006 14:56:31 +0000 Subject: [PATCH] bcapabilities and ccapabilities won't be changing names any time soon, remove experimental marker. ulimits are honored for 2.6 kernels as well. Whitespace cleanup. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2364 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- doc/configuration.xml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/doc/configuration.xml b/doc/configuration.xml index 1c34a85..4acd1e6 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -67,7 +67,7 @@ a vserver specific setting. /vservers/.pkg - + The default apt.conf which is going to be used. It is overridden by distribution specific configuration file. @@ -344,15 +344,14 @@ the vserver is stopped, this can be a dangling symlink. -[experimental; name is subject of possible change] Contains the system capabilities. See +Contains the system capabilities. See lib/bcaps-v13.c for possible values. -[experimental; name is subject of possible change] Contains the -context capabilities. See lib/ccaps-v13.c for possible values. @@ -507,7 +506,7 @@ The new process and its children will share a common Limit the number of process in the vserver according to ulimit setting. Normally, ulimit is a per user thing. -With this flag, it becomes a per vserver thing. +With this flag, it becomes a per vserver thing. @@ -829,7 +828,7 @@ The name of the current vserver. Repository of initialize like scripts. Before executing the script, the configuration directory will be made the working directory. - + See initialize. @@ -870,7 +869,7 @@ The name of the current vserver. Repository of prepre-start like scripts. Before executing the script, the configuration directory will be made the working directory. - + See prepre-start. @@ -912,7 +911,7 @@ The name of the current vserver. Repository of pre-start like scripts. Before executing these scripts, the vserver root directory will be made the working directory. - + See pre-start. @@ -996,7 +995,7 @@ The name of the current vserver. Repository of pre-stop like scripts. Before executing the script, the vserver root directory will be made the working directory. - + See pre-stop. @@ -1194,21 +1193,20 @@ interface will be executed. A directory with ulimits. Possible resources are cpu, data, fsize, -locks, memlock, nofile, nproc, rss and/or stack. This configuration -will be honored for kernel 2.4 only. - +locks, memlock, nofile, nproc, rss and/or stack. + A file which contains the hard- and soft-limit of the given resource in the first line. The special keyword 'inf' is recognized. - + A file which contains the hard- of the given resource in the first line. The special keyword 'inf' is recognized. - + A file which contains the soft- of the given resource in the first @@ -1222,19 +1220,19 @@ line. The special keyword 'inf' is recognized. A directory with resource limits. Possible resources are cpu, fsize, data, stack, core, rss, nproc, nofile, memlock, as and locks. This configuration will be honored for kernel 2.6 only. - + A file which contains the hard- and soft-limit of the given resource in the first line. The special keyword 'inf' is recognized. - + A file which contains the hard- of the given resource in the first line. The special keyword 'inf' is recognized. - + A file which contains the soft- of the given resource in the first -- 1.8.1.5