Pirates of Silicon Valley ends the main story in 1985 with the 1997 Macworld announcement being the framing story.
JOBS ends with Steve's return to Apple in 1997 (no mention of the Microsoft investment) with the framing story being the internal announcement of the iPod.