Skip to content

Commit

Permalink
Merge pull request #261 from gonzoid/gonzoid-patch-1
Browse files Browse the repository at this point in the history
Fix some typos
  • Loading branch information
waveform80 committed Feb 15, 2016
2 parents 24e1a17 + c22e8fc commit eacf216
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion picamera/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -3776,7 +3776,7 @@ def _set_preview_layer(self, value):
self._preview_layer = value
preview_layer = property(
_get_preview_layer, _set_preview_layer, doc="""
Retrieves of sets the layer of the preview window.
Retrieves or sets the layer of the preview window.
.. deprecated:: 1.8
Please use the :attr:`~picamera.renderers.PiRenderer.layer`
Expand Down
8 changes: 4 additions & 4 deletions picamera/renderers.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def _set_layer(self, value):
prefix="Failed to set layer")
layer = property(
_get_layer, _set_layer, doc="""
Retrieves of sets the layer of the renderer.
Retrieves or sets the layer of the renderer.
The :attr:`layer` property is an integer which controls the layer that
the renderer occupies. Higher valued layers obscure lower valued layers
Expand Down Expand Up @@ -388,7 +388,7 @@ def _set_rotation(self, value):
self._get_transform(value, self._vflip, self._hflip))
self._rotation = value
rotation = property(_get_rotation, _set_rotation, doc="""
Retrieves of sets the current rotation of the renderer.
Retrieves or sets the current rotation of the renderer.
When queried, the :attr:`rotation` property returns the rotation
applied to the renderer. Valid values are 0, 90, 180, and 270.
Expand All @@ -413,7 +413,7 @@ def _set_vflip(self, value):
self._get_transform(self._rotation, value, self._hflip))
self._vflip = value
vflip = property(_get_vflip, _set_vflip, doc="""
Retrieves of sets whether the renderer's output is vertically flipped.
Retrieves or sets whether the renderer's output is vertically flipped.
When queried, the :attr:`vflip` property returns a boolean indicating
whether or not the renderer's output is vertically flipped. The
Expand All @@ -436,7 +436,7 @@ def _set_hflip(self, value):
self._get_transform(self._rotation, self._vflip, value))
self._hflip = value
hflip = property(_get_hflip, _set_hflip, doc="""
Retrieves of sets whether the renderer's output is horizontally
Retrieves or sets whether the renderer's output is horizontally
flipped.
When queried, the :attr:`vflip` property returns a boolean indicating
Expand Down

0 comments on commit eacf216

Please sign in to comment.