web commit by EthanGlasserCamp: Oops, this is what the patch actually says!

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 6da466b90eb5e3db801761d762d3ae27ca0f7686..dd1a9be8c441737a1bb6764abf780af6d39add2f 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -26,8 +26,6 @@ you through setting up a wiki that is stored in [[Subversion]], [[Git]],
                mkdir /tla
                tla make-archive me@localhost--wiki /tla/wikirepo
                tla my-id "<me@localhost>"
                mkdir /tla
                tla make-archive me@localhost--wiki /tla/wikirepo
                tla my-id "<me@localhost>"

-               # Edit {arch}/=tagging-method and change the precious
-               # line to add the .ikiwiki directory to the regexp.

 
                # Mercurial
                hg init /hg/wikirepo
 
                # Mercurial
                hg init /hg/wikirepo


@@ -47,6 +45,8 @@ you through setting up a wiki that is stored in [[Subversion]], [[Git]],
                cd ~/wikiwc
                tla archive-setup me@localhost--wiki/wiki--0
                tla init-tree me@localhost--wiki/wiki--0
                cd ~/wikiwc
                tla archive-setup me@localhost--wiki/wiki--0
                tla init-tree me@localhost--wiki/wiki--0

+               # Edit {arch}/=tagging-method and change the precious
+               # line to add the .ikiwiki directory to the regexp.

                tla import
 
                # Mercurial
                tla import
 
                # Mercurial


@@ -114,7 +114,7 @@ you through setting up a wiki that is stored in [[Subversion]], [[Git]],
    subversion configuration, and uncomment and edit the configuration for
    your chosen RCS.
 
    subversion configuration, and uncomment and edit the configuration for
    your chosen RCS.
 

-   Note that the default file has a block to configure an [[post-commit]] 
+   Note that the default file has a block to configure a [[post-commit]] 

    wrapper to update the wiki. You need to uncomment the related block for
    whatever RCS you use and comment out the other rcs blocks.
 
    wrapper to update the wiki. You need to uncomment the related block for
    whatever RCS you use and comment out the other rcs blocks.
 


@@ -139,4 +139,4 @@ you through setting up a wiki that is stored in [[Subversion]], [[Git]],
    
    Then run `ikiwiki --setup ikiwiki.setup` again.
 
    
    Then run `ikiwiki --setup ikiwiki.setup` again.
 

-10. Enjoy your new wiki! Add yourself to [[IkiWikiUsers]]
+10. Enjoy your new wiki! Add yourself to [[IkiWikiUsers]].