Merge branch 'master' of ssh://git.ikiwiki.info

8 files changed, 90 insertions, 136 deletions

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_8_098bb7a3112751a7e6167483dde626bb._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_8_098bb7a3112751a7e6167483dde626bb._comment
new file mode 100644
index 000000000..ff0d79dbd
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_8_098bb7a3112751a7e6167483dde626bb._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://andrewspiers.pip.verisignlabs.com/"
+ ip="118.209.91.42"
+ subject="passing environment variables."
+ date="2012-08-24T03:47:07Z"
+ content="""
+I am getting this 'Error: \"do\" parameter missing' when trying to log in as well. I am using Apache and Firefox. The Apache error log says \"Died at /usr/share/perl5/IkiWiki/CGI.pm line 428.\" when it dies.
+
+I do have ssl set up, not sure if this is part of the problem?
+"""]]
diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_9_fbf403255c38da93caa5b98589fbb285._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_9_fbf403255c38da93caa5b98589fbb285._comment
new file mode 100644
index 000000000..53c44d14f
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_9_fbf403255c38da93caa5b98589fbb285._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://andrewspiers.pip.verisignlabs.com/"
+ ip="118.209.91.42"
+ subject="comment 9"
+ date="2012-08-24T04:29:06Z"
+ content="""
+SSL was the problem, it was necessary to specify https:// in the url=> and cgiurl=> parameters in ikiwiki.setup, the redirect wasn't working otherwise.
+"""]]
diff --git a/doc/forum/What__39__s_the_difference_between_tag_and_taglink__63__/comment_1_b3553d65d12af4c4a87f1f66f961c8d9._comment b/doc/forum/What__39__s_the_difference_between_tag_and_taglink__63__/comment_1_b3553d65d12af4c4a87f1f66f961c8d9._comment
new file mode 100644
index 000000000..239444516
--- /dev/null
+++ b/doc/forum/What__39__s_the_difference_between_tag_and_taglink__63__/comment_1_b3553d65d12af4c4a87f1f66f961c8d9._comment
@@ -0,0 +1,49 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 1"
+ date="2012-08-19T15:05:35Z"
+ content="""
+`\[[!tag]]` does not produce any output in the body of the page, but
+stores an invisible tag (which, in the default templates, gets displayed
+in the footer of the page).
+
+For instance, this
+
+    Here is some text about badgers
+    \[[!tag badger]]
+
+or this
+
+    \[[!tag badger]]
+    Here is some text about badgers
+
+or even this
+
+    Here is some text about \[[!tag badger]]badgers
+
+will all come out like this:
+
+    Edit | RecentChanges | etc.
+    ----
+    Here is some text about badgers
+    ----
+    tags: badger
+
+`\[[!taglink]]` produces a [[ikiwiki/WikiLink]] in the body of the
+page, *and* stores an invisible tag like `\[[!tag]]`.
+
+So this:
+
+    Some text about \[[!tag mushrooms]] and toadstools
+
+renders like this
+
+    Edit | RecentChanges | etc.
+    ----
+    Some text about _mushrooms_ and toadstools
+    ----
+    tags: mushrooms
+
+where `_mushrooms_` represents a hyperlink.
+"""]]
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5c3bb8d51..0a5af6a25 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -6,6 +6,8 @@ Hello, ikiwiki.
 
 Testing.
 
+Testing. One Two Three.
+
 [[!sidebar ]]
 
 Here's a hr:
diff --git a/doc/tips/Importing_posts_from_Wordpress/discussion.mdwn b/doc/tips/Importing_posts_from_Wordpress/discussion.mdwn
index 09e6f6742..f1028bc38 100644
--- a/doc/tips/Importing_posts_from_Wordpress/discussion.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress/discussion.mdwn
@@ -1,3 +1,18 @@
+Using a new debian 6.0.5 system, I get the following error trying to run the script:
+
+    ~/bin/ikiwiki-wordpress-import.py "Name" email@domain log < ~/share/wordpress.2012-08-23.xml.edited | git-fast-import
+    Traceback (most recent call last):
+      File "/home/luke/bin/ikiwiki-wordpress-import.py", line 139, in <module>
+        main(*sys.argv[1:])
+      File "/home/luke/bin/ikiwiki-wordpress-import.py", line 65, in main
+        content += x.find('content:encoded').string.replace('\r\n', '\n')
+    AttributeError: 'NoneType' object has no attribute 'replace'
+    git-fast-import statistics:
+
+Any ideas on what I am doing wrong would be appreciated.
+
+-----
+
 When I attempt to use this script, I get the following error:
 warning: Not updating refs/heads/master (new tip 26b1787fca04f2f9772b6854843fe99fe06e6088 does not contain fc0ad65d14d88fd27a6cee74c7cef3176f6900ec).  I have git 1.5.6.5, any ideas?
 
