Just to clarify, the right hand grip rule and the right hand solenoid rule are the same thing.
The diagram is correct, because, while Robert is right in saying that usually field lines point to the south pole, the right hand grip rule (or right hand solenoid rule) refers to the external field, not the internal field. Curl the fingers on your right hand in the direction that the current is flowing, and your thumb will point to the north pole of the external field generated by the solenoid.
If it helps, you can look at it from one end, and view the cross section of the solenoid as a circle. Then, you curl the fingers on your right hand in the direction of the current flow, and your thumb points towards the north pole of the external magnetic field.