directory -> folder

Let's be consistent, now we are using a folder icon.

4 files changed, 18 insertions, 17 deletions

diff --git a/README b/README
index d1aa22c..954bc7a 100644
--- a/README
+++ b/README
@@ -59,13 +59,13 @@ the one system.  They can chat about it, on the one system.
 
 ## What does it do already?
 
-Currently it'll scan the current directory and subdirectories looking for
+Currently it'll scan the current folder and sub folders looking for
 .md files in CommonMark syntax.  This should cover some MarkDown
 variations.  Then it produces .HTML files converted from these .md files,
 and links them all together into a web site.
 
 Any .md file that is just the beginning metadata block doesn't get
-rendered into HTML, but is global metadata for this directory and subs,
+rendered into HTML, but is global metadata for this folder and subs,
 though the subs can override this with their own metadata.md files.
 
 git is used to store the .md files, and provides edit history.  Added on
@@ -73,7 +73,7 @@ the footer is links to cgit, which is used to store the files in git on
 your server.  This provides acces to the source code, history, and ATOM
 feed for the site.
 
-It can also scan an external directory and merge that with the current
+It can also scan an external folder and merge that with the current
 one, but this isn't tested yet.
 
 ## other stuff
diff --git a/TODO.md b/TODO.md
index d6f6039..044ed82 100644
--- a/TODO.md
+++ b/TODO.md
@@ -37,7 +37,7 @@ Mostly from something chomwitt deleted.
 ~~~
 
 - Syntax highlighting in code blocks.
-- Allow default.template files in sub directories.
+- Allow default.template files in sub folders.
 - Might be useful to automatically convert anything looking like a URL into a linky.
 
 Automate symlinks.
diff --git a/about/index.md b/about/index.md
index 6086d85..3f15be7 100644
--- a/about/index.md
+++ b/about/index.md
@@ -1,5 +1,5 @@
 # notYetAnotherWiki is not another wiki, at least not yet. It'll be much more than that, eventually.
 
-This is a new directory, an entire PR department can hang out here.
+This is a new folder, an entire PR department can hang out here.
 
 This would just be a duplicate of README, but for testing purposes.
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index f12547a..0883d87 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -215,10 +215,11 @@ else
     print("Can't open everything.md for writing.")
 end
 
--- Scan the subdirectories looking for our files.
-local Directory = arg[1]
+-- Scan the sub folders looking for our files.
+local Folder = arg[1]
 toSub('')
-if nil == Directory then Directory = '.' end
+if nil == Folder then Folder = '.' end
+--GlobalMetaData.root = Folder
 
 --[[ Sort out realURL for symlinked .md.md files.
     realURL is the generic URL part for this page.  By policy it points to whatever is the latest copy / symlink of the original download .md.md.
@@ -230,7 +231,7 @@ if nil == Directory then Directory = '.' end
     For the "page moved"     problem, that'll be the most recent symlink, the old one still has it's symlink pointing to the download .md.md, which gets updated with the current realURL.
         So when some external old URL points to someplace a page used to be, it's old symlink points to the up to date download .md.md, and we know where to go to find the page now.
 ]]
-for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
+for l in io.popen('find -L ' .. Folder .. ' -name unsorted -prune -o -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
     local metadata = readMdMd(string.sub(l, 1, -4), {})
     if nil == metadata.realURL then
         metadata.realURL = string.sub(l, 1, -7)
@@ -256,7 +257,7 @@ for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*
 end
 
 -- Clean up unsorted.
-for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*.md" -a -not -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
+for l in io.popen('find -L ' .. Folder .. ' -name unsorted -prune -o -name "*.md" -a -not -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
     local tp = '_fos'
     local metadata = readMdMd(l, {})
     if nil ~= metadata then
@@ -273,7 +274,7 @@ for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*
 end
 
 -- Look for copied pages from the other wikis.
-for l in io.popen('find -L ' .. Directory .. ' -name "*.HTM" -type f,l -printf "%P\n"'):lines() do
+for l in io.popen('find -L ' .. Folder .. ' -name "*.HTM" -type f,l -printf "%P\n"'):lines() do
 -- Only do this if .HTM is newer than .md, or .md doesn't exist.
     local htime = io.popen("date -ur " ..            l ..           " +%s"):read('l')
     local mtime = io.popen("date -ur " .. string.sub(l, 1, -4) .. "md +%s 2>/dev/null"):read('l')
@@ -424,14 +425,14 @@ writeString(l .. '_ORIGINAL1', body)
     end
 end
 
-if '.' ~= Directory then
+if '.' ~= Folder then
     for l in io.popen('find -L . -name "*.md" -type f,l -printf "%P\n"'):lines() do
         toFile(string.gsub(l, '%.md$', ''))
     end
 end
 
--- Can add in a distant directory to, for putting it's results in the current directory.
-for l in io.popen('find -L ' .. Directory .. ' -name "*.md" -type f,l -printf "%P\n"'):lines() do
+-- Can add in a distant folder to, for putting it's results in the current folder.
+for l in io.popen('find -L ' .. Folder .. ' -name "*.md" -type f,l -printf "%P\n"'):lines() do
     local n = string.gsub(l, '%.md$', '')
     if nil == Files[n] then toFile(n) end
 end
@@ -492,7 +493,7 @@ for name, sub in pairs(Subs) do
         print("EMPTY " .. name)
         h = io.open(name .. '/index.md', 'w')
         if nil ~= h then
-            h:write('This directory has no files.')
+            h:write('This folder has no files.')
             h:close()
         else
             print("Can't open " .. name .. '/index.md for writing.')
@@ -504,7 +505,7 @@ end
 ---------------------------------------------------------------------------------
 -- These functions assume the above file and sub scan has completed.
 
--- Which page in this directory should we show?
+-- Which page in this folder should we show?
 -- NOTE - only looking for the .md files we scanned for before, any stray HTML, html, HTM, and htm files will get ignored.
 local whichPage = function(f)
     local fl = ''
@@ -547,7 +548,7 @@ local whichWiki = function(metadata)
 end
 
 
--- Calculate a link from the source directory to the destination directory.
+-- Calculate a link from the source folder to the destination folder.
 local linkFrom = function(source, dest)
     -- Evil hacks!
     if 'Profiles' == dest then dest = 'PmWiki/Profiles' end