[Checkins] [zopefoundation/Zope] b1c176: remove import of ConflictError (#472)

[Michael Howitz]

  Branch: refs/heads/zmi_description_not_absolute
  Home:   https://github.com/zopefoundation/Zope
  Commit: b1c176bd86824904263a47b734c210462f05732d
      https://github.com/zopefoundation/Zope/commit/b1c176bd86824904263a47b734c210462f05732d
  Author: Thomas Schorr <t_schorr at gmx.de>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M src/ZPublisher/WSGIPublisher.py

  Log Message:
  -----------
  remove import of ConflictError (#472)


  Commit: f2b5461c5c79d4de80ad44afd6105172cd6cc8fc
      https://github.com/zopefoundation/Zope/commit/f2b5461c5c79d4de80ad44afd6105172cd6cc8fc
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M CHANGES.rst
    M src/OFS/ObjectManager.py
    M src/OFS/tests/testObjectManager.py
    M src/OFS/zpt/main.zpt

  Log Message:
  -----------
  - Fix faulty ZMI links due to missing URL-quoting (#465)


  Commit: c5bc5a92cae6be9944a1ddfcec3643b7c2e22b65
      https://github.com/zopefoundation/Zope/commit/c5bc5a92cae6be9944a1ddfcec3643b7c2e22b65
  Author: Jürgen Gmach <jugmac00 at users.noreply.github.com>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M docs/zdgbook/Figures/2-1.png
    M docs/zdgbook/ObjectPublishing.rst

  Log Message:
  -----------
  Update HTTP Publishing section (#470)

Zope 4 no longer ships with the ZServer.

Instead, Zope interacts with a WSGI server.

The description and the figure has been updated accordingly.

cf  #252

modified:   docs/zdgbook/Figures/2-1.png
modified:   docs/zdgbook/ObjectPublishing.rst


  Commit: 5365a2dd80f751a9ccba6a885a332bd5cfd836a6
      https://github.com/zopefoundation/Zope/commit/5365a2dd80f751a9ccba6a885a332bd5cfd836a6
  Author: Michael Howitz <mh at gocept.com>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    M CHANGES.rst
    M docs/zdgbook/Figures/2-1.png
    M docs/zdgbook/ObjectPublishing.rst
    M src/OFS/ObjectManager.py
    M src/OFS/tests/testObjectManager.py
    M src/OFS/zpt/main.zpt
    M src/ZPublisher/WSGIPublisher.py

  Log Message:
  -----------
  Merge branch 'master' into zmi_description_not_absolute


Compare: https://github.com/zopefoundation/Zope/compare/25c1d6934694...5365a2dd80f7