XanaduAI · josh146 · Mar 19, 2020 · Feb 19, 2020 · Feb 19, 2020 · Feb 19, 2020
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 <h3>New features since last release</h3>
 
-* Adds initial support for the Xanadu cloud platform.
+* Adds initial support for the Xanadu's photonic quantum hardware.
   [(#101)](https://github.com/XanaduAI/strawberryfields/pull/101)
   [(#148)](https://github.com/XanaduAI/strawberryfields/pull/148)
   [(#294)](https://github.com/XanaduAI/strawberryfields/pull/294)
@@ -15,7 +15,7 @@
   from strawberryfields import ops
   from strawberryfields.utils import random_interferometer
 
-  # replace AUTHENTICATION_TOKEN with your Xanadu cloud token
+  # replace AUTHENTICATION_TOKEN with your Xanadu cloud access token
   eng = RemoteEngine("chip2", token="AUTHENTICATION_TOKEN")
   prog = sf.Program(8)
 
@@ -53,7 +53,7 @@
 <br>
 
 * New `sf` command line program for configuring Strawberry Fields for access
-  with the Xanadu cloud platform, as well as submitting and executing jobs from the
+  to the Xanadu cloud platform, as well as submitting and executing jobs from the
   command line.
   [(#146)](https://github.com/XanaduAI/strawberryfields/pull/146)
   [(#312)](https://github.com/XanaduAI/strawberryfields/pull/312)
@@ -65,7 +65,7 @@
 
   * `sf run input [--output FILE]`: submit and execute quantum programs from the command line
 
-  * `sf --ping`: verify your connection to the Xanadu cloud platform.
+  * `sf --ping`: verify your connection to the Xanadu cloud platform
 
   For more details, see the
   [documentation](https://strawberryfields.readthedocs.io/en/stable/code/sf_cli.html).
@@ -117,7 +117,7 @@
 
 * Modified the rectangular decomposition to ensure that identity-like
   unitaries are implemented with no swaps.
-  [#311](https://github.com/XanaduAI/strawberryfields/pull/311)
+  [(#311)](https://github.com/XanaduAI/strawberryfields/pull/311)
 
 <h3>Bug fixes</h3>
 
@@ -141,7 +141,7 @@
 
 This release contains contributions from (in alphabetical order):
 
-Ville Bergholm, Tom Bromley, Jack Ceroni, Theodor Isacsson, Josh Izaac, Shreya P Kumar,
+Ville Bergholm, Tom Bromley, Jack Ceroni, Theodor Isacsson, Josh Izaac, Nathan Killoran, Shreya P Kumar,
 Nicolás Quesada, Jeremy Swinarton, Antal Száva, Paul Tan, Zeid Zabaneh
 
 

diff --git a/doc/code/sf_cli.rst b/doc/code/sf_cli.rst
@@ -10,7 +10,8 @@ including:
 
 * ``sf run input [--output FILE]``: submit and execute quantum programs from the command line
 
-* ``sf --ping``: verify your connection to the Xanadu cloud platform.
+* ``sf --ping``: verify your connection to the Xanadu cloud platform
+
 
 
 Configure
@@ -42,8 +43,10 @@ Using the ``sf configure`` command to create a configuration file on Windows:
 
 **Flags:**
 
-* ``--token``: The authentication token to use.
-* ``--local``: Whether or not to create the configuration file locally in the current directory.
+* ``--token``: the authentication token to use
+
+* ``--local``: whether or not to create the configuration file locally in the current directory
+
 
 If not provided, the configuration file will be saved in the user's configuration directory.
 

diff --git a/doc/development/research.rst b/doc/development/research.rst
@@ -33,8 +33,8 @@ Support
 If you are having issues, please let us know by posting the issue on our Github issue tracker.
 
 To chat directly with the team designing and building Strawberry Fields, as well as members of our
-community - ranging from professors of quantum physics, to students, to those just interested in being a
-part of a rapidly growing industry - you can join our `discussion forum <https://discuss.pennylane.ai>`_ and `Slack channel <https://u.strawberryfields.ai/slack>`_.
+community—ranging from professors of quantum physics, to students, to those just interested in being a
+part of a rapidly growing industry—you can join our `discussion forum <https://discuss.pennylane.ai>`_ and `Slack channel <https://u.strawberryfields.ai/slack>`_.
 
 Sometimes, it might take us a couple of hours to reply - please be patient!
 

diff --git a/doc/index.rst b/doc/index.rst
@@ -130,7 +130,7 @@ Support
 
 If you are having issues, please let us know by posting the issue on our Github issue tracker.
 
-To chat directly with the team designing and building Strawberry Fields, as well as members of our community — ranging from quantum computing researchers, to students, to those just interested in being a part of a rapidly growing industry — you can join our `discussion forum <https://discuss.pennylane.ai>`_ and `Slack channel <https://u.strawberryfields.ai/slack>`_.
+To chat directly with the team designing and building Strawberry Fields, as well as members of our community—ranging from quantum computing researchers, to students, to those just interested in being a part of a rapidly growing industry—you can join our `discussion forum <https://discuss.pennylane.ai>`_ and `Slack channel <https://u.strawberryfields.ai/slack>`_.
 
 For more details on contributing or performing research with Strawberry Fields, please see
 :ref:`research`.

diff --git a/doc/introduction/configuration.rst b/doc/introduction/configuration.rst
@@ -73,8 +73,8 @@ For more advanced configuration options see the :func:`~.configuration_wizard` p
 
 **Flags:**
 
-* ``--token``: The authentication token to use.
-* ``--local``: Whether or not to create the configuration file locally in the current directory.
+* ``--token``: the authentication token to use
+* ``--local``: whether or not to create the configuration file locally in the current directory
 
 If not provided, the configuration file will be saved in the user's configuration directory.
 
@@ -91,7 +91,7 @@ scanning the following three directories in order of preference:
 3. The default user configuration directory:
 
    * On Linux: ``~/.config/strawberryfields``
-   * On Windows: ``~C:\Users\USERNAME\AppData\Local\Xanadu\strawberryfields``
+   * On Windows: ``C:\Users\USERNAME\AppData\Local\Xanadu\strawberryfields``
    * On MacOS: ``~/Library/Application\ Support/strawberryfields``
 
 The configuration file ``config.toml`` uses the `TOML standard <https://github.com/toml-lang/toml>`_,

diff --git a/doc/introduction/remote.rst b/doc/introduction/remote.rst
@@ -53,11 +53,11 @@ For this example, consider the following Blackbird script, which represents a qu
 exactly the gate layout of the ``chip2`` photonic hardware device. We will save the following
 file as ``test.xbb`` in our current working directory:
 
-.. code-block:: python
+.. code-block:: python3
 
     name template_4x2_chip2     # Name of the program
     version 1.0                 # Blackbird version number
-    target chip2 (shots = 100)   # This program will run on chip2 for 50 shots
+    target chip2 (shots = 100)   # This program will run on chip2 for 100 shots
 
     # define the squeezing amplitude
     float r = 1.0
@@ -243,7 +243,7 @@ We can convert the samples into counts using the following function:
           bitstrings = [tuple(i) for i in samples]
           return {k:v for k, v in Counter(bitstrings).items()}
 
->>> samples = np.array([[0, 2],[1, 0],[0, 1],[0, 0],[0, 0],[2, 0],[0, 1],[0, 1]])
+>>> samples = np.array([[0, 2], [1, 0], [0, 1], [0, 0], [0, 0], [2, 0], [0, 1], [0, 1]])
 >>> counts = count(samples)
 >>> print(counts)
 {(0, 2): 1, (1, 0): 1, (0, 1): 3, (0, 0): 2, (2, 0): 1}
@@ -279,11 +279,11 @@ Furthermore, several automatic decompositions are supported:
 
 For example, consider the following Blackbird script:
 
-.. code-block:: python
+.. code-block:: python3
 
     name compilation_example  # Name of the program
     version 1.0               # Blackbird version number
-    target chip2 (shots=100)   # This program will run on chip0 for 50 shots
+    target chip2 (shots=100)   # This program will run on chip0 for 100 shots
 
     # Define a unitary matrix
     complex array U[4, 4] =
@@ -319,7 +319,7 @@ This program will execute following the same steps as above; :class:`~.RemoteEng
 compile the program to match the layout of the chip.
 
 You may wish to view the compiled program; this can be easily done in Python using
-the ``Program.compile`` method:
+the ``Program.print`` method:
 
 
 >>> from strawberryfields import RemoteEngine
@@ -353,7 +353,7 @@ Rgate(1.902) | (q[0])
 Rgate(-1.173) | (q[5])
 MeasureFock | (q[0], q[1], q[2], q[3], q[4], q[5], q[6], q[7])
 
-and even saved as a new Blackbird script using the :func:`~.io.save` function:
+The compiled program can be saved as a new Blackbird script using the :func:`~.io.save` function:
 
 >>> from strawberryfields.io import save
 >>> save("test_compiled.xbb", prog)
@@ -409,7 +409,7 @@ values are of the form :math:`\{d, 0\}`.
 
     # the following mean photon number per mode
     # quantity is set to ensure that the singular values
-    # are scaled such that all squeezers have value 1
+    # are scaled such that all Sgates have value squeezing value r=1
     m = 0.345274461385554870545
 
     with prog.context as q:

diff --git a/doc/introduction/tutorials.rst b/doc/introduction/tutorials.rst
@@ -130,7 +130,7 @@ Optimization and machine learning
 
     We are currently making some huge changes to the TensorFlow backend
     of Strawberry Fields, including upcoming TensorFlow 2.0 support. As a result,
-    this tutorial currently is unavailable. Please bear with us as we finish off the
+    the tutorials in this section are currently not supported. Please bear with us as we finish off the
     work on our new TensorFlow backend!
 
 .. customgalleryitem::

diff --git a/doc/tutorials/tutorial_machine_learning.rst b/doc/tutorials/tutorial_machine_learning.rst
@@ -3,7 +3,7 @@
 Optimization & machine learning
 ###############################
 
-.. warning:: We are currently making some huge changes to the TensorFlow backend of Strawberry Fields, including upcoming TensorFlow 2.0 support. As a result, this tutorial currently is unavailable. Please bare with us as we finish off the work on our new TensorFlow backend!
+.. warning:: We are currently making some huge changes to the TensorFlow backend of Strawberry Fields, including upcoming TensorFlow 2.0 support. As a result, this tutorial currently not working. Please bare with us as we finish off the work on our new TensorFlow backend!
 
 .. note:: The content in this page is suited to more advanced users who already have an understanding of Strawberry Fields, e.g., those who have completed the :ref:`teleportation tutorial <tutorial>`. Some basic knowledge of `Tensorflow <https://www.tensorflow.org/>`_ is also helpful.
 

diff --git a/doc/tutorials/tutorial_teleportation.rst b/doc/tutorials/tutorial_teleportation.rst
@@ -168,7 +168,7 @@ in our truncated Fock basis. We now have all the parameters ready to initialize
 
 We can now execute our quantum program ``prog`` on the engine via the :func:`Engine.run` method:
 
-.. code-block:: python
+.. code-block:: python3
 
     result = eng.run(prog, run_options={"shots":1, "modes":None}, compile_options={})
 
@@ -240,7 +240,7 @@ Once the engine has been run, we can extract results of measurements and the qua
 .. code-block:: pycon
 
     >>> result.samples
-    [2.9645296452964534, -2.9465294652946525, None]
+    [[2.9645296452964534, -2.9465294652946525, None]]
 
 If a mode has not been measured, this attribute simply returns ``None``.
 

diff --git a/strawberryfields/api/connection.py b/strawberryfields/api/connection.py
@@ -52,7 +52,7 @@ class Connection:
     retrieves an existing job.
 
     >>> connection = Connection(token="abc")
-    >>> success = connection.ping() # `True` if successful, `False` if the connection fails
+    >>> success = connection.ping()  # `True` if successful, `False` if the connection fails
     >>> job = connection.create_job("chip2", program, shots=123)
     >>> job
     <Job: id=d177cbf5-1816-4779-802f-cef2c117dc1a, ...>

diff --git a/strawberryfields/circuitspecs/chip2.py b/strawberryfields/circuitspecs/chip2.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Circuit class specification for the chip0 class of circuits."""
+"""Circuit class specification for the chip2 class of circuits."""
 import textwrap
 
 import numpy as np

diff --git a/strawberryfields/configuration.py b/strawberryfields/configuration.py
@@ -51,7 +51,7 @@ def load_config(filename="config.toml", **kwargs):
         2. data contained in environmental variables (if any)
         3. data contained in a configuration file (if exists)
 
-    Kwargs:
+    Keyword Args:
         filename (str): the name of the configuration file to look for
 
         Additional configuration options are detailed in
@@ -89,7 +89,7 @@ def create_config(authentication_token=None, **kwargs):
     If called without passing any keyword arguments, then a default
     configuration object is created.
 
-    Kwargs:
+    Keyword Args:
         Configuration options as detailed in :doc:`/introduction/configuration`
 
     Returns:
@@ -124,7 +124,7 @@ def get_config_filepath(filename="config.toml"):
         * The directory specified by the environment variable SF_CONF (if specified)
         * The user configuration directory (if specified)
 
-    Kwargs:
+    Keyword Args:
         filename (str): the configuration file to look for
 
     Returns:
@@ -235,7 +235,7 @@ def store_account(authentication_token, filename="config.toml", location="user_c
     This global user configuration directory differs depending on the operating system:
 
     * On Linux: ``~/.config/strawberryfields``
-    * On Windows: ``~C:\Users\USERNAME\AppData\Local\Xanadu\strawberryfields``
+    * On Windows: ``C:\Users\USERNAME\AppData\Local\Xanadu\strawberryfields``
     * On MacOS: ``~/Library/Application Support/strawberryfields``
 
     By default, Strawberry Fields will load the configuration and account credentials from the global
@@ -289,7 +289,7 @@ def store_account(authentication_token, filename="config.toml", location="user_c
         authentication_token (str): API token for authentication to the Xanadu cloud platform.
             This is required for submitting remote jobs using :class:`~.RemoteEngine`.
 
-    Kwargs:
+    Keyword Args:
         location (str): determines where the configuration file should be saved
         filename (str): the name of the configuration file to look for