[PATCH v2 0/5] rst2man.py support and doc-build cleanups

W. Trevor King wking at tremily.us
Sat May 10 10:03:31 PDT 2014


The first four patches from v1 have already landed in master.
This series is v2 of the remainder of the series [1].

In patch 1/5 (v1's 5/7):

* Explicitly empty RST2MAN [2,3], rather than letting external
  environment variables fall through (or explicitly using them to
  bypass configure's detection code [4]).
* Restore HAVE_RST2MAN instead of using non-empty RST2MAN [5].  I'm
  willing to go along with this (hence the patch), but I'd prefer
  dropping the HAVE_* variables.  More details in the commit message
  for patch 5/5.

In patch 4/5 (v1's 7/7):

* Add a '.. -*- rst -*-' prefix to doc/INSTALL [6].
* Fix 'build build' -> 'build' [7].
* Fix 'Building the man Docutils' -> 'Building with Docutils' [7].
* Standardize on build-{html|info|man} and install-{info|man} [8].
* Add notes about the Sphinx/Docutils variables [7].

Patches 3/5 and 5/5 are new since v1, and add Sphinx-less support for
build-html.

[1]: id:cover.1396718720.git.wking at tremily.us
     http://article.gmane.org/gmane.mail.notmuch.general/17732
[2]: id:m2a9bzd2bo.fsf at guru.guru-group.fi
     http://article.gmane.org/gmane.mail.notmuch.general/17742
[3]: id:m21txac0qy.fsf at guru.guru-group.fi
     http://article.gmane.org/gmane.mail.notmuch.general/17775
[4]: id:20140405191917.GF5316 at odin.tremily.us
     http://article.gmane.org/gmane.mail.notmuch.general/17745
[5]: id:m24n26c1m9.fsf at guru.guru-group.fi
     http://article.gmane.org/gmane.mail.notmuch.general/17774
[6]: id:87wqejtxs9.fsf at maritornes.cs.unb.ca
     http://article.gmane.org/gmane.mail.notmuch.general/17956
[7]: id:874n271plm.fsf at maritornes.cs.unb.ca
     http://article.gmane.org/gmane.mail.notmuch.general/17746
[8]: id:871txb1j8z.fsf at maritornes.cs.unb.ca
     http://article.gmane.org/gmane.mail.notmuch.general/17754

W. Trevor King (5):
  doc: Allow rst2man.py as an alternative to rst2man
  doc/prerst2man.py: Convert execfile to import
  doc/prerst2x.py: Adjust to handle any output format, not just man
    pages
  doc: Consolidate Makefile targets around {build|install}-{format}
  doc: Add rst2html support for building HTML docs

 Makefile.local     | 14 ++++++++--
 configure          | 41 ++++++++++++++++++++++++++---
 doc/INSTALL        | 47 ++++++++++++++++++++++++----------
 doc/Makefile.local | 48 +++++++++++++++++++---------------
 doc/prerst2man.py  | 63 ---------------------------------------------
 doc/prerst2x.py    | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 186 insertions(+), 102 deletions(-)
 delete mode 100644 doc/prerst2man.py
 create mode 100644 doc/prerst2x.py

-- 
1.9.1.353.gc66d89d


More information about the notmuch mailing list