Hi Peter,
Both. Our Connection Finder includes relationships by marriage (whereas the Relationship Finder only considers descent).
Whether or not you're adopted does not matter, if you've attached your parents. That is, whether or not you mark your parents as "non-biological" is not relevant in the Connection Finder.
Chris