The best book, far and away, is Russell Weigley's The Age of Battles. Weigley explores the evolution of modern military strategy from its roots in the 30 Years War to the defeat of Napoleon at Waterloo. He does exactly what your question asks, tells you how generals planned and fought battles from the 1630s to 1815, as well as telling you a bit about pretty much every major war and battle between. Plus, he also ties in the evolution of naval strategy, such that it was, into his narrative.

I cannot recommend this book enough, as it is exactly what I think youre looking for.

For naval, although it's fictional (but set in The French Revolutionary War, books starts in 1793) 'Under Enemy Colours' is a great book about a lieutenant with an English father and French mother who is acting as bulwark between the 'Themis' s' (name of ship) tyrannical Captain Hart and the mutinous crew.

I really enjoyed this book, and it actually made me more interested in naval warfare and the like.

It's by the 'Top Ten Bestelling' author Sean Thomas Russell.

Also for land, Bernard Cornwells 'Sharpe' series is very good and is set in the 'Napoleonic Wars'. I'm currently also watching the TV series 'Sharpe' with Sean Bean acting Sharpe. Very good book series and show.

Edit: more info.

I recommend Matthew Spring's With Zeal and With Bayonets Only. Its an interesting look at how the British army functioned at a tactical level during the American Revolution. Also, I found it to be quite a smooth read for an academic history.

My best advice would be to study the campaigns of successful military leaders. You can do no better than this.

I would suggest studying Napoleon first and foremost, then also look at the campaigns of The Duke of Wellington, The Duke of Marlborough, Turenne, Frederick the Great, Eugene of Savoy, Charles XII of Sweden and Maurice de Saxe to name but a few.

I prefer targeted studies to general histories but there are some good ones out there regardless.