pgsql: Fix pg_locks view to call advisory locks advisory locks, while

Log Message:
-----------
Fix pg_locks view to call advisory locks advisory locks, while preserving
backward compatibility for anyone using the old userlock code that's now
on pgfoundry --- locks from that code still show as 'userlock'.

Modified Files:
--------------
    pgsql/doc/src/sgml:
        catalogs.sgml (r2.133 -> r2.134)
        (http://developer.postgresql.org/cvsweb.cgi/pgsql/doc/src/sgml/catalogs.sgml.diff?r1=2.133&r2=2.134)
    pgsql/src/backend/storage/lmgr:
        deadlock.c (r1.42 -> r1.43)
        (http://developer.postgresql.org/cvsweb.cgi/pgsql/src/backend/storage/lmgr/deadlock.c.diff?r1=1.42&r2=1.43)
        lmgr.c (r1.87 -> r1.88)
        (http://developer.postgresql.org/cvsweb.cgi/pgsql/src/backend/storage/lmgr/lmgr.c.diff?r1=1.87&r2=1.88)
    pgsql/src/backend/utils/adt:
        lockfuncs.c (r1.25 -> r1.26)
        (http://developer.postgresql.org/cvsweb.cgi/pgsql/src/backend/utils/adt/lockfuncs.c.diff?r1=1.25&r2=1.26)
    pgsql/src/include/storage:
        lock.h (r1.99 -> r1.100)
        (http://developer.postgresql.org/cvsweb.cgi/pgsql/src/include/storage/lock.h.diff?r1=1.99&r2=1.100)