diff --git a/docs/content/content-blocks.md b/docs/content/content-blocks.md
index f331af41..4ef45490 100644
--- a/docs/content/content-blocks.md
+++ b/docs/content/content-blocks.md
@@ -141,10 +141,17 @@ If you'd like in-line margin content with numbered references, see [](margin:sid
 
 Here's how you can use the `{margin}` directive:
 
-````{example}
-:no-container:
-:reverse:
+```{margin} **Here is my margin content**
+It is pretty cool!
+```
+
+:::{important}
+The `{margin}` directive should not be nested under other elements such as topics or admonitions.
+:::
+
+**Source**
 
+````
 ```{margin} **Here is my margin content**
 It is pretty cool!
 ```
@@ -217,12 +224,17 @@ We can reference the figure with {ref}`myfig4`. Or a numbered reference like
 
 Margin content can include all kinds of things, such as code blocks:
 
+**Code blocks in the margin**
+
 ````{margin} Code blocks in margins
 ```python
 print("here is some python")
 ```
 ````
 
+**Source**
+
+`````
 ````{margin} Code blocks in margins
 ```python
 print("here is some python")
@@ -230,10 +242,18 @@ print("here is some python")
 ````
 `````
 
-`````{example} Admonitions and images in the margin
-:no-container:
-:reverse:
+**Admonitions and images in the margin**
 
+````{margin} **Notes in margins**
+```{note}
+Wow, a note with an image in a margin!
+![](../images/cool.jpg)
+```
+````
+
+**Source**
+
+`````
 ````{margin} **Notes in margins**
 ```{note}
 Wow, a note with an image in a margin!
@@ -249,9 +269,16 @@ page to flow around them, rather than moving to the right margin.
 
 To add content sidebars, use this syntax:
 
-`````{example}
-:no-container:
+````{sidebar} **My sidebar title**
+```{note}
+Here is my sidebar content, it is pretty cool!
+```
+![](../images/cool.jpg)
+````
 
+**Source**
+
+`````
 ````{sidebar} **My sidebar title**
 ```{note}
 Here is my sidebar content, it is pretty cool!
@@ -265,6 +292,10 @@ However, the sidebar text will still be in line with your content. There are
 certain kinds of elements, such as "note" blocks and code cells, that may
 clash with your sidebar. If this happens, try using a `{margin}` instead.
 
+:::{important}
+The `{sidebar}` directive should not be nested under other elements such as topics or admonitions.
+:::
+
 ## Full-width content
 
 Full-width content extends into the right margin, making it stand out against
diff --git a/docs/contributing/setup.md b/docs/contributing/setup.md
index 94db9b13..d1e7404e 100644
--- a/docs/contributing/setup.md
+++ b/docs/contributing/setup.md
@@ -39,17 +39,17 @@ Follow these steps:
    $ pre-commit install
    ```
 
-   :::{margin}
-   You can also run pre-commit via `tox`:
-   ```console
-   $ tox -e py38-pre-commit -- --all
-   ```
-   or manually run all `pre-commit` jobs for this repository:
+:::{margin}
+You can also run pre-commit via `tox`:
+```console
+$ tox -e py38-pre-commit -- --all
+```
+or manually run all `pre-commit` jobs for this repository:
 
-   ```console
-   $ pre-commit run --all-files
-   ```
-   :::
+```console
+$ pre-commit run --all-files
+```
+:::
 
 The rest of these instructions use `tox` to automate the installation and commands necessary to do many common things.