Merge "refactor in ApiDocs.java"