Merge branch 'master' into v0.12

mwaskom · mwaskom · commit df31a75de8ea · 2022-10-17T20:35:11.000-04:00
diff --git a/doc/_docstrings/objects.Agg.ipynb b/doc/_docstrings/objects.Agg.ipynb
@@ -76,7 +76,7 @@
    "id": "555394c1-25f8-4932-94d1-f67a8a9fa1c6",
    "metadata": {},
    "source": [
-    "When other mapping variables are assigned, they'll be used to define aggregation groups. With some marks, it may be helpful to use additional transforms, such as :class:`objects.Dodge`:"
+    "When other mapping variables are assigned, they'll be used to define aggregation groups. With some marks, it may be helpful to use additional transforms, such as :class:`Dodge`:"
    ]
   },
   {
@@ -94,7 +94,7 @@
    "id": "07eb1150-db57-4a58-b830-8a7aba9f46ec",
    "metadata": {},
    "source": [
-    "The variable that gets aggregated depends on the orientation of the layer, which is usually inferred from the coordinate variable types (but may also be specified with the `orient` parameter in :meth:`objects.Plot.add`):"
+    "The variable that gets aggregated depends on the orientation of the layer, which is usually inferred from the coordinate variable types (but may also be specified with the `orient` parameter in :meth:`Plot.add`):"
    ]
   },
   {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@`
`76`	`76`	`"id": "555394c1-25f8-4932-94d1-f67a8a9fa1c6",`
`77`	`77`	`"metadata": {},`
`78`	`78`	`"source": [`
`79`		- "When other mapping variables are assigned, they'll be used to define aggregation groups. With some marks, it may be helpful to use additional transforms, such as :class:`objects.Dodge`:"
	`79`	+ "When other mapping variables are assigned, they'll be used to define aggregation groups. With some marks, it may be helpful to use additional transforms, such as :class:`Dodge`:"
`80`	`80`	`]`
`81`	`81`	`},`
`82`	`82`	`{`
`@@ -94,7 +94,7 @@`
`94`	`94`	`"id": "07eb1150-db57-4a58-b830-8a7aba9f46ec",`
`95`	`95`	`"metadata": {},`
`96`	`96`	`"source": [`
`97`		- "The variable that gets aggregated depends on the orientation of the layer, which is usually inferred from the coordinate variable types (but may also be specified with the `orient` parameter in :meth:`objects.Plot.add`):"
	`97`	+ "The variable that gets aggregated depends on the orientation of the layer, which is usually inferred from the coordinate variable types (but may also be specified with the `orient` parameter in :meth:`Plot.add`):"
`98`	`98`	`]`
`99`	`99`	`},`
`100`	`100`	`{`