Skip to content

Commit

Permalink
More doc link corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
waveform80 committed Mar 16, 2015
1 parent 6f5842f commit dc7748e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions docs/deprecated.rst
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,9 @@ preview. As a result, the preview system is no longer "part of" the
:attr:`~picamera.camera.PiCamera.preview` attribute which is a separate
:class:`~picamera.renderers.PiPreviewRenderer` instance when the preview is
active. In turn this meant that :attr:`~picamera.camera.PiCamera.preview_alpha`
was deprecated in favor of the :attr:`~picamera.PiRenderer.alpha` property of
the new :attr:`~picamera.camera.PiCamera.preview` attribute. Similar changes
were made to :attr:`~picamera.camera.PiCamera.preview_layer`,
was deprecated in favor of the :attr:`~picamera.renderers.PiRenderer.alpha`
property of the new :attr:`~picamera.camera.PiCamera.preview` attribute.
Similar changes were made to :attr:`~picamera.camera.PiCamera.preview_layer`,
:attr:`~picamera.camera.PiCamera.preview_fullscreen`, and
:attr:`~picamera.camera.PiCamera.preview_window`. Hence, the following code::

Expand Down Expand Up @@ -489,9 +489,9 @@ for no background, ``True`` to draw a black background).
In order to provide the new functionality while maintaining a certain amount of
backward compatibility the new attribute accepts ``None`` for no background
(note that the "truthiness" of ``None`` is the same as ``False`` so existing
tests should continue to work), and a :class:`~picamera.Color` instance for a
custom background color (:class:`~picamera.Color` instances are "truthy" so
again, existing tests against the attribute continue to work).
tests should continue to work), and a :class:`~picamera.color.Color` instance
for a custom background color (:class:`~picamera.color.Color` instances are
"truthy" so again, existing tests against the attribute continue to work).

Setting the attribute as a bool is now deprecated. Hence, the following code::

Expand Down
2 changes: 1 addition & 1 deletion docs/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ available on PyPI), the release process for Raspbian packages is semi-manual.
There is typically a delay of a few days after a release before updated
picamera packages become accessible in the Raspbian repository.

Users desperate to try the latest version make choose to uninstall their
Users desperate to try the latest version may choose to uninstall their
``apt`` based copy (uninstall instructions are provided in the
:ref:`installation instructions <raspbian_install2>`, and install using
:ref:`pip instead <system_install2>`. However, be aware that keeping a PyPI
Expand Down

0 comments on commit dc7748e

Please sign in to comment.