Optional Rule 10.2 is in the non-combat section.
During non-combat, you land the aircraft that took part in combat (10.3) and can move aircraft that did not (10.1), so both options would be available.
Were playing '36 and I read this in the rules “Ships and Submarines can be placed at any factory location or Naval Base (including Shipyards) connected to a factory via an undamaged railroad. Submarines may be placed at a Submarine base. No more than five ships can be placed in this manner.” My question is in order to place subs at a sub base does it need to connected factory via an undamaged railroad or is that just for Naval Base (including Shipyards)? I would think they would have included sub bases in that same sentence, but they didn’t.
Yes. They were just stating that the subs could also be placed at submarine bases.