Gauss in Disquisitiones Arithmeticae has a long section on binary quadratic forms dealing with reduction and equivalence. This seems to do more than the other texts I have to hand, but (in Arthur A Clarke's translation, at least) seems to labour over things which would be done differently now.
JH Conway in "The Sensual (quadratic) Form" refers to the fact that he does not cover "Gauss's group of binary forms under composition" (preface p viii). Now this seems to be the core of the heavy lifting in the Disquisitiones (together with an theory of neighbouring forms, which Conway seems to have rewritten in a much more accessible way). Gauss also has an analysis of forms which are contained in others (where the determinant of a transformation of variables is not $\pm 1$), and these ideas seem to be absent from the texts I have to hand.
[On the other hand Gauss seems to deal almost in passing with Pell's equation as a necessary part of the discussion, and units in quadratic fields too]
Bits of Gauss seem to appear in many different places. But I haven't seen a source which does the whole job.
So this is a request for references for modern treatments of as much of Gauss as possible. Really I'm looking for works which replace what Gauss was doing in modern language. I don't mind if they are technical, but Gauss in the Disquisitiones had a preference for elementary methods where possible - maybe that is why it is the way to is. But elementary treatments would be very welcome.
[My other question on the Disquisitiones is whether anyone has ever tried to replicate the contents of the elusive chapter VIII].
So, references please for modern treatments of the Disquisitiones on quadratic forms.
Note that this is a reference request - there is much useful material, including references, in the comments, which would be valid in answers. Thanks to all who have commented.