48 files changed, 152 insertions, 152 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d4f723f..b94b57c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ Changes:
 * Lexers with no tokens can be styled manually.
 * Added more OSX default key shortcuts.
 
-[`gui.filteredlist()`]: ../api/gui.html#filteredlist
+[`gui.filteredlist()`]: api/gui.html#filteredlist
 [GtkOSXApplication]: https://live.gnome.org/GTK%2B/OSX/Integration#Gtk-mac-integration.2BAC8-GtkOSXApplication
 
 ## 5.0 (01 Feb 2012)
@@ -35,7 +35,7 @@ Changes:
 * Updated to [Scintilla][] 3.0.3.
 * Also include [LuaJIT][] executables in releases.
 
-[4 to 5 migration guide]: ../manual/14_Appendix.html#Textadept.4.to.5
+[4 to 5 migration guide]: 14_Appendix.html#Textadept.4.to.5
 [Scintilla]: http://scintilla.org
 [LuaJIT]: http://luajit.org
 
@@ -54,11 +54,11 @@ Changes:
 * Renamed editing module's `current_word()` to [`select_word()`][].
 * Updated [manual][].
 
-[`reset()`]: ../api/_G.html#reset
-[`_L`]: ../api/_L.html
-[`_M`]: ../api/_M.html
+[`reset()`]: api/_G.html#reset
+[`_L`]: api/_L.html
+[`_M`]: api/_M.html
 [manual]: ./
-[`select_word()`]: ../api/_M.textadept.editing.html#select_word
+[`select_word()`]: api/_M.textadept.editing.html#select_word
 
 ## 5.0 alpha (21 Dec 2012)
 
@@ -91,8 +91,8 @@ Changes:
 * Simplify theming via [gtkrc][] by naming `GtkWindow` only.
 * Updated to [Scintilla][] 3.0.1.
 
-[theme switching]: ../api/gui.html#set_theme
-[gtkrc]: ../manual/8_Themes.html#Theming.the.GUI
+[theme switching]: api/gui.html#set_theme
+[gtkrc]: 8_Themes.html#Theming.the.GUI
 [Scintilla]: http://scintilla.org
 
 ## 4.2 (01 Nov 2011)
@@ -133,13 +133,13 @@ Changes:
 * Use lexer at the caret for key commands and snippets.
 * Updated to [Scintilla][] 2.29.
 
-[dwell events]: ../api/events.html
-[`_BUFFERS`]: ../api/_G.html#_BUFFERS
-[`_VIEWS`]: ../api/_G.html#_VIEWS
-[`buffer:check_global()`]: ../api/buffer.html#buffer.check_global
-[`view:goto_buffer()`]: ../api/view.html#view:goto_buffer
-[`gui.goto_view()`]: ../api/gui.html#goto_view
-[context menu]: ../api/_M.html#Context.Menu
+[dwell events]: api/events.html
+[`_BUFFERS`]: api/_G.html#_BUFFERS
+[`_VIEWS`]: api/_G.html#_VIEWS
+[`buffer:check_global()`]: api/buffer.html#buffer.check_global
+[`view:goto_buffer()`]: api/view.html#view:goto_buffer
+[`gui.goto_view()`]: api/gui.html#goto_view
+[context menu]: api/_M.html#Context.Menu
 [LuaCoco]: http://coco.luajit.org/
 [Scintilla]: http://scintilla.org
 
@@ -162,8 +162,8 @@ Changes:
 * Changed some key commands from 4.0 beta 2.
 * Do not hide the statusbar when the command entry has focus.
 
-[3 to 4 migration guide]: ../manual/14_Appendix.html#Textadept.3.to.4
-[`gui.dialog()`]: ../api/gui.html#dialog
+[3 to 4 migration guide]: 14_Appendix.html#Textadept.3.to.4
+[`gui.dialog()`]: api/gui.html#dialog
 
 ## 4.0 beta 2 (11 Aug 2011)
 
@@ -182,7 +182,7 @@ Changes:
 * Swapped OSX `c` and `m` key command definition modifiers.
 * Changed some key bindings from 4.0 beta.
 
-[recent file list]: ../api/io.html#recent_files
+[recent file list]: api/io.html#recent_files
 
 ## 4.0 beta (01 Aug 2011)
 
@@ -205,9 +205,9 @@ Changes:
 * *Completely new set of key commands.*
 * Updated to [Scintilla][] 2.28.
 
