Merge branch 'develop'

diff --cc .gitignore
index 70a725244e3bc495dd1e9e88bada37f36c5d7136,dd4ad8a2f9fa92a0aa1685dfd8f7c00ba6a0bea0..52749188c5e09c9bac53d782ba42ea24ab79e982
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,12 +1,11 @@@
  *~
  *.cache
- Makefile
  build
  *-linux-*
 -<<<<<<< HEAD
+ *.pyc
+ *.tmp
+ docs/man3
+ docs/html
  *.tmp
  *.pyc
  __pycache__

diff --cc docs/zzipdoc/htm2dbk.py
index 98b4f674ead7b2d99e7d6b4d548f1bf98ac96c34,d0f17cc3d233643d66c8f6416d1808011080ee8b..021a22a7ddba8c2ff73b43282956047a7e6455a9
--- 1/docs/zzipdoc/htm2dbk.py
--- 2/docs/zzipdoc/htm2dbk.py
+++ b/docs/zzipdoc/htm2dbk.py
@@@ -146,8 -146,8 +146,13 @@@ def htm2dbk_files(args)
              doc.filename = filename
              doc.add(f.read())
              f.close()
++<<<<<<< HEAD
 +        except IOError as e:
 +            print >> sys.stderr, "can not open "+filename
++=======
+         except IOError:
+             print("can not open "+filename, file=sys.stderr)
++>>>>>>> develop
      return doc.value()
  
  def html2docbook(text):