44 files changed, 57 insertions, 58 deletions

diff --git a/doc/manual/01_Introduction.md b/doc/01_Introduction.md
index 0bdf97e2..0bdf97e2 100644
--- a/doc/manual/01_Introduction.md
+++ b/doc/01_Introduction.md
diff --git a/doc/manual/02_Installation.md b/doc/02_Installation.md
index ffc8b938..ffc8b938 100644
--- a/doc/manual/02_Installation.md
+++ b/doc/02_Installation.md
diff --git a/doc/manual/03_UserInterface.md b/doc/03_UserInterface.md
index bda4d1fe..bda4d1fe 100644
--- a/doc/manual/03_UserInterface.md
+++ b/doc/03_UserInterface.md
diff --git a/doc/manual/04_WorkingWithFiles.md b/doc/04_WorkingWithFiles.md
index 201e46cf..e5c30d8e 100644
--- a/doc/manual/04_WorkingWithFiles.md
+++ b/doc/04_WorkingWithFiles.md
@@ -64,6 +64,6 @@ OSX) or from the `Tools -> Snapopen -> Current Directory` menu. Snapopen is
 pretty limited from the menu, but more versatile in scripts. See its [LuaDoc][].
 `Ctrl+U` (`⌘U`) snaps open `~/.textadept/`.
 
-[LuaDoc]: ../api/_M.textadept.snapopen.html
+[LuaDoc]: api/_M.textadept.snapopen.html
 
 ![Snapopen](images/snapopen.png)
diff --git a/doc/manual/05_FileNavigation.md b/doc/05_FileNavigation.md
index 953464a7..953464a7 100644
--- a/doc/manual/05_FileNavigation.md
+++ b/doc/05_FileNavigation.md
diff --git a/doc/manual/06_AdeptEditing.md b/doc/06_AdeptEditing.md
index 9dee1183..30deac58 100644
--- a/doc/manual/06_AdeptEditing.md
+++ b/doc/06_AdeptEditing.md
@@ -46,7 +46,7 @@ For more information on adding adeptsense support for another language, see
 the [LuaDoc][].
 
 [ctags]: http://ctags.sf.net
-[LuaDoc]: ../api/_M.textadept.adeptsense.html
+[LuaDoc]: api/_M.textadept.adeptsense.html
 
 ## Find and Replace
 
diff --git a/doc/manual/07_Modules.md b/doc/07_Modules.md
index 1b915c85..6a9f334b 100644
--- a/doc/manual/07_Modules.md
+++ b/doc/07_Modules.md
@@ -14,7 +14,7 @@ snippets, etc.). These kinds of modules are generally loaded on startup. See the
 [preferences][] page for instructions on how to load generic modules when
 Textadept starts.
 
-[textadept module]: ../api/_M.textadept.html
+[textadept module]: api/_M.textadept.html
 [preferences]: 9_Preferences.html#User.Init
 
 ## Language Specific
@@ -25,8 +25,8 @@ particular programming language unless you specify otherwise. Examples are the
 [cpp][] and [lua][] modules which provide special editing features for the C/C++
 and Lua languages respectively.
 
-[cpp]: ../api/_M.cpp.html
-[lua]: ../api/_M.lua.html
+[cpp]: api/_M.cpp.html
+[lua]: api/_M.lua.html
 
 ### Lexer
 
@@ -34,7 +34,7 @@ All languages have a [lexer][] that performs syntax highlighting on the source
 code. While the lexer itself is not part of the module, its existence in
 `lexers/` is required.
 
-[lexer]: ../api/lexer.html
+[lexer]: api/lexer.html
 
 ### Activation
 
@@ -55,7 +55,7 @@ within another snippet).
     
 ![Snippet Expanded](images/snippet2.png)
 
-[snippets]: ../api/_M.textadept.snippets.html
+[snippets]: api/_M.textadept.snippets.html
 
 ### Commands
 