diff --git a/doc/todo/FormattingHelp_should_open_new_window.mdwn b/doc/todo/FormattingHelp_should_open_new_window.mdwn
new file mode 100644
index 000000000..58b4b6856
--- /dev/null
+++ b/doc/todo/FormattingHelp_should_open_new_window.mdwn
@@ -0,0 +1 @@
+Currently the FormattingHelp link on the editing page takes you away from the editing page. The formattinghelp link should open in a new window, to allow the user to continue editing; wikipedia's edit page behaves this way.
diff --git a/doc/todo/Updated_bug_tracking_example.mdwn b/doc/todo/Updated_bug_tracking_example.mdwn
index 4fbb06497..76ecae58c 100644
--- a/doc/todo/Updated_bug_tracking_example.mdwn
+++ b/doc/todo/Updated_bug_tracking_example.mdwn
@@ -1,136 +1,2 @@
-I've put together an updated bug tracking example.  This example requires some recent
-patches of mine.  It requires [[todo/tracking_bugs_with_dependencies]], 
-[[todo/Allow_edittemplate_to_set_file_type]] and the second [[patch]] in
-[[todo/structured_page_data]] (the data plugin, not the form plugin).
-
-You'll then want to add/replace the following files in the software project example.  The
-heading is the name of the file.  I've commented all the directives.  Oh, and I don't
-have nice CSS for this yet. I did make sure that if I borrowed
-[Trac's](http://trac.edgewall.org/) css then it would display as nicely as theirs - the
-html is there if not the CSS.
-
-It might be worth adding some justification of what is going on here.  The datatable
-and data directives generate a nice tabular form for the structured data.  The HTML
-generated is the same as for Trac, except I've got fewer fields.  Adding more is trivial.
-
-I use data directives rather than links because the data directive allows separating
-dependencies from links.  We can specify 'bugs with all dependencies closed' without
-being confused by other links on the page.
-
--- [[Will]]
-
-### templates/bug.mdwn
-
-    \[[!datatable class="bugtable" datalist="""
-    [[!data key="Reported by" link=""]]					[[!data key="Owned by" link=""]]
-    [[!data key="Depends on"]]
-    """]]
-    
-    ### Description
-    
-    This is a bug that needs solving.
-    
-    #### Steps to reproduce:
-    
-    #### What I expect to happen:
-    
-    #### What actually happens:
-    
-    #### What I have tried to narrow it down:
-    
-### bugs.mdwn
-
-    This is FooBar's bug list. Link bugs to \[[bugs/done]] when done.
-    
-    \[[!inline pages="bugs and ! bugs" feeds=no postform=yes 
-    postformtext="Report a bug:" rootpage="bugs"]]
-    
-    \[[!edittemplate template="templates/bug" match="bugs/* and !*/Discussion" silent=yes]]
-    
-    \[[!toggle id="all bugs" text="Show all bugs"]]
-    
-    \[[!toggle id="open bugs" text="Show open bugs"]]
-    
-    \[[!toggle id="ready bugs" text="Show ready bugs (open bugs with all dependencies closed)"]]
-    
-    \[[!toggleable id="ready bugs" text="""
-    #### Ready Bugs
-    
-    Open bugs with all dependencies closed.
-    
-    [[!inline pages="define(~open, ./bugs/* and !./bugs/done and !link(done) and !*/Discussion)
-    and ~open and !data_link(Depends on,~open)" actions=yes archive=yes show=0]]
-    """]]
-    
-    \[[!toggleable id="open bugs" text="""
-    #### Open Bugs
-    
-    [[!inline pages="./bugs/* and !./bugs/done and !link(done) 
-    and !*/Discussion" actions=yes archive=yes show=0]]
-    """]]
-    
-    \[[!toggleable id="all bugs" text="""
-    #### All Bugs
-    
-    [[!inline pages="./bugs/* and !./bugs/done and !*/Discussion"
-    actions=yes archive=yes show=0]]
-    """]]
-    
-### bugs/needs_more_bugs.mdwn
-
-    \[[!datatable class="bugtable" datalist="""
-    [[!data key="Reported by" link="John"]]					[[!data key="Owned by" link="Frank"]]
-    [[!data key="Depends on" link="bugs/fails_to_frobnicate"]]
-    """]]
-    
-    ### Description
-    
-    FooBar does not have enough bugs, which suggests that it's not a real Free
-    Software project. Please help create more bugs by adding code to FooBar!
-    :-)
-    
-    #### Steps to reproduce:
-    
-    Test frobnicate.
-    
-    #### What I expect to happen:
-    
-    It should fail.
-    
-    #### What actually happens:
-    
-    It works.
-    
-    #### What I have tried to narrow it down:
-    
-    I've added some code, but I'm not sure it was the right code.
-
-### bugs/fails_to_frobnicate.mdwn
-
-    \[[!datatable class="bugtable" datalist="""
-    [[!data key="Reported by" link="John"]]					[[!data key="Owned by" link="Frank"]]
-    [[!data key="Depends on"]]
-    """]]
-    
-    ### Description
-    
-    FooBar, when used with the `--frob` option, fails to properly frobnicate
-    output.
-    
-    > This is fixed in \[[news/version_1.0]]; marking this bug \[[done]].
-    
-    #### Steps to reproduce:
-    
-    Use FooBar with the `--frob` option.
-    
-    #### What I expect to happen:
-    
-    Lots of frobnication.
-    
-    #### What actually happens:
-    
-    Complete lack of frobnication
-    
-    #### What I have tried to narrow it down:
-    
-    Tested on Linux, MacOS and NetBSD.
+Computer software, or just software, is a collection of computer programs and related data that provides the instructions for telling a computer what to do and how to do it. Software refers to one or more computer programs and data held in the storage of the computer for some reasons. In other words, software is a set of programs, procedures, algorithms and its documentation concerned with the operation of a data processing system. Program software performs the function of the program it implements, either by directly providing instructions to the computer hardware or by serving as input to another piece of software. The term was coined to contrast to the old term hardware (meaning physical devices). In contrast to hardware, software "cannot be touched".[1] Software is also sometimes used in a more narrow sense, meaning application software only. Sometimes the term includes data that has not traditionally been associated with computers, such as film, tapes, and records.[2]
+Computer software is so called to distinguish it from computer hardware, which encompasses the physical interconnections and devices required to store and execute (or run) the software. At the lowest level, executable code consists of machine language instructions specific to an individual processor. A machine language consists of groups of binary values signifying processor instructions that change the state of the computer from its preceding state. Programs are an ordered sequence of instructions for changing the state of the computer in a particular sequence. It is usually written in high-level programming languages that are easier and more efficient for humans to use (closer to natural language) than machine language. High-level languages are compiled or interpreted into machine language object code. Software may also be written in an assembly language, essentially, a mnemonic representation of a machine language using a natural language alphabet. Assembly language must be assembled into object code via an assembler. [software](http://www.software.com/)
diff --git a/doc/todo/osm_arbitrary_layers.mdwn b/doc/todo/osm_arbitrary_layers.mdwn
new file mode 100644
index 000000000..1f410eab5
--- /dev/null
+++ b/doc/todo/osm_arbitrary_layers.mdwn
@@ -0,0 +1,3 @@
+[[!template  id=gitbranch branch=anarcat/master author="[[anarcat]]"]]
+
+I got tired of hacking at the osm.pm every time I wanted to change the layers, so I made it so the layers can be changed in the .setup file. In my master branch, there are now two new configuration settings: `osm_layers` and `osm_layers_order` which replace the hackish `osm_mapurl`. The variables are a hash and an array that allow the operator to define the list of URLs to be loaded as layers and also to change the order of layers. -- [[users/anarcat]]