From: Joey Hess Date: Thu, 20 Dec 2012 19:28:28 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: 3.20130212~47 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4f274e04544d5cb25f693e3590d32e181a13ea9e?hp=12c9219d671c672fedcf9e9ab7f9187b23b8f7f4 Merge branch 'master' of ssh://git.ikiwiki.info --- 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
- - - - - - - - - -
- - - 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 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. +"""]] 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. 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 ------------------------ diff --git a/doc/setup.mdwn b/doc/setup.mdwn index ce51faa6d..bdbe323fd 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -143,3 +143,10 @@ setup file. Add yourself to [[IkiWikiUsers]]. And check out the [[tips]] to find out how to get more out of 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.