Merge branch 'master' into dh-async-repo

This commit is contained in:
joshaber
2016-01-04 11:15:01 -05:00
2 changed files with 4 additions and 4 deletions

View File

@@ -3037,7 +3037,7 @@ class TextEditor extends Model
# Essential: Scrolls the editor to the given screen position.
#
# * `screenPosition` An object that represents a buffer position. It can be either
# * `screenPosition` An object that represents a screen position. It can be either
# an {Object} (`{row, column}`), {Array} (`[row, column]`), or {Point}
# * `options` (optional) {Object}
# * `center` Center the editor around the position if possible. (default: false)