From 88d7896494c030131fe19d8a05b63af3d4b181bb Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 18 Dec 2012 04:27:14 -0400 Subject: This reverts commit a877cc5d4caeab4f6f369fd1f1aa7520edb7e05f --- doc/examples/blog/posts/test.html | 1405 ------------------------------------- 1 file changed, 1405 deletions(-) delete mode 100644 doc/examples/blog/posts/test.html diff --git a/doc/examples/blog/posts/test.html b/doc/examples/blog/posts/test.html deleted file mode 100644 index 6edc04738..000000000 --- a/doc/examples/blog/posts/test.html +++ /dev/null @@ -1,1405 +0,0 @@ - - - -CNN.com - Breaking News, U.S., World, Weather, Entertainment & Video News - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- -
- -
-
- -
-
-
updated 12:12 PM EST, Mon December 17, 2012
- - -
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-

'We have wept with you'

-
-
-

Newtown begins saying goodbyes

-

-

-
-A day after President Obama told a packed auditorium in Newtown that he would use "whatever power" he has to prevent more tragedies, the first funerals for the 20 children killed will be held. FULL STORY -
-
-
- - -
-

-
-
-
-
-
-
-
- -
-
-
-
-
- -
- -
- -
-
-
-
-
- -
- - - - - -
- - - -
-
-
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-CNN TV live all day from Newtown -
-
Latest massacre updates
-
-
-
-
-
-
-
-
-
-
-'OutFront': Hearing from her friends -
-
Remembering Nancy Lanza
-
-
-
-
-
-
-
-
-
-
-'AC360' looks back at her life -
-
6-year-old Newtown victim
-
-
-
-
-
-
-
-
-
-
-A new perspective on 'Starting Point' -
-
Mind of young shooter
-
-
-
-
-
-
-
-
-
-
-Piers Morgan and guests weigh in -
-
Gun control debate
-
-
-
-
-
-
-
-
-
-
-Be part of Piers Morgan audience Wed. -
-
Town hall after tragedy
-
-
-
-
-
-
-
-
-
-
-'AC360' has the emotional interview -
-
Principal's family speaks
-
-
-
-
-
-
-
-
-
-
-'Piers Morgan Tonight' tribute -
-
Remembering young victims
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
CNN Radio | HLN | Full Schedule
-
-
-
-
- -
-
-
Markets
-
- -
-
-
-
-
Weather
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-

U.S.

-
-
- -
-
More
-
-
-
-
-
-
-
-

World

-
-
- -
-
More
-
-
-
-
-
-
-
-

Politics

-
-
- -
-
More
-
-
-
-
-
-
-
-

Video

-
-
- -
-
More
-
-
-
-
-
-
-
-
-
-
-
-

Tech

-
-
- -
-
More
-
-
-
-
-
-
-
-

Business

-
-
- -
-
More
-
-
-
-
-
-
-
-

Opinion

-
-
- -
-
More
-
-
-
-
-
-
-
-

Popular on Facebook

-
-
-
    - - - -
- -
-
-
-
-
-
-
-
-
-
-
-
-

Entertainment

-
-
- -
-
More
-
-
-
-
-
-
-
-

Travel

-
-
- -
-
More
-
-
-
-
-
-
-
-

Living

-
-
- -
-
More
-
-
-
-
-
- - -
-
-
-
-
-
-
-
-
-

Health

-
-
- -
-
More
-
-
-
-
-
-
-
-

Best photos

-
-
- -
-
More
-
-
-
-
-
-
-
-

Sports

-
-
- -
-
More
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

HLNtv.com

-
-
- -
-
More
-
-
-
-
-
-
-
-

SI.com

-
-
- -
-
More
-
-
-
-
-
-
-
-

Play CNN Games!

-
-
-
    - - - -
- -

- -
-
More
-
-
-
-
-
- -
-

Quick vote

- - -
-
- -
Do you own a gun?
-
-
    -
    • - -
    • - -
-
- -
-
-
or view results
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
- -

TV & Video

