[Pytest-commit] [pytest-dev/pytest] bb8984: fix error in caplog docs.

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: bb8984f5edfc82884a11f6e08418632da7223c0c
      https://github.com/pytest-dev/pytest/commit/bb8984f5edfc82884a11f6e08418632da7223c0c
  Author: Rachel Kogan <rachelkogan at Rachels-MacBook-Air.local>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M _pytest/logging.py
    M doc/en/builtin.rst

  Log Message:
  -----------
  fix error in caplog docs.


  Commit: 8ff8a82c5183f7b390ba48be9ef20b444c58dc6b
      https://github.com/pytest-dev/pytest/commit/8ff8a82c5183f7b390ba48be9ef20b444c58dc6b
  Author: Rachel Kogan <rachelkogan at Rachels-MacBook-Air.local>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M CONTRIBUTING.rst
    M _pytest/helpconfig.py
    M _pytest/python.py
    M _pytest/runner.py
    A changelog/2798.bugfix.rst
    A changelog/3398.trivial.rst
    M doc/en/builtin.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/test/plugin/terminal.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/test_runner.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:pytest-dev/pytest


  Commit: 48c99f62e347a7d6ed093027e223f74502b05cfa
      https://github.com/pytest-dev/pytest/commit/48c99f62e347a7d6ed093027e223f74502b05cfa
  Author: Rachel Kogan <rachelkogan at Rachels-MacBook-Air.local>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    A changelog/3406.doc.rst

  Log Message:
  -----------
  add changelog


  Commit: cefeba33efa366e1f2775b2967b2c5c5d74457ed
      https://github.com/pytest-dev/pytest/commit/cefeba33efa366e1f2775b2967b2c5c5d74457ed
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M changelog/3406.doc.rst

  Log Message:
  -----------
  Update changelog formatting


  Commit: f0084608cc72573e0629712d5cfc40bf9ff6952e
      https://github.com/pytest-dev/pytest/commit/f0084608cc72573e0629712d5cfc40bf9ff6952e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/logging.py
    A changelog/3406.doc.rst
    M doc/en/builtin.rst

  Log Message:
  -----------
  Merge pull request #3407 from rachel1792/master

Fix typo in caplog fixture documentation: Issue #3406


Compare: https://github.com/pytest-dev/pytest/compare/1cc79ffc1044...f0084608cc72