Bone Axes?

I’m rigging mt first model in Blender and I’ve run into a rather frustrating problem.

I’ve noticed that the axis of each joint at rest is aligned to the global axis, meaning rotation along X spins the bone around global X.

What I’d like is to be able to manually realign those axes so that I can use x rotation to control an elbow, without having to make the model’s at-rest position line up with global co-ords.

Does anyone know of a way to edit a bone’s axis?

Put Armature in Edit Mode
Select Bone
Press Ctrl+R (Edit Bone Roll)

Ah thank you! This is not exactly how I’m used to doing this, but I think it’ll work out fine.