-[`io.open_recent_file()`]: ../api/io.html#open_recent_file
-[`buffer` functions]: ../api/buffer.html#Functions
-[menu]: ../api/gui.html#gtkmenu
+[`io.open_recent_file()`]: api/io.html#open_recent_file
+[`buffer` functions]: api/buffer.html#Functions
+[menu]: api/gui.html#gtkmenu
 [Scintilla]: http://scintilla.org
 
 ## 3.9 (01 Jul 2011)
@@ -230,11 +230,11 @@ Changes:
 * Added ConTeXt lexer.
 
 [GTK]: http://gtk.org
-[`gui.dialog`]: ../api/gui.html#dialog
-[functions]: ../api/_SCINTILLA.html#Functions
+[`gui.dialog`]: api/gui.html#dialog
+[functions]: api/_SCINTILLA.html#Functions
 [Scintilla]: http://scintilla.org
-[emit events]: ../api/_M.textadept.run.html#Run.Events
-[find]: ../api/gui.find.html
+[emit events]: api/_M.textadept.run.html#Run.Events
+[find]: api/gui.find.html
 
 ## 3.8 (11 Jun 2011)
 
@@ -255,12 +255,12 @@ Changes:
 * Added native folding for more than 60% of existing lexers. The rest still use
   folding by indentation by default.
 
-[`events.handlers`]: ../api/events.html#handlers
-[events]: ../api/events.html
-[documentation]: ../manual/7_Modules.html#Getting.Modules
+[`events.handlers`]: api/events.html#handlers
+[events]: api/events.html
+[documentation]: 7_Modules.html#Getting.Modules
 [official modules]: http://foicica.com/hg
 [Scintilla]: http://scintilla.org
-[easier]: ../api/lexer.html#Simple.Code.Folding
+[easier]: api/lexer.html#Simple.Code.Folding
 
 ## 3.7 (01 May 2011)
 
@@ -273,8 +273,8 @@ Changes:
 * Changed Mac OSX Adeptsense complete key command from `~` to `Ctrl+Escape`.
 * Added [PHP module][].
 
-[`buffer:get_lexer()`]: ../api/buffer.html#buffer.get_lexer
-[PHP module]: ../api/_M.php.html
+[`buffer:get_lexer()`]: api/buffer.html#buffer.get_lexer
+[PHP module]: api/_M.php.html
 
 ## 3.7 beta 3 (01 Apr 2011)
 
@@ -310,13 +310,13 @@ Changes:
 * Officially supported modules have their own [repositories][] and are available
   as a separate download.
 
-[`post_init.lua`]: ../manual/7_Modules.html#Customizing.Modules
-[module]: ../api/_M.rails.html
-[RHTML module]: ../api/_M.rhtml.html
-[`buffer:get_lexer(true)`]: ../api/buffer.html#buffer.get_lexer
+[`post_init.lua`]: 7_Modules.html#Customizing.Modules
+[module]: api/_M.rails.html
+[RHTML module]: api/_M.rhtml.html
+[`buffer:get_lexer(true)`]: api/buffer.html#buffer.get_lexer
 [Scintilla]: http://scintilla.org
-[`_m.textadept.snippets`]: ../api/_M.textadept.snippets.html
-[`gui.print()`]: ../api/gui.html#print
+[`_m.textadept.snippets`]: api/_M.textadept.snippets.html
+[`gui.print()`]: api/gui.html#print
 [repositories]: http://foicica.com/hg
 
 ## 3.7 beta 2 (01 Mar 2011)
@@ -351,15 +351,15 @@ Changes:
 * Included libpng12 build for 64-bit Debian-based Linux distros (Ubuntu).
 * Added [CSS][], [HTML][], [Java][], and [Ruby][] modules with Adeptsenses.
 
-[`goto_ctag()`]: ../api/_M.textadept.adeptsense.html#goto_ctag
+[`goto_ctag()`]: api/_M.textadept.adeptsense.html#goto_ctag
 [Scintilla]: http://scintilla.org
