Byte-compilation warnings after merging eldoc changes

[Eli Zaretskii]

Like this:

  In cfengine3-mode:
  progmodes/cfengine.el:1400:41: Warning: `eldoc-documentation-function' is an
      obsolete variable (as of eldoc-1.1.0); use `eldoc-documentation-strategy'
      instead.
  progmodes/cfengine.el:1399:52: Warning: `eldoc-documentation-function' is an
      obsolete variable (as of eldoc-1.1.0); use `eldoc-documentation-strategy'
      instead.

  In python-mode:
  progmodes/python.el:5556:13: Warning: `eldoc-documentation-function' is an
      obsolete variable (as of eldoc-1.1.0); use `eldoc-documentation-strategy'
      instead.
  progmodes/python.el:5562:43: Warning: `eldoc-documentation-function' is an
      obsolete variable (as of eldoc-1.1.0); use `eldoc-documentation-strategy'
      instead.

Can these be fixed, please?