Merge branch '1.8RC'

1 files changed, 0 insertions, 41 deletions

diff --git a/include/importdoc.php b/include/importdoc.php
deleted file mode 100755
index 90dfb2fc4..000000000
--- a/include/importdoc.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-
-
-require_once('include/cli_startup.php');
-
-
-function importdoc_run($argv, $argc){
-
-	cli_startup();
-
-	require_once('include/help.php');
-
-
-	update_docs_dir('doc/*');
-
-}
-if (array_search(__file__,get_included_files())===0){
-  importdoc_run($argv,$argc);
-  killme();
-}
-
-function update_docs_dir($s) {
-	$f = basename($s);
-	$d = dirname($s);
-	if($s === 'doc/html')
-		return;
-	$files = glob("$d/$f");
-	if($files) {
-		foreach($files as $fi) {
-			if($fi === 'doc/html')
-				continue;
-			if(is_dir($fi))
-				update_docs_dir("$fi/*");
-			else
-				store_doc_file($fi);
-		}
-	}
-}
-
-