-[tutorial]: ../api/_M.textadept.adeptsense.html
-[`complete()`]: ../api/_M.textadept.adeptsense.html#complete
-[`show_documentation()`]: ../api/_M.textadept.adeptsense.html#show_documentation
-[CSS]: ../api/_M.css.html
-[HTML]: ../api/_M.hypertext.html
-[Java]: ../api/_M.java.html
-[Ruby]: ../api/_M.ruby.html
+[tutorial]: api/_M.textadept.adeptsense.html
+[`complete()`]: api/_M.textadept.adeptsense.html#complete
+[`show_documentation()`]: api/_M.textadept.adeptsense.html#show_documentation
+[CSS]: api/_M.css.html
+[HTML]: api/_M.hypertext.html
+[Java]: api/_M.java.html
+[Ruby]: api/_M.ruby.html
 
 ## 3.7 beta (01 Feb 2011)
 
@@ -381,11 +381,11 @@ Changes:
 * Language-specific [`char_matches`][] and [`braces`][] can be defined.
 * `command_entry_keypress` event accepts modifier keys.
 
-[Adeptsense]: ../manual/6_AdeptEditing.html#Adeptsense
-[`language_module_loaded`]: ../api/_M.textadept.mime_types.html#Mime-type.Events
-[`gui.filteredlist()`]: ../api/gui.html#filteredlist
-[`char_matches`]: ../api/_M.textadept.editing.html#char_matches
-[`braces`]: ../api/_M.textadept.editing.html#braces
+[Adeptsense]: 6_AdeptEditing.html#Adeptsense
+[`language_module_loaded`]: api/_M.textadept.mime_types.html#Mime-type.Events
+[`gui.filteredlist()`]: api/gui.html#filteredlist
+[`char_matches`]: api/_M.textadept.editing.html#char_matches
+[`braces`]: api/_M.textadept.editing.html#braces
 
 ## 3.6 (01 Jan 2011)
 
@@ -405,8 +405,8 @@ Changes:
 * Moved GUI events from `core/events.lua` to `core/gui.lua`.
 * Separated key command manager from key command definitions.
 
-[`_m.textadept.filter_through`]: ../api/_M.textadept.filter_through.html
-[shell commands]: ../manual/10_Advanced.html#Shell.Commands.and.Filtering.Text
+[`_m.textadept.filter_through`]: api/_M.textadept.filter_through.html
+[shell commands]: 10_Advanced.html#Shell.Commands.and.Filtering.Text
 
 ## 3.5 (01 Dec 2010)
 
@@ -424,10 +424,10 @@ Changes:
 * New [manual][].
 * Added `file_after_save` [event][].
 
-[Menus]: ../api/_M.textadept.menu.html
-[`_m.textadept.editing.enclose()`]: ../api/_M.textadept.editing.html#enclose
+[Menus]: api/_M.textadept.menu.html
+[`_m.textadept.editing.enclose()`]: api/_M.textadept.editing.html#enclose
 [manual]: ./
-[event]: ../api/io.html#File.Events
+[event]: api/io.html#File.Events
 
 ## 3.4 (01 Nov 2010)
 
@@ -465,12 +465,12 @@ Changes:
 * Updated to [Scintilla][] 2.22.
 * Renamed `_G.MAC` to `_G.OSX`.
 
-[Switch Buffers]: ../manual/4_WorkingWithFiles.html#Buffer.Browser
-[`gui.dialog()`]: ../api/gui.html#dialog
-[`_m.textadept.snapopen.open()`]: ../api/_M.textadept.snapopen.html#open
-[highlight]: ../manual/6_AdeptEditing.html#Word.Highlight
-[`_G.timeout()`]: ../api/_G.html#timeout
-[find API]: ../api/gui.find.html#find_in_files
+[Switch Buffers]: 4_WorkingWithFiles.html#Buffer.Browser
+[`gui.dialog()`]: api/gui.html#dialog
+[`_m.textadept.snapopen.open()`]: api/_M.textadept.snapopen.html#open
+[highlight]: 6_AdeptEditing.html#Word.Highlight
+[`_G.timeout()`]: api/_G.html#timeout
+[find API]: api/gui.find.html#find_in_files
 [Scintilla]: http://scintilla.org
 
 ## 3.3 (01 Oct 2010)
@@ -484,7 +484,7 @@ Changes:
 * Added [`_m.textadept.snapopen`][] module with menu options for rapidly opening
   files.
 
-[`_m.textadept.snapopen`]: ../api/_M.textadept.snapopen.html
+[`_m.textadept.snapopen`]: api/_M.textadept.snapopen.html
 
 ## 3.2 (01 Sep 2010)
 
