Merge branch 'master' into run-doc8-for-docs

Qiskit · Feb 20, 2019 · 890e674 · 890e674
2 parents 38e5153 + 354bf8b
commit 890e674
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 30 deletions.
diff --git a/docs/advanced_use_of_ibm_q_devices.rst b/docs/advanced_use_of_ibm_q_devices.rst
@@ -17,8 +17,8 @@ The Provider
 ------------
 
 The IBMQ Provider is an entity that provides access to a group of
-different backends (for example, backends available through IBM Q
-Experience or IBM Q Network).
+different backends (for example, backends available through the IBM Q
+Experience or IBM Q Network quantum cloud services).
 
 The IBMQ provider inherits from BaseProvider and implements the methods:
 

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
@@ -81,18 +81,11 @@ which plots circuit in the form found in many textbooks.
 
 .. code:: python
 
-    circ.draw()
+    circ.draw(output='mpl')
 
 
-.. raw:: html
+.. image:: images/figures/getting_started_with_qiskit_circuit_0.png
 
-    <pre style="word-wrap: normal;white-space: pre;line-height: 15px;">        ┌───┐
-    q_0: |0>┤ H ├──■────■──
-            └───┘┌─┴─┐  │
-    q_1: |0>─────┤ X ├──┼──
-                 └───┘┌─┴─┐
-    q_2: |0>──────────┤ X ├
-                      └───┘</pre>
 
 
 
@@ -170,7 +163,7 @@ status of the job and a result object respectively.
 
 .. note::
 
-    Note: Jobs run asynchronously but when the result method is called it
+    Jobs run asynchronously but when the result method is called it
     switches to synchronous and waits for it to finish before moving on to
     another task.
 
@@ -252,7 +245,7 @@ Measurements cause the quantum system to collapse into classical bits.
 For example, suppose we make independent measurements on each qubit of
 the three-qubit GHZ state
 
-.. math:: |\psi\rangle = |000\rangle +|111\rangle)/\sqrt{2},
+.. math:: |\psi\rangle = (|000\rangle +|111\rangle)/\sqrt{2},
 
 and let :math:`xyz` denote the bitstring that results. Recall that,
 under the qubit labeling used by Qiskit, :math:`x` would correspond to
@@ -300,23 +293,10 @@ backend.
     qc = circ+meas
 
     #drawing the circuit
-    qc.draw()
+    qc.draw(output='mpl')
 
-.. raw:: html
+.. image:: images/figures/getting_started_with_qiskit_circuit_0.png
 
-    <pre style="word-wrap: normal;white-space: pre;line-height: 15px;">        ┌───┐           ░ ┌─┐
-    q_0: |0>┤ H ├──■────■───░─┤M├──────
-            └───┘┌─┴─┐  │   ░ └╥┘┌─┐
-    q_1: |0>─────┤ X ├──┼───░──╫─┤M├───
-                 └───┘┌─┴─┐ ░  ║ └╥┘┌─┐
-    q_2: |0>──────────┤ X ├─░──╫──╫─┤M├
-                      └───┘ ░  ║  ║ └╥┘
-     c_0: 0 ═══════════════════╩══╬══╬═
-                                  ║  ║
-     c_1: 0 ══════════════════════╩══╬═
-                                     ║
-     c_2: 0 ═════════════════════════╩═
-                                       </pre>
 
 
 
@@ -459,7 +439,7 @@ circuit. Then, we execute the circuit on the backend using the
 running our circuit.
 
 .. note::
-    When the .result() method is called, the code block will wait
+    When the ``.result()`` method is called, the code block will wait
     until the job has finished before releasing the cell.
 
 .. code:: python

diff --git a/docs/images/figures/getting_started_with_qiskit_21_0.png b/docs/images/figures/getting_started_with_qiskit_21_0.png
diff --git a/docs/images/figures/getting_started_with_qiskit_circuit_0.png b/docs/images/figures/getting_started_with_qiskit_circuit_0.png
diff --git a/docs/images/figures/getting_started_with_qiskit_circuit_1.png b/docs/images/figures/getting_started_with_qiskit_circuit_1.png
diff --git a/docs/install.rst b/docs/install.rst
@@ -86,7 +86,9 @@ Access IBM Q Devices
 --------------------
 
 IBM Q offers several real quantum computers and high-performance classical computing simulators
-`accessible through the cloud <https://www.research.ibm.com/ibm-q/technology/devices/>`_ with Qiskit.
+through its `quantum cloud services <https://www.research.ibm.com/ibm-q/technology/devices/>`_ with
+Qiskit.
+
 
 `Create a free IBM Q account <https://quantumexperience.ng.bluemix.net/qx/login>`_ to get an API
 token.

diff --git a/docs/theme/static/css/theme.css b/docs/theme/static/css/theme.css
@@ -182,6 +182,18 @@ h5.mdl-color-text--primary{
     border-left: 0px !important;
 }
 
+.topic {
+    border: 1px solid #eaeaea;
+    padding: .5em 1em;
+    background-color: #fafafa;
+    margin-bottom: 1em;
+}
+.topic-title {
+    font-weight: bold !important;
+    font-size: 1.1em !important;
+    color: #000000;
+}
+
 a.reference.external:hover{
     border-bottom: 1px solid #0062FF;
 }