@@ -63,7 +63,7 @@ Most language-specific modules have a set of [key commands][]. See the module's
 Lua code for which key commands are available. They are typically stored in the
 `Ctrl+L` (`⌘L` on Mac OSX) key prefix.
 
-[key commands]: ../api/_M.textadept.keys.html
+[key commands]: api/_M.textadept.keys.html
 
 #### Run
 
@@ -120,7 +120,7 @@ module, it will be loaded instead of the one that comes with Textadept.
 
 See the [LuaDoc][] for modules.
 
-[LuaDoc]: ../api/_M.html
+[LuaDoc]: api/_M.html
 
 ## Customizing Modules
 
@@ -155,4 +155,4 @@ from `post_init.lua`:
 Similarly, you can use `post_init.lua` to change the compile/run commands, load
 more [Adeptsense tags][], and add additional key commands and snippets.
 
-[Adeptsense tags]: ../api/_M.textadept.adeptsense.html#load_ctags
+[Adeptsense tags]: api/_M.textadept.adeptsense.html#load_ctags
diff --git a/doc/manual/08_Themes.md b/doc/08_Themes.md
index b40135e2..488c7b0a 100644
--- a/doc/manual/08_Themes.md
+++ b/doc/08_Themes.md
@@ -35,7 +35,7 @@ and keywords. These elements are assigned styles composed of font and color
 information in the theme's `lexer.lua`. See the `Styling Tokens` section of the
 [lexer][] page for more information on how to create styles and colors.
 
-[lexer]: ../api/lexer.html
+[lexer]: api/lexer.html
 
 ### Buffer
 
@@ -49,14 +49,14 @@ use tabs:
 
 See the [LuaDoc][] for documentation on the properties.
 
-[LuaDoc]: ../api/buffer.html
+[LuaDoc]: api/buffer.html
 
 ### View
 
 `view.lua` contains view-specific properties like caret and selection colors.
 See the [LuaDoc][] for documentation on the properties.
 
-[LuaDoc]: ../api/buffer.html
+[LuaDoc]: api/buffer.html
 
 ## Testing Themes
 
diff --git a/doc/manual/09_Preferences.md b/doc/09_Preferences.md
index abceaa97..8832c698 100644
--- a/doc/manual/09_Preferences.md
+++ b/doc/09_Preferences.md
@@ -50,7 +50,7 @@ whitespace stripping on save, your `~/.textadept/init.lua` might look like:
     _M.textadept.editing.AUTOPAIR = false
     _M.textadept.editing.STRIP_WHITESPACE_ON_SAVE = false
 
-[LuaDoc]: ../api/index.html
+[LuaDoc]: api/index.html
 
 ### Other
 
diff --git a/doc/manual/10_Advanced.md b/doc/10_Advanced.md
index d81687aa..21cb29ae 100644
--- a/doc/manual/10_Advanced.md
+++ b/doc/10_Advanced.md
@@ -15,7 +15,7 @@ redirects to  [`gui.print()`][]. Use `_G.print()` for Lua's `print()`.
 ![Command Entry](images/commandentry.png)
 
 [scripting]: 11_Scripting.html
-[`gui.print()`]: ../api/gui.html#print
+[`gui.print()`]: api/gui.html#print
 
 ### Tab Completion
 
@@ -31,7 +31,7 @@ You can extend the command entry to do more than enter Lua commands. An
 example of this is [incremental search][]. See `modules/textadept/find.lua` for
 the implementation.
 
-[incremental search]: ../api/gui.find.html#find_incremental
+[incremental search]: api/gui.find.html#find_incremental
 
 ## Command Selection
 
@@ -81,4 +81,4 @@ supported by other text editors and operating systems. You can change the file's
 encoding via the `Buffer -> Encoding` menu. Textadept saves new files as UTF-8
 by default.
 
-[`io.try_encodings`]: ../api/io.html#try_encodings
+[`io.try_encodings`]: api/io.html#try_encodings
diff --git a/doc/manual/11_Scripting.md b/doc/11_Scripting.md
index 463d01bc..86eb1a5a 100644
--- a/doc/manual/11_Scripting.md
+++ b/doc/11_Scripting.md
@@ -8,7 +8,7 @@ libraries. See the [`lua` module documentation][] for more information.
     
 ![Adeptsense tadoc](images/adeptsense_tadoc.png)
 