@@ -512,7 +512,7 @@ Changes:
 * Updated to [Scintilla][] 2.20.
 * Added Lua autocompletion.
 
-[propagation]: ../api/keys.html#Propagation
+[propagation]: api/keys.html#Propagation
 [Scintilla]: http://scintilla.org
 
 ## 3.0 (01 Jul 2010)
@@ -528,7 +528,7 @@ Changes:
 
 * More accurate CSS and Diff lexers.
 
-[2 to 3 migration guide]: ../manual/14_Appendix.html#Textadept.2.to.3
+[2 to 3 migration guide]: 14_Appendix.html#Textadept.2.to.3
 
 ## 3.0 beta (21 Jun 2010)
 
@@ -551,13 +551,13 @@ Changes:
 * Added statusbar notification on [`reset()`][].
 * Added Gtkrc, Prolog, and Go lexers.
 
-[`buffer:text_range()`]: ../api/buffer.html#buffer.text_range
-[`textadept`]: ../api/_M.textadept.html
-[API]: ../api
+[`buffer:text_range()`]: api/buffer.html#buffer.text_range
+[`textadept`]: api/_M.textadept.html
+[API]: api
 [Scintilla]: http://scintilla.org
-[Abbreviated]: ../manual/10_Advanced.html#Command.Entry
-[arguments]: ../api/args.html
-[`reset()`]: ../api/_G.html#reset
+[Abbreviated]: 10_Advanced.html#Command.Entry
+[arguments]: api/args.html
+[`reset()`]: api/_G.html#reset
 
 ## 2.2 (11 May 2010)
 
@@ -594,10 +594,10 @@ Changes:
 * Added Inform, Lilypond, and NSIS lexers.
 * `_m.textadept.editing.enclosure` is now an accessible table.
 
-[`buffer:text_range()`]: ../api/buffer.html#buffer.text_range
-[run]: ../api/_M.html#Run
-[compile]: ../api/_M.html#Compile
-[Block comment]: ../api/_M.html#Block.Comment
+[`buffer:text_range()`]: api/buffer.html#buffer.text_range
+[run]: api/_M.html#Run
+[compile]: api/_M.html#Compile
+[Block comment]: api/_M.html#Block.Comment
 
 ## 2.2 beta (01 Apr 2010)
 
@@ -624,7 +624,7 @@ Changes:
 * Removed api file support.
 
 [gcocoadialog]: http://foicica.com/gcocoadialog
-[`gui.dialog('filteredist', ...)]: ../api/gui.html#dialog
+[`gui.dialog('filteredist', ...)]: api/gui.html#dialog
 
 ## 2.1 (01 Mar 2010)
 
@@ -672,7 +672,7 @@ Changes:
 * Added `style_whitespace` to [lexers][] for custom styles.
 * Added standard `F3` key command for "Find Next" for Windows/Linux.
 
-[lexers]: ../api/lexer.html
+[lexers]: api/lexer.html
 
 ## 2.0 beta (31 Jul 2009)
 
@@ -715,15 +715,15 @@ Changes:
 * Removed confusing `local function` and `local table` LuaDoc.
 * Rewrote the manual and most of the documentation.
 
-[list of encodings]: ../api/io.html#try_encodings
-[events]: ../api/events.html
+[list of encodings]: api/io.html#try_encodings
+[events]: api/events.html
 [Scintilla]: http://scintilla.org
-[compile commands]: ../api/_M.textadept.run.html#compile_command
-[run commands]: ../api/_M.textadept.run.html#run_command
+[compile commands]: api/_M.textadept.run.html#compile_command
+[run commands]: api/_M.textadept.run.html#run_command
 [gcocoadialog]: http://foicica.com/gcocoadialog
 [lua_dialog]: http://luaforge.net/projects/lua-dialog
 [cocoaDialog]: http://cocoadialog.sf.net
-[Incremental find]: ../manual/6_AdeptEditing.html#Find.Incremental
+[Incremental find]: 6_AdeptEditing.html#Find.Incremental
 [GTK]: http://gtk.org
 
 ## 1.6 (01 Apr 2009)
@@ -741,7 +741,7 @@ Updates:
 * Trimmed theme files.
 * Added `file_before_save` [event][].
 
-[event]: ../api/io.html#File.Events
+[event]: api/io.html#File.Events
 
 ## 1.6 beta (01 Mar 2009)
 
