on javascript, plugins, and htmlscrubber

[git.ikiwiki.info.git] / doc / setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 4ad64d73b06639f9f984699b7afb8a2ea58422a4..3ea0022ccfc18ed09331924f7e9b5a25db25df17 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -89,7 +89,7 @@ These range from changing the wiki's name, to enabling [[plugins]],
 to banning users and locking pages.
 
 If you log in as the admin user you configured earlier, and go to
 to banning users and locking pages.
 
 If you log in as the admin user you configured earlier, and go to

-your Preferences page, you can click on "Wiki Setup" to customize many
+your Preferences page, you can click on "Setup" to customize many

 wiki settings and plugins.
 
 Some settings cannot be configured on the web, for security reasons or
 wiki settings and plugins.
 
 Some settings cannot be configured on the web, for security reasons or


@@ -105,7 +105,7 @@ After making changes to this file, you need to tell ikiwiki to use it:
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,

-and outputs the files to a destination directory [write my essay](http://custom-essay-writing-service.org/faq.php). The source directory is
+and outputs the files to a destination directory. The source directory is

 a working copy checked out from the version control system repository.
 
 When you used `auto.setup`, ikiwiki put the source directory, destination
 a working copy checked out from the version control system repository.
 
 When you used `auto.setup`, ikiwiki put the source directory, destination


@@ -118,7 +118,7 @@ First, move the destination directory and repository around.
        % mv public_html/foo /srv/web/foo.com
        % mv foo.git /srv/git/foo.git
 
        % mv public_html/foo /srv/web/foo.com
        % mv foo.git /srv/git/foo.git
 

-If you moved the repository to a new location [buy reports](http://essaywritingservices.org/book-report.php), checkouts pointing at the
+If you moved the repository to a new location, checkouts pointing at the

 old location won't work, and the easiest way to deal with this is to delete
 them and re-checkout from the new repository location.
    
 old location won't work, and the easiest way to deal with this is to delete
 them and re-checkout from the new repository location.