-[`lua` module documentation]: ../api/_M.lua.html
+[`lua` module documentation]: api/_M.lua.html
 
 ## LuaDoc and Examples
 
@@ -16,7 +16,7 @@ Textadept's API is heavily documented. The [LuaDoc][] is the ultimate resource
 on scripting Textadept. There are of course abundant scripting examples since
 Textadept is mostly written in Lua.
 
-[LuaDoc]: ../api/index.html
+[LuaDoc]: api/index.html
 
 ## Lua Configuration
 
@@ -39,7 +39,7 @@ Textadept's API is derived from the [Scintilla API][] so any C/C++ code using
 Scintilla calls can be ported to Lua without too much trouble.
 
 [Scintilla]: http://scintilla.org
-[buffer]: ../api/buffer.html
+[buffer]: api/buffer.html
 [Scintilla API]: http://scintilla.org/ScintillaDoc.html
 
 ## Textadept Structure
diff --git a/doc/manual/12_Compiling.md b/doc/12_Compiling.md
index aa7b2303..aa7b2303 100644
--- a/doc/manual/12_Compiling.md
+++ b/doc/12_Compiling.md
diff --git a/doc/manual/13_Help.md b/doc/13_Help.md
index 800a18cb..800a18cb 100644
--- a/doc/manual/13_Help.md
+++ b/doc/13_Help.md
diff --git a/doc/manual/14_Appendix.md b/doc/14_Appendix.md
index 426ab35f..61ad842d 100644
--- a/doc/manual/14_Appendix.md
+++ b/doc/14_Appendix.md
@@ -495,7 +495,7 @@ Localization is done using a global table [`_L`][] instead of calling
 `locale.localize()`. Replace all instances of `locale.localize('message')` with
 `_L['message']`. This allows messages to be modified via scripts if desirable.
 
-[`_L`]: ../api/_L.html
+[`_L`]: api/_L.html
 
 ##### `current_word`
 
@@ -613,8 +613,8 @@ Key commands in `~/.textadept/key_commands.lua` and snippets in
 [`keys`][] and/or [`snippets`][] from within your `~/.textadept/init.lua` or a
 file loaded by `~/.textadept/init.lua`.
 
-[`keys`]: ../api/keys.html
-[`snippets`]: ../api/_M.textadept.snippets.html
+[`keys`]: api/keys.html
+[`snippets`]: api/_M.textadept.snippets.html
 
 #### Function Changes
 
@@ -659,28 +659,28 @@ Here is a summary of API changes:
   * Renamed `textadept.session_file` to `_SESSIONFILE`.
 * Removed global `textadept` module.
 
