diff options
| author | Joey Hess <joey@kitenet.net> | 2010-08-05 17:39:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-05 17:39:47 -0400 |
| commit | aac249cca3cb2b33a695da4a22fe5422776081be (patch) | |
| tree | d9b347722a07e0024ad103b4c216f59fbbb12530 | |
| parent | 86dc710d9047faa87cc38b2f8e44f6ff9cc457a6 (diff) | |
| parent | 69297da448452050823dd27ccb9c1a7d4b2dfe27 (diff) | |
| download | ikiwiki-aac249cca3cb2b33a695da4a22fe5422776081be.tar ikiwiki-aac249cca3cb2b33a695da4a22fe5422776081be.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 2 | ||||
| -rw-r--r-- | doc/users/Perry.mdwn | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 65b7cd96a..5f17e3ae0 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -26,4 +26,6 @@ which seems to do the right thing in page.tmpl, but not for change.tmpl. Where i > The use of an absolute baseurl in change.tmpl is a special case. --[[Joey]] +So I'm facing this same issue. I have a wiki which needs to be accessed on three different URLs(!) and the hard coding of the URL from the setup file is becoming a problem for me. Is there anything I can do here? --[[Perry]] + [[wishlist]] diff --git a/doc/users/Perry.mdwn b/doc/users/Perry.mdwn new file mode 100644 index 000000000..d10b8621f --- /dev/null +++ b/doc/users/Perry.mdwn @@ -0,0 +1 @@ +Just another IkiWiki user. |