From 53bafb796b654d1f7206196fd97cf8ba0b08ad7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 28 Sep 2015 12:29:58 +0200
Subject: Imported Upstream version 3.0

---
 man/biosdecode.8 |  2 +-
 man/dmidecode.8  | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'man')

diff --git a/man/biosdecode.8 b/man/biosdecode.8
index 46bea95..c39d6a0 100644
--- a/man/biosdecode.8
+++ b/man/biosdecode.8
@@ -52,7 +52,7 @@ for a more detailed output.
 .B biosdecode
 started its life as a part of
 .B dmidecode
-but as more entry point types were added, if was moved to a different
+but as more entry point types were added, it was moved to a different
 program.
 
 .SH OPTIONS
diff --git a/man/dmidecode.8 b/man/dmidecode.8
index 9ca2d82..a64cf5d 100644
--- a/man/dmidecode.8
+++ b/man/dmidecode.8
@@ -25,8 +25,12 @@ and developed by the \s-1DMTF\s0 (Desktop Management Task Force).
 
 As you run it,
 .B dmidecode
-will try to locate the \s-1DMI\s0 table. If it succeeds, it will then parse
-this table and display a list of records like this one:
+will try to locate the \s-1DMI\s0 table. It will first try to read the DMI table
+from sysfs, and next try reading directly from memory if sysfs access failed.
+If
+.B dmidecode
+succeeds in locating a valid DMI table, it will then parse this table
+and display a list of records like this one:
 
 Handle 0x0002, DMI type 2, 8 bytes.
 Base Board Information
@@ -89,6 +93,13 @@ keywords is printed and
 .B dmidecode
 exits with an error.
 This option cannot be used more than once.
+
+Note: on Linux, most of these strings can alternatively be read directly
+from
+.BR sysfs ,
+typically from files under
+.IR /sys/devices/virtual/dmi/id .
+Most of these files are even readable by regular users.
 .TP
 .BR "-t" ", " "--type TYPE"
 Only display the entries of type \fBTYPE\fR. \fBTYPE\fR can be either a
@@ -119,6 +130,10 @@ later.
 Read the DMI data from a binary file previously generated using 
 \fB--dump-bin\fR.
 .TP
+.BR "  " "  " "--no-sysfs"
+Do not attempt to read DMI data from sysfs files. This is mainly useful for
+debugging.
+.TP
 .BR "-h" ", " "--help"
 Display usage information and exit
 .TP
@@ -234,6 +249,8 @@ The DMI table is located at offset 0x20.
 
 .SH FILES
 .I /dev/mem
+.I /sys/firmware/dmi/tables/smbios_entry_point (Linux only)
+.I /sys/firmware/dmi/tables/DMI (Linux only)
 .SH BUGS
 More often than not, information contained in the \s-1DMI\s0 tables is inaccurate,
 incomplete or simply wrong.
-- 
cgit v1.2.3