obsolete variable, use 2nd arg of `display-buffer' instead

[Sam Steingold <sds@gnu.org>]

Hi,
variables special-display-buffer-names, special-display-regexps et al
are now obsolete and replaced with display-buffer-alist.
alas, I cannot figure out how to replace my settings.

E.g., I used to do
 (custom-set-variables
 '(special-display-buffer-names ("*info*" ...))
 '(special-display-regexps '("^*Customize " "^*Shell " "^*WoMan "))
 '(same-window-buffer-names '("*Diff*"))
 ...)
 what do I replace them with?
I tried this:

(custom-set-variables
 '(Man-frame-parameters
   `((height . ,(min 70 sds-frame-height)) (width . 80)
     (top . 35) (left . 0) (font . ,sds-small-font)) t)
 '(display-buffer-alist
      (cons
       `(((label . special) (regexp . "List\\*$")
          (regexp . "Help\\*$") (regexp . "Apropos") (regexp . "^*WoMan ")
          (regexp . "^*Customize ") (regexp . "^*Shell ")
          (name . "*info*"))
         pop-up-frame
         (pop-up-frame-alist . ,Man-frame-parameters))
       display-buffer-alist)))

this does not work for *info* (C-h i does not create a new frame).
this does not even attempt to handle "*Diff*" (how do I do that?)

So, what am I doing wrong?

PS  is there a way to tell custom-set-variables to push something on top
of the existing value instead of replacing it (like I do with cons above)?

-- 
Sam Steingold (http://sds.podval.org/) on CentOS release 5.6 (Final) X 11.0.60900031
http://openvotingconsortium.org http://ffii.org http://palestinefacts.org
http://pmw.org.il http://camera.org http://jihadwatch.org http://dhimmi.com
Modern man is the missing link between apes and human beings.