  We report on a comprehensive and consistent investigation into the X-ray
emission from GX 339-4. All public observations in the 11 year RXTE archive
were analysed. Three different types of model - single powerlaw, broken
powerlaw and a disc + powerlaw - were fitted to investigate the evolution of
the disc, along with a fixed gaussian component at 6.4 keV to investigate any
iron line in the spectrum. We show that the relative variation in flux and
X-ray colour between the two best sampled outbursts are very similar. The decay
of the disc temperature during the outburst is clearly seen in the soft state.
The expected decay is S_Disc \propto T^4; we measure T^4.75\pm0.23. This
implies that the inner disc radius is approximately constant in the soft state.
We also show a significant anti-correlation between the iron line significant
width and the X-ray flux in the soft state while in the hard state the EW is
independent of the flux. This results in hysteresis in the relation between
X-ray flux and both line flux and EW. To compare the X-ray binary outburst to
the behaviour seen in AGN, we construct a Disc Fraction Luminosity Diagram for
GX 339-4, the first for an X-ray binary. The shape qualitatively matches that
produced for AGN. Linking this with the radio emission from GX 339-4 the change
in radio spectrum between the disc and power-law dominated states is clearly
visible.
