diff --git a/docs/wipy/general.rst b/docs/wipy/general.rst
index 49e48acd4..bcbbe53d7 100644
--- a/docs/wipy/general.rst
+++ b/docs/wipy/general.rst
@@ -43,6 +43,8 @@ For instance, on a linux shell (when connected to the WiPy in AP mode)::
 
    $ telnet 192.168.1.1
 
+.. _wipy_filesystem:
+
 Local file system and FTP access
 --------------------------------
 
diff --git a/docs/wipy/tutorial/index.rst b/docs/wipy/tutorial/index.rst
index 90523d0dc..c3d51e2e5 100644
--- a/docs/wipy/tutorial/index.rst
+++ b/docs/wipy/tutorial/index.rst
@@ -4,7 +4,7 @@ WiPy tutorials and examples
 ===========================
 
 Before starting, make sure that you are running the latest firmware,
-for instrucctions see :ref:`OTA How-To <wipy_firmware_upgrade>`.
+for instructions see :ref:`OTA How-To <wipy_firmware_upgrade>`.
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/wipy/tutorial/repl.rst b/docs/wipy/tutorial/repl.rst
index 87b296f88..ef69d9144 100644
--- a/docs/wipy/tutorial/repl.rst
+++ b/docs/wipy/tutorial/repl.rst
@@ -6,9 +6,11 @@ interactive MicroPython prompt that you can access on the WiPy.  Using
 the REPL is by far the easiest way to test out your code and run commands.
 You can use the REPL in addition to writing scripts in ``main.py``.
 
+.. _wipy_uart:
+
 To use the REPL, you must connect to the WiPy either via :ref:`telnet <wipy_telnet>`,
-or with a USB to serial converter wired to the one the two UARTs on the
-WiPy. To enable REPL duplication on UART0 (the one accesible via the expansion board)
+or with a USB to serial converter wired to one of the two UARTs on the
+WiPy. To enable REPL duplication on UART0 (the one accessible via the expansion board)
 do::
 
    >>> from machine import UART
diff --git a/docs/wipy/tutorial/wlan.rst b/docs/wipy/tutorial/wlan.rst
index 396bbac0f..434367cd9 100644
--- a/docs/wipy/tutorial/wlan.rst
+++ b/docs/wipy/tutorial/wlan.rst
@@ -13,6 +13,15 @@ You can check the current mode (which is always ``WLAN.AP`` after power up)::
 
    >>> wlan.mode()
 
+.. warning:: 
+    When you change the WLAN mode following the instructions below, your WLAN 
+    connection to the WiPy will be broken. This means you will not be able 
+    to run these commands interactively over the WLAN.
+
+    There are two ways around this::
+     1. put this setup code into your :ref:`boot.py file<wipy_filesystem>` so that it gets executed automatically after reset.
+     2. :ref:`duplicate the REPL on UART <wipy_uart>`, so that you can run commands via USB.
+
 Connecting to your home router
 ------------------------------
 
@@ -22,6 +31,7 @@ it as a station::
    from network import WLAN
    wlan = WLAN(mode=WLAN.STA)
 
+
 Now you can proceed to scan for networks::
 
     nets = wlan.scan()