-
-
-
- - -
-
-
    -
  • CNN Radio
    • -
  • HLN
    • -
  • Full Schedule
    • -
  • -
    - -
    -
    • -
-

Must Watch TV

-
    -
  1. SoledadStarting Point
    7am ET / 4am PT on CNN
    2. -
  2. The Situation RoomThe Situation Room
    4pm ET / 1pm PT on CNN
    3. -
  3. Erin Burnett: OutFrontErin Burnett: OutFront
    7pm ET / 4pm PT on CNN
    4. -
  4. AC 360AC 360
    8pm ET/PT on CNN
    5. -
  5. Piers Morgan TonightPiers Morgan Tonight
    9pm ET/PT on CNN
    6. -
- -

Trending Video

- - -
-
-
-
-
- - -
- -
ADVERTISEMENT
- - - -
- - - - - - - -
ADVERTISEMENT
- -
ADVERTISEMENT
- - - - - - - - - -
- - - -- cgit v1.2.3 From 5e202a079cda8ee84dd44be906d2912ecd7c6e7a Mon Sep 17 00:00:00 2001 From: "http://mildred.fr/" Date: Tue, 18 Dec 2012 10:12:31 -0400 Subject: Added a comment: git-annex --- .../comment_1_df8a9f4249af435cc335f77768a3278d._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/ikiwiki_and_big_files/comment_1_df8a9f4249af435cc335f77768a3278d._comment diff --git a/doc/forum/ikiwiki_and_big_files/comment_1_df8a9f4249af435cc335f77768a3278d._comment b/doc/forum/ikiwiki_and_big_files/comment_1_df8a9f4249af435cc335f77768a3278d._comment new file mode 100644 index 000000000..4ab5b52ee --- /dev/null +++ b/doc/forum/ikiwiki_and_big_files/comment_1_df8a9f4249af435cc335f77768a3278d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://mildred.fr/" + ip="2a01:e35:2f7b:8350:8d29:c70d:c3e:d110" + subject="git-annex" + date="2012-12-18T14:12:31Z" + content=""" +I suppose we could use git-annex to do that. The question is: does the Git plugin in ikiwiki supports git-annex ? I'd hope so. +"""]] -- cgit v1.2.3 From 8308d0d5563cd659ac82344224258245a4d76084 Mon Sep 17 00:00:00 2001 From: Theo Date: Tue, 18 Dec 2012 10:46:14 -0400 Subject: Added some hint for users --- doc/plugins/theme.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index d74784ac2..5261df111 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -8,7 +8,7 @@ inside `/usr/share/ikiwiki/themes/`. See [[themes]] for an overview of the themes included in ikiwiki and the [[theme market]] for third party themes. You can set the theme via the **theme** option in your config file (after -enabling the plugin). Refresh the wiki after changing it to see the changes. +enabling the plugin). Refresh the wiki (with `ikiwiki -setup `, `--setup` won't work, they are not interchangable) after changing it to see the changes. Hints for theme builders ------------------------ -- cgit v1.2.3 From 828d991dcd52468afb13e4183e3cceb8d59bf72d Mon Sep 17 00:00:00 2001 From: Theo Date: Tue, 18 Dec 2012 10:53:31 -0400 Subject: --- doc/setup.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index ce51faa6d..3f6c168af 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -143,3 +143,7 @@ setup file. Add yourself to [[IkiWikiUsers]]. And check out the [[tips]] to find out how to get more out of ikiwiki. + +---- + +_Note: If you are searching for the file where the users are stored, it's in `your_repository/.ikiwiki/userdb`. The one which is in YOUR REPOSITORY, it cannot be found into your ~/.ikiwiki._ -- cgit v1.2.3 From b84fa3a254649ac0f1581488ae50aada9f0a93f4 Mon Sep 17 00:00:00 2001 From: Theo Date: Tue, 18 Dec 2012 10:54:01 -0400 Subject: --- doc/setup.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 3f6c168af..c05093f67 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -146,4 +146,4 @@ the [[tips]] to find out how to get more out of ikiwiki. ---- -_Note: If you are searching for the file where the users are stored, it's in `your_repository/.ikiwiki/userdb`. The one which is in YOUR REPOSITORY, it cannot be found into your ~/.ikiwiki._ +_Note: If you are searching for the file where the users are stored, it's in `your_repository/.ikiwiki/userdb`. The one which is in YOUR REPOSITORY, it cannot be found into your `~/.ikiwiki`._ -- cgit v1.2.3 From 4638aff119e1b5a959cc02fdc8dbe6f8728c7f48 Mon Sep 17 00:00:00 2001 From: "http://mildred.fr/" Date: Tue, 18 Dec 2012 11:42:25 -0400 Subject: --- .../How_to_set_up_git_repository_hook___63__.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/forum/How_to_set_up_git_repository_hook___63__.mdwn diff --git a/doc/forum/How_to_set_up_git_repository_hook___63__.mdwn b/doc/forum/How_to_set_up_git_repository_hook___63__.mdwn new file mode 100644 index 000000000..34bc4ace2 --- /dev/null +++ b/doc/forum/How_to_set_up_git_repository_hook___63__.mdwn @@ -0,0 +1,19 @@ +Hi, + +I want to set up hooks for Git, and I don't know how to. Is there any documentation somewhere? Basically, I'd like to do what [[/ikiwiki-makerepo]] does, but manually. + +Why? Because I want to have a special layout to my repository. Especially, I want to include at the root level some special files: + +- the nginx configuration +- the script that installs the nginx configuration to the system +- the script that starts the fast-cgi wrapper +- the `ikiwiki.setup` file +- ... + +And I want the ikiwiki sources to be in a subdirectory `src/` and the generated files in `out/` (where the nginx configuration points). + +So, what is the special `post-update` hook generated by [[/ikiwiki-makerepo]]? I noticed it was an ELF file, why not a script? What does it do? + +Thanks, + +Mildred -- cgit v1.2.3 From 7f534f034840993fd3ea0d9d67ca79ad3d8e5b7e Mon Sep 17 00:00:00 2001 From: Theo Date: Tue, 18 Dec 2012 12:16:53 -0400 Subject: Added debian package names, so people won't assume the dependencies will be resolved when installing `xapian-omega` --- doc/plugins/search.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn index e95739cf3..f116649c1 100644 --- a/doc/plugins/search.mdwn +++ b/doc/plugins/search.mdwn @@ -5,7 +5,7 @@ This plugin adds full text search to ikiwiki, using the [xapian](http://xapian.org/) engine, its [omega](http://xapian.org/docs/omega/overview.html) frontend, and the [[!cpan Search::Xapian]], [[!cpan Digest::SHA]], and [[!cpan HTML::Scrubber]] -perl modules. +perl modules (on debian, check that you have packages `libsearch-xapian-perl`, `libdigest-sha-perl` and `libhtml-scrubber-perl` installed). The [[ikiwiki/searching]] page describes how to write search queries. -- cgit v1.2.3 From 130fd91a6926990ba8fc3a132a81e55c61d16270 Mon Sep 17 00:00:00 2001 From: Theo Date: Tue, 18 Dec 2012 12:41:45 -0400 Subject: Added some warning. --- doc/setup.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/setup.mdwn b/doc/setup.mdwn index c05093f67..bdbe323fd 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -146,4 +146,7 @@ the [[tips]] to find out how to get more out of ikiwiki. ---- -_Note: If you are searching for the file where the users are stored, it's in `your_repository/.ikiwiki/userdb`. The one which is in YOUR REPOSITORY, it cannot be found into your `~/.ikiwiki`._ +_Notes_: + +- If you are searching for the file where the users are stored, it's in `your_repository/.ikiwiki/userdb`. The one which is in YOUR REPOSITORY, it cannot be found into your `~/.ikiwiki`. +- If you want to enable a plugin you **WILL HAVE** to add it to the `add_plugins` array in the `*.setup` file (or to use the `--plugin` switch while calling `ikiwiki`). Uncommenting the plugin options/configuration fields in the setup is not **ALWAYS** sufficient. You have been warned. -- cgit v1.2.3