Commits

Thomas Waldmann committed f4308cd

improved docs

  • Participants
  • Parent commits 23c10f5

Comments (0)

Files changed (5)

File docs/admin/install.rst

 
 Alternative 1 (using Mercurial DVCS)::
 
- $ hg clone http://hg.moinmo.in/moin/2.0 moin2
+ $ hg clone http://hg.moinmo.in/moin/2.0 moin-2.0
 
 Alternative 2:
 Visit http://hg.moinmo.in/moin/2.0 with your web browser, download the tgz
 
  ./quickinstall  # for linux (or other posix OSes)
  # or
- quickinstall.cmd  # for windows
+ quickinstall.bat  # for windows
 
 This will use virtualenv to create a directory `env/` and create a virtual
 environment for moin there and then install moin2 including all dependencies

File docs/admin/requirements.rst

 Requirements
 ============
 
-MoinMoin requires Python >= 2.6, we recommend using 2.6.x.
+MoinMoin requires Python >= 2.6 and < 3.0.
 
-Python 3.x won't work for MoinMoin for now.
-
-Python build options:
+Python build options (in case you have to build your own Python):
 
 * zlib support (required)
 * ucs4 (32bit unicode, recommended)
 * the builtin "moin" server (recommended for desktop wikis, testing,
   debugging, development, adhoc-wikis)
 * apache with mod_wsgi (recommended for bigger/busier wikis)
-* other WSGI-compatible servers
 * For cgi, fastcgi, scgi, ajp, ... you can use the "flup" middleware:
   http://trac.saddi.com/flup
-* For IIS 6.0 on Windows 2003, you can use a ISAPI-WSGI gateway:
-  http://code.google.com/p/isapi-wsgi/ v0.4.1 has been used successfully.
+* IIS with ISAPI-WSGI gateway: http://code.google.com/p/isapi-wsgi/
+* other WSGI-compatible servers or middlewares
 
 
 Dependencies (Python code)
 
 For dependency information of python libs, please see setup.py.
 
-If you use easy_install or pip, this is usually automatically dealt with.
+If you use easy_install or pip (or our ``quickinstall`` script),
+this is usually automatically dealt with.
 
 
 Dependencies (static files)
 
 This is stuff like javascript, java applets, etc.
 
+If you use our ``quickinstall`` script, this is usually automatically dealt
+with.
+
 If you are a Linux distributor you may want to package this software
 separately and adapt wikiconfig.py (or the defaults in
 MoinMoin/config/default.py).

File docs/admin/serve.rst

 Server options
 ==============
 
-There are basically 2 things needing configuration:
-
-* the web server (IP address, port, hostname, ...)
-* the MoinMoin wiki engine (how the wiki behaves)
-
 Builtin Web Server (easy)
 =========================
-Moin comes with some simple builtin web server (provided by werkzeug), which
+Moin comes with a simple builtin web server (provided by werkzeug), which
 is suitable for development, debugging, personal and small group wikis.
 
 It is not made for serving bigger loads, but it is easy to use.

File docs/intro/features.rst

 =============
 * Access Control Lists (ACLs)
 
-  - global (per backend)
+  - global (per storage backend)
   - local (per wiki item)
   - give rights like:
 
 * we store data of any type (text, images, audio, binary)
 * we separately store any metadata
 * everything is revisioned
-* all important metadata items are indexed
+* all important metadata is indexed
 
 Storage Backend Types
 ---------------------
 * Tags / Tag Cloud
 * Missing Items
 * Orphaned Items
-* What refers here?
+* "What refers here?" functionality
 * Sitemap
 * Macro support
 

File docs/intro/license.rst

 
 .. _license:
 
-License
-=======
-MoinMoin is licensed under the GNU GPL v2 (or any later version).
+.. literalinclude:: ../../LICENSE.txt
 
-For a FAQ about the GPL, a copy of the misc. GPL license versions, please see
-there: http://www.gnu.org/licenses/gpl.html
+For a FAQ about the GPL and a copy of the misc. GPL license versions,
+please see there: http://www.gnu.org/licenses/gpl.html
 
-Here is the GNU GPL v2 text:
+This is the GNU GPL version 2 (from file docs/licenses/COPYING):
 
 .. literalinclude:: ../licenses/COPYING