1)
Which Nedarim and Nedavos is the Torah referring to?
1.
Rashi: It is referring (both - Rashi) to Nedarim and Nedavos that one undertakes on Yom-Tov itself (and to Nedarim and Nedavos that one undertook to bring during the year
1
Rashi: Which one is advised to bring when one comes to Yerushalayim on Yom-Tov, in case he does not manage to make the trip later.