summaryrefslogtreecommitdiff
path: root/man/systemd-hwdb.xml
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-06-18 19:47:44 +0200
committerTom Gundersen <teg@jklm.no>2015-06-18 19:47:44 +0200
commit12b42c76672a66c2d4ea7212c14f8f1b5a62b78d (patch)
tree0a9f5aff7fc2f144765f936c618c563568edba1f /man/systemd-hwdb.xml
parent74b1f5276365bbdf02dacec707fb9c40509650b4 (diff)
downloadsystemd-12b42c76672a66c2d4ea7212c14f8f1b5a62b78d.tar.gz
systemd-12b42c76672a66c2d4ea7212c14f8f1b5a62b78d.tar.bz2
systemd-12b42c76672a66c2d4ea7212c14f8f1b5a62b78d.zip
man: revert dynamic paths for split-usr setups
This did not really work out as we had hoped. Trying to do this upstream introduced several problems that probably makes it better suited as a downstream patch after all. At any rate, it is not releaseable in the current state, so we at least need to revert this before the release. * by adjusting the path to binaries, but not do the same thing to the search path we end up with inconsistent man-pages. Adjusting the search path too would be quite messy, and it is not at all obvious that this is worth the effort, but at any rate it would have to be done before we could ship this. * this means that distributed man-pages does not make sense as they depend on config options, and for better or worse we are still distributing man pages, so that is something that definitely needs sorting out before we could ship with this patch. * we have long held that split-usr is only minimally supported in order to boot, and something we hope will eventually go away. So before we start adding even more magic/effort in order to make this work nicely, we should probably question if it makes sense at all.
Diffstat (limited to 'man/systemd-hwdb.xml')
-rw-r--r--man/systemd-hwdb.xml7
1 files changed, 2 insertions, 5 deletions
diff --git a/man/systemd-hwdb.xml b/man/systemd-hwdb.xml
index 9a58776af2..f1a14025b0 100644
--- a/man/systemd-hwdb.xml
+++ b/man/systemd-hwdb.xml
@@ -1,9 +1,6 @@
<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="systemd-hwdb" conditional="ENABLE_HWDB">
<refentryinfo>
@@ -60,7 +57,7 @@
<varlistentry>
<term><option>--usr</option></term>
<listitem>
- <para>Generate in &udevlibexecdir; instead of /etc/udev.</para>
+ <para>Generate in /usr/lib/udev instead of /etc/udev.</para>
</listitem>
</varlistentry>
<varlistentry>