From: Kay Sievers Date: Sat, 14 Apr 2012 19:16:31 +0000 (+0200) Subject: udev: trivial gtk-doc update X-Git-Tag: v183~301 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3306a5316851e3c7af12514d45c46da590f37311;hp=20d83f2f436ba0cbc522270526f2cd36b5371c3f udev: trivial gtk-doc update --- diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am index 803a2bbd8..f2e953247 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 2798edaba..cf83d143f 100644 --- a/docs/gudev/gudev-docs.xml +++ b/docs/gudev/gudev-docs.xml @@ -1,7 +1,8 @@ + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + ]> diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am index 9d1e3646f..9eb5c5cbf 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 e2e7292c5..c11752902 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"