Merge pull request #1534 from qiskit-community/main

Build site

.github/workflows/deploy.workflow.yml

@@ -30,9 +30,9 @@ jobs:
           python-version: 3.7
 
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.x
+          ruby-version: 2.7.7
 
       - name: Install Python dependencies
         run: |

content/ch-applications/qaoa.ipynb

@@ -4907,7 +4907,7 @@
     "\n",
     "#### 2.1 (weighted) $MAXCUT$\n",
     "\n",
-    "Consider an $n$-node non-directed graph *G = (V, E)* where *|V| = n* with edge weights $w_{ij}>0$, $w_{ij}=w_{ji}$, for $(j,k)\\in E$. A cut is defined as a partition of the original set V into two subsets. The cost function to be optimized is in this case the sum of weights of edges connecting points in the two different subsets, *crossing* the cut. By assigning $x_i=0$ or $x_i=1$ to each node $i$, one tries to maximize the global profit function (here and in the following summations run over indices 0,1,...n-1)\n",
+    "Consider an $n$-node non-directed graph *G = (V, E)* where *|V| = n* with edge weights $w_{ij}>0$, $w_{ij}=w_{ji}$, for $(i,j)\\in E$. A cut is defined as a partition of the original set V into two subsets. The cost function to be optimized is in this case the sum of weights of edges connecting points in the two different subsets, *crossing* the cut. By assigning $x_i=0$ or $x_i=1$ to each node $i$, one tries to maximize the global profit function (here and in the following summations run over indices 0,1,...n-1)\n",
     "\n",
     "\n",
     "\n",

content/ch-paper-implementations/tsp.ipynb

@@ -722,8 +722,8 @@
     "        <td>$|10001101\\ \\rangle$</td>\n",
     "    </tr>\n",
     "    <tr>\n",
-    "        <td>$1-3-2-4$</td>\n",
-    "        <td>$|11001001\\ \\rangle$</td>\n",
+    "        <td>$1-2-4-3$</td>\n",
+    "        <td>$|10000111\\ \\rangle$</td>\n",
     "    </tr>\n",
     "</table>\n",
     "\n"
@@ -1455,4 +1455,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}

content/ch-quantum-hardware/accessing_higher_energy_states.ipynb

@@ -82,7 +82,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We begin by importing dependencies and defining some default variable values. We choose qubit 0 to run our experiments. We perform our experiments on the publicly available single qubit device `ibmq_armonk`."
+    "We begin by importing dependencies and defining some default variable values. We choose qubit 0 to run our experiments. We perform our experiments on the publicly available single qubit device `ibmq_manila`."
    ]
   },
   {
@@ -266,7 +266,7 @@
    "metadata": {},
    "source": [
     "The first step in our calibration is to compute the frequency needed to go from the $1\\rightarrow2$ state. There are two methods to do this:\n",
-    "1. Do a frequency sweep from the ground state and apply very high power. If the applied power is large enough, two peaks should be observed. One at the $0\\rightarrow1$ frequency found in section [1](#discrim01) and one at the $0\\rightarrow2$ frequency. The $1\\rightarrow2$ frequency can be obtained by taking the difference of the two. Unfortunately, for `ibmq_armonk`, the maximum drive power of $1.0$ is not sufficient to see this transition. Instead, we turn to the second method.\n",
+    "1. Do a frequency sweep from the ground state and apply very high power. If the applied power is large enough, two peaks should be observed. One at the $0\\rightarrow1$ frequency found in section [1](#discrim01) and one at the $0\\rightarrow2$ frequency. The $1\\rightarrow2$ frequency can be obtained by taking the difference of the two. Unfortunately, for `ibmq_manila`, the maximum drive power of $1.0$ is not sufficient to see this transition. Instead, we turn to the second method.\n",
     "2. Excite the $|1\\rangle$ state by applying a $0\\rightarrow1$ $\\pi$ pulse. Then perform the frequency sweep over excitations of the $|1\\rangle$ state. A single peak should be observed at a frequency lower than the $0\\rightarrow1$ frequency which corresponds to the $1\\rightarrow2$ frequency."
    ]
   },

content/ch-states/atoms-computation.ipynb

@@ -4718,7 +4718,7 @@
     "\n",
     "The dashed lines in the image are just to distinguish the different parts of the circuit (although they can have more interesting uses too). They are made by using the `barrier` command.\n",
     "\n",
-    "The basic operations of computing are known as logic gates. We’ve already used the NOT gate, but this is not enough to make our half adder. We could only use it to manually write out the answers. Since we want the computer to do the actual computing for us, we’ll need some more powerful gates.\n",
+    "The basic building blocks of computers are known as logic gates. We’ve already used the NOT gate, but this is not enough to make our half adder. We could only use it to manually write out the answers. Since we want the computer to do the actual computing for us, we’ll need some more powerful gates.\n",
     "\n",
     "To see what we need, let’s take another look at what our half adder needs to do.\n",
     "\n",