Commits

Thomas Waldmann committed cfef35e

install/serve docs: some clarifications about locating the wiki config, running in single/multi threaded mode

  • Participants
  • Parent commits 3d7bae5

Comments (0)

Files changed (2)

docs/admin/install.rst

  # or
  env\Scripts\activate.bat  # for windows
 
+As you have activated the virtual env now, the moin command should be in your
+path now, so you can just invoke it using "moin".
+
+Letting moin find the wiki configuration
+----------------------------------------
+
+moin needs to find the wiki configuration. If you want it to run in the most
+simple way (without giving parameters to the moin command), it is easiest if
+you are in the same directory as the configuration files (e.g. wikiconfig.py).
+
+If you are working from a repository workdir, this is just the top level
+directory and there is already a ready-to-use wikiconfig.py.
+
+In case you want to just give the configuration file location, make sure you
+use an **absolute path**. moin will try to find its configuration in this
+order:
+
+- command line argument `--config /path/to/wikiconfig.py`
+- environment variable `MOINCFG=/path/to/wikiconfig.py`
+- current directory, file `wikiconfig_local.py`
+- current directory, file `wikiconfig.py`
+
 Initializing index and/or storage
 ---------------------------------
 If you have an existing storage AND a valid index (for this storage’s content, and for this moin version),

docs/admin/serve.rst

 ---------------------------
 Then you can run the moin built-in server by::
 
+ # easiest for debugging (single-process, single-threaded server):
  moin
+
+ # required for some browsers like IE9 or Chrome in incognito mode (try this
+ # in case you encounter a hanging browser / not responding server):
+ moin moin --threaded
+
  # or, if you need another ip/port:
  moin moin --config /path/to/wikiconfig.py --host 1.2.3.4 --port 7777
 
-MoinMoin will start the built-in server and try to locate the wiki configuration
-from one of the following: **NOTE: please use an absolute path**
-
-- command line argument `--config /path/to/wikiconfig.py`
-- environment variable `MOINCFG=/path/to/wikiconfig.py`
-- current directory, file `wikiconfig_local.py`
-- current directory, file `wikiconfig.py`
-
 While the moin server is starting up, you will see some log output, for example::
 
  2011-03-06 23:35:11,445 INFO werkzeug:116  * Running on http://127.0.0.1:8080/