Winter '16 (API version 35.0)
Use Salesforce admin, but use Salesforce administrator for UI text and end-user docs related to logging in. If you’re using the phrase Salesforce admin more than a few times in a topic, OK to shorten to admin where needed.