GC and passport are sufficient. People getting greencard from employment or marriage while in US do not get i-551 endorsement in their passport. The "AND" in the link you mentioned is meant to be "OR".

http://www.cbsa-asfc.gc.ca/travel-voyage/ivc-rnc-eng.html#a1a