summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-04-14 21:16:31 +0200
committerKay Sievers <kay@vrfy.org>2012-04-14 21:16:31 +0200
commit3306a5316851e3c7af12514d45c46da590f37311 (patch)
tree4d80230aa9546318742cc249ffbdda10e4f88745
parent20d83f2f436ba0cbc522270526f2cd36b5371c3f (diff)
udev: trivial gtk-doc update
-rw-r--r--docs/gudev/Makefile.am2
-rw-r--r--docs/gudev/gudev-docs.xml5
-rw-r--r--docs/libudev/Makefile.am2
-rw-r--r--rules/99-systemd.rules.in2
4 files changed, 6 insertions, 5 deletions
diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am
index 803a2bbd80..f2e953247a 100644
--- a/docs/gudev/Makefile.am
+++ b/docs/gudev/Makefile.am
@@ -32,7 +32,7 @@ SCAN_OPTIONS=
# Extra options to supply to gtkdoc-mkdb.
# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g_udev
+MKDB_OPTIONS=--xml-mode --output-format=xml --name-space=g_udev
# Extra options to supply to gtkdoc-mktmpl
# e.g. MKTMPL_OPTIONS=--only-section-tmpl
diff --git a/docs/gudev/gudev-docs.xml b/docs/gudev/gudev-docs.xml
index 2798edabac..cf83d143f0 100644
--- a/docs/gudev/gudev-docs.xml
+++ b/docs/gudev/gudev-docs.xml
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+ <!ENTITY version SYSTEM "version.xml">
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am
index 9d1e3646fb..9eb5c5cbf6 100644
--- a/docs/libudev/Makefile.am
+++ b/docs/libudev/Makefile.am
@@ -32,7 +32,7 @@ SCAN_OPTIONS=
# Extra options to supply to gtkdoc-mkdb.
# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=udev
+MKDB_OPTIONS=--xml-mode --output-format=xml --name-space=udev
# Extra options to supply to gtkdoc-mktmpl
# e.g. MKTMPL_OPTIONS=--only-section-tmpl
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index e2e7292c51..c117529020 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -28,7 +28,7 @@ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_T
# accessible or not does not matter as long as it is unique and in the
# filesystem namespace.
#
-# http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
+# http://cgit.freedesktop.org/systemd/systemd/tree/src/libudev/libudev-enumerate.c#n922
SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name"
SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k"