Now where does my election donation go? Primary or general?

As the primary season seems to be done, would this mean that a first-time donation made to either John McCain or Barack Obama would go straight into the fund for the general campaign, or would it still go into the primary fund?

Am I now limited to donating no more than $2,300.00?