diff --git a/docs/publish.rst b/docs/publish.rst
index 96d67d58..489558d8 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -54,20 +54,12 @@ HTML files directly::
     firefox output/index.html
 
 Because the above method may have trouble locating your CSS and other linked
-assets, running a simple web server using Python will often provide a more
-reliable previewing experience.
+assets, running Pelican's simple built-in web server will often provide a more
+reliable previewing experience::
 
-For Python 2, run::
+    pelican --listen
 
-    cd output
-    python -m SimpleHTTPServer
-
-For Python 3, run::
-
-    cd output
-    python -m http.server
-
-Once the basic server has been started, you can preview your site at
+Once the web server has been started, you can preview your site at:
 http://localhost:8000/
 
 Deployment
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 4ad9416f..646dd987 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -50,18 +50,18 @@ Given that this example article is in Markdown format, save it as
 Generate your site
 ------------------
 
-From your site directory, run the ``pelican`` command to generate your site::
+From your project root directory, run the ``pelican`` command to generate your site::
 
     pelican content
 
-Your site has now been generated inside the ``output`` directory. (You may see
+Your site has now been generated inside the ``output/`` directory. (You may see
 a warning related to feeds, but that is normal when developing locally and can
 be ignored for now.)
 
 Preview your site
 -----------------
 
-Open a new terminal session, navigate to your generated output directory and
+Open a new terminal session, navigate to your project root directory, and
 run the following command to launch Pelican's web server::
 
     pelican --listen