diff --git a/docs/faq/index.rst b/docs/faq/index.rst
index 79cc8e98e6..e4b97407e5 100644
--- a/docs/faq/index.rst
+++ b/docs/faq/index.rst
@@ -22,7 +22,7 @@ before trying again.
 
 * Solution::
 
-  $ manage.py shell
+  $ mayan-edms.py shell
 
   >>> from django.db import connection
   >>> cursor = connection.cursor()
@@ -110,7 +110,7 @@ Django's development server doesn't serve static files unless the ``DEBUG``
 option is set to ``True``, this mode of operation should only be used for
 development or testing.  For production deployments the management command::
 
-  $ ./manage.py collectstatic
+  $ mayan-edms.py collectstatic
 
 should be used and the resulting ``static`` folder served from a webserver.
 For more information, read https://docs.djangoproject.com/en/dev/howto/static-files/
diff --git a/docs/topics/initial_import.rst b/docs/topics/initial_import.rst
index 55a15e33f8..0f84a434f6 100644
--- a/docs/topics/initial_import.rst
+++ b/docs/topics/initial_import.rst
@@ -5,24 +5,24 @@ Initial data loading
 Bulk document import
 --------------------
 
-**Mayan EDMS** has the ability to individually upload the contents of compressed 
-files, however by nature of being a web based application it is bounded by the 
-limitations of the HTTP protocol. This imposes a limit on the file size and 
-the amount of time **Mayan EDMS** may keep a connection open while it processes 
-compressed files.  When the desired amount of documents is bigger than what 
-these limitations allow, **Mayan EDMS** provides a command line tool for out of 
+**Mayan EDMS** has the ability to individually upload the contents of compressed
+files, however by nature of being a web based application it is bounded by the
+limitations of the HTTP protocol. This imposes a limit on the file size and
+the amount of time **Mayan EDMS** may keep a connection open while it processes
+compressed files.  When the desired amount of documents is bigger than what
+these limitations allow, **Mayan EDMS** provides a command line tool for out of
 process document importation.
 
 The command line options for this feature are as follows::
 
-  $ ./manage.py bulk_upload --noinput --metadata '{"project": "bulk"}' --document_type "Accounting documents" compressed.zip 
+  $ mayan-edms.py bulk_upload --noinput --metadata '{"project": "bulk"}' --document_type "Accounting documents" compressed.zip
 
 **Optional arguments**
 
 * The ``--noinput`` argument skips confirmation and starts the upload immediately.
 * The ``--metadata`` argument allows specifing what metadata will be assigned
   to the documents when uploaded.
-* And the ``--document_type`` applies a previously defined 
+* And the ``--document_type`` applies a previously defined
   document type to the uploaded documents.
 
 
@@ -34,9 +34,9 @@ includes a management command to import a large number of users
 from a CSV file.  The command line options for this feature are as
 follow::
 
-  $ ./manage.py import_users --noinput --password=welcome123 --skip-repeated user_list.csv 
+  $ mayan-edms.py import_users --noinput --password=welcome123 --skip-repeated user_list.csv
 
-The CSV field order must be: username, first name, last name and email, any columns after 
+The CSV field order must be: username, first name, last name and email, any columns after
 those are ignored.
 
 **Optional arguments**