Commit 96b9071c authored by Iustin Pop's avatar Iustin Pop
Browse files

Revert "Workaround man page output for long PREFIX dirs"

This reverts commit 83d9f436

.

man is still unable to wrap some long lines, so we simply revert this patch
(and filter out the specific message in autotools/check-man).
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent abd8e836
...@@ -16,7 +16,6 @@ RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir ...@@ -16,7 +16,6 @@ RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
CHECK_MAN = $(top_srcdir)/autotools/check-man CHECK_MAN = $(top_srcdir)/autotools/check-man
REPLACE_VARS_SED = autotools/replace_vars.sed REPLACE_VARS_SED = autotools/replace_vars.sed
REPLACE_VARS_MAN = autotools/replace_vars.man
hypervisordir = $(pkgpythondir)/hypervisor hypervisordir = $(pkgpythondir)/hypervisor
httpdir = $(pkgpythondir)/http httpdir = $(pkgpythondir)/http
...@@ -58,8 +57,7 @@ maintainer-clean-local: ...@@ -58,8 +57,7 @@ maintainer-clean-local:
rm -rf doc/api doc/html rm -rf doc/api doc/html
CLEANFILES = \ CLEANFILES = \
$(REPLACE_VARS_SED) \ autotools/replace_vars.sed \
$(REPLACE_VARS_MAN) \
daemons/daemon-util \ daemons/daemon-util \
daemons/ganeti-cleaner \ daemons/ganeti-cleaner \
devel/upload \ devel/upload \
...@@ -404,12 +402,12 @@ man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER) ...@@ -404,12 +402,12 @@ man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
{ echo 'docbook2html' not found during configure; exit 1; } { echo 'docbook2html' not found during configure; exit 1; }
$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@ $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
man/%.7: man/%.7.in $(REPLACE_VARS_MAN) man/%.7: man/%.7.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_MAN) < $< > $@ sed -f $(REPLACE_VARS_SED) < $< > $@
$(CHECK_MAN) $@ $(CHECK_MAN) $@
man/%.8: man/%.8.in $(REPLACE_VARS_MAN) man/%.8: man/%.8.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_MAN) < $< > $@ sed -f $(REPLACE_VARS_SED) < $< > $@
$(CHECK_MAN) $@ $(CHECK_MAN) $@
man/%.html: man/%.html.in $(REPLACE_VARS_SED) man/%.html: man/%.html.in $(REPLACE_VARS_SED)
...@@ -474,9 +472,6 @@ $(REPLACE_VARS_SED): Makefile ...@@ -474,9 +472,6 @@ $(REPLACE_VARS_SED): Makefile
echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \ echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
} > $@ } > $@
$(REPLACE_VARS_MAN): $(REPLACE_VARS_SED)
sed -e 's^/^\0\\\\:^g' < $^ >$@
# We need to create symlinks because "make distcheck" will not install Python # We need to create symlinks because "make distcheck" will not install Python
# files when building. # files when building.
stamp-srclinks: Makefile stamp-directories stamp-srclinks: Makefile stamp-directories
......
...@@ -49,12 +49,11 @@ ...@@ -49,12 +49,11 @@
</para> </para>
<para> <para>
<command>&dhpackage;</command> automatically removes all files <command>&dhpackage;</command> automatically removes all files older than
older than 21 days from the archive located at: 21 days from
<filename>@LOCALSTATEDIR@/lib/ganeti/queue/archive</filename>.
</para> </para>
<literallayout>@LOCALSTATEDIR@/lib/ganeti/queue/archive</literallayout>
</refsect1> </refsect1>
&footer; &footer;
......
...@@ -66,21 +66,17 @@ ...@@ -66,21 +66,17 @@
<para> <para>
The watcher does synchronous queries but will submit jobs for The watcher does synchronous queries but will submit jobs for
executing the changes. Due to locking, it could be that the jobs executing the changes. Due to locking, it could be that the jobs
execute much later than the watcher schedules them. execute much later than the watcher executes them.
</para> </para>
<para>The command has a state file located at</para>
<literallayout>@LOCALSTATEDIR@/lib/ganeti/watcher.data</literallayout>
<para>and a log file at</para>
<literallayout>@LOCALSTATEDIR@/log/ganeti/watcher.log</literallayout>
<para> <para>
Removal of either file will not affect correct operation; the The command has a state file located at
removal of the state file will just cause the restart counters <filename>@LOCALSTATEDIR@/lib/ganeti/watcher.data</filename> and a log
for the instances to reset to zero. file at
<filename>@LOCALSTATEDIR@/log/ganeti/watcher.log</filename>. Removal of
either file will not affect correct operation; the removal of
the state file will just cause the restart counters for the
instances to reset to zero.
</para> </para>
</refsect1> </refsect1>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment