From 99b80c57dbf98840065082a77dc498525c8d38cc Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:07:34 -0400 Subject: --- doc/examples/blog.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/examples') diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 5f8f6c3ce..23a5e440b 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]]. + to display on the [[index]] [[du lich|http://didaudidau.vn]]. * Enable the [[comments|plugins/comments]] plugin to enable comments to posts to the blog. -- cgit v1.2.3 From f0cbd662fdb615a4b5c0715c06bc375f9d81f4ad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Nov 2011 12:17:09 -0400 Subject: 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(-) (limited to 'doc/examples') 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]] -- cgit v1.2.3 From 1d1447323474a00d4d479fcdfd4daa85a6e0eecf Mon Sep 17 00:00:00 2001 From: "http://jno.homeip.net/owncloud/?jno" Date: Fri, 20 Jan 2012 06:54:14 -0400 Subject: тест MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "doc/examples/blog/posts/\321\204.mdwn" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "doc/examples/blog/posts/\321\204.mdwn" (limited to 'doc/examples') diff --git "a/doc/examples/blog/posts/\321\204.mdwn" "b/doc/examples/blog/posts/\321\204.mdwn" new file mode 100644 index 000000000..89a5511a7 --- /dev/null +++ "b/doc/examples/blog/posts/\321\204.mdwn" @@ -0,0 +1 @@ +проба пера -- cgit v1.2.3 From efbae4b0f93e53cf2bbe3e0dcac66895ffc83a0c Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~vanyok" Date: Fri, 20 Jan 2012 08:42:51 -0400 Subject: some test records --- "doc/examples/blog/posts/Tec\321\202.html" | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 "doc/examples/blog/posts/Tec\321\202.html" (limited to 'doc/examples') diff --git "a/doc/examples/blog/posts/Tec\321\202.html" "b/doc/examples/blog/posts/Tec\321\202.html" new file mode 100644 index 000000000..8c922ac89 --- /dev/null +++ "b/doc/examples/blog/posts/Tec\321\202.html" @@ -0,0 +1,3 @@ +

Русские идут. Русские пришли. ^_^

+

Всем большой привет!

+

-- cgit v1.2.3 From 493a228e5ba0d10f4821d41bda0072c675c7fd4c Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~vanyok" Date: Fri, 20 Jan 2012 08:44:44 -0400 Subject: oops! This reverts commit efbae4b0f93e53cf2bbe3e0dcac66895ffc83a0c --- "doc/examples/blog/posts/Tec\321\202.html" | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 "doc/examples/blog/posts/Tec\321\202.html" (limited to 'doc/examples') diff --git "a/doc/examples/blog/posts/Tec\321\202.html" "b/doc/examples/blog/posts/Tec\321\202.html" deleted file mode 100644 index 8c922ac89..000000000 --- "a/doc/examples/blog/posts/Tec\321\202.html" +++ /dev/null @@ -1,3 +0,0 @@ -

Русские идут. Русские пришли. ^_^

-

Всем большой привет!

-

-- cgit v1.2.3 From 55de24cb64b51f45ad23502cb17349547056ada0 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 20 Jan 2012 10:00:50 -0400 Subject: clean example blog This reverts commit 1d1447323474a00d4d479fcdfd4daa85a6e0eecf --- "doc/examples/blog/posts/\321\204.mdwn" | 1 - 1 file changed, 1 deletion(-) delete mode 100644 "doc/examples/blog/posts/\321\204.mdwn" (limited to 'doc/examples') diff --git "a/doc/examples/blog/posts/\321\204.mdwn" "b/doc/examples/blog/posts/\321\204.mdwn" deleted file mode 100644 index 89a5511a7..000000000 --- "a/doc/examples/blog/posts/\321\204.mdwn" +++ /dev/null @@ -1 +0,0 @@ -проба пера -- cgit v1.2.3 From 02898461f24530159b37fcae22a8b79c86b12091 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jan 2012 15:16:13 -0400 Subject: cleanup --- doc/examples/blog/posts/Discussion.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/examples/blog/posts/Discussion.mdwn (limited to 'doc/examples') diff --git a/doc/examples/blog/posts/Discussion.mdwn b/doc/examples/blog/posts/Discussion.mdwn deleted file mode 100644 index f04a9558d..000000000 --- a/doc/examples/blog/posts/Discussion.mdwn +++ /dev/null @@ -1 +0,0 @@ -foo bar. -- cgit v1.2.3 From e8dfb79a80103c70371b8c741ecac1e80936a63c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm3nkx3XijKnsGW7VLDQW0SrfY2Hs0GKmM" Date: Tue, 31 Jan 2012 00:55:11 -0400 Subject: A comment. --- doc/examples/blog/posts/Test_Post.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/examples/blog/posts/Test_Post.mdwn (limited to 'doc/examples') diff --git a/doc/examples/blog/posts/Test_Post.mdwn b/doc/examples/blog/posts/Test_Post.mdwn new file mode 100644 index 000000000..e416c235f --- /dev/null +++ b/doc/examples/blog/posts/Test_Post.mdwn @@ -0,0 +1,7 @@ +## Test Post + +This is a quick test of *ikiwiki*. The quick brown dog jumps over the lazy dog and now is the time for all good men to come to the aid of the party. + +### Some More Stuff + +And here is a new paragraph. -- cgit v1.2.3 From 8fe55be60df09ce69a0c9453770d8b5bc5188138 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Wed, 1 Feb 2012 06:40:26 -0400 Subject: clean example blog This reverts commit e8dfb79a80103c70371b8c741ecac1e80936a63c --- doc/examples/blog/posts/Test_Post.mdwn | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 doc/examples/blog/posts/Test_Post.mdwn (limited to 'doc/examples') diff --git a/doc/examples/blog/posts/Test_Post.mdwn b/doc/examples/blog/posts/Test_Post.mdwn deleted file mode 100644 index e416c235f..000000000 --- a/doc/examples/blog/posts/Test_Post.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -## Test Post - -This is a quick test of *ikiwiki*. The quick brown dog jumps over the lazy dog and now is the time for all good men to come to the aid of the party. - -### Some More Stuff - -And here is a new paragraph. -- cgit v1.2.3