merge dups

diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index accd96bd72f149ba9142cfbb184494311e2fc3fb..68f0b9be201609442f966a6d152186b689316e18 100644 (file)
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -27,3 +27,16 @@ URL rewriting, authorisation, etc.
 > 
 > Perhaps this should be something that is configurable via the setup file
 > instead. --[[Joey]]
 > 
 > Perhaps this should be something that is configurable via the setup file
 > instead. --[[Joey]]

+
+> See 
+
+---
+
+Hi, I would like to have my htaccess files in svn repository so ikiwiki would export that file to my webspace with every commit.
+
+That way I have revision control on that file too. That may be a security concern, but I trust everybody that has svn commit
+access and such .htaccess files should not be accessible through wiki cgi. Of course, it could default to 'off'.
+
+> See [[debbug 447267]] for a patch for this.
+
+[[tag patch]]

diff --git a/doc/todo/htaccess_files_in_svn_repository.mdwn b/doc/todo/htaccess_files_in_svn_repository.mdwn
deleted file mode 100644 (file)
index aea81aa..0000000
--- a/doc/todo/htaccess_files_in_svn_repository.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-Hi, I would like to have my htaccess files in svn repository so ikiwiki would export that file to my webspace with every commit.
-
-That way I have revision control on that file too. That may be a security concern, but I trust everybody that has svn commit
-access and such .htaccess files should not be accessible through wiki cgi. Of course, it could default to 'off'.
-
-> See [[debbug 447267]] for a patch for this.
-
-[[tag patch]]