tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ns/fix-documentation-build' into next

Browse Source
This commit is contained in:
Nicolas Sebrecht 2011-03-10 19:24:17 +01:00
commit b1a570d393
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.draft.rst
View File

@ -33,6 +33,8 @@ Changes
Bug Fixes Bug Fixes
--------- ---------
* Fix ignoring output while determining the rst2xxx command name to build
documentation.
* Fix hang because of infinite loop reading EOF. * Fix hang because of infinite loop reading EOF.
* Allow SSL connections to send keep-alive messages. * Allow SSL connections to send keep-alive messages.
* Fix regression (UIBase is no more). * Fix regression (UIBase is no more).

2
Makefile
View File

@ -18,7 +18,7 @@
VERSION=`./offlineimap.py --version` VERSION=`./offlineimap.py --version`
TARGZ=offlineimap_$(VERSION).tar.gz TARGZ=offlineimap_$(VERSION).tar.gz
SHELL=/bin/bash SHELL=/bin/bash
RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py` RST2HTML=`type rst2html >/dev/null 2>&1 && echo rst2html || echo rst2html.py`
all: build all: build

4
docs/Makefile
View File

@ -5,8 +5,8 @@ SOURCES = $(wildcard *.rst)
HTML_TARGETS = $(patsubst %.rst,%.html,$(SOURCES)) HTML_TARGETS = $(patsubst %.rst,%.html,$(SOURCES))
RM = rm RM = rm
RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py` RST2HTML=`type rst2html >/dev/null 2>&1 && echo rst2html || echo rst2html.py`
RST2MAN=`type rst2man 2>/dev/null 2>&1 && echo rst2man || echo rst2man.py` RST2MAN=`type rst2man >/dev/null 2>&1 && echo rst2man || echo rst2man.py`
all: html all: html