From f0cbd662fdb615a4b5c0715c06bc375f9d81f4ad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Nov 2011 12:17:09 -0400 Subject: [PATCH] Revert multiple spams --- doc/examples.mdwn | 2 +- doc/examples/blog.mdwn | 2 +- doc/rcs.mdwn | 2 +- doc/rcs/git.mdwn | 4 +--- doc/recentchanges.mdwn | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/doc/examples.mdwn b/doc/examples.mdwn index fe1d82a85..e24973b69 100644 --- a/doc/examples.mdwn +++ b/doc/examples.mdwn @@ -5,7 +5,7 @@ page gives some examples of ways to use ikiwiki. * [[softwaresite]] - a website for some software package, the package can also build static html docs from its wiki -Each example [[du lich|http://didaudidau.vn]] is contained in its own subdirectory; just copy the source +Each example is contained in its own subdirectory; just copy the source files into your wiki to start using one of the examples. The [[tips]] page has some other ideas for ways to use ikiwiki, and the diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 23a5e440b..5f8f6c3ce 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -16,7 +16,7 @@ Some additional configuration you might want to do, if not using \[[!tag life]] * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud - to display on the [[index]] [[du lich|http://didaudidau.vn]]. + to display on the [[index]]. * Enable the [[comments|plugins/comments]] plugin to enable comments to posts to the blog. diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index c304572c3..1f6b3c24e 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -11,7 +11,7 @@ generic that it can be adapted to work with many systems by writing a While all supported revision control systems work well enough for basic use, some advanced or special features are not supported in all of them. The table below summarises this for each revision control system and -links to more information about each [[du lich|http://didaudidau.vn]]. +links to more information about each. [[!table data=""" feature |[[git]]|[[svn]]|[[bzr]] |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]] |[[cvs]] diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index 85fa862e0..b4f639c61 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -114,7 +114,5 @@ the first time you run setup.) Use standard git commands to handle pulling from and pushing to the server. **Note**: After pulling changes from the bare root repository, you will need to manually update the local wiki, with a command such as `ikiwiki --setup localwiki.setup -refresh`. You [[Du lich|http://didaudidau.vn]] could use git's `post-merge` hook +-setup localwiki.setup -refresh`. You could use git's `post-merge` hook to automate that command. - - diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index 2b5d55516..3383fc703 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -4,5 +4,4 @@ Recent changes to this wiki: [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" -template=recentchanges show=0]][[du lich|http://didaudidau.vn]] - +template=recentchanges show=0]] -- 2.26.2