Does remaining-day abstention replace the later make-up fast?

Kitab al-Sawm: Mistaken Dawn or Sunset, Qada and Kaffarah

• Yes, always
• Only for travellers
• No, they are separate
• Only on Eid