[systemd-commits] 2 commits - Makefile.am man/custom-html.xsl man/custom-man.xsl src/python-systemd
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Tue Mar 12 21:01:18 PDT 2013
Makefile.am | 16 +++++-----
man/custom-html.xsl | 5 +++
man/custom-man.xsl | 55 ++++++++++++++++++++++++++++++++++++
src/python-systemd/docs/layout.html | 2 -
4 files changed, 69 insertions(+), 9 deletions(-)
New commits:
commit 702f64b93cb215d43f673dd4b2f3646b879c566e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Tue Mar 12 23:57:09 2013 -0400
man,html: say 'systemd 198' in the header
This should help readers of the man or HTML pages know if the documentation
is out of date. An alternative to use a date generated from 'git log' was
considered, but since we try to keep user visible documentation up to date,
showing the project version should be enough.
diff --git a/Makefile.am b/Makefile.am
index 25e0ab4..cfcca7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3680,9 +3680,9 @@ XSLTPROC_FLAGS = \
--nonet \
--stringparam man.output.quietly 1 \
--stringparam funcsynopsis.style ansi \
- --stringparam man.th.extra1.suppress 1 \
--stringparam man.authors.section.enabled 0 \
- --stringparam man.copyright.section.enabled 0
+ --stringparam man.copyright.section.enabled 0 \
+ --stringparam systemd.version $(VERSION)
XSLTPROC_PROCESS_MAN = \
$(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
index c612baf..c4099b2 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -65,6 +65,11 @@
</xsl:attribute>
<xsl:text>gudev </xsl:text>
</a>
+
+ <span style="float:right">
+ <xsl:text>systemd </xsl:text>
+ <xsl:value-of select="$systemd.version"/>
+ </span>
<hr/>
</xsl:template>
diff --git a/man/custom-man.xsl b/man/custom-man.xsl
index 4d9d08e..753e571 100644
--- a/man/custom-man.xsl
+++ b/man/custom-man.xsl
@@ -28,4 +28,28 @@
<xsl:template name="top.comment" />
+<xsl:template name="TH.title.line">
+ <xsl:param name="title"/>
+ <xsl:param name="section"/>
+ <xsl:param name="extra1"/>
+ <xsl:param name="extra2"/>
+ <xsl:param name="extra3"/>
+
+ <xsl:call-template name="mark.subheading"/>
+ <xsl:text>.TH "</xsl:text>
+ <xsl:call-template name="string.upper">
+ <xsl:with-param name="string">
+ <xsl:value-of select="normalize-space($title)"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ <xsl:text>" "</xsl:text>
+ <xsl:value-of select="normalize-space($section)"/>
+ <xsl:text>" "" "systemd </xsl:text>
+ <xsl:value-of select="$systemd.version"/>
+ <xsl:text>" "</xsl:text>
+ <xsl:value-of select="normalize-space($extra3)"/>
+ <xsl:text>"
</xsl:text>
+ <xsl:call-template name="mark.subheading"/>
+</xsl:template>
+
</xsl:stylesheet>
diff --git a/src/python-systemd/docs/layout.html b/src/python-systemd/docs/layout.html
index 7898914..be5ff98 100644
--- a/src/python-systemd/docs/layout.html
+++ b/src/python-systemd/docs/layout.html
@@ -6,7 +6,7 @@
<a href="index.html">Python </a>·
<a href="../libudev/index.html">libudev </a>·
<a href="../libudev/index.html">gudev </a>
- <span style="float:right">systemd v. {{release}}</span>
+ <span style="float:right">systemd {{release}}</span>
<hr />
{% endblock %}
commit a0b8045be2206aec3558fdb11dad052cb590bf74
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Tue Mar 12 17:22:19 2013 -0400
man: strip the comments in man page headers
They contained the date, which creates a problem with multiarch
packages, since the generated file would be different each time.
diff --git a/Makefile.am b/Makefile.am
index 96262ec..25e0ab4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3686,25 +3686,25 @@ XSLTPROC_FLAGS = \
XSLTPROC_PROCESS_MAN = \
$(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+ $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
XSLTPROC_PROCESS_HTML = \
$(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
-man/%.1: man/%.xml
+man/%.1: man/%.xml man/custom-man.xsl
$(XSLTPROC_PROCESS_MAN)
-man/%.3: man/%.xml
+man/%.3: man/%.xml man/custom-man.xsl
$(XSLTPROC_PROCESS_MAN)
-man/%.5: man/%.xml
+man/%.5: man/%.xml man/custom-man.xsl
$(XSLTPROC_PROCESS_MAN)
-man/%.7: man/%.xml
+man/%.7: man/%.xml man/custom-man.xsl
$(XSLTPROC_PROCESS_MAN)
-man/%.8: man/%.xml
+man/%.8: man/%.xml man/custom-man.xsl
$(XSLTPROC_PROCESS_MAN)
man/%.html: man/%.xml man/custom-html.xsl
diff --git a/man/custom-man.xsl b/man/custom-man.xsl
new file mode 100644
index 0000000..4d9d08e
--- /dev/null
+++ b/man/custom-man.xsl
@@ -0,0 +1,31 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+
+<!--
+ This file is part of systemd.
+
+ Copyright 2013 Zbigniew Jędrzejewski-Szmek
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:exsl="http://exslt.org/common"
+ extension-element-prefixes="exsl"
+ version="1.0">
+
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
+
+<xsl:template name="top.comment" />
+
+</xsl:stylesheet>
More information about the systemd-commits
mailing list