-[API]: ../api
-[`_m.textadept.snippets`]: ../api/_M.textadept.snippets.html
-[`_G.events`]: ../api/events.html
-[`events.emit()`]: ../api/events.html#emit
-[`events.connect()`]: ../api/events.html#connect
-[`_SCINTILLA.constants`]: ../api/_SCINTILLA.html#constants
-[`_SCINTILLA.functions`]: ../api/_SCINTILLA.html#functions
-[`_SCINTILLA.properties`]: ../api/_SCINTILLA.html#properties
-[`_BUFFERS`]: ../api/_G.html#_BUFFERS
-[`_VIEWS`]: ../api/_G.html#_VIEWS
-[`gui`]: ../api/gui.html
-[`gui._print()`]: ../api/gui.html#_print
-[`gui.command_entry`]: ../api/gui.command_entry.html
-[`gui.dialog()`]: ../api/gui.html#dialog
-[`gui.find`]: ../api/gui.find.html
-[`gui.get_split_table()`]: ../api/gui.html#get_split_table
-[`gui.gtkmenu()`]: ../api/gui.html#gtkmenu
-[`gui.goto_view()`]: ../api/gui.html#goto_view
-[`gui.print()`]: ../api/gui.html#print
-[`gui.switch_buffer()`]: ../api/gui.html#switch_buffer
-[`new_buffer()`]: ../api/_G.html#new_buffer
-[`quit()`]: ../api/_G.html#quit
-[`reset()`]:../api/_G.html#reset
-[`user_dofile()`]: ../api/_G.html#user_dofile
-[`string.iconv()`]: ../api/string.html#iconv
+[API]: api
+[`_m.textadept.snippets`]: api/_M.textadept.snippets.html
+[`_G.events`]: api/events.html
+[`events.emit()`]: api/events.html#emit
+[`events.connect()`]: api/events.html#connect
+[`_SCINTILLA.constants`]: api/_SCINTILLA.html#constants
+[`_SCINTILLA.functions`]: api/_SCINTILLA.html#functions
+[`_SCINTILLA.properties`]: api/_SCINTILLA.html#properties
+[`_BUFFERS`]: api/_G.html#_BUFFERS
+[`_VIEWS`]: api/_G.html#_VIEWS
+[`gui`]: api/gui.html
+[`gui._print()`]: api/gui.html#_print
+[`gui.command_entry`]: api/gui.command_entry.html
+[`gui.dialog()`]: api/gui.html#dialog
+[`gui.find`]: api/gui.find.html
+[`gui.get_split_table()`]: api/gui.html#get_split_table
+[`gui.gtkmenu()`]: api/gui.html#gtkmenu
+[`gui.goto_view()`]: api/gui.html#goto_view
+[`gui.print()`]: api/gui.html#print
+[`gui.switch_buffer()`]: api/gui.html#switch_buffer
+[`new_buffer()`]: api/_G.html#new_buffer
+[`quit()`]: api/_G.html#quit
+[`reset()`]:api/_G.html#reset
+[`user_dofile()`]: api/_G.html#user_dofile
+[`string.iconv()`]: api/string.html#iconv
diff --git a/doc/gen_manual.lua b/doc/gen_manual.lua
index fcdf0b14..47c1bb8c 100644
--- a/doc/gen_manual.lua
+++ b/doc/gen_manual.lua
@@ -5,7 +5,7 @@ local HTML = [[
   <html>
     <head>
       <title>%(title)</title>
-      <link rel="stylesheet" href="../style.css" type="text/css" />
+      <link rel="stylesheet" href="style.css" type="text/css" />
       <meta charset="utf-8" />
     </head>
     <body>
@@ -36,13 +36,13 @@ local template = {}
 -- Get manual pages.
 local pages = {}
 local lfs = require 'lfs'
-for file in lfs.dir('manual/') do
+for file in lfs.dir('.') do
   if file:find('^%d+_.-%.md$') then pages[#pages + 1] = file end
 end
 table.sort(pages)
-pages[#pages + 1] = '../../README.md'
-pages[#pages + 1] = '../../CHANGELOG.md'
-pages[#pages + 1] = '../../THANKS.md'
+pages[#pages + 1] = '../README.md'
+pages[#pages + 1] = '../CHANGELOG.md'
+pages[#pages + 1] = '../THANKS.md'
 
 -- Create the header and footer.
 local p = io.popen('markdown header.md')
@@ -53,7 +53,7 @@ template.footer = p:read('*all')
 p:close()
 
 -- Create the navigation list.
-local navfile = 'manual/.nav.md'
+local navfile = '.nav.md'
 local f = io.open(navfile, 'wb')
 for _, page in ipairs(pages) do
   local name = page:match('^%A+(.-)%.md$'):gsub('(%l)(%u)', '%1 %2')
@@ -61,7 +61,7 @@ for _, page in ipairs(pages) do
   f:write('* [', name, '](', page:gsub('%.md$', '.html'), ')\n')
 end
 f:close()
-p = io.popen('markdown "'..navfile..'"')
+p = io.popen('markdown '..navfile)
 template.nav = p:read('*all')
 p:close()
 
@@ -69,11 +69,11 @@ p:close()
 for _, page in ipairs(pages) do
   local name = page:match('^%A+(.-)%.md$'):gsub('(%l)(%u)', '%1 %2')
   template.title = name..' - Textadept Manual'
-  p = io.popen('markdown -f toc -T "manual/'..page..'"')
+  p = io.popen('markdown -f toc -T '..page)
   template.toc, template.main = p:read('*all'):match('^(.-\n</ul>\n)(.+)$')
   p:close()
   if page:find('^%.%./') then page = page:match('^%A+(.+)$') end
-  f = io.open('manual/'..page:gsub('%.md$', '.html'), 'wb')
+  f = io.open(page:gsub('%.md$', '.html'), 'wb')
   local html = HTML:gsub('%%%(([^)]+)%)', template)
   f:write(html)
   f:close()
diff --git a/doc/header.md b/doc/header.md
index 3ff4f97b..84995ac0 100644
--- a/doc/header.md
+++ b/doc/header.md
@@ -2,7 +2,6 @@
 
 * [Home](http://foicica.com/textadept) |
 * [Download](http://foicica.com/textadept/download) |
-* [Manual](http://foicica.com/textadept/manual) |
 * [Lua API](http://foicica.com/textadept/api) |
 * [Source](http://foicica.com/hg/textadept) |
 * [Language Modules](http://foicica.com/hg) |
diff --git a/doc/manual/images/adeptsense_doc.png b/doc/images/adeptsense_doc.png
index 36356591..36356591 100644
--- a/doc/manual/images/adeptsense_doc.png
+++ b/doc/images/adeptsense_doc.png
diff --git a/doc/manual/images/adeptsense_lua.png b/doc/images/adeptsense_lua.png
index 75e581f2..75e581f2 100644
--- a/doc/manual/images/adeptsense_lua.png
+++ b/doc/images/adeptsense_lua.png
diff --git a/doc/manual/images/adeptsense_string.png b/doc/images/adeptsense_string.png
index ed5f4244..ed5f4244 100644
--- a/doc/manual/images/adeptsense_string.png
+++ b/doc/images/adeptsense_string.png
diff --git a/doc/manual/images/adeptsense_ta.png b/doc/images/adeptsense_ta.png
index e280fc72..e280fc72 100644
--- a/doc/manual/images/adeptsense_ta.png
+++ b/doc/images/adeptsense_ta.png
diff --git a/doc/manual/images/adeptsense_tadoc.png b/doc/images/adeptsense_tadoc.png
index 8ccd325e..8ccd325e 100644
--- a/doc/manual/images/adeptsense_tadoc.png
+++ b/doc/images/adeptsense_tadoc.png
diff --git a/doc/manual/images/bufferbrowser.png b/doc/images/bufferbrowser.png
index de7defe1..de7defe1 100644
--- a/doc/manual/images/bufferbrowser.png
+++ b/doc/images/bufferbrowser.png
diff --git a/doc/manual/images/bufferbrowserfiltered.png b/doc/images/bufferbrowserfiltered.png
index c4c01486..c4c01486 100644
--- a/doc/manual/images/bufferbrowserfiltered.png
+++ b/doc/images/bufferbrowserfiltered.png
diff --git a/doc/manual/images/commandentry.png b/doc/images/commandentry.png
index cbcd66a7..cbcd66a7 100644
--- a/doc/manual/images/commandentry.png
+++ b/doc/images/commandentry.png
diff --git a/doc/manual/images/commandentrycompletion.png b/doc/images/commandentrycompletion.png
index a4b83059..a4b83059 100644
--- a/doc/manual/images/commandentrycompletion.png
+++ b/doc/images/commandentrycompletion.png
diff --git a/doc/manual/images/darktheme.png b/doc/images/darktheme.png
index 0c683dc7..0c683dc7 100644
--- a/doc/manual/images/darktheme.png
+++ b/doc/images/darktheme.png
diff --git a/doc/manual/images/docstatusbar.png b/doc/images/docstatusbar.png
index 5e709ab2..5e709ab2 100644
--- a/doc/manual/images/docstatusbar.png
+++ b/doc/images/docstatusbar.png
diff --git a/doc/manual/images/findinfiles.png b/doc/images/findinfiles.png
index 2f8783aa..2f8783aa 100644
--- a/doc/manual/images/findinfiles.png
+++ b/doc/images/findinfiles.png
diff --git a/doc/manual/images/icon.png b/doc/images/icon.png
index c9457dfe..c9457dfe 100644
--- a/doc/manual/images/icon.png
+++ b/doc/images/icon.png
diff --git a/doc/manual/images/lighttheme.png b/doc/images/lighttheme.png
index e5100912..e5100912 100644
--- a/doc/manual/images/lighttheme.png
+++ b/doc/images/lighttheme.png
diff --git a/doc/manual/images/linux.png b/doc/images/linux.png
index a8640022..a8640022 100644
--- a/doc/manual/images/linux.png
+++ b/doc/images/linux.png
diff --git a/doc/manual/images/macosx.png b/doc/images/macosx.png
index 2035a95b..2035a95b 100644
--- a/doc/manual/images/macosx.png
+++ b/doc/images/macosx.png
diff --git a/doc/manual/images/matchingbrace.png b/doc/images/matchingbrace.png
index 22a99c19..22a99c19 100644
--- a/doc/manual/images/matchingbrace.png
+++ b/doc/images/matchingbrace.png
diff --git a/doc/manual/images/rectangularselection.png b/doc/images/rectangularselection.png
index 3fe77a6a..3fe77a6a 100644
--- a/doc/manual/images/rectangularselection.png
+++ b/doc/images/rectangularselection.png
diff --git a/doc/manual/images/rectangularselection2.png b/doc/images/rectangularselection2.png
index a4a84f61..a4a84f61 100644
--- a/doc/manual/images/rectangularselection2.png
+++ b/doc/images/rectangularselection2.png
diff --git a/doc/manual/images/snapopen.png b/doc/images/snapopen.png
index 8ae1bb74..8ae1bb74 100644
--- a/doc/manual/images/snapopen.png
+++ b/doc/images/snapopen.png
diff --git a/doc/manual/images/snippet.png b/doc/images/snippet.png
index d73c621a..d73c621a 100644
--- a/doc/manual/images/snippet.png
+++ b/doc/images/snippet.png
diff --git a/doc/manual/images/snippet2.png b/doc/images/snippet2.png
index cbafb98c..cbafb98c 100644
--- a/doc/manual/images/snippet2.png
+++ b/doc/images/snippet2.png
diff --git a/doc/manual/images/splitviews.png b/doc/images/splitviews.png
index bdb516ec..bdb516ec 100644
--- a/doc/manual/images/splitviews.png
+++ b/doc/images/splitviews.png
diff --git a/doc/manual/images/textadept.png b/doc/images/textadept.png
index 8731e5cc..8731e5cc 100644
--- a/doc/manual/images/textadept.png
+++ b/doc/images/textadept.png
diff --git a/doc/manual/images/ui.png b/doc/images/ui.png
index e9c97f4c..e9c97f4c 100644
--- a/doc/manual/images/ui.png
+++ b/doc/images/ui.png
diff --git a/doc/manual/images/win32.png b/doc/images/win32.png
index 996c2b5f..996c2b5f 100644
--- a/doc/manual/images/win32.png
+++ b/doc/images/win32.png
diff --git a/doc/manual/images/wordcompletion.png b/doc/images/wordcompletion.png
index e55280a9..e55280a9 100644
--- a/doc/manual/images/wordcompletion.png
+++ b/doc/images/wordcompletion.png
diff --git a/doc/manual/images/wordhighlight.png b/doc/images/wordhighlight.png
index 61c8832b..61c8832b 100644
--- a/doc/manual/images/wordhighlight.png
+++ b/doc/images/wordhighlight.png