summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-09-07 23:48:17 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2023-09-07 23:48:49 +0000
commite8c7ac9a7990d41daada0f2a3b49ba7030051b49 (patch)
treed44f4fdc78f97bc350b639b7a3fa37947241d88d /doc
parent74266756a204f730fef84d30f8ad5ba5627a4921 (diff)
downloads6-linux-utils-e8c7ac9a7990d41daada0f2a3b49ba7030051b49.tar.xz
Prepare for 2.6.2.0, add minflt/majflt to s6-ps
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/index.html4
-rw-r--r--doc/s6-ps.html4
-rw-r--r--doc/upgrade.html2
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/index.html b/doc/index.html
index 3c59b96..5ea0813 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -47,7 +47,7 @@ on the wrong page. I apologize for the confusion.
The Linux kernel must be 3.5 or later. </li>
<li> GNU make, version 3.81 or later </li>
<li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.13.1.0 or later. It's a build-time requirement. It's also a run-time
+2.13.2.0 or later. It's a build-time requirement. It's also a run-time
requirement if you link against the shared version of the skalibs
library. </li>
</ul>
@@ -63,7 +63,7 @@ library. </li>
<ul>
<li> The current released version of s6-linux-utils is
-<a href="s6-linux-utils-2.6.1.3.tar.gz">2.6.1.3</a>. </li>
+<a href="s6-linux-utils-2.6.2.0.tar.gz">2.6.2.0</a>. </li>
<li> Alternatively, you can checkout a copy of the
<a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-utils/">s6-linux-utils
git repository</a>:
diff --git a/doc/s6-ps.html b/doc/s6-ps.html
index 12a986c..09d6a1d 100644
--- a/doc/s6-ps.html
+++ b/doc/s6-ps.html
@@ -81,6 +81,10 @@ cannot tell whether a process has locked memory pages or not. </li>
<li> <tt>sess</tt>&nbsp;: the session leader's pid. </li>
<li> <tt>tty</tt>&nbsp;: the name of the process's controlling terminal.</li>
<li> <tt>tpgid</tt>&nbsp;: the pid of the foreground process group. </li>
+ <li> <tt>minflt</tt>&nbsp;: the number of minor page fault the process has encountered. </li>
+ <li> <tt>cminflt</tt>&nbsp;: the cumulative number of minor page fault the process and its dead children have encountered. </li>
+ <li> <tt>majflt</tt>&nbsp;: the number of major page fault the process has encountered. </li>
+ <li> <tt>cmajflt</tt>&nbsp;: the cumulative number of major page fault the process and its dead children have encountered. </li>
<li> <tt>utime</tt>&nbsp;: the time the process spent in user mode. </li>
<li> <tt>stime</tt>&nbsp;: the time the process spent in kernel mode. </li>
<li> <tt>cutime</tt>&nbsp;: the time spent in user mode by the process <em>and</em>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 62c0aa6..34b2cb4 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,7 +18,7 @@
<h1> What has changed in s6-linux-utils </h1>
-<h2> in 2.6.1.3 </h2>
+<h2> in 2.6.2.0 </h2>
<ul>
<li> <a href="//skarnet.org/software/skalibs/">skalibs</a>