@@ -766,7 +766,7 @@ Updates:
 * Removed `project` PM browser.
 * Multiple character encoding support for opening and saving files.
 
-[`_m.textadept.run`]: ../api/_M.textadept.run.html
+[`_m.textadept.run`]: api/_M.textadept.run.html
 
 ## 1.5 (20 Feb 2009)
 
@@ -854,7 +854,7 @@ Updates:
   is displayed in a message buffer and you can double-click errors and warnings
   to go to them in the source file.
 
-[`_m.textadept.run`]: ../api/_M.textadept.run.html
+[`_m.textadept.run`]: api/_M.textadept.run.html
 
 ## 1.1 (11 Jan 2009)
 
@@ -872,8 +872,8 @@ Updates:
 * Various improvements to efficiency, speed, and readability of source code.
 * Manually parse `~/.gtkrc-2.0` on Mac since GTK-OSX does not do it.
 
-[localization]: ../api/_L.html
-[bookmarks]: ../api/_M.textadept.bookmarks.html
+[localization]: api/_L.html
+[bookmarks]: api/_M.textadept.bookmarks.html
 
 ## 1.0 (01 Jan 2009)
 
@@ -896,7 +896,7 @@ Updates:
 * New Textadept icons.
 * Added a true project manager.
 
-[find]: ../api/gui.find.html
+[find]: api/gui.find.html
 [GTK-OSX]: http://www.gtk.org/download/macos.php
 [LPeg]: http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html
 [LuaFileSystem]: http://keplerproject.github.com/luafilesystem/
@@ -919,9 +919,9 @@ Updates:
   "buffer_new" and "view_new" event handlers respectively.
 * File types can be recognized by [pattern matching][] the first line.
 
-[Theming]: ../manual/8_Themes.html
+[Theming]: 8_Themes.html
 [manual]: ./
-[pattern matching]: ../manual/9_Preferences.html#Detect.by.Pattern
+[pattern matching]: 9_Preferences.html#Detect.by.Pattern
 
 ## 0.5 (23 Jul 2008)
 
@@ -959,8 +959,8 @@ Updates:
 * Added Doxygen documentation for C source files.
 * Updated Luadoc, and added Textadept manual.
 
-[bookmark]: ../api/_M.textadept.bookmarks.html
-[tab-completion]: ../manual/10_Advanced.html#Tab.Completion
+[bookmark]: api/_M.textadept.bookmarks.html
+[tab-completion]: 10_Advanced.html#Tab.Completion
 
 ## 0.3 (04 Mar 2008)
 
@@ -980,7 +980,7 @@ Updates:
 * Added new find in files project manager browser.
 * Fixed some code redundancy and typos in documentation.
 
-[`select_indented_block()`]: ../api/_M.textadept.editing.html#select_indented_block
+[`select_indented_block()`]: api/_M.textadept.editing.html#select_indented_block
 [Zenity]: http://live.gnome.org/Zenity
 [lua_dialog]: http://luaforge.net/projects/lua-dialog
 
diff --git a/README.md b/README.md
index 0778bfb1..357bb409 100644
--- a/README.md
+++ b/README.md
@@ -59,5 +59,5 @@ and hosting for Textadept, its source code repository, mailing list, etc.
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="hidden" name="hosted_button_id" value="3165962">
 <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="">
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
+<img alt="Donate" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 </form>
diff --git a/THANKS.md b/THANKS.md
index 28a971ac..2fd96f74 100644
--- a/THANKS.md
+++ b/THANKS.md
@@ -6,6 +6,7 @@ Textadept the amazing editor that it is today.
 ## Code and Documentation Contributors
 
 * Alex Bepple
+* Ana Balan
 * Anton Verbitski
 * Brian Schott
 * Callum Wilson
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).
 &nbsp;&nbsp;&nbsp;&nbsp;
 ![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.
 &nbsp;&nbsp;&nbsp;&nbsp;
 ![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
diff --git a/src/Makefile b/src/Makefile
index af374424..69b83b45 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -190,7 +190,7 @@ adeptsense: ../modules ../core ../lexers/lexer.lua
 doxygen: Doxyfile
 	cd ../ && doxygen $<
 cleandoc:
-	rm -f ../doc/manual/*.html
+	rm -f ../doc/*.html
 	rm -rf ../doc/api ../doc/doxygen
 
 # Package (only for Linux x86_64)