Merge remote-tracking branch 'origin/pr/264' into develop

sigmavirus24 · sigmavirus24 · commit 3f52760924dd · 2014-08-10T21:07:23.000-05:00
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -64,3 +64,5 @@ Contributors
 - Daniel Johnson (@danielj7)
 
 - David Moss (@damoss007)
+
+- John Barbuto (@jbarbuto)
diff --git a/github3/repos/repo.py b/github3/repos/repo.py
@@ -71,7 +71,9 @@ def __init__(self, repo, session=None):
         self.forks = repo.get('forks', 0)
 
         #: The number of forks of this repository.
-        self.fork_count = repo.get('fork_count')
+        self.forks_count = repo.get('forks_count')
+        # For backward compatibility
+        self.fork_count = self.forks_count
 
         #: Is this repository a fork?
         self.fork = repo.get('fork')
@@ -703,12 +705,11 @@ def create_milestone(self, title, state=None, description=None,
 
     @requires_auth
     def create_pull(self, title, base, head, body=None):
-        """Create a pull request using commits from ``head`` and comparing
-        against ``base``.
+        """Create a pull request of ``head`` onto ``base`` branch in this repo.
 
         :param str title: (required)
-        :param str base: (required), e.g., 'username:branch', or a sha
-        :param str head: (required), e.g., 'master', or a sha
+        :param str base: (required), e.g., 'master'
+        :param str head: (required), e.g., 'username:branch'
         :param str body: (optional), markdown formatted description
         :returns: :class:`PullRequest <github3.pulls.PullRequest>` if
             successful, else None
@@ -722,8 +723,8 @@ def create_pull_from_issue(self, issue, base, head):
         """Create a pull request from issue #``issue``.
 
         :param int issue: (required), issue number
-        :param str base: (required), e.g., 'username:branch', or a sha
-        :param str head: (required), e.g., 'master', or a sha
+        :param str base: (required), e.g., 'master'
+        :param str head: (required), e.g., 'username:branch'
         :returns: :class:`PullRequest <github3.pulls.PullRequest>` if
             successful, else None
         """
