From 2098e011e638b5c86c56e68df7757975fc4d728f Mon Sep 17 00:00:00 2001
From: Shamus Hammons <jlhamm@acm.org>
Date: Mon, 13 Feb 2017 13:53:37 -0600
Subject: [PATCH] Move content from _manual/ to include/.

---
 .../01_welcome-to-ardour/01_about-ardour.html |  19 -
 _manual/02_introducing-ardour.html            |  11 -
 .../03_using-external-midi-devices.html       |   9 -
 .../04_connecting-audio-and-midi-devices.html |   9 -
 _manual/08_working-with-sessions.html         |   6 -
 _manual/10_working-with-playlists.html        |  11 -
 _manual/11_working-with-tracks.html           |   6 -
 .../04_plugin-sidebar.html                    |  38 --
 _manual/16_recording.html                     |   6 -
 _manual/18_editing-and-arranging.html         |   6 -
 .../08_separation.html                        |   7 -
 _manual/19_automation.html                    |   6 -
 _manual/20_mixing.html                        |   6 -
 _manual/21_exporting.html                     |   7 -
 _manual/22_synchronization.html               |   8 -
 _manual/25_using-control-surfaces.html        |  13 -
 _manual/28_appendix.html                      |  13 -
 build.py                                      |   5 -
 .../about-ardours-documentation.html          |   5 +-
 .../about-ardours-interface.html              |   4 +-
 .../add-new-notes.html                        |   5 +-
 .../adding-pre-existing-material.html         |   5 +-
 .../adding-tracks-busses-and-vcas.html        |   5 +-
 .../additional-resources.html                 |   5 +-
 .../align-spot-regions.html                   |   5 +-
 include/ardour-concepts.html                  |   4 +-
 .../ardour-monitor-modes.html                 |   5 +-
 include/ardour-setup-for-surround.html        |   4 +-
 include/ardour-systems.html                   |   4 +-
 include/arranging-regions.html                |   4 +-
 include/audio-recording.html                  |   4 +-
 .../04_audio.html => include/audio-tab.html   |   6 +-
 .../audio-track-controls.html                 |   5 +-
 .../audiomidi-busses-mixer-strips.html        |   4 +-
 .../audiomidi-mixer-strips.html               |   4 +-
 ...g-midi---pitch-bending-and-aftertouch.html |   6 +-
 include/automation.html                       |   4 +-
 .../aux-sends.html                            |   5 +-
 .../backup-and-sharing-of-sessions.html       |   5 +-
 .../balance-control.html                      |   5 +-
 .../basic-gui-operations.html                 |   5 +-
 include/basic-mixing.html                     |   4 +-
 ...r-devices-in-mackielogic-control-mode.html |   7 +-
 .../bus-controls.html                         |   5 +-
 .../change-note-properties.html               |   5 +-
 .../class-reference.html                      |   6 +-
 .../cleaning-up-sessions.html                 |   5 +-
 include/clocks.html                           |   4 +-
 .../common-region-edit-operations.html        |   6 +-
 .../comparing-aux-sends-and-subgroups.html    |   6 +-
 include/configuring-midi.html                 |   4 +-
 .../connecting-audio-and-midi-devices.html    |   6 +
 .../control-masters-mixer-strips.html         |   4 +-
 .../control-surfaces-tab.html                 |   6 +-
 ...ng-ardour-with-mackie-control-devices.html |   5 +-
 .../controlling-ardour-with-osc.html          |   5 +-
 .../controlling-playback.html                 |   5 +-
 .../controlling-track-appearance.html         |   5 +-
 .../controlling-track-ordering.html           |   5 +-
 include/controls.html                         |   4 +-
 .../copy-regions.html                         |   5 +-
 .../copying-the-interchange-folder.html       |   5 +-
 .../copying-versus-linking.html               |   5 +-
 .../corresponding-regions-selection.html      |   5 +-
 .../create-midi-regions.html                  |   5 +-
 .../create-midi-tracks.html                   |   5 +-
 .../create-region-fades-and-crossfades.html   |   5 +-
 .../creating-location-markers.html            |   5 +-
 .../creating-music-with-ardour.html           |   5 +-
 .../creating-range-markers.html               |   5 +-
 .../cut-and-paste-operations.html             |   5 +-
 .../default-keyboard-bindings.html            |   6 +-
 .../deleting-objects.html                     |   5 +-
 ...es-using-mackielogic-control-protocol.html |   6 +-
 .../edit-midi.html                            |   5 +-
 include/edit-mode-and-tools.html              |   4 +-
 .../edit-point-control.html                   |   4 +-
 include/editing-basics.html                   |   4 +-
 .../editing-clocks.html                       |   5 +-
 include/editing-regions-and-selections.html   |   4 +-
 .../editor-lists.html                         |   4 +-
 .../03_editor.html => include/editor-tab.html |   6 +-
 .../export-dialog.html                        |   5 +-
 .../export-format-profiles.html               |   5 +-
 .../external-sends.html                       |   5 +-
 include/fades-and-crossfades.html             |   4 +-
 .../03_fades.html => include/fades-tab.html   |   6 +-
 include/favorite-plugins-window.html          |  11 +-
 .../favorite-plugins-window_2.html            |  13 +-
 ...-session-management-and-compatibility.html |   4 +-
 .../filenames-tab.html                        |   6 +-
 ...es-and-directories-ardour-knows-about.html |   4 -
 .../fundamental-concepts.html                 |   5 +-
 .../generic-midi-and-encoders.html            |   5 +-
 .../generic-midi-binding-maps.html            |   5 +-
 .../generic-midi-learn.html                   |   5 +-
 .../generic-midi.html                         |   5 +-
 .../getting-more-plugins.html                 |   5 +-
 .../global-misc-tab.html                      |   6 +-
 .../global-preferences-dialog.html            |   6 +-
 .../grid-controls.html                        |   4 +-
 include/grouping-tracks.html                  |   4 +-
 .../groups-list.html                          |   4 +-
 .../11_gui.html => include/gui-tab.html       |   6 +-
 .../handling-overlapping-notes.html           |   6 +-
 include/i_o-setup.html                        |   5 -
 .../import-dialog.html                        |   5 +-
 .../importing-and-exporting-session-data.html |   4 +-
 ...dent-and-dependent-midi-region-copies.html |   6 +-
 .../04_inserts.html => include/inserts.html   |   5 +-
 .../interchange-with-other-daws.html          |   5 +-
 .../interface-elements.html                   |   5 +-
 include/io-setup.html                         |   3 +
 ...snt-this-a-really-complicated-program.html |   5 +-
 include/kde-plasma-5.html                     |   4 +-
 include/keyboard-and-mouse-shortcuts.html     |   4 +-
 .../latency-and-latency-compensation.html     |   6 +-
 .../latency-considerations.html               |   6 +-
 .../layering-display.html                     |   5 +-
 .../list-of-menu-actions.html                 |   5 +-
 .../locations-tab.html                        |   6 +-
 include/lua-scripting-in-ardour.html          |   4 +-
 .../lua-scripting.html                        |   5 +-
 .../main-menu.html                            |   4 +-
 include/making-selections.html                |   4 +-
 .../managing-plugin-presets.html              |   5 +-
 .../marker-context-menu.html                  |   5 +-
 .../master-bus-strip.html                     |   4 +-
 .../04_media.html => include/media-tab.html   |   6 +-
 include/memory-locations.html                 |   4 +-
 .../09_metadata.html => include/metadata.html |   5 +-
 .../meterbridge-tab.html                      |   6 +-
 .../metering-in-ardour.html                   |   5 +-
 .../metering-tab.html                         |   6 +-
 .../microsoft-windows.html                    |   5 +-
 include/midi-editing.html                     |   4 +-
 include/midi-editors.html                     |   4 +-
 include/midi-event-list.html                  |   4 +-
 .../midi-on-linux.html                        |   5 +-
 .../midi-on-os-x.html                         |   5 +-
 include/midi-recording.html                   |   4 +-
 .../midi-scene-automation.html                |   5 +-
 .../06_midi.html => include/midi-tab.html     |   6 +-
 .../midi-track-controls.html                  |   5 +-
 include/mixdown.html                          |   4 +-
 include/mixer-strips.html                     |   4 +-
 .../mnemonic-bindings-for-linux.html          |   6 +-
 .../mnemonic-bindings-for-os-x.html           |   5 +-
 .../monitor-section.html                      |   4 +-
 .../monitor-setup-in-ardour.html              |   6 +-
 .../monitor-signal-flow.html                  |   6 +-
 .../monitoring-tab.html                       |   6 +-
 .../monitoring.html                           |   5 +-
 .../mono-panner.html                          |   5 +-
 .../02_mouse.html => include/mouse.html       |   5 +-
 .../move-regions-with-the-mouse.html          |   5 +-
 .../move-regions.html                         |   5 +-
 .../moving-markers.html                       |  49 +-
 ...ultichannel-tracks-and-signal-routing.html |   4 +-
 .../muting-and-soloing.html                   |   5 +-
 .../newopen-session-dialog.html               |   5 +-
 .../note-cut-copy-and-paste.html              |   5 +-
 .../note-selection.html                       |   5 +-
 .../nudge-controls.html                       |   4 +-
 .../on-clock-and-time.html                    |   5 +-
 .../osc-control-for-ardour-4.7-and-prior.html |   5 +-
 .../osc58-controlling-ardour-with-osc.html    |   5 +-
 ...osc58-feedback-and-strip-types-values.html |   5 +-
 .../osc58-feedback.html                       |   5 +-
 .../osc58-parameter-types.html                |   5 +-
 .../osc58-personal-monitoring-control.html    |   5 +-
 .../osc58-querying-ardour.html                |   5 +-
 ...election-and-expansion-considerations.html |   5 +-
 .../osc58-using-the-setup-dialog.html         |   5 +-
 ...view-of-all-timecode-related-settings.html |   6 +-
 .../02_panning.html => include/panning.html   |   5 +-
 .../patch-change.html                         |   5 +-
 .../07_Patchbay.html => include/patchbay.html |   5 +-
 .../platform-specifics.html                   |   5 +-
 include/playing-back-track-material.html      |   4 +-
 .../playlist-operations.html                  |   5 +-
 .../playlist-usecases.html                    |   5 +-
 include/playlists.html                        |   4 +-
 include/plugin-and-hardware-inserts.html      |   4 +-
 .../plugin-manager.html                       |   5 +-
 include/plugins-bundled-with-ardour.html      |   4 +-
 .../plugins-tab.html                          |   6 +-
 .../preferences-and-session-properties.html   |   5 +-
 include/preferences.html                      |   4 +-
 .../processor-box.html                        |   5 +-
 .../punch-range.html                          |   5 +-
 include/punch-recording-modes.html            |   4 +-
 .../pushpull-trimming.html                    |   5 +-
 .../quantize-midi.html                        |   5 +-
 include/record-setup.html                     |   4 +-
 .../region-context-menu.html                  |   5 +-
 include/region-loops-and-groups.html          |   4 +-
 .../region-naming.html                        |   5 +-
 .../renaming-a-session.html                   |   5 +-
 .../reordering-tracks.html                    |   5 +-
 include/rhythm-ferret.html                    |   4 +-
 .../12_the-ruler.html => include/ruler.html   |   4 +-
 include/score-editor.html                     |   4 +-
 .../scripting-documentation.html              |   5 +-
 .../searching-for-files-using-tags.html       |   5 +-
 .../select-regions.html                       |   5 +-
 .../selecting-tracks.html                     |   5 +-
 .../selection-and-punch-clocks.html           |   4 +-
 .../selection-techniques.html                 |   5 +-
 .../separate-range.html                       |   5 +-
 .../separate-under.html                       |   5 +-
 .../session-misc-tab.html                     |   6 +-
 .../session-properties-dialog.html            |   6 +-
 .../session-templates.html                    |   5 +-
 include/sessions.html                         |   4 +-
 .../setting-up-midi.html                      |   5 +-
 .../setting-up-your-system.html               |   5 +-
 .../sidechaining.html                         |   5 +-
 .../signal-routing.html                       |   5 +-
 .../snapshots.html                            |   5 +-
 .../solomute-tab.html                         |   6 +-
 .../ssl-nucleus.html                          |   5 +-
 .../starting-ardour.html                      |   5 +-
 .../status-bar.html                           |   4 +-
 .../status-indicators-and-mode-buttons.html   |   4 +-
 .../stem-exports.html                         |   5 +-
 .../step-entry.html                           |   5 +-
 .../stereo-panner.html                        |   5 +-
 .../strip-silence-from-audio-regions.html     |   6 +-
 .../strips-list.html                          |   4 +-
 .../subgrouping.html                          |   5 +-
 .../summary.html                              |   4 +-
 .../supported-file-formats.html               |   5 +-
 include/surround-panning-and-mixing.html      |   4 +-
 .../02_sync.html => include/sync-tab.html     |   6 +-
 include/system-setup.html                     |   4 +-
 ...ques-for-working-with-tempo-and-meter.html |   4 +-
 .../tempo-and-meter.html                      |   6 +-
 .../the-edit-menu.html                        |   4 +-
 .../the-help-menu.html                        |   4 +-
 .../the-loop-range.html                       |   5 +-
 .../the-ranges-and-marks-lists.html           |   4 +-
 .../the-region-list.html                      |   4 +-
 .../the-region-menu.html                      |   4 +-
 ...ght-computer-system-for-digital-audio.html | 216 ++++---
 .../the-session-menu.html                     |   4 +-
 .../the-snapshot-list.html                    |   4 +-
 .../the-track-and-bus-group-list.html         |   4 +-
 .../the-track-menu.html                       |   4 +-
 .../the-tracks-and-busses-list.html           |   4 +-
 .../the-transport-menu.html                   |   4 +-
 .../the-view-menu.html                        |   4 +-
 .../the-window-menu.html                      |   4 +-
 .../13_theme.html => include/theme-tab.html   |   6 +-
 include/time-tempo-and-meter.html             |   3 +
 include/time_-tempo-and-meter.html            |   5 -
 .../timecode-generators-and-slaves.html       |   5 +-
 .../timecode-tab.html                         |   6 +-
 .../toolbox.html                              |   4 +-
 .../03_tooltips.html => include/tooltips.html |   5 +-
 .../track-and-bus-groups.html                 |   5 +-
 .../track-color.html                          |   5 +-
 .../track-context-menu.html                   |   5 +-
 .../track-height.html                         |   5 +-
 ...track-ordering-and-remote-control-ids.html |   5 +-
 .../track-recording-modes.html                |   6 +-
 .../track-types.html                          |   5 +-
 .../trackbus-signal-flow.html                 |   5 +-
 include/tracks.html                           |   4 +-
 .../transcoding-formats-amp-codecs.html       |   5 +-
 ...orming-midi---mathematical-operations.html |   6 +-
 .../transport-bar.html                        |   4 +-
 .../transport-clocks.html                     |   4 +-
 .../transport-tab.html                        |   6 +-
 .../transposing-midi.html                     |   6 +-
 .../trimming-regions.html                     |   5 +-
 .../ubuntu-linux.html                         |   5 +-
 ...anding-basic-concepts-and-terminology.html |   5 +-
 .../understanding-playlists.html              |   5 +-
 .../undoredo-for-editing.html                 |   5 +-
 .../user-interaction-tab.html                 |   6 +-
 .../using-aatranslator.html                   |   5 +-
 include/using-external-midi-devices.html      |   6 +
 include/using-key-bindings.html               |   4 +-
 .../using-more-than-one-audio-device.html     |   5 +-
 .../using-the-ableton-push-2.html             |   6 +-
 .../using-the-mouse.html                      |   5 +-
 .../using-the-presonus-faderport.html         |   6 +-
 .../using-windows-vst-plugins-on-linux.html   |   5 +-
 .../vbap-panner.html                          |   5 +-
 .../09_video.html => include/video-tab.html   |   6 +-
 .../video-timeline-and-monitoring.html        |   5 +-
 .../video-timeline-setup.html                 |   5 +-
 .../waveform-display.html                     |   5 +-
 include/welcome-to-ardour.html                |   4 +-
 .../welcome-to-ardour_2.html                  |   5 +-
 ...at-to-do-if-your-device-is-not-listed.html |   6 +-
 .../whats-in-a-session.html                   |   5 +-
 .../where-are-sessions-stored.html            |   5 +-
 .../which-regions-are-affected.html           |   6 +-
 .../why-is-it-called-ardour.html              |   5 +-
 .../why-write-a-daw-for-linux.html            |   5 +-
 .../why-write-another-daw.html                |   5 +-
 .../workflow-amp-operations.html              |   5 +-
 ...king-with-ardour-built-plugin-editors.html |   5 +-
 .../working-with-extenders.html               |   6 +-
 ...orking-with-field-recorders-in-ardour.html |   4 +-
 .../working-with-markers.html                 |   5 +-
 .../working-with-plugins.html                 |   5 +-
 .../working-with-regions.html                 |   5 +-
 include/working-with-synchronization.html     |   4 +-
 include/working-with-video-in-ardour.html     |   4 +-
 .../zoom-controls.html                        |   4 +-
 master-doc.txt                                | 546 ++++++++----------
 314 files changed, 689 insertions(+), 1750 deletions(-)
 delete mode 100644 _manual/01_welcome-to-ardour/01_about-ardour.html
 delete mode 100644 _manual/02_introducing-ardour.html
 delete mode 100644 _manual/03_setting-up-your-system/03_using-external-midi-devices.html
 delete mode 100644 _manual/03_setting-up-your-system/04_connecting-audio-and-midi-devices.html
 delete mode 100644 _manual/08_working-with-sessions.html
 delete mode 100644 _manual/10_working-with-playlists.html
 delete mode 100644 _manual/11_working-with-tracks.html
 delete mode 100644 _manual/13_working-with-plugins/04_plugin-sidebar.html
 delete mode 100644 _manual/16_recording.html
 delete mode 100644 _manual/18_editing-and-arranging.html
 delete mode 100644 _manual/18_editing-and-arranging/08_separation.html
 delete mode 100644 _manual/19_automation.html
 delete mode 100644 _manual/20_mixing.html
 delete mode 100644 _manual/21_exporting.html
 delete mode 100644 _manual/22_synchronization.html
 delete mode 100644 _manual/25_using-control-surfaces.html
 delete mode 100644 _manual/28_appendix.html
 rename _manual/01_welcome-to-ardour/02_about-ardour-documentation.html => include/about-ardours-documentation.html (98%)
 rename _manual/05_ardours-interface.html => include/about-ardours-interface.html (99%)
 rename _manual/12_working-with-midi/04_add-new-notes.html => include/add-new-notes.html (96%)
 rename _manual/15_adding-pre-existing-material.html => include/adding-pre-existing-material.html (91%)
 rename _manual/11_working-with-tracks/02_adding-tracks-and-busses.html => include/adding-tracks-busses-and-vcas.html (97%)
 rename _manual/01_welcome-to-ardour/03_additional-resources.html => include/additional-resources.html (91%)
 rename _manual/18_editing-and-arranging/06_move-regions/02_align-spotting-regions.html => include/align-spot-regions.html (95%)
 rename _manual/28_appendix/02_monitor-modes.html => include/ardour-monitor-modes.html (99%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/04_audio.html => include/audio-tab.html (98%)
 rename _manual/11_working-with-tracks/07_audio-track-controls.html => include/audio-track-controls.html (91%)
 rename _manual/05_ardours-interface/19_busses-mixer-strips.html => include/audiomidi-busses-mixer-strips.html (99%)
 rename _manual/05_ardours-interface/18_audio-midi-mixer-strips.html => include/audiomidi-mixer-strips.html (99%)
 rename _manual/12_working-with-midi/14_automation-midi.html => include/automating-midi---pitch-bending-and-aftertouch.html (90%)
 rename _manual/17_signal-routing/01_aux-sends.html => include/aux-sends.html (98%)
 rename _manual/08_working-with-sessions/04_backup-and-sharing-of-sessions.html => include/backup-and-sharing-of-sessions.html (92%)
 rename _manual/20_mixing/02_panning/02_balance_control.html => include/balance-control.html (89%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations.html => include/basic-gui-operations.html (76%)
 rename _manual/25_using-control-surfaces/02_mackie-control-protocol/03_behringer-devices-in-mackielogic-control-mode.html => include/behringer-devices-in-mackielogic-control-mode.html (98%)
 rename _manual/11_working-with-tracks/06_bus-controls.html => include/bus-controls.html (94%)
 rename _manual/12_working-with-midi/05_change-note-properties.html => include/change-note-properties.html (97%)
 rename _manual/27_lua-scripting/02_class_reference.html => include/class-reference.html (99%)
 rename _manual/08_working-with-sessions/10_cleaning_up.html => include/cleaning-up-sessions.html (98%)
 rename _manual/18_editing-and-arranging/03_common-region-edit-operations.html => include/common-region-edit-operations.html (96%)
 rename _manual/17_signal-routing/02_comparing-aux-sends-and-subgroups.html => include/comparing-aux-sends-and-subgroups.html (87%)
 create mode 100644 include/connecting-audio-and-midi-devices.html
 rename _manual/05_ardours-interface/20_control-masters.html => include/control-masters-mixer-strips.html (98%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/08_control_surfaces.html => include/control-surfaces-tab.html (86%)
 rename _manual/25_using-control-surfaces/02_mackie-control-protocol.html => include/controlling-ardour-with-mackie-control-devices.html (81%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc.html => include/controlling-ardour-with-osc.html (84%)
 rename _manual/06_controlling-playback.html => include/controlling-playback.html (97%)
 rename _manual/11_working-with-tracks/04_controlling-track-appearance.html => include/controlling-track-appearance.html (74%)
 rename _manual/11_working-with-tracks/05_controlling-track-ordering.html => include/controlling-track-ordering.html (91%)
 rename _manual/18_editing-and-arranging/05_copy-regions.html => include/copy-regions.html (93%)
 rename _manual/08_working-with-sessions/05_interchange-with-other-daws/01_copying-the-interchange-folder.html => include/copying-the-interchange-folder.html (88%)
 rename _manual/15_adding-pre-existing-material/02_copying-versus-linking.html => include/copying-versus-linking.html (95%)
 rename _manual/09_working-with-regions/02_corresponding-regions-selection.html => include/corresponding-regions-selection.html (95%)
 rename _manual/12_working-with-midi/03_create-midi-regions.html => include/create-midi-regions.html (87%)
 rename _manual/12_working-with-midi/02_create-midi-tracks.html => include/create-midi-tracks.html (88%)
 rename _manual/18_editing-and-arranging/07_create-region-fades-and-crossfades.html => include/create-region-fades-and-crossfades.html (98%)
 rename _manual/07_working-with-markers/01_creating-location-markers.html => include/creating-location-markers.html (94%)
 rename _manual/02_introducing-ardour/01_creating-music-with-ardour.html => include/creating-music-with-ardour.html (98%)
 rename _manual/07_working-with-markers/02_creating-range-markers.html => include/creating-range-markers.html (90%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations/06_cut-and-paste-operations.html => include/cut-and-paste-operations.html (92%)
 rename _manual/23_default-keyboard-bindings.html => include/default-keyboard-bindings.html (96%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations/07_deleting-objects.html => include/deleting-objects.html (93%)
 rename _manual/25_using-control-surfaces/02_mackie-control-protocol/01_mackie-control-configure.html => include/devices-using-mackielogic-control-protocol.html (95%)
 rename _manual/12_working-with-midi.html => include/edit-midi.html (97%)
 rename _manual/05_ardours-interface/10_the-edit-point-control.html => include/edit-point-control.html (97%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations/08_editing-clocks.html => include/editing-clocks.html (99%)
 rename _manual/05_ardours-interface/14_editor-lists.html => include/editor-lists.html (94%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/03_editor.html => include/editor-tab.html (98%)
 rename _manual/21_exporting/01_export-dialog.html => include/export-dialog.html (97%)
 rename _manual/21_exporting/02_edit-export-format-profile.html => include/export-format-profiles.html (98%)
 rename _manual/17_signal-routing/03_external-sends.html => include/external-sends.html (96%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/03_fades.html => include/fades-tab.html (88%)
 rename _manual/05_ardours-interface/15_favorite-plugins-window.html => include/favorite-plugins-window_2.html (76%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/06_filenames.html => include/filenames-tab.html (91%)
 rename _manual/28_appendix/03_files-and-directories.html => include/files-and-directories-ardour-knows-about.html (98%)
 rename _manual/12_working-with-midi/01_fundamental-concepts.html => include/fundamental-concepts.html (95%)
 rename _manual/25_using-control-surfaces/03_generic-midi/03_working-with-encoders.html => include/generic-midi-and-encoders.html (97%)
 rename _manual/25_using-control-surfaces/03_generic-midi/01_midi-binding-maps.html => include/generic-midi-binding-maps.html (99%)
 rename _manual/25_using-control-surfaces/03_generic-midi/02_midi-learn.html => include/generic-midi-learn.html (97%)
 rename _manual/25_using-control-surfaces/03_generic-midi.html => include/generic-midi.html (89%)
 rename _manual/13_working-with-plugins/07_getting-plugins.html => include/getting-more-plugins.html (99%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/01_misc.html => include/global-misc-tab.html (98%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog.html => include/global-preferences-dialog.html (58%)
 rename _manual/05_ardours-interface/09_the-grid-controls.html => include/grid-controls.html (99%)
 rename _manual/05_ardours-interface/17_the-groups-list.html => include/groups-list.html (99%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/11_gui.html => include/gui-tab.html (97%)
 rename _manual/12_working-with-midi/06_handle-overlapping-notes.html => include/handling-overlapping-notes.html (94%)
 delete mode 100644 include/i_o-setup.html
 rename _manual/15_adding-pre-existing-material/01_import-dialog.html => include/import-dialog.html (98%)
 rename _manual/12_working-with-midi/12_copy-midi-region.html => include/independent-and-dependent-midi-region-copies.html (94%)
 rename _manual/17_signal-routing/04_inserts.html => include/inserts.html (95%)
 rename _manual/08_working-with-sessions/05_interchange-with-other-daws.html => include/interchange-with-other-daws.html (92%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations/01_interface-elements.html => include/interface-elements.html (63%)
 create mode 100644 include/io-setup.html
 rename _manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html => include/isnt-this-a-really-complicated-program.html (91%)
 rename _manual/22_synchronization/02_latency-and-latency-compensation.html => include/latency-and-latency-compensation.html (99%)
 rename _manual/16_recording/01_monitoring/01_latency-considerations.html => include/latency-considerations.html (95%)
 rename _manual/11_working-with-tracks/04_controlling-track-appearance/01_layering-display.html => include/layering-display.html (96%)
 rename _manual/28_appendix/01_menu-actions-list.html => include/list-of-menu-actions.html (99%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/05_locations.html => include/locations-tab.html (86%)
 rename _manual/27_lua-scripting.html => include/lua-scripting.html (71%)
 rename _manual/05_ardours-interface/01_main-menu.html => include/main-menu.html (96%)
 rename _manual/13_working-with-plugins/01_managing-plugin-presets.html => include/managing-plugin-presets.html (96%)
 rename _manual/07_working-with-markers/05_marker-context-menu.html => include/marker-context-menu.html (96%)
 rename _manual/05_ardours-interface/21_the-master-bus-strip.html => include/master-bus-strip.html (96%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/04_media.html => include/media-tab.html (84%)
 rename _manual/08_working-with-sessions/09_metadata.html => include/metadata.html (82%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/08_meterbridge.html => include/meterbridge-tab.html (87%)
 rename _manual/04_meters.html => include/metering-in-ardour.html (99%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/12_metering.html => include/metering-tab.html (92%)
 rename _manual/03_setting-up-your-system/07_platform-specifics/02_microsoft-windows.html => include/microsoft-windows.html (94%)
 rename _manual/03_setting-up-your-system/05_setting-up-midi/02_midi-on-linux.html => include/midi-on-linux.html (97%)
 rename _manual/03_setting-up-your-system/05_setting-up-midi/01_midi-on-os-x.html => include/midi-on-os-x.html (93%)
 rename _manual/19_automation/01_midi-scenes.html => include/midi-scene-automation.html (96%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/06_midi.html => include/midi-tab.html (97%)
 rename _manual/11_working-with-tracks/08_midi-track-controls.html => include/midi-track-controls.html (95%)
 rename _manual/23_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html => include/mnemonic-bindings-for-linux.html (99%)
 rename _manual/23_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html => include/mnemonic-bindings-for-os-x.html (99%)
 rename _manual/05_ardours-interface/22_the-monitor-section.html => include/monitor-section.html (99%)
 rename _manual/16_recording/01_monitoring/03_monitor-setup-in-ardour.html => include/monitor-setup-in-ardour.html (94%)
 rename _manual/16_recording/01_monitoring/02_monitor-signal-flow.html => include/monitor-signal-flow.html (94%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/07_monitoring.html => include/monitoring-tab.html (86%)
 rename _manual/16_recording/01_monitoring.html => include/monitoring.html (83%)
 rename _manual/20_mixing/02_panning/01_mono_panner.html => include/mono-panner.html (97%)
 rename _manual/03_setting-up-your-system/02_mouse.html => include/mouse.html (96%)
 rename _manual/18_editing-and-arranging/06_move-regions/01_move-regions-with-the-mouse.html => include/move-regions-with-the-mouse.html (94%)
 rename _manual/18_editing-and-arranging/06_move-regions.html => include/move-regions.html (96%)
 rename _manual/07_working-with-markers/03_moving-markers.html => include/moving-markers.html (88%)
 rename _manual/20_mixing/01_muting-and-soloing.html => include/muting-and-soloing.html (98%)
 rename _manual/08_working-with-sessions/01_new-session-dialog.html => include/newopen-session-dialog.html (98%)
 rename _manual/12_working-with-midi/07_note-cut-copy-and-paste-.html => include/note-cut-copy-and-paste.html (78%)
 rename _manual/12_working-with-midi/08_note-selection.html => include/note-selection.html (95%)
 rename _manual/05_ardours-interface/11_the-nudge-controls.html => include/nudge-controls.html (95%)
 rename _manual/22_synchronization/01_on-clock-and-time.html => include/on-clock-and-time.html (98%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/09_osc-control-in-ardour-4.7-and-prior.html => include/osc-control-for-ardour-4.7-and-prior.html (99%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/01_osc-control.html => include/osc58-controlling-ardour-with-osc.html (99%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/05_calculating-feedback-and-strip-types-values.html => include/osc58-feedback-and-strip-types-values.html (98%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/04_feedback-in-osc.html => include/osc58-feedback.html (99%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/07_parameter-types-in-osc.html => include/osc58-parameter-types.html (95%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/06_osc-personal-monitoring.html => include/osc58-personal-monitoring-control.html (98%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/03_querying-ardour-with-osc.html => include/osc58-querying-ardour.html (98%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/08_selection-considerations-in-osc.html => include/osc58-selection-and-expansion-considerations.html (97%)
 rename _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/02_osc-setup-dialog.html => include/osc58-using-the-setup-dialog.html (98%)
 rename _manual/22_synchronization/04_overview-of-timecode-related-settings.html => include/overview-of-all-timecode-related-settings.html (97%)
 rename _manual/20_mixing/02_panning.html => include/panning.html (96%)
 rename _manual/12_working-with-midi/11_patch-change.html => include/patch-change.html (97%)
 rename _manual/17_signal-routing/07_Patchbay.html => include/patchbay.html (98%)
 rename _manual/03_setting-up-your-system/07_platform-specifics.html => include/platform-specifics.html (74%)
 rename _manual/10_working-with-playlists/02_playlist-operations.html => include/playlist-operations.html (97%)
 rename _manual/10_working-with-playlists/03_playlist_usecases.html => include/playlist-usecases.html (96%)
 rename _manual/13_working-with-plugins/02_plugin-manager.html => include/plugin-manager.html (97%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/10_plugins.html => include/plugins-tab.html (96%)
 rename _manual/24_preferences-and-session-properties.html => include/preferences-and-session-properties.html (87%)
 rename _manual/13_working-with-plugins/03_processor-box.html => include/processor-box.html (97%)
 rename _manual/07_working-with-markers/06_punch-range.html => include/punch-range.html (87%)
 rename _manual/18_editing-and-arranging/04_change-region-lengths/01_pushpull-trimming.html => include/pushpull-trimming.html (95%)
 rename _manual/12_working-with-midi/09_quantize-midi.html => include/quantize-midi.html (88%)
 rename _manual/09_working-with-regions/03_region-context-menu.html => include/region-context-menu.html (97%)
 rename _manual/09_working-with-regions/01_region-naming.html => include/region-naming.html (97%)
 rename _manual/08_working-with-sessions/06_renaming-a-session.html => include/renaming-a-session.html (89%)
 rename _manual/11_working-with-tracks/05_controlling-track-ordering/01_reordering-tracks.html => include/reordering-tracks.html (97%)
 rename _manual/05_ardours-interface/12_the-ruler.html => include/ruler.html (98%)
 rename _manual/27_lua-scripting/01_brain_dump.html => include/scripting-documentation.html (99%)
 rename _manual/15_adding-pre-existing-material/03_searching-for-files-using-tags.html => include/searching-for-files-using-tags.html (94%)
 rename _manual/18_editing-and-arranging/01_select-regions.html => include/select-regions.html (98%)
 rename _manual/11_working-with-tracks/03_selecting-tracks.html => include/selecting-tracks.html (94%)
 rename _manual/05_ardours-interface/05_selection-and-punch-clocks.html => include/selection-and-punch-clocks.html (96%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations/02_selection-techniques.html => include/selection-techniques.html (96%)
 rename _manual/18_editing-and-arranging/08_separation/02_separate-range.html => include/separate-range.html (84%)
 rename _manual/18_editing-and-arranging/08_separation/01_separate-under.html => include/separate-under.html (94%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/09_misc.html => include/session-misc-tab.html (93%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog.html => include/session-properties-dialog.html (75%)
 rename _manual/08_working-with-sessions/07_session-templates.html => include/session-templates.html (93%)
 rename _manual/03_setting-up-your-system/05_setting-up-midi.html => include/setting-up-midi.html (95%)
 rename _manual/03_setting-up-your-system.html => include/setting-up-your-system.html (77%)
 rename _manual/17_signal-routing/09_sidechaining.html => include/sidechaining.html (99%)
 rename _manual/17_signal-routing.html => include/signal-routing.html (95%)
 rename _manual/08_working-with-sessions/08_snapshots.html => include/snapshots.html (98%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/05_solomute.html => include/solomute-tab.html (98%)
 rename _manual/25_using-control-surfaces/02_mackie-control-protocol/02_ssl-nucleus.html => include/ssl-nucleus.html (99%)
 rename _manual/03_setting-up-your-system/08_starting-ardour.html => include/starting-ardour.html (97%)
 rename _manual/05_ardours-interface/02_status-bar.html => include/status-bar.html (98%)
 rename _manual/05_ardours-interface/06_status-indicators.html => include/status-indicators-and-mode-buttons.html (96%)
 rename _manual/08_working-with-sessions/05_interchange-with-other-daws/02_stem-exports.html => include/stem-exports.html (86%)
 rename _manual/12_working-with-midi/10_step-entry.html => include/step-entry.html (96%)
 rename _manual/20_mixing/02_panning/03_stereo_panner.html => include/stereo-panner.html (99%)
 rename _manual/18_editing-and-arranging/09_strip-silence-from-audio-regions.html => include/strip-silence-from-audio-regions.html (87%)
 rename _manual/05_ardours-interface/16_the-strips-list.html => include/strips-list.html (97%)
 rename _manual/17_signal-routing/06_subgrouping.html => include/subgrouping.html (96%)
 rename _manual/05_ardours-interface/13_the-summary.html => include/summary.html (98%)
 rename _manual/15_adding-pre-existing-material/04_supported-file-formats.html => include/supported-file-formats.html (93%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/02_sync.html => include/sync-tab.html (74%)
 rename _manual/14_working-with-tempo-and-meter.html => include/tempo-and-meter.html (98%)
 rename _manual/05_ardours-interface/01_main-menu/03_Edit-menu.html => include/the-edit-menu.html (99%)
 rename _manual/05_ardours-interface/01_main-menu/08_Help-menu.html => include/the-help-menu.html (97%)
 rename _manual/07_working-with-markers/04_loop-range.html => include/the-loop-range.html (86%)
 rename _manual/05_ardours-interface/14_editor-lists/05_ranges-and-marks-list.html => include/the-ranges-and-marks-lists.html (98%)
 rename _manual/05_ardours-interface/14_editor-lists/01_region-list.html => include/the-region-list.html (98%)
 rename _manual/05_ardours-interface/01_main-menu/04_Region-menu.html => include/the-region-menu.html (99%)
 rename _manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html => include/the-right-computer-system-for-digital-audio.html (95%)
 rename _manual/05_ardours-interface/01_main-menu/01_Session-menu.html => include/the-session-menu.html (99%)
 rename _manual/05_ardours-interface/14_editor-lists/03_snapshot-list.html => include/the-snapshot-list.html (88%)
 rename _manual/05_ardours-interface/14_editor-lists/04_track-and-bus-group-list.html => include/the-track-and-bus-group-list.html (96%)
 rename _manual/05_ardours-interface/01_main-menu/05_Track-menu.html => include/the-track-menu.html (98%)
 rename _manual/05_ardours-interface/14_editor-lists/02_tracks-and-busses-list.html => include/the-tracks-and-busses-list.html (97%)
 rename _manual/05_ardours-interface/01_main-menu/02_Transport-menu.html => include/the-transport-menu.html (99%)
 rename _manual/05_ardours-interface/01_main-menu/06_View-menu.html => include/the-view-menu.html (99%)
 rename _manual/05_ardours-interface/01_main-menu/07_Window-menu.html => include/the-window-menu.html (99%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/13_theme.html => include/theme-tab.html (98%)
 create mode 100644 include/time-tempo-and-meter.html
 delete mode 100644 include/time_-tempo-and-meter.html
 rename _manual/22_synchronization/03_timecode-generators-and-slaves.html => include/timecode-generators-and-slaves.html (99%)
 rename _manual/24_preferences-and-session-properties/02_session-properties-dialog/01_timecode.html => include/timecode-tab.html (89%)
 rename _manual/05_ardours-interface/07_the-toolbox.html => include/toolbox.html (99%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations/03_tooltips.html => include/tooltips.html (89%)
 rename _manual/11_working-with-tracks/09_track-and-bus-groups.html => include/track-and-bus-groups.html (99%)
 rename _manual/11_working-with-tracks/04_controlling-track-appearance/02_track-coloring.html => include/track-color.html (94%)
 rename _manual/11_working-with-tracks/10_track-context-menu.html => include/track-context-menu.html (97%)
 rename _manual/11_working-with-tracks/04_controlling-track-appearance/03_track-height.html => include/track-height.html (95%)
 rename _manual/11_working-with-tracks/05_controlling-track-ordering/02_track-ordering-and-remote-control-ids.html => include/track-ordering-and-remote-control-ids.html (89%)
 rename _manual/16_recording/02_track-recording-modes.html => include/track-recording-modes.html (79%)
 rename _manual/11_working-with-tracks/01_track-types.html => include/track-types.html (98%)
 rename _manual/17_signal-routing/08_signal-flow.html => include/trackbus-signal-flow.html (99%)
 rename _manual/26_video-timeline/02_transcoding_formats_codecs.html => include/transcoding-formats-amp-codecs.html (97%)
 rename _manual/12_working-with-midi/15_transformation-midi.html => include/transforming-midi---mathematical-operations.html (95%)
 rename _manual/05_ardours-interface/03_the-transport-bar.html => include/transport-bar.html (99%)
 rename _manual/05_ardours-interface/04_transport-clocks.html => include/transport-clocks.html (99%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/02_transport.html => include/transport-tab.html (98%)
 rename _manual/12_working-with-midi/13_transpose-midi.html => include/transposing-midi.html (81%)
 rename _manual/18_editing-and-arranging/04_change-region-lengths.html => include/trimming-regions.html (98%)
 rename _manual/03_setting-up-your-system/07_platform-specifics/01_ubuntu-linux.html => include/ubuntu-linux.html (99%)
 rename _manual/02_introducing-ardour/02_understanding-basic-concepts-and-terminology.html => include/understanding-basic-concepts-and-terminology.html (98%)
 rename _manual/10_working-with-playlists/01_understanding-playlists.html => include/understanding-playlists.html (97%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations/04_undoredo-for-editing-.html => include/undoredo-for-editing.html (96%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/07_interaction.html => include/user-interaction-tab.html (92%)
 rename _manual/08_working-with-sessions/05_interchange-with-other-daws/03_using-aatranslator.html => include/using-aatranslator.html (92%)
 create mode 100644 include/using-external-midi-devices.html
 rename _manual/03_setting-up-your-system/06_using_more_than_one_audio_device.html => include/using-more-than-one-audio-device.html (97%)
 rename _manual/25_using-control-surfaces/05_Ableton_Push2.html => include/using-the-ableton-push-2.html (99%)
 rename _manual/02_introducing-ardour/03_basic-gui-operations/05_using-the-mouse.html => include/using-the-mouse.html (98%)
 rename _manual/25_using-control-surfaces/04_Presonus_FaderPort.html => include/using-the-presonus-faderport.html (99%)
 rename _manual/13_working-with-plugins/05_windows-vst-support.html => include/using-windows-vst-plugins-on-linux.html (96%)
 rename _manual/20_mixing/02_panning/04_vbap_panner.html => include/vbap-panner.html (98%)
 rename _manual/24_preferences-and-session-properties/01_preferences-dialog/09_video.html => include/video-tab.html (90%)
 rename _manual/26_video-timeline.html => include/video-timeline-and-monitoring.html (94%)
 rename _manual/26_video-timeline/01_setup.html => include/video-timeline-setup.html (98%)
 rename _manual/11_working-with-tracks/04_controlling-track-appearance/04_waveform-display.html => include/waveform-display.html (95%)
 rename _manual/01_welcome-to-ardour.html => include/welcome-to-ardour_2.html (97%)
 rename _manual/25_using-control-surfaces/02_mackie-control-protocol/04_devices-not-listed.html => include/what-to-do-if-your-device-is-not-listed.html (87%)
 rename _manual/08_working-with-sessions/02_whats-in-a-session.html => include/whats-in-a-session.html (95%)
 rename _manual/08_working-with-sessions/03_where-are-sessions-stored.html => include/where-are-sessions-stored.html (88%)
 rename _manual/18_editing-and-arranging/02_which-regions-are-affected.html => include/which-regions-are-affected.html (93%)
 rename _manual/01_welcome-to-ardour/01_about-ardour/03_why-is-it-called-ardour.html => include/why-is-it-called-ardour.html (94%)
 rename _manual/01_welcome-to-ardour/01_about-ardour/02_why-write-a-daw-for-linux.html => include/why-write-a-daw-for-linux.html (95%)
 rename _manual/01_welcome-to-ardour/01_about-ardour/04_why-write-another-daw.html => include/why-write-another-daw.html (90%)
 rename _manual/26_video-timeline/03_operations.html => include/workflow-amp-operations.html (98%)
 rename _manual/13_working-with-plugins/06_working-with-ardour-built-plugin-editors.html => include/working-with-ardour-built-plugin-editors.html (90%)
 rename _manual/25_using-control-surfaces/02_mackie-control-protocol/05_working-with-extenders.html => include/working-with-extenders.html (97%)
 rename _manual/07_working-with-markers.html => include/working-with-markers.html (91%)
 rename _manual/13_working-with-plugins.html => include/working-with-plugins.html (97%)
 rename _manual/09_working-with-regions.html => include/working-with-regions.html (96%)
 rename _manual/05_ardours-interface/08_the-zoom-controls.html => include/zoom-controls.html (98%)

diff --git a/_manual/01_welcome-to-ardour/01_about-ardour.html b/_manual/01_welcome-to-ardour/01_about-ardour.html
deleted file mode 100644
index dff309b..0000000
--- a/_manual/01_welcome-to-ardour/01_about-ardour.html
+++ /dev/null
@@ -1,19 +0,0 @@
----
-layout: default
-title: About Ardour
----                        
- 
-<p>
-<dfn>Ardour</dfn> allows you to record and edit both audio and MIDI data, add
-many different kinds of effects and mix.
-</p>
-<p>Things you might use Ardour for include:</p>
-<ul>
-<li>Digitally record acoustic/electric instruments or vocals</li>
-<li>Compose and arrange audio and MIDI tracks</li>
-<li>Edit live recordings</li>
-<li>Mix and edit movie soundtracks and dialogue</li>
-<li>Create sound designs for an arbitrary number of output channels</li>
-</ul>
-
-{% children %}
diff --git a/_manual/02_introducing-ardour.html b/_manual/02_introducing-ardour.html
deleted file mode 100644
index ed6f89d..0000000
--- a/_manual/02_introducing-ardour.html
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: default
-title: Introducing Ardour
----                        
-
-
-  
-  
-<p>This chapter gives you a conceptual overview of Ardour and provides an example of a common workflow when creating music with the program.</p>
-
-{% children %}
diff --git a/_manual/03_setting-up-your-system/03_using-external-midi-devices.html b/_manual/03_setting-up-your-system/03_using-external-midi-devices.html
deleted file mode 100644
index c40ff1e..0000000
--- a/_manual/03_setting-up-your-system/03_using-external-midi-devices.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: default
-title: Using External MIDI Devices
----                        
-
-
-  
-  
-  
diff --git a/_manual/03_setting-up-your-system/04_connecting-audio-and-midi-devices.html b/_manual/03_setting-up-your-system/04_connecting-audio-and-midi-devices.html
deleted file mode 100644
index c9c7ce9..0000000
--- a/_manual/03_setting-up-your-system/04_connecting-audio-and-midi-devices.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: default
-title: Connecting Audio and MIDI Devices
----                        
-
-
-  
-  
-  
diff --git a/_manual/08_working-with-sessions.html b/_manual/08_working-with-sessions.html
deleted file mode 100644
index 4123fd0..0000000
--- a/_manual/08_working-with-sessions.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Working With Sessions
----                        
-
-{% children %}
diff --git a/_manual/10_working-with-playlists.html b/_manual/10_working-with-playlists.html
deleted file mode 100644
index bbc9ccf..0000000
--- a/_manual/10_working-with-playlists.html
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: default
-title: Working With Playlists
----                        
-  
-<p>
-  <dfn>Playlists</dfn> are a fundamental concept in Ardour that you may or
-  may not end up using, depending on your workflow.
-</p>
-  
-{% children %}
diff --git a/_manual/11_working-with-tracks.html b/_manual/11_working-with-tracks.html
deleted file mode 100644
index 45657c2..0000000
--- a/_manual/11_working-with-tracks.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Working With Tracks
----                        
-
-{% children %}
diff --git a/_manual/13_working-with-plugins/04_plugin-sidebar.html b/_manual/13_working-with-plugins/04_plugin-sidebar.html
deleted file mode 100644
index c48e552..0000000
--- a/_manual/13_working-with-plugins/04_plugin-sidebar.html
+++ /dev/null
@@ -1,38 +0,0 @@
----
-layout: default
-title: Plugin Sidebar
----
-
-<p>
-  Since Version 4.5, Ardour has a plugin-sidebar on the top-left side of the
-	Mixer Window.
-	Like other elements in that sidebar it has variable height and can be hidden
-	by dragging it to zero-height. If it is not visible, grab the top-handle
-	and drag it down.
-</p>
-
-<img src="/images/a4_plugin_sidebar.png" alt="Plugin Sidebar"/>
-
-<h2>Features</h2>
-<p>
-  The Plugin sidebar provides easy access to common operations.
-	All interaction is done with the mouse and Drag/Drop.
-</p>
-<ul>
-	<li>The sidebar lists "favorite" plugins only.</li>
-	<li>Plugins can be dragged from the sidebar to any track or bus, which will add the plugin to that track/bus at the given position.</li>
-	<li>The list includes user-presets for the plugins. Dragging a preset to a given track/bus will load that preset after adding the plugin.</li>
-	<li>Double-click on a plugin or preset adds the given plugin to all selected tracks/busses pre-fader. Other insert positions are available from the context menu (right click).</li>
-</ul>
-<p>
-  The sidebar also allows to manage presets and favorites.
-</p>
-<ul>
-	<li>Dragging a plugin from a track into the sidebar will add it to the "favorites" and optionally create a new preset from the current settings.</li>
-	<li>The context-menu allows to delete presets or remove the plugin from the "favorite" list.</li>
-	<li>Plugins in the list can be re-ordered using drag/drop. The custom order is saved.</li>
-</ul>
-
-<p>
-	Note, when favorites are added with the <a href="/working-with-plugins/plugin-manager/">plugin-manager</a>, they are appended at the bottom of the list.
-</p>
diff --git a/_manual/16_recording.html b/_manual/16_recording.html
deleted file mode 100644
index 61e7666..0000000
--- a/_manual/16_recording.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Recording
----                        
-
-{% children %}
diff --git a/_manual/18_editing-and-arranging.html b/_manual/18_editing-and-arranging.html
deleted file mode 100644
index 75259d2..0000000
--- a/_manual/18_editing-and-arranging.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Editing and Arranging
----                        
-
-{% children %}
diff --git a/_manual/18_editing-and-arranging/08_separation.html b/_manual/18_editing-and-arranging/08_separation.html
deleted file mode 100644
index 33720d9..0000000
--- a/_manual/18_editing-and-arranging/08_separation.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-layout: default
-title: Separation
----                        
-
-
-{% children %}
diff --git a/_manual/19_automation.html b/_manual/19_automation.html
deleted file mode 100644
index e14a309..0000000
--- a/_manual/19_automation.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Automation
----                        
-
-{% children %}
diff --git a/_manual/20_mixing.html b/_manual/20_mixing.html
deleted file mode 100644
index 1ece4d5..0000000
--- a/_manual/20_mixing.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Mixing
----                        
-
-{% children %}
diff --git a/_manual/21_exporting.html b/_manual/21_exporting.html
deleted file mode 100644
index 02fd29b..0000000
--- a/_manual/21_exporting.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-layout: default
-title: Exporting
----                        
-  
-{% children %}
-  
diff --git a/_manual/22_synchronization.html b/_manual/22_synchronization.html
deleted file mode 100644
index 752f2b8..0000000
--- a/_manual/22_synchronization.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: default
-title: Synchronization
----                        
-
-<p>Ardour can be synchronized with a variety of external devices and other software.</p>
-
-{% children %}
diff --git a/_manual/25_using-control-surfaces.html b/_manual/25_using-control-surfaces.html
deleted file mode 100644
index 962ba7b..0000000
--- a/_manual/25_using-control-surfaces.html
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: default
-title: Using Control Surfaces
----                        
-
-
-  
-  
-  
-
-
-
-{% children %}
diff --git a/_manual/28_appendix.html b/_manual/28_appendix.html
deleted file mode 100644
index d45d2ec..0000000
--- a/_manual/28_appendix.html
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: default
-title: Appendix
----
-
-
-
-
-
-
-
-
-{% children %}
diff --git a/build.py b/build.py
index 980ecec..639d8ef 100755
--- a/build.py
+++ b/build.py
@@ -322,11 +322,6 @@ if os.access(siteDir, os.F_OK):
 
 shutil.copytree('./source', siteDir)
 
-# Yeah, need to make a symlink in include/ too :-P
-# [this will go away when the rewrite happens]
-if (os.access('include/_manual', os.F_OK) == False):
-	os.symlink('../_manual/', 'include/_manual')
-
 
 # Read the template, and fix the stuff that's fixed for all pages
 temp = open('page-template.txt')
diff --git a/_manual/01_welcome-to-ardour/02_about-ardour-documentation.html b/include/about-ardours-documentation.html
similarity index 98%
rename from _manual/01_welcome-to-ardour/02_about-ardour-documentation.html
rename to include/about-ardours-documentation.html
index 99c59ec..8688842 100644
--- a/_manual/01_welcome-to-ardour/02_about-ardour-documentation.html
+++ b/include/about-ardours-documentation.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: About Ardour documentation
----                        
 
 <h2>Conventions Used In This Manual</h2>
 <p>
@@ -131,3 +127,4 @@ title: About Ardour documentation
   quality, or eat your proverbial goldfish, are displayed in this way.
 </p>
 
+
diff --git a/_manual/05_ardours-interface.html b/include/about-ardours-interface.html
similarity index 99%
rename from _manual/05_ardours-interface.html
rename to include/about-ardours-interface.html
index 231b9c3..530e49a 100644
--- a/_manual/05_ardours-interface.html
+++ b/include/about-ardours-interface.html
@@ -1,6 +1,3 @@
----
-title: Ardour's Interface
----
 
 <p>
   In Ardour, work is done in two main windows: the <dfn>Editor</dfn> and the
@@ -118,3 +115,4 @@ title: Ardour's Interface
 
 
 {% children %}
+
diff --git a/_manual/12_working-with-midi/04_add-new-notes.html b/include/add-new-notes.html
similarity index 96%
rename from _manual/12_working-with-midi/04_add-new-notes.html
rename to include/add-new-notes.html
index b85ac63..af2029f 100644
--- a/_manual/12_working-with-midi/04_add-new-notes.html
+++ b/include/add-new-notes.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Add New Notes
----                        
   
 <h2>Adding new notes</h2>
 <p>
@@ -46,3 +42,4 @@ title: Add New Notes
   allowing you to enter notes from a virtual keyboard and lots more besides.
 </p>
   
+
diff --git a/_manual/15_adding-pre-existing-material.html b/include/adding-pre-existing-material.html
similarity index 91%
rename from _manual/15_adding-pre-existing-material.html
rename to include/adding-pre-existing-material.html
index 600d2f2..8474727 100644
--- a/_manual/15_adding-pre-existing-material.html
+++ b/include/adding-pre-existing-material.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Adding Pre-existing Material
----                        
   
 <p>
   There are several ways to importing an audio or MIDI file into a 
@@ -29,3 +25,4 @@ title: Adding Pre-existing Material
 </p>
 
 {% children %}
+
diff --git a/_manual/11_working-with-tracks/02_adding-tracks-and-busses.html b/include/adding-tracks-busses-and-vcas.html
similarity index 97%
rename from _manual/11_working-with-tracks/02_adding-tracks-and-busses.html
rename to include/adding-tracks-busses-and-vcas.html
index 5bb142f..1c7f8bc 100644
--- a/_manual/11_working-with-tracks/02_adding-tracks-and-busses.html
+++ b/include/adding-tracks-busses-and-vcas.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Adding Tracks, Busses and VCAs
----                        
 
 <img class="right" src="/images/add-track-or-bus.png" alt="the add-track dialog" />
 <p>A track, bus or VCA can be added to a session in various ways:</p>
@@ -52,3 +48,4 @@ title: Adding Tracks, Busses and VCAs
   use this option with care!
 </p>
 
+
diff --git a/_manual/01_welcome-to-ardour/03_additional-resources.html b/include/additional-resources.html
similarity index 91%
rename from _manual/01_welcome-to-ardour/03_additional-resources.html
rename to include/additional-resources.html
index aaa8c6b..80d55fb 100644
--- a/_manual/01_welcome-to-ardour/03_additional-resources.html
+++ b/include/additional-resources.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Additional Resources
----                        
 
 <p>In addition to this documentation, you may check a variety of other
 <dfn>resources</dfn>:</p>
@@ -21,3 +17,4 @@ title: Additional Resources
   busiest from 19:00&nbsp;UTC to 04:00&nbsp;UTC. If you can, keep your chat
   window open, so that you don't miss a belated answer.
 </p>  
+
diff --git a/_manual/18_editing-and-arranging/06_move-regions/02_align-spotting-regions.html b/include/align-spot-regions.html
similarity index 95%
rename from _manual/18_editing-and-arranging/06_move-regions/02_align-spotting-regions.html
rename to include/align-spot-regions.html
index acb8e8c..432b337 100644
--- a/_manual/18_editing-and-arranging/06_move-regions/02_align-spotting-regions.html
+++ b/include/align-spot-regions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Align (Spot) Regions
----
 
 <p>
   Aligning regions (sometimes called "spotting") means moving one or more
@@ -20,3 +16,4 @@ title: Align (Spot) Regions
   <dt>Align Region starts relative <kbd class="mod4">a</kbd></dt>
   <dd>Selected region(s) are moved so that the start of the earliest region is located at the current edit point, and all others maintain their relative position relative to that region</dd>
 </dl>
+
diff --git a/include/ardour-concepts.html b/include/ardour-concepts.html
index 09e5b51..b28b04f 100644
--- a/include/ardour-concepts.html
+++ b/include/ardour-concepts.html
@@ -1,5 +1,3 @@
----
-title: Ardour Concepts
----
+
 
 
diff --git a/_manual/28_appendix/02_monitor-modes.html b/include/ardour-monitor-modes.html
similarity index 99%
rename from _manual/28_appendix/02_monitor-modes.html
rename to include/ardour-monitor-modes.html
index 8ba673f..313a9a6 100644
--- a/_manual/28_appendix/02_monitor-modes.html
+++ b/include/ardour-monitor-modes.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Ardour Monitor Modes
----
 
 <p>
   The table bellow details what will be seen on the meter and heard on the monitor according to Ardour's settings.
@@ -75,3 +71,4 @@ title: Ardour Monitor Modes
 	<tr><td>63</td><td>Audio Hardware</td><td>On</td><td>On</td><td>On</td><td>&#9654;</td><td>On</td><td>Input</td><td>HW Pass Through</td></tr>
 	<tr><td>64</td><td>Audio Hardware</td><td>On</td><td>On</td><td>On</td><td>&#9654;</td><td>Off</td><td>Input</td><td>HW Pass Through</td></tr>
 </table>
+
diff --git a/include/ardour-setup-for-surround.html b/include/ardour-setup-for-surround.html
index fcacfb4..3c1813d 100644
--- a/include/ardour-setup-for-surround.html
+++ b/include/ardour-setup-for-surround.html
@@ -1,7 +1,5 @@
----
-title: Ardour Setup for Surround
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/include/ardour-systems.html b/include/ardour-systems.html
index 11a03f9..b28b04f 100644
--- a/include/ardour-systems.html
+++ b/include/ardour-systems.html
@@ -1,5 +1,3 @@
----
-title: Ardour Systems
----
+
 
 
diff --git a/include/arranging-regions.html b/include/arranging-regions.html
index a8c8c8a..3c1813d 100644
--- a/include/arranging-regions.html
+++ b/include/arranging-regions.html
@@ -1,7 +1,5 @@
----
-title: Arranging Regions
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/include/audio-recording.html b/include/audio-recording.html
index 34e806b..b28b04f 100644
--- a/include/audio-recording.html
+++ b/include/audio-recording.html
@@ -1,5 +1,3 @@
----
-title: Audio Recording
----
+
 
 
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/04_audio.html b/include/audio-tab.html
similarity index 98%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/04_audio.html
rename to include/audio-tab.html
index cdba84b..64d99a4 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/04_audio.html
+++ b/include/audio-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Audio Tab
-menu_title: Audio Tab
----
 
 <p>
   This tab contains settings for handling audio.
@@ -150,3 +145,4 @@ audio tab"/>
     </ul>
   </li>
 </ul>
+
diff --git a/_manual/11_working-with-tracks/07_audio-track-controls.html b/include/audio-track-controls.html
similarity index 91%
rename from _manual/11_working-with-tracks/07_audio-track-controls.html
rename to include/audio-track-controls.html
index 3462258..6bbe7ae 100644
--- a/_manual/11_working-with-tracks/07_audio-track-controls.html
+++ b/include/audio-track-controls.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Audio Track Controls
----                        
 
 <p>
   A typical control area or <dfn>track header</dfn> for an audio track is 
@@ -26,3 +22,4 @@ title: Audio Track Controls
   </dd>
 </dl>
   
+
diff --git a/_manual/05_ardours-interface/19_busses-mixer-strips.html b/include/audiomidi-busses-mixer-strips.html
similarity index 99%
rename from _manual/05_ardours-interface/19_busses-mixer-strips.html
rename to include/audiomidi-busses-mixer-strips.html
index 5d737d0..208236e 100644
--- a/_manual/05_ardours-interface/19_busses-mixer-strips.html
+++ b/include/audiomidi-busses-mixer-strips.html
@@ -1,6 +1,3 @@
----
-title: Audio/MIDI Busses Mixer Strips
----
 
 <img class="right" src="/images/bus-mixer-strip.png" alt="A bus mixer strip">
 
@@ -85,3 +82,4 @@ title: Audio/MIDI Busses Mixer Strips
 <p class="note">
   Busses can be plugged to other busses, through outputs or sends. Both example workflows discussed previously, i.e. busses for grouping tracks and busses for effects, can both coexist, as e.g. a "grouping" drum bus can have a send to a reverb bus, and be connected to a compressor bus.
 </p>
+
diff --git a/_manual/05_ardours-interface/18_audio-midi-mixer-strips.html b/include/audiomidi-mixer-strips.html
similarity index 99%
rename from _manual/05_ardours-interface/18_audio-midi-mixer-strips.html
rename to include/audiomidi-mixer-strips.html
index 62f7155..dbae70e 100644
--- a/_manual/05_ardours-interface/18_audio-midi-mixer-strips.html
+++ b/include/audiomidi-mixer-strips.html
@@ -1,6 +1,3 @@
----
-title: Audio/MIDI Mixer Strips
----
 
 <img class="right" src="/images/mixer-1-strip-numbered.png" alt="A mixer strip">
 
@@ -284,3 +281,4 @@ title: Audio/MIDI Mixer Strips
   as e.g. a particular setting. The button's caption is replaced by the beginning of the text, so
   it can be used as a "sub"name for the track.
 </p>
+
diff --git a/_manual/12_working-with-midi/14_automation-midi.html b/include/automating-midi---pitch-bending-and-aftertouch.html
similarity index 90%
rename from _manual/12_working-with-midi/14_automation-midi.html
rename to include/automating-midi---pitch-bending-and-aftertouch.html
index 0abb57e..e6d8a2a 100644
--- a/_manual/12_working-with-midi/14_automation-midi.html
+++ b/include/automating-midi---pitch-bending-and-aftertouch.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Automating MIDI - Pitch bending and aftertouch
-menu_title: Automating MIDI
----                        
 
 <p>Adding pitch bending or aftertouch can add a lot of subtlety to an otherwise plain sounding midi region and help humanize it.</p>
 
@@ -15,3 +10,4 @@ menu_title: Automating MIDI
 <p>The values can be anything between 0 (-4 semitones) to 16383 (+4 semitones). No automation or a value of 8192 means no pitch shifting.</p>
 
 <p>Aftertouch works very similarly, though the values are between 0 and 127. It should be noted that aftertouch differs from velocity, as aftertouch allows to slightly change the timbre or create a vibrato, while the velocity sets the power with which the note is played (e.g. on a keyboard, the key is hit).</p>
+
diff --git a/include/automation.html b/include/automation.html
index 3342b90..3c1813d 100644
--- a/include/automation.html
+++ b/include/automation.html
@@ -1,7 +1,5 @@
----
-title: Automation
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/_manual/17_signal-routing/01_aux-sends.html b/include/aux-sends.html
similarity index 98%
rename from _manual/17_signal-routing/01_aux-sends.html
rename to include/aux-sends.html
index 9e2ee62..edc5853 100644
--- a/_manual/17_signal-routing/01_aux-sends.html
+++ b/include/aux-sends.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Aux Sends
----                        
 
 <p>
   <dfn>Auxilliary sends</dfn> are <a
@@ -110,3 +106,4 @@ title: Aux Sends
   for in-ear monitor mixes delivered in stereo.
 </p>
   
+
diff --git a/_manual/08_working-with-sessions/04_backup-and-sharing-of-sessions.html b/include/backup-and-sharing-of-sessions.html
similarity index 92%
rename from _manual/08_working-with-sessions/04_backup-and-sharing-of-sessions.html
rename to include/backup-and-sharing-of-sessions.html
index ea32fb0..d8ba9cb 100644
--- a/_manual/08_working-with-sessions/04_backup-and-sharing-of-sessions.html
+++ b/include/backup-and-sharing-of-sessions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Backup and Sharing of Sessions
----                        
 
 <p>
   An Ardour session is stored in a single folder on your computer's filesystem. 
@@ -25,3 +21,4 @@ title: Backup and Sharing of Sessions
   session sharing as well.
 </p>
   
+
diff --git a/_manual/20_mixing/02_panning/02_balance_control.html b/include/balance-control.html
similarity index 89%
rename from _manual/20_mixing/02_panning/02_balance_control.html
rename to include/balance-control.html
index b735809..3365d85 100644
--- a/_manual/20_mixing/02_panning/02_balance_control.html
+++ b/include/balance-control.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Balance Control
----                        
 
 <p>
   For stereo tracks, you can now switch between the default stereo panner 
@@ -20,3 +16,4 @@ control"/>
   panner, it works with arbitrary content without danger of introducing
   comb filter artefacts.
 </p>
+
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations.html b/include/basic-gui-operations.html
similarity index 76%
rename from _manual/02_introducing-ardour/03_basic-gui-operations.html
rename to include/basic-gui-operations.html
index d0a87c8..383b4e9 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations.html
+++ b/include/basic-gui-operations.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Basic GUI Operations
----                        
 
 <p>
   Ardour offers a number of different ways for you to interact with it.
@@ -10,3 +6,4 @@ title: Basic GUI Operations
 </p>
 
 {% children %}
+
diff --git a/include/basic-mixing.html b/include/basic-mixing.html
index 5995b87..b28b04f 100644
--- a/include/basic-mixing.html
+++ b/include/basic-mixing.html
@@ -1,5 +1,3 @@
----
-title: Basic Mixing
----
+
 
 
diff --git a/_manual/25_using-control-surfaces/02_mackie-control-protocol/03_behringer-devices-in-mackielogic-control-mode.html b/include/behringer-devices-in-mackielogic-control-mode.html
similarity index 98%
rename from _manual/25_using-control-surfaces/02_mackie-control-protocol/03_behringer-devices-in-mackielogic-control-mode.html
rename to include/behringer-devices-in-mackielogic-control-mode.html
index 39d0ce5..c2eed3e 100644
--- a/_manual/25_using-control-surfaces/02_mackie-control-protocol/03_behringer-devices-in-mackielogic-control-mode.html
+++ b/include/behringer-devices-in-mackielogic-control-mode.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Behringer devices in Mackie/Logic Control Mode
-menu_title: Behringer devices
----                        
 
 <h2>Behringer BCF-2000 Faders Controller</h2> 
 <p>
@@ -259,4 +254,4 @@ The surface can be broken into 8 groups of controls.
 </p>
 <p>
   FIX ME
-</p>
\ No newline at end of file
+</p>
diff --git a/_manual/11_working-with-tracks/06_bus-controls.html b/include/bus-controls.html
similarity index 94%
rename from _manual/11_working-with-tracks/06_bus-controls.html
rename to include/bus-controls.html
index 4b0bc59..e42fce0 100644
--- a/_manual/11_working-with-tracks/06_bus-controls.html
+++ b/include/bus-controls.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Bus Controls
----                        
 
 <p>A typical control area or <dfn>bus header<dfn> is shown below:</p>
 <img src="/images/typical-bus-controls.png" alt="bus controls" />
@@ -28,3 +24,4 @@ title: Bus Controls
   new group. For details see <a href="/working-with-tracks/track-and-bus-groups/">Track and bus groups</a>. </dd>
 </dl>
   
+
diff --git a/_manual/12_working-with-midi/05_change-note-properties.html b/include/change-note-properties.html
similarity index 97%
rename from _manual/12_working-with-midi/05_change-note-properties.html
rename to include/change-note-properties.html
index b8bb672..1026980 100644
--- a/_manual/12_working-with-midi/05_change-note-properties.html
+++ b/include/change-note-properties.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Change Note Properties
----                        
 
 <p>
   You can view all the details about a selected note by context-clicking on 
@@ -69,3 +65,4 @@ title: Change Note Properties
   <dt>Step Entry, Quantize etc.</dt>
   <dd></dd>
 </dl> 
+
diff --git a/_manual/27_lua-scripting/02_class_reference.html b/include/class-reference.html
similarity index 99%
rename from _manual/27_lua-scripting/02_class_reference.html
rename to include/class-reference.html
index f21f6ae..36c2ad8 100644
--- a/_manual/27_lua-scripting/02_class_reference.html
+++ b/include/class-reference.html
@@ -1,8 +1,3 @@
----
-layout: default
-style: luadoc
-title: Class Reference
----
 
 <p class="warning">
 This documentation is far from complete may be inaccurate and subject to change.
@@ -5422,3 +5417,4 @@ Pointer Classes cannot be created in lua scripts. It always requires a call to C
 <!-- 476 / 2168 !-->
 </div>
 <div class="luafooter">Ardour 5.5-66-g4992ed1 &nbsp;-&nbsp; Thu, 08 Dec 2016 13:34:35 +0100</div>
+
diff --git a/_manual/08_working-with-sessions/10_cleaning_up.html b/include/cleaning-up-sessions.html
similarity index 98%
rename from _manual/08_working-with-sessions/10_cleaning_up.html
rename to include/cleaning-up-sessions.html
index 7a5b906..07fb9f4 100644
--- a/_manual/08_working-with-sessions/10_cleaning_up.html
+++ b/include/cleaning-up-sessions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Cleaning up Sessions
----                        
   
 <p>Recording and editing any serious session might leave the session with some
   unused or misplaced files here and there. Ardour can help deal with this clutter thanks
@@ -68,3 +64,4 @@ title: Cleaning up Sessions
   If a file is mistakenly destroyed this way, the user will have to rely on data recovery techniques to try getting it back.
 </p>
   
+
diff --git a/include/clocks.html b/include/clocks.html
index 6f3505d..b28b04f 100644
--- a/include/clocks.html
+++ b/include/clocks.html
@@ -1,5 +1,3 @@
----
-title: Clocks
----
+
 
 
diff --git a/_manual/18_editing-and-arranging/03_common-region-edit-operations.html b/include/common-region-edit-operations.html
similarity index 96%
rename from _manual/18_editing-and-arranging/03_common-region-edit-operations.html
rename to include/common-region-edit-operations.html
index f43595e..e44c9d4 100644
--- a/_manual/18_editing-and-arranging/03_common-region-edit-operations.html
+++ b/include/common-region-edit-operations.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Common Region Edit Operations
-menu_title: Region Editing
----
 
 <p>
   This section covers a set of <dfn>region editing operations</dfn>
@@ -59,3 +54,4 @@ view.</dd>
 <dd>Inserts the currently selected regions in the Region List at the edit
 point.</dd>
 </dl>
+
diff --git a/_manual/17_signal-routing/02_comparing-aux-sends-and-subgroups.html b/include/comparing-aux-sends-and-subgroups.html
similarity index 87%
rename from _manual/17_signal-routing/02_comparing-aux-sends-and-subgroups.html
rename to include/comparing-aux-sends-and-subgroups.html
index f0dbb45..9e80f44 100644
--- a/_manual/17_signal-routing/02_comparing-aux-sends-and-subgroups.html
+++ b/include/comparing-aux-sends-and-subgroups.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Comparing Aux Sends and Subgroups
-menu_title: Auxes vs. Groups
----                        
 
 <p>
   Auxes and Subgroups share a common concept &mdash; they both provide a way 
@@ -22,3 +17,4 @@ menu_title: Auxes vs. Groups
 </p>
 <img width="300px" src="/images/subgroup_routes.png" alt="sub group signal routing" />
   
+
diff --git a/include/configuring-midi.html b/include/configuring-midi.html
index 94c80ba..b28b04f 100644
--- a/include/configuring-midi.html
+++ b/include/configuring-midi.html
@@ -1,5 +1,3 @@
----
-title: Configuring MIDI
----
+
 
 
diff --git a/include/connecting-audio-and-midi-devices.html b/include/connecting-audio-and-midi-devices.html
new file mode 100644
index 0000000..83d0fa2
--- /dev/null
+++ b/include/connecting-audio-and-midi-devices.html
@@ -0,0 +1,6 @@
+
+
+  
+  
+  
+
diff --git a/_manual/05_ardours-interface/20_control-masters.html b/include/control-masters-mixer-strips.html
similarity index 98%
rename from _manual/05_ardours-interface/20_control-masters.html
rename to include/control-masters-mixer-strips.html
index b8b0384..c11ca4f 100644
--- a/_manual/05_ardours-interface/20_control-masters.html
+++ b/include/control-masters-mixer-strips.html
@@ -1,6 +1,3 @@
----
-title: Control Masters Mixer Strips
----
 
 <img class="right" src="/images/vca-numbered.png" alt="A Control Master mixer strip">
 
@@ -61,3 +58,4 @@ A Control Master strip is made of (from top to bottom in the screenshot) :
   multiple VCA buttons. Disconnecting a Control MAste from a track is done by unchecking this Control Master in
   the list that pops up, or clicking <kbd class="menu">Unassign All</kbd> to disconnect from all Control Masters at once.
 </p>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/08_control_surfaces.html b/include/control-surfaces-tab.html
similarity index 86%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/08_control_surfaces.html
rename to include/control-surfaces-tab.html
index 8b4a4c8..baa1953 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/08_control_surfaces.html
+++ b/include/control-surfaces-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Control Surfaces Tab
-menu_title: Control Surfaces Tab
----
 
 <p>
   This tab contains settings for control surfaces. Also see
@@ -22,3 +17,4 @@ control surfaces tab"/>
   <strong>Control surface remote ID:</strong> can follow the order of the mixer
   or be user assigned.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/02_mackie-control-protocol.html b/include/controlling-ardour-with-mackie-control-devices.html
similarity index 81%
rename from _manual/25_using-control-surfaces/02_mackie-control-protocol.html
rename to include/controlling-ardour-with-mackie-control-devices.html
index 60033fe..019c2db 100644
--- a/_manual/25_using-control-surfaces/02_mackie-control-protocol.html
+++ b/include/controlling-ardour-with-mackie-control-devices.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Controlling Ardour with Mackie Control Devices
----
 
 <p>
   Since Mackie and Logic made the first Logic Control Surface, Mackie
@@ -12,3 +8,4 @@ title: Controlling Ardour with Mackie Control Devices
 </p>
 
 {% children %}
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc.html b/include/controlling-ardour-with-osc.html
similarity index 84%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc.html
rename to include/controlling-ardour-with-osc.html
index 230b56e..e921ed7 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc.html
+++ b/include/controlling-ardour-with-osc.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Controlling Ardour with OSC
----
 
 <p>
   <abbr title="Open Sound Control"><dfn>OSC</dfn></abbr> lets synthesizers
@@ -11,3 +7,4 @@ title: Controlling Ardour with OSC
 </p>
 
 {% children %}
+
diff --git a/_manual/06_controlling-playback.html b/include/controlling-playback.html
similarity index 97%
rename from _manual/06_controlling-playback.html
rename to include/controlling-playback.html
index e054475..84185e0 100644
--- a/_manual/06_controlling-playback.html
+++ b/include/controlling-playback.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Controlling Playback
----
 
 <h2>Positioning the Playhead</h2>
 
@@ -57,3 +53,4 @@ title: Controlling Playback
   For more information on defining and altering the loop range see
   <a href="/working-with-markers/loop-range/">Loop Range Markers</a>.
 </p>
+
diff --git a/_manual/11_working-with-tracks/04_controlling-track-appearance.html b/include/controlling-track-appearance.html
similarity index 74%
rename from _manual/11_working-with-tracks/04_controlling-track-appearance.html
rename to include/controlling-track-appearance.html
index a222a69..d61af39 100644
--- a/_manual/11_working-with-tracks/04_controlling-track-appearance.html
+++ b/include/controlling-track-appearance.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Controlling Track Appearance
----                        
 
 <p>
   Ardour offers many options for controlling the appearance of tracks, 
@@ -11,3 +7,4 @@ title: Controlling Track Appearance
 </p>
 
 {% children %}
+
diff --git a/_manual/11_working-with-tracks/05_controlling-track-ordering.html b/include/controlling-track-ordering.html
similarity index 91%
rename from _manual/11_working-with-tracks/05_controlling-track-ordering.html
rename to include/controlling-track-ordering.html
index b58688f..091aaa0 100644
--- a/_manual/11_working-with-tracks/05_controlling-track-ordering.html
+++ b/include/controlling-track-ordering.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Controlling Track Ordering
----                        
 
 <p>
   Ardour does not impose any particular ordering of tracks and busses in 
@@ -23,3 +19,4 @@ title: Controlling Track Ordering
 </p>
 
 {% children %}
+
diff --git a/include/controls.html b/include/controls.html
index 48460ea..b28b04f 100644
--- a/include/controls.html
+++ b/include/controls.html
@@ -1,5 +1,3 @@
----
-title: Controls
----
+
 
 
diff --git a/_manual/18_editing-and-arranging/05_copy-regions.html b/include/copy-regions.html
similarity index 93%
rename from _manual/18_editing-and-arranging/05_copy-regions.html
rename to include/copy-regions.html
index 72b5234..9e1e1ae 100644
--- a/_manual/18_editing-and-arranging/05_copy-regions.html
+++ b/include/copy-regions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Copy Regions
----                        
   
 <h2>Copy a Single Region</h2>
 <p>
@@ -27,3 +23,4 @@ title: Copy Regions
   <kbd class="mouse mod1">Middle</kbd>-drag instead.
 </p>
   
+
diff --git a/_manual/08_working-with-sessions/05_interchange-with-other-daws/01_copying-the-interchange-folder.html b/include/copying-the-interchange-folder.html
similarity index 88%
rename from _manual/08_working-with-sessions/05_interchange-with-other-daws/01_copying-the-interchange-folder.html
rename to include/copying-the-interchange-folder.html
index a882d5f..0f29b20 100644
--- a/_manual/08_working-with-sessions/05_interchange-with-other-daws/01_copying-the-interchange-folder.html
+++ b/include/copying-the-interchange-folder.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Copying The Interchange Folder
----                        
   
 <p>
   All media in a session folder is stored in a sub-folder called 
@@ -15,3 +11,4 @@ title: Copying The Interchange Folder
   application should be able to handle the files without any issues.
 </p>
   
+
diff --git a/_manual/15_adding-pre-existing-material/02_copying-versus-linking.html b/include/copying-versus-linking.html
similarity index 95%
rename from _manual/15_adding-pre-existing-material/02_copying-versus-linking.html
rename to include/copying-versus-linking.html
index cd30fd7..f514d22 100644
--- a/_manual/15_adding-pre-existing-material/02_copying-versus-linking.html
+++ b/include/copying-versus-linking.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Copying versus Linking
----                        
 
 <p>
   <dfn>Copying</dfn> and <dfn>linking</dfn> are two different methods of 
@@ -54,3 +50,4 @@ title: Copying versus Linking
   enabled, you will not be able to link a file.
 </p>
   
+
diff --git a/_manual/09_working-with-regions/02_corresponding-regions-selection.html b/include/corresponding-regions-selection.html
similarity index 95%
rename from _manual/09_working-with-regions/02_corresponding-regions-selection.html
rename to include/corresponding-regions-selection.html
index 6846401..cf0bdd4 100644
--- a/_manual/09_working-with-regions/02_corresponding-regions-selection.html
+++ b/include/corresponding-regions-selection.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Corresponding Regions Selection
----                        
   
 <p>
   <a href="/working-with-tracks/track-and-bus-groups/">Track Groups</a> have
@@ -45,3 +41,4 @@ title: Corresponding Regions Selection
   cases that the fixed rules above might make cumbersome.
 </p>
   
+
diff --git a/_manual/12_working-with-midi/03_create-midi-regions.html b/include/create-midi-regions.html
similarity index 87%
rename from _manual/12_working-with-midi/03_create-midi-regions.html
rename to include/create-midi-regions.html
index 7021501..05cb150 100644
--- a/_manual/12_working-with-midi/03_create-midi-regions.html
+++ b/include/create-midi-regions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Create MIDI Regions
----                        
   
 <p>
   Although recording MIDI is a common way to create new MIDI regions, it is 
@@ -18,3 +14,4 @@ title: Create MIDI Regions
   <a href="/working-with-midi/add-new-notes/">Add some notes to it</a>.
 </p>
   
+
diff --git a/_manual/12_working-with-midi/02_create-midi-tracks.html b/include/create-midi-tracks.html
similarity index 88%
rename from _manual/12_working-with-midi/02_create-midi-tracks.html
rename to include/create-midi-tracks.html
index eb0ee67..fc3956f 100644
--- a/_manual/12_working-with-midi/02_create-midi-tracks.html
+++ b/include/create-midi-tracks.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Create MIDI Tracks
----                        
   
 <p>
   To create a new <dfn>MIDI track</dfn>, choose <kbd class="menu">Session &gt; 
@@ -16,3 +12,4 @@ title: Create MIDI Tracks
   generate audio output. 
 </p>
   
+
diff --git a/_manual/18_editing-and-arranging/07_create-region-fades-and-crossfades.html b/include/create-region-fades-and-crossfades.html
similarity index 98%
rename from _manual/18_editing-and-arranging/07_create-region-fades-and-crossfades.html
rename to include/create-region-fades-and-crossfades.html
index 59e7010..4492768 100644
--- a/_manual/18_editing-and-arranging/07_create-region-fades-and-crossfades.html
+++ b/include/create-region-fades-and-crossfades.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Create Region Fades and Crossfades
----
 <p>Every Region has a fade-in and fade-out. By default, the region fade 
 is very short, and serves to de-click the transitions at the start and 
 end of the region.  By adjusting the regions fade length, a more 
@@ -121,3 +117,4 @@ fade curve with a faster cutoff, the mathematical difference between
 this and simply shortening the fade is vanishingly small; and the
 amount of effort to shorten the fade is much easier than messing with a
 crossfade editor dialog.<br></p>
+
diff --git a/_manual/07_working-with-markers/01_creating-location-markers.html b/include/creating-location-markers.html
similarity index 94%
rename from _manual/07_working-with-markers/01_creating-location-markers.html
rename to include/creating-location-markers.html
index fc71e01..016103e 100644
--- a/_manual/07_working-with-markers/01_creating-location-markers.html
+++ b/include/creating-location-markers.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Creating Location Markers
----
 
 <p>
   <dfn>Location Markers</dfn> appear in the <dfn>Locations ruler</dfn> at the top
@@ -27,3 +23,4 @@ title: Creating Location Markers
   <a href="/ardours-interface/editor-lists/ranges-and-marks-list/">Ranges &amp; Marks List</a>
   and <a href="/introducing-ardour/basic-gui-operations/editing-clocks/">Editing Clocks</a>.
 </p>
+
diff --git a/_manual/02_introducing-ardour/01_creating-music-with-ardour.html b/include/creating-music-with-ardour.html
similarity index 98%
rename from _manual/02_introducing-ardour/01_creating-music-with-ardour.html
rename to include/creating-music-with-ardour.html
index 1b472a8..9a63bb4 100644
--- a/_manual/02_introducing-ardour/01_creating-music-with-ardour.html
+++ b/include/creating-music-with-ardour.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Creating Music with Ardour
----                        
 <p>
   Ardour can be used in many different ways, from extremely simple to
   extremely complex. Many projects will be handled using the following
@@ -112,3 +108,4 @@ title: Creating Music with Ardour
   any time, in any supported format.
 </p>
   
+
diff --git a/_manual/07_working-with-markers/02_creating-range-markers.html b/include/creating-range-markers.html
similarity index 90%
rename from _manual/07_working-with-markers/02_creating-range-markers.html
rename to include/creating-range-markers.html
index 42b7a1f..266dbf3 100644
--- a/_manual/07_working-with-markers/02_creating-range-markers.html
+++ b/include/creating-range-markers.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Creating Range Markers
----                        
   
 <p>
   <dfn>Range markers</dfn> are essentially two location markers the are grouped
@@ -22,3 +18,4 @@ title: Creating Range Markers
   &amp; Marks List</kbd> in the Editor list.
 </p>
   
+
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations/06_cut-and-paste-operations.html b/include/cut-and-paste-operations.html
similarity index 92%
rename from _manual/02_introducing-ardour/03_basic-gui-operations/06_cut-and-paste-operations.html
rename to include/cut-and-paste-operations.html
index 01d8571..173ea7c 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations/06_cut-and-paste-operations.html
+++ b/include/cut-and-paste-operations.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Cut and Paste Operations
----                        
   
 <p>
   The <dfn>clipboard</dfn> is a holder for various kinds of objects (regions,
@@ -33,3 +29,4 @@ title: Cut and Paste Operations
   The default key binding is <kbd class="mod1">v</kbd>.
 </p>
   
+
diff --git a/_manual/23_default-keyboard-bindings.html b/include/default-keyboard-bindings.html
similarity index 96%
rename from _manual/23_default-keyboard-bindings.html
rename to include/default-keyboard-bindings.html
index 83e7ad6..83a7be4 100644
--- a/_manual/23_default-keyboard-bindings.html
+++ b/include/default-keyboard-bindings.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Default Keyboard Bindings
-menu-title: Key Bindings
----
 
 <p>
   Almost every available function in Ardour can be bound to a keyboard
@@ -54,3 +49,4 @@ menu-title: Key Bindings
 
 
 {% children %}
+
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations/07_deleting-objects.html b/include/deleting-objects.html
similarity index 93%
rename from _manual/02_introducing-ardour/03_basic-gui-operations/07_deleting-objects.html
rename to include/deleting-objects.html
index e88c09a..72d5a98 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations/07_deleting-objects.html
+++ b/include/deleting-objects.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Deleting Objects
----                        
 
 <p>
   Within the Editor window (and to some extent within the Mixer window too),
@@ -36,3 +32,4 @@ title: Deleting Objects
   be used.
 </p>
   
+
diff --git a/_manual/25_using-control-surfaces/02_mackie-control-protocol/01_mackie-control-configure.html b/include/devices-using-mackielogic-control-protocol.html
similarity index 95%
rename from _manual/25_using-control-surfaces/02_mackie-control-protocol/01_mackie-control-configure.html
rename to include/devices-using-mackielogic-control-protocol.html
index 4733d6d..e731547 100644
--- a/_manual/25_using-control-surfaces/02_mackie-control-protocol/01_mackie-control-configure.html
+++ b/include/devices-using-mackielogic-control-protocol.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Devices using Mackie/Logic Control Protocol
-menu_title: Mackie Control Configuring
----
 
 <p>
   This will walk you through the process of configuring and using
@@ -71,3 +66,4 @@ menu_title: Mackie Control Configuring
   world uses Mackie Control Protocol. Ardour does not support HUI at
   this time.
 </p>
+
diff --git a/_manual/12_working-with-midi.html b/include/edit-midi.html
similarity index 97%
rename from _manual/12_working-with-midi.html
rename to include/edit-midi.html
index 0629a62..f4e68db 100644
--- a/_manual/12_working-with-midi.html
+++ b/include/edit-midi.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Working with MIDI
----
 
 <p>
   Ardour's handling of <dfn>MIDI editing</dfn> differs from most other DAWs
@@ -65,3 +61,4 @@ title: Working with MIDI
 </ul>
 
 {% children %}
+
diff --git a/include/edit-mode-and-tools.html b/include/edit-mode-and-tools.html
index b65f57a..b28b04f 100644
--- a/include/edit-mode-and-tools.html
+++ b/include/edit-mode-and-tools.html
@@ -1,5 +1,3 @@
----
-title: Edit Mode and Tools
----
+
 
 
diff --git a/_manual/05_ardours-interface/10_the-edit-point-control.html b/include/edit-point-control.html
similarity index 97%
rename from _manual/05_ardours-interface/10_the-edit-point-control.html
rename to include/edit-point-control.html
index 4a7622c..043355b 100644
--- a/_manual/05_ardours-interface/10_the-edit-point-control.html
+++ b/include/edit-point-control.html
@@ -1,6 +1,3 @@
----
-title: Edit Point Control
----
 
 
 
@@ -71,3 +68,4 @@ title: Edit Point Control
   unit selector.
 
 </p>
+
diff --git a/include/editing-basics.html b/include/editing-basics.html
index df12127..b28b04f 100644
--- a/include/editing-basics.html
+++ b/include/editing-basics.html
@@ -1,5 +1,3 @@
----
-title: Editing Basics
----
+
 
 
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations/08_editing-clocks.html b/include/editing-clocks.html
similarity index 99%
rename from _manual/02_introducing-ardour/03_basic-gui-operations/08_editing-clocks.html
rename to include/editing-clocks.html
index 22dded2..a12061b 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations/08_editing-clocks.html
+++ b/include/editing-clocks.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Editing Clocks
----
 <h2>Clock Modes</h2>
 
 <p>
@@ -120,3 +116,4 @@ title: Editing Clocks
   decreases it, again with a step size equal to the unit of the field you
   began the drag on.
 </p>
+
diff --git a/include/editing-regions-and-selections.html b/include/editing-regions-and-selections.html
index aa602ea..139597f 100644
--- a/include/editing-regions-and-selections.html
+++ b/include/editing-regions-and-selections.html
@@ -1,4 +1,2 @@
----
-title: Editing Regions and Selections
----
+
 
diff --git a/_manual/05_ardours-interface/14_editor-lists.html b/include/editor-lists.html
similarity index 94%
rename from _manual/05_ardours-interface/14_editor-lists.html
rename to include/editor-lists.html
index 5a882a7..86c14b1 100644
--- a/_manual/05_ardours-interface/14_editor-lists.html
+++ b/include/editor-lists.html
@@ -1,6 +1,3 @@
----
-title: Editor Lists
----
 
 <p>
   At the right hand side of the editor window is an optional area which provides one of a
@@ -13,3 +10,4 @@ title: Editor Lists
 </p>
 
 {% children %}
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/03_editor.html b/include/editor-tab.html
similarity index 98%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/03_editor.html
rename to include/editor-tab.html
index 106b16e..b6202c7 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/03_editor.html
+++ b/include/editor-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Editor Tab
-menu_title: Editor Tab
----
 
 <p>
   This tab contains settings that affect behavior in the <dfn>Editor</dfn>
@@ -150,3 +145,4 @@ editor tab"/>
     </p>
   </li>
 </ul>
+
diff --git a/_manual/21_exporting/01_export-dialog.html b/include/export-dialog.html
similarity index 97%
rename from _manual/21_exporting/01_export-dialog.html
rename to include/export-dialog.html
index 8f6dfc4..c767002 100644
--- a/_manual/21_exporting/01_export-dialog.html
+++ b/include/export-dialog.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Export Dialog
----                        
 
 <p>
 When you have finished mixing your session, you probably want to export it to a sound 
@@ -100,3 +96,4 @@ case.
 {% children %}
 
 
+
diff --git a/_manual/21_exporting/02_edit-export-format-profile.html b/include/export-format-profiles.html
similarity index 98%
rename from _manual/21_exporting/02_edit-export-format-profile.html
rename to include/export-format-profiles.html
index 2b75d78..2778546 100644
--- a/_manual/21_exporting/02_edit-export-format-profile.html
+++ b/include/export-format-profiles.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Export Format Profiles
----
 
 <h2>Export Format Profiles</h2>
 
@@ -134,3 +130,4 @@ like. Currently these are:
 Any part of the command-line enclosed in double-quotes (") will be used as-is.
 
 {% children %}
+
diff --git a/_manual/17_signal-routing/03_external-sends.html b/include/external-sends.html
similarity index 96%
rename from _manual/17_signal-routing/03_external-sends.html
rename to include/external-sends.html
index 6f1945e..e507338 100644
--- a/_manual/17_signal-routing/03_external-sends.html
+++ b/include/external-sends.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: External Sends
----                        
 
 <p>
   Like a normal aux send, an <dfn>external send</dfn> taps the signal at a 
@@ -59,3 +55,4 @@ title: External Sends
   of the send.
 </p>
   
+
diff --git a/include/fades-and-crossfades.html b/include/fades-and-crossfades.html
index 5bd005d..b28b04f 100644
--- a/include/fades-and-crossfades.html
+++ b/include/fades-and-crossfades.html
@@ -1,5 +1,3 @@
----
-title: Fades and Crossfades
----
+
 
 
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/03_fades.html b/include/fades-tab.html
similarity index 88%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/03_fades.html
rename to include/fades-tab.html
index e07a211..a62ced3 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/03_fades.html
+++ b/include/fades-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Fades Tab
-menu_title: Fades Tab
----                        
 
 <img src="/images/a4_session_properties_fades.png" alt="session properties fades tab"/>
 
@@ -26,3 +21,4 @@ menu_title: Fades Tab
   </li>
 
 </ul>
+
diff --git a/include/favorite-plugins-window.html b/include/favorite-plugins-window.html
index 6e83d38..20b6265 100644
--- a/include/favorite-plugins-window.html
+++ b/include/favorite-plugins-window.html
@@ -1,9 +1,3 @@
----
-title: Favorite Plugins Window
----
-
-<img class="right" src="/images/favorite-plugins.png" alt="Favorite Plugins wind
-ow">
 
 <p>
   The <dfn>Favorite Plugins</dfn> window is on the top-left side of the <dfn>Mixer Window</dfn>. Like other elements in that window it has variable height and can be hidden by dragging it to zero-height. If it is not visible, the top-handle can be grabbed and dragged down to reveal it.
@@ -15,13 +9,12 @@ ow">
 
 <h2>Features</h2>
 
-<img class="right" src="/images/mixer-to-fav-dnd.png" alt="Dragging plugin to Favorites window">
 <p>
   The Favorite Plugins window provides easy access to frequently used plugins:
 </p>
 
 <ul>
-  <li>Plugins can be dragged from the window to any track or bus <a href="@@processor-box"><dfn>processor box</dfn></a>, which will add the plugin to that track or bus at the given position.</li>
+  <li>Plugins can be dragged from the window to any track or bus <a href="/working-with-plugins/processor-box/"><dfn>processor box</dfn></a>, which will add the plugin to that track or bus at the given position.</li>
   <li>The list includes user-presets for the plugins. Dragging a preset to a given track or bus will load that preset after adding the plugin.</li>
   <li>Double-clicking on a plugin or preset adds the given plugin to all selected tracks/busses pre-fader. Other insert positions are available from the context menu (right click).</li>
   <li>Dragging a plugin from a track into the window will add it to the list and optionally create a new preset from the current settings. The horizontal line in the list shows the spot where the plugin will land.</li>
@@ -30,6 +23,6 @@ ow">
 </ul>
 
 <p class="note">
-  When favorites are added with the <a href="@@plugin-manager">Plugin Manager</a>, they are appended to the bottom of the list.
+  When favorites are added with the <a href="/working-with-plugins/plugin-manager/">Plugin Manager</a>, they are appended to the bottom of the list.
 </p>
 
diff --git a/_manual/05_ardours-interface/15_favorite-plugins-window.html b/include/favorite-plugins-window_2.html
similarity index 76%
rename from _manual/05_ardours-interface/15_favorite-plugins-window.html
rename to include/favorite-plugins-window_2.html
index 78b6467..5341aeb 100644
--- a/_manual/05_ardours-interface/15_favorite-plugins-window.html
+++ b/include/favorite-plugins-window_2.html
@@ -1,6 +1,6 @@
----
-title: Favorite Plugins Window
----
+
+<img class="right" src="/images/favorite-plugins.png" alt="Favorite Plugins wind
+ow">
 
 <p>
   The <dfn>Favorite Plugins</dfn> window is on the top-left side of the <dfn>Mixer Window</dfn>. Like other elements in that window it has variable height and can be hidden by dragging it to zero-height. If it is not visible, the top-handle can be grabbed and dragged down to reveal it.
@@ -12,12 +12,13 @@ title: Favorite Plugins Window
 
 <h2>Features</h2>
 
+<img class="right" src="/images/mixer-to-fav-dnd.png" alt="Dragging plugin to Favorites window">
 <p>
   The Favorite Plugins window provides easy access to frequently used plugins:
 </p>
 
 <ul>
-  <li>Plugins can be dragged from the window to any track or bus <a href="/working-with-plugins/processor-box/"><dfn>processor box</dfn></a>, which will add the plugin to that track or bus at the given position.</li>
+  <li>Plugins can be dragged from the window to any track or bus <a href="@@processor-box"><dfn>processor box</dfn></a>, which will add the plugin to that track or bus at the given position.</li>
   <li>The list includes user-presets for the plugins. Dragging a preset to a given track or bus will load that preset after adding the plugin.</li>
   <li>Double-clicking on a plugin or preset adds the given plugin to all selected tracks/busses pre-fader. Other insert positions are available from the context menu (right click).</li>
   <li>Dragging a plugin from a track into the window will add it to the list and optionally create a new preset from the current settings. The horizontal line in the list shows the spot where the plugin will land.</li>
@@ -26,5 +27,7 @@ title: Favorite Plugins Window
 </ul>
 
 <p class="note">
-  When favorites are added with the <a href="/working-with-plugins/plugin-manager/">Plugin Manager</a>, they are appended to the bottom of the list.
+  When favorites are added with the <a href="@@plugin-manager">Plugin Manager</a>, they are appended to the bottom of the list.
 </p>
+
+
diff --git a/include/file-and-session-management-and-compatibility.html b/include/file-and-session-management-and-compatibility.html
index 3eca224..3c1813d 100644
--- a/include/file-and-session-management-and-compatibility.html
+++ b/include/file-and-session-management-and-compatibility.html
@@ -1,7 +1,5 @@
----
-title: File and Session Management and Compatibility
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/06_filenames.html b/include/filenames-tab.html
similarity index 91%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/06_filenames.html
rename to include/filenames-tab.html
index 2454c87..c52f894 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/06_filenames.html
+++ b/include/filenames-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Filenames Tab
-menu_title: Filenames Tab
----                        
 
 <img src="/images/a4_session_properties_filenames.png" alt="session properties filenames tab"/>
 
@@ -26,3 +21,4 @@ menu_title: Filenames Tab
   end of the take name will incremented by 1. If the track name specified doen't have
   a number on the end, the number 1 will be suffixed.
 </p>
+
diff --git a/_manual/28_appendix/03_files-and-directories.html b/include/files-and-directories-ardour-knows-about.html
similarity index 98%
rename from _manual/28_appendix/03_files-and-directories.html
rename to include/files-and-directories-ardour-knows-about.html
index a61b5d9..b3537d2 100644
--- a/_manual/28_appendix/03_files-and-directories.html
+++ b/include/files-and-directories-ardour-knows-about.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Files and Directories Ardour Knows About
----
 
 <h2>Configuration Directory</h2>
 <p>
diff --git a/_manual/12_working-with-midi/01_fundamental-concepts.html b/include/fundamental-concepts.html
similarity index 95%
rename from _manual/12_working-with-midi/01_fundamental-concepts.html
rename to include/fundamental-concepts.html
index 9ad5758..1177a4b 100644
--- a/_manual/12_working-with-midi/01_fundamental-concepts.html
+++ b/include/fundamental-concepts.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Fundamental Concepts
----                        
 
 <p>Ardour's MIDI editing is based on two basic principles:</p>
 <ol>
@@ -34,3 +30,4 @@ title: Fundamental Concepts
   notes from one region to another. You can, of course, copy and paste the 
   region(s), just as with audio.
 </p>  
+
diff --git a/_manual/25_using-control-surfaces/03_generic-midi/03_working-with-encoders.html b/include/generic-midi-and-encoders.html
similarity index 97%
rename from _manual/25_using-control-surfaces/03_generic-midi/03_working-with-encoders.html
rename to include/generic-midi-and-encoders.html
index 0f0ae75..3ea13d7 100644
--- a/_manual/25_using-control-surfaces/03_generic-midi/03_working-with-encoders.html
+++ b/include/generic-midi-and-encoders.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Generic MIDI and Encoders
----
 
 <p>
   Encoders are showing up more frequently on controllers. However, they use
@@ -54,3 +50,4 @@ title: Generic MIDI and Encoders
   Many controllers have more than one choice as well, check the manual for
   the surface.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/03_generic-midi/01_midi-binding-maps.html b/include/generic-midi-binding-maps.html
similarity index 99%
rename from _manual/25_using-control-surfaces/03_generic-midi/01_midi-binding-maps.html
rename to include/generic-midi-binding-maps.html
index a760b4f..43d56a1 100644
--- a/_manual/25_using-control-surfaces/03_generic-midi/01_midi-binding-maps.html
+++ b/include/generic-midi-binding-maps.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Generic MIDI Binding Maps
----
 
 <p>
   Ardour 2.X supported
@@ -394,3 +390,4 @@ bindings"&gt;
 </p>
 
 {% children %}
+
diff --git a/_manual/25_using-control-surfaces/03_generic-midi/02_midi-learn.html b/include/generic-midi-learn.html
similarity index 97%
rename from _manual/25_using-control-surfaces/03_generic-midi/02_midi-learn.html
rename to include/generic-midi-learn.html
index 74e3d83..d516bbc 100644
--- a/_manual/25_using-control-surfaces/03_generic-midi/02_midi-learn.html
+++ b/include/generic-midi-learn.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Generic MIDI Learn
----
 
 <h2>Philosophy</h2>
 <p>
@@ -42,3 +38,4 @@ session, the simplest thing to do is to use <kbd class="menu">Session &gt; Save
 Template</kbd>. Then, when creating new sessions, select that template and
 all the bindings will be automatically set up for you.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/03_generic-midi.html b/include/generic-midi.html
similarity index 89%
rename from _manual/25_using-control-surfaces/03_generic-midi.html
rename to include/generic-midi.html
index d548b08..17aa381 100644
--- a/_manual/25_using-control-surfaces/03_generic-midi.html
+++ b/include/generic-midi.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Generic Midi Surface Control
----
 
 <p>
   Generic Midi allows synthesizers and other devices communicate with
@@ -16,3 +12,4 @@ title: Generic Midi Surface Control
 </p>
 
 {% children %}
+
diff --git a/_manual/13_working-with-plugins/07_getting-plugins.html b/include/getting-more-plugins.html
similarity index 99%
rename from _manual/13_working-with-plugins/07_getting-plugins.html
rename to include/getting-more-plugins.html
index 1b42437..4ebb818 100644
--- a/_manual/13_working-with-plugins/07_getting-plugins.html
+++ b/include/getting-more-plugins.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Getting Plugins
----
 
 <p>
   The following list shows <dfn>plugin packages</dfn>. In some cases, 
@@ -137,3 +133,4 @@ title: Getting Plugins
   just work.
 </p>
 
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/01_misc.html b/include/global-misc-tab.html
similarity index 98%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/01_misc.html
rename to include/global-misc-tab.html
index 2a2ee31..859f4d0 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/01_misc.html
+++ b/include/global-misc-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Misc Tab
-menu_title: Misc Tab
----
 
 <p>
   This tab contains settings that do not belong on the other tabs.
@@ -147,3 +142,4 @@ misc tab"/>
     </ul>
 
 </ul>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog.html b/include/global-preferences-dialog.html
similarity index 58%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog.html
rename to include/global-preferences-dialog.html
index 60dc4ee..5d500d6 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog.html
+++ b/include/global-preferences-dialog.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Global Preferences Dialog
-menu_title: Global Preferences
----                        
 
 <p>
   These preferences apply to all Ardour sessions.
@@ -12,3 +7,4 @@ menu_title: Global Preferences
 dialog"/>
   
 {% children %}
+
diff --git a/_manual/05_ardours-interface/09_the-grid-controls.html b/include/grid-controls.html
similarity index 99%
rename from _manual/05_ardours-interface/09_the-grid-controls.html
rename to include/grid-controls.html
index e4c730a..c69ee9f 100644
--- a/_manual/05_ardours-interface/09_the-grid-controls.html
+++ b/include/grid-controls.html
@@ -1,6 +1,3 @@
----
-title: Grid Controls
----
 
 
 
@@ -253,3 +250,4 @@ either
   you are going to use any of the Region grid units.
 
 </p>
+
diff --git a/include/grouping-tracks.html b/include/grouping-tracks.html
index 082e445..b28b04f 100644
--- a/include/grouping-tracks.html
+++ b/include/grouping-tracks.html
@@ -1,5 +1,3 @@
----
-title: Grouping Tracks
----
+
 
 
diff --git a/_manual/05_ardours-interface/17_the-groups-list.html b/include/groups-list.html
similarity index 99%
rename from _manual/05_ardours-interface/17_the-groups-list.html
rename to include/groups-list.html
index 8eb3f7b..7a9cf6e 100644
--- a/_manual/05_ardours-interface/17_the-groups-list.html
+++ b/include/groups-list.html
@@ -1,6 +1,3 @@
----
-title: Groups list
----
 
 <p>
   The <dfn>Goups List</dfn> allows to quickly manage the <a href="/working-with-tracks/track-and-bus-groups/">groups</a>
@@ -52,3 +49,4 @@ title: Groups list
   while the <kbd class="menu">&minus;</kbd> button deletes the selected group (but not the tracks in
   this group).
 </p>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/11_gui.html b/include/gui-tab.html
similarity index 97%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/11_gui.html
rename to include/gui-tab.html
index 80ca623..9cfbd82 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/11_gui.html
+++ b/include/gui-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: GUI Tab
-menu_title: GUI Tab
----
 
 <p>
   This tab contains settings that affect
@@ -64,3 +59,4 @@ gui tab"/>
     </p>
   </li>
 </ul>
+
diff --git a/_manual/12_working-with-midi/06_handle-overlapping-notes.html b/include/handling-overlapping-notes.html
similarity index 94%
rename from _manual/12_working-with-midi/06_handle-overlapping-notes.html
rename to include/handling-overlapping-notes.html
index 9be7268..eebe24e 100644
--- a/_manual/12_working-with-midi/06_handle-overlapping-notes.html
+++ b/include/handling-overlapping-notes.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Handling Overlapping Notes
-menu_title: Overlapping Notes
----                        
   
 <p>
   Every MIDI note consists of two messages, a NoteOn and a NoteOff. Each one 
@@ -43,3 +38,4 @@ menu_title: Overlapping Notes
   If you create these, it is your responsibility to deal with the consequences.
 </p>
   
+
diff --git a/include/i_o-setup.html b/include/i_o-setup.html
deleted file mode 100644
index 89b4e4a..0000000
--- a/include/i_o-setup.html
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: I/O Setup
----
-
-
diff --git a/_manual/15_adding-pre-existing-material/01_import-dialog.html b/include/import-dialog.html
similarity index 98%
rename from _manual/15_adding-pre-existing-material/01_import-dialog.html
rename to include/import-dialog.html
index abdc0fb..42efbe7 100644
--- a/_manual/15_adding-pre-existing-material/01_import-dialog.html
+++ b/include/import-dialog.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Import Dialog
----
 
 <img class="right" src="/images/import-window.png" alt="The import window">
 
@@ -93,3 +89,4 @@ title: Import Dialog
   <a href="/adding-pre-existing-material/copying-versus-linking/">Copying
   versus Linking</a> for details.
 </p>
+
diff --git a/include/importing-and-exporting-session-data.html b/include/importing-and-exporting-session-data.html
index a56dce2..3c1813d 100644
--- a/include/importing-and-exporting-session-data.html
+++ b/include/importing-and-exporting-session-data.html
@@ -1,7 +1,5 @@
----
-title: Importing and Exporting Session Data
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/_manual/12_working-with-midi/12_copy-midi-region.html b/include/independent-and-dependent-midi-region-copies.html
similarity index 94%
rename from _manual/12_working-with-midi/12_copy-midi-region.html
rename to include/independent-and-dependent-midi-region-copies.html
index 60d2d32..b94e076 100644
--- a/_manual/12_working-with-midi/12_copy-midi-region.html
+++ b/include/independent-and-dependent-midi-region-copies.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Independent and Dependent MIDI Region Copies
-menu_title: Copy MIDI Region
----
 
 <p>
   When <dfn>copying a MIDI region</dfn>, Ardour has to decide whether to make the
@@ -51,3 +46,4 @@ menu_title: Copy MIDI Region
   from. Put differently, if you make an independent copy of a trimmed
   MIDI region, you cannot "untrim" it to a larger size.
 </p>
+
diff --git a/_manual/17_signal-routing/04_inserts.html b/include/inserts.html
similarity index 95%
rename from _manual/17_signal-routing/04_inserts.html
rename to include/inserts.html
index b599da3..fa79570 100644
--- a/_manual/17_signal-routing/04_inserts.html
+++ b/include/inserts.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Inserts
----                        
 
 <p>
   <dfn>Inserts</dfn> are signal tap points that can be placed anywhere
@@ -32,3 +28,4 @@ title: Inserts
   Inserts will incur an additional JACK period of latency, which can be
   measured and compensated for during mixing, but not during tracking! 
 </p>    
+
diff --git a/_manual/08_working-with-sessions/05_interchange-with-other-daws.html b/include/interchange-with-other-daws.html
similarity index 92%
rename from _manual/08_working-with-sessions/05_interchange-with-other-daws.html
rename to include/interchange-with-other-daws.html
index 0b0e2e5..c35c6ac 100644
--- a/_manual/08_working-with-sessions/05_interchange-with-other-daws.html
+++ b/include/interchange-with-other-daws.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Interchange with other DAWs
----                        
   
 <p>
   It has never been particularly easy to move sessions or projects from one
@@ -33,3 +29,4 @@ title: Interchange with other DAWs
 </ul>
 
 {% children %}
+
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations/01_interface-elements.html b/include/interface-elements.html
similarity index 63%
rename from _manual/02_introducing-ardour/03_basic-gui-operations/01_interface-elements.html
rename to include/interface-elements.html
index b25c57b..98dad7f 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations/01_interface-elements.html
+++ b/include/interface-elements.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Interface Elements
----                        
 
 <h2>Checkboxes</h2>
 <h2>Buttons</h2>
@@ -10,3 +6,4 @@ title: Interface Elements
 <h2>Context Menus</h2>
 <h2>Browsers</h2>
   
+
diff --git a/include/io-setup.html b/include/io-setup.html
new file mode 100644
index 0000000..b28b04f
--- /dev/null
+++ b/include/io-setup.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/_manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html b/include/isnt-this-a-really-complicated-program.html
similarity index 91%
rename from _manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html
rename to include/isnt-this-a-really-complicated-program.html
index 8a061e2..bcaca26 100644
--- a/_manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html
+++ b/include/isnt-this-a-really-complicated-program.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Isn't This A Really Complicated Program?
----                        
   
 <p>
 There is no point in pretending that Ardour is a simple, easy to use
@@ -27,3 +23,4 @@ lead developer has
 <a href="https://community.ardour.org/node/3322">some thoughts on that</a>.
 </p>
   
+
diff --git a/include/kde-plasma-5.html b/include/kde-plasma-5.html
index dc15947..bd48cef 100644
--- a/include/kde-plasma-5.html
+++ b/include/kde-plasma-5.html
@@ -1,6 +1,3 @@
----
-title: KDE Plasma 5
----
 
 <p>
   Under <dfn>KDE Plasma 5</dfn>, plugin and various other windows will not stay
@@ -59,3 +56,4 @@ title: KDE Plasma 5
 </p>
 
 
+
diff --git a/include/keyboard-and-mouse-shortcuts.html b/include/keyboard-and-mouse-shortcuts.html
index 25763a6..b28b04f 100644
--- a/include/keyboard-and-mouse-shortcuts.html
+++ b/include/keyboard-and-mouse-shortcuts.html
@@ -1,5 +1,3 @@
----
-title: Keyboard and Mouse Shortcuts
----
+
 
 
diff --git a/_manual/22_synchronization/02_latency-and-latency-compensation.html b/include/latency-and-latency-compensation.html
similarity index 99%
rename from _manual/22_synchronization/02_latency-and-latency-compensation.html
rename to include/latency-and-latency-compensation.html
index c93b684..531c977 100644
--- a/_manual/22_synchronization/02_latency-and-latency-compensation.html
+++ b/include/latency-and-latency-compensation.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Latency and Latency-Compensation
-menu_title: Latency
----
 
 <p>
   <a
@@ -246,3 +241,4 @@ menu_title: Latency
   <li>Adjust the playback and capture levels in your mixer.</li>
 </ol>
 
+
diff --git a/_manual/16_recording/01_monitoring/01_latency-considerations.html b/include/latency-considerations.html
similarity index 95%
rename from _manual/16_recording/01_monitoring/01_latency-considerations.html
rename to include/latency-considerations.html
index 3b94aae..a18846f 100644
--- a/_manual/16_recording/01_monitoring/01_latency-considerations.html
+++ b/include/latency-considerations.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Latency Considerations
-menu_title: Latency
----                        
 
 <p>  
   In the days of analog tape recording, the routing of monitor signals was
@@ -39,3 +34,4 @@ menu_title: Latency
 </p>
 
 {% children %}
+
diff --git a/_manual/11_working-with-tracks/04_controlling-track-appearance/01_layering-display.html b/include/layering-display.html
similarity index 96%
rename from _manual/11_working-with-tracks/04_controlling-track-appearance/01_layering-display.html
rename to include/layering-display.html
index 42185de..793d43a 100644
--- a/_manual/11_working-with-tracks/04_controlling-track-appearance/01_layering-display.html
+++ b/include/layering-display.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Layering Display
----                        
 
 <img class="right" style="clear:both" src="/images/track-layer-dialog.png"
 alt="Track layering menu" />
@@ -43,3 +39,4 @@ alt="Track layering menu" />
   works much better for this than a small one.
 </p>
   
+
diff --git a/_manual/28_appendix/01_menu-actions-list.html b/include/list-of-menu-actions.html
similarity index 99%
rename from _manual/28_appendix/01_menu-actions-list.html
rename to include/list-of-menu-actions.html
index 8bf4131..e90d0d0 100644
--- a/_manual/28_appendix/01_menu-actions-list.html
+++ b/include/list-of-menu-actions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: List of Menu Actions
----
 
 
 <h2>Menu actions</h2>
@@ -741,3 +737,4 @@ title: List of Menu Actions
 </dl>
 
 {% children %}
+
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/05_locations.html b/include/locations-tab.html
similarity index 86%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/05_locations.html
rename to include/locations-tab.html
index e752b52..34c52a6 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/05_locations.html
+++ b/include/locations-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Locations Tab
-menu_title: Locations Tab
----                        
 
 <img src="/images/a4_session_properties_locations.png" alt="session properties locations tab"/>
 
@@ -19,3 +14,4 @@ menu_title: Locations Tab
   to remove it from the search path.
 </p>
 
+
diff --git a/include/lua-scripting-in-ardour.html b/include/lua-scripting-in-ardour.html
index 9549710..b28b04f 100644
--- a/include/lua-scripting-in-ardour.html
+++ b/include/lua-scripting-in-ardour.html
@@ -1,5 +1,3 @@
----
-title: Lua Scripting in Ardour
----
+
 
 
diff --git a/_manual/27_lua-scripting.html b/include/lua-scripting.html
similarity index 71%
rename from _manual/27_lua-scripting.html
rename to include/lua-scripting.html
index 649db7e..439b61a 100644
--- a/_manual/27_lua-scripting.html
+++ b/include/lua-scripting.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Lua Scripting
----                        
 
 <p>
 Starting with version 4.7.213, Ardour supports Lua scripts.
@@ -12,3 +8,4 @@ Lua Integration is Work in Progress and far from complete.
 </p>
 
 {% children %}
+
diff --git a/_manual/05_ardours-interface/01_main-menu.html b/include/main-menu.html
similarity index 96%
rename from _manual/05_ardours-interface/01_main-menu.html
rename to include/main-menu.html
index 63f5fc7..9d66801 100644
--- a/_manual/05_ardours-interface/01_main-menu.html
+++ b/include/main-menu.html
@@ -1,6 +1,3 @@
----
-title: Main Menu
----
 
 <p>
   The <dfn>Main Menu</dfn> is made of 8 menus that allow the user to interact with Ardour, and below is a reference of all the menu actions.
@@ -14,3 +11,4 @@ title: Main Menu
 </p>
 
 {% children %}
+
diff --git a/include/making-selections.html b/include/making-selections.html
index 266869b..b28b04f 100644
--- a/include/making-selections.html
+++ b/include/making-selections.html
@@ -1,5 +1,3 @@
----
-title: Making Selections
----
+
 
 
diff --git a/_manual/13_working-with-plugins/01_managing-plugin-presets.html b/include/managing-plugin-presets.html
similarity index 96%
rename from _manual/13_working-with-plugins/01_managing-plugin-presets.html
rename to include/managing-plugin-presets.html
index a066d1c..4ff0692 100644
--- a/_manual/13_working-with-plugins/01_managing-plugin-presets.html
+++ b/include/managing-plugin-presets.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Managing Plugin Presets
----                        
   
 <p>
   All plugin control widgets, whether they are created by Ardour or 
@@ -58,3 +54,4 @@ title: Managing Plugin Presets
   currently loaded (although the settings will stay as they were). 
 </p>
   
+
diff --git a/_manual/07_working-with-markers/05_marker-context-menu.html b/include/marker-context-menu.html
similarity index 96%
rename from _manual/07_working-with-markers/05_marker-context-menu.html
rename to include/marker-context-menu.html
index d4c33a8..caf2e5b 100644
--- a/_manual/07_working-with-markers/05_marker-context-menu.html
+++ b/include/marker-context-menu.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Marker Context Menu
----
 
 <p>
   <kbd class="mouse">Right</kbd>-clicking a marker in the timeline opens the
@@ -39,3 +35,4 @@ title: Marker Context Menu
   and move it to a nearby region boundary, region sync point, or to the
   playhead or mouse.
 </p>
+
diff --git a/_manual/05_ardours-interface/21_the-master-bus-strip.html b/include/master-bus-strip.html
similarity index 96%
rename from _manual/05_ardours-interface/21_the-master-bus-strip.html
rename to include/master-bus-strip.html
index 6e40c9d..66695b9 100644
--- a/_manual/05_ardours-interface/21_the-master-bus-strip.html
+++ b/include/master-bus-strip.html
@@ -1,6 +1,3 @@
----
-title: Master Bus Strip
----
 
 <img class="right" src="/images/master-strip.png" alt="The Master strip in the mixer">
 
@@ -19,3 +16,4 @@ title: Master Bus Strip
 <p class="note">
   The Master bus strip is <em>allways</em> fixed, at the right end of the mixer, regardless of the scrolling position.
 </p>
+
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/04_media.html b/include/media-tab.html
similarity index 84%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/04_media.html
rename to include/media-tab.html
index ab8092d..9411cc5 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/04_media.html
+++ b/include/media-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Media Tab
-menu_title: Media Tab
----                        
 
 <img src="/images/a4_session_properties_media.png" alt="session properties media tab"/>
 
@@ -21,3 +16,4 @@ menu_title: Media Tab
     <strong>File type</strong> options are WAVE,  WAVE-64, and CAF.
   </li>
 </ul>
+
diff --git a/include/memory-locations.html b/include/memory-locations.html
index 2fcd867..3c1813d 100644
--- a/include/memory-locations.html
+++ b/include/memory-locations.html
@@ -1,7 +1,5 @@
----
-title: Memory Locations
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/_manual/08_working-with-sessions/09_metadata.html b/include/metadata.html
similarity index 82%
rename from _manual/08_working-with-sessions/09_metadata.html
rename to include/metadata.html
index cdb0f53..1c7f969 100644
--- a/_manual/08_working-with-sessions/09_metadata.html
+++ b/include/metadata.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Metadata
----                        
   
 <p>
 Sessions can have various items of metadata attached to them, via
@@ -11,3 +7,4 @@ Sessions can have various items of metadata attached to them, via
 
 <h2>Edit Session Metadata Dialog</h2>
 <img src="/images/edit-session-metadata.png" />
+
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/08_meterbridge.html b/include/meterbridge-tab.html
similarity index 87%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/08_meterbridge.html
rename to include/meterbridge-tab.html
index 3490a9b..e61f59d 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/08_meterbridge.html
+++ b/include/meterbridge-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Meterbridge Tab
-menu_title: Meterbridge Tab
----                        
 
 <p>
   The meters from audio tracks always display in the <dfn>Meterbridge</dfn>.
@@ -24,3 +19,4 @@ menu_title: Meterbridge Tab
 </ul>
 
 <img src="/images/a4_meterbridge_full.png" alt="image of meterbidge with all options on"/>
+
diff --git a/_manual/04_meters.html b/include/metering-in-ardour.html
similarity index 99%
rename from _manual/04_meters.html
rename to include/metering-in-ardour.html
index 985f5d9..56f930a 100644
--- a/_manual/04_meters.html
+++ b/include/metering-in-ardour.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Metering in Ardour
----                        
 
 <h2>Introduction</h2>
 <p>
@@ -176,3 +172,4 @@ alt="Bar-graph meters in Ardour" />
 	LV2 plugins (see image on the right):
 	<a href="https://github.com/x42/meters.lv2/">meters.lv2</a>.
 </p>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/12_metering.html b/include/metering-tab.html
similarity index 92%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/12_metering.html
rename to include/metering-tab.html
index 1d903fd..29425c3 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/12_metering.html
+++ b/include/metering-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Metering Tab
-menu_title: Metering Tab
----
 
 <p>
   This tab contains settings that affect <a href="/meters/">
@@ -51,3 +46,4 @@ metering tab"/>
     </p>
   </li>
 </ul>
+
diff --git a/_manual/03_setting-up-your-system/07_platform-specifics/02_microsoft-windows.html b/include/microsoft-windows.html
similarity index 94%
rename from _manual/03_setting-up-your-system/07_platform-specifics/02_microsoft-windows.html
rename to include/microsoft-windows.html
index 781b718..dc12d9b 100644
--- a/_manual/03_setting-up-your-system/07_platform-specifics/02_microsoft-windows.html
+++ b/include/microsoft-windows.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Microsoft Windows
----
 
 <p>
   <dfn>Microsoft Windows</dfn> is not currently officially supported. If you are
@@ -27,3 +23,4 @@ title: Microsoft Windows
     <li>Update this manual via pull requests on <a href="https://github.com/Ardour/manual">github<a/>.</li>
   </ul>
 </p>
+
diff --git a/include/midi-editing.html b/include/midi-editing.html
index 5b46275..b28b04f 100644
--- a/include/midi-editing.html
+++ b/include/midi-editing.html
@@ -1,5 +1,3 @@
----
-title: MIDI Editing
----
+
 
 
diff --git a/include/midi-editors.html b/include/midi-editors.html
index 8196ff7..b28b04f 100644
--- a/include/midi-editors.html
+++ b/include/midi-editors.html
@@ -1,5 +1,3 @@
----
-title: MIDI Editors
----
+
 
 
diff --git a/include/midi-event-list.html b/include/midi-event-list.html
index f5368f4..6fb66a5 100644
--- a/include/midi-event-list.html
+++ b/include/midi-event-list.html
@@ -1,6 +1,4 @@
----
-title: MIDI Event List
----
+
 
 
 
diff --git a/_manual/03_setting-up-your-system/05_setting-up-midi/02_midi-on-linux.html b/include/midi-on-linux.html
similarity index 97%
rename from _manual/03_setting-up-your-system/05_setting-up-midi/02_midi-on-linux.html
rename to include/midi-on-linux.html
index f775c83..ca7b252 100644
--- a/_manual/03_setting-up-your-system/05_setting-up-midi/02_midi-on-linux.html
+++ b/include/midi-on-linux.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: MIDI on Linux
----                        
 
 The right approach for using MIDI on Linux depends on which version of
 JACK you use. The world divides into:
@@ -72,3 +68,4 @@ add <kbd class="input">a2jmidid -e &amp;</kbd> as an "after start-up" script
 in the <kbd class="menu">Setup &gt; Options</kbd> tab of QJackCtl, so
 that it is started automatically whenever you start JACK.
 </p>
+
diff --git a/_manual/03_setting-up-your-system/05_setting-up-midi/01_midi-on-os-x.html b/include/midi-on-os-x.html
similarity index 93%
rename from _manual/03_setting-up-your-system/05_setting-up-midi/01_midi-on-os-x.html
rename to include/midi-on-os-x.html
index 8107a2e..d1323fb 100644
--- a/_manual/03_setting-up-your-system/05_setting-up-midi/01_midi-on-os-x.html
+++ b/include/midi-on-os-x.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: MIDI on OS X
----                        
   
 <p>
   In order for CoreMIDI to work with Jack MIDI, a CoreMIDI-to-JACK-MIDI
@@ -31,3 +27,4 @@ title: MIDI on OS X
 </ul>
 
   
+
diff --git a/include/midi-recording.html b/include/midi-recording.html
index 233180d..b28b04f 100644
--- a/include/midi-recording.html
+++ b/include/midi-recording.html
@@ -1,5 +1,3 @@
----
-title: MIDI Recording
----
+
 
 
diff --git a/_manual/19_automation/01_midi-scenes.html b/include/midi-scene-automation.html
similarity index 96%
rename from _manual/19_automation/01_midi-scenes.html
rename to include/midi-scene-automation.html
index 8b641f1..7bb9ff4 100644
--- a/_manual/19_automation/01_midi-scenes.html
+++ b/include/midi-scene-automation.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: MIDI Scene Automation
----                        
 
 <p>
 Ardour is capable of being used to both record and deliver MIDI
@@ -78,3 +74,4 @@ This feature is not currently implemented.
 </p>
 
 {% children %}
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/06_midi.html b/include/midi-tab.html
similarity index 97%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/06_midi.html
rename to include/midi-tab.html
index c6f56f3..df1cf9f 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/06_midi.html
+++ b/include/midi-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: MIDI Tab
-menu_title: MIDI Tab
----
 
 <p>
   This tab contains settings related to the use of MIDI inside Ardour.
@@ -111,3 +106,4 @@ MIDI tab"/>
   </li>
 
 </ul>
+
diff --git a/_manual/11_working-with-tracks/08_midi-track-controls.html b/include/midi-track-controls.html
similarity index 95%
rename from _manual/11_working-with-tracks/08_midi-track-controls.html
rename to include/midi-track-controls.html
index 01129db..f06b51b 100644
--- a/_manual/11_working-with-tracks/08_midi-track-controls.html
+++ b/include/midi-track-controls.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: MIDI Track Controls
----                        
   
 <p>A typical <dfn>MIDI track header</dfn> looks like this:</p>
 <img src="/images/typical-midi-track-controls.png" alt="midi track controls"
@@ -38,3 +34,4 @@ title: MIDI Track Controls
   To edit the contents of a MIDI track see <a href="/working-with-midi/">Edit
   MIDI</a>.
 </p>
+
diff --git a/include/mixdown.html b/include/mixdown.html
index 24b0d43..b28b04f 100644
--- a/include/mixdown.html
+++ b/include/mixdown.html
@@ -1,5 +1,3 @@
----
-title: Mixdown
----
+
 
 
diff --git a/include/mixer-strips.html b/include/mixer-strips.html
index 7e82974..b28b04f 100644
--- a/include/mixer-strips.html
+++ b/include/mixer-strips.html
@@ -1,5 +1,3 @@
----
-title: Mixer Strips
----
+
 
 
diff --git a/_manual/23_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html b/include/mnemonic-bindings-for-linux.html
similarity index 99%
rename from _manual/23_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html
rename to include/mnemonic-bindings-for-linux.html
index 6893e68..e6ae5b9 100644
--- a/_manual/23_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html
+++ b/include/mnemonic-bindings-for-linux.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Mnemonic Bindings for Linux
-menu-title: Linux
----                        
 
 <p>
   A printable cheat-sheet with the mnemonic bindings for <dfn>Linux</dfn>
@@ -337,3 +332,4 @@ menu-title: Linux
 <dd><kbd class="">9</kbd></dd>
 </dl>
 
+
diff --git a/_manual/23_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html b/include/mnemonic-bindings-for-os-x.html
similarity index 99%
rename from _manual/23_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html
rename to include/mnemonic-bindings-for-os-x.html
index 2996930..04375c5 100644
--- a/_manual/23_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html
+++ b/include/mnemonic-bindings-for-os-x.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Mnemonic Bindings for OS X
----                        
   
 <p>
   A <a href="/files/a3_mnemonic_cheat_sheet_osx.pdf">printable cheat sheet</a> 
@@ -330,3 +326,4 @@ title: Mnemonic Bindings for OS X
 </dl>
 
 
+
diff --git a/_manual/05_ardours-interface/22_the-monitor-section.html b/include/monitor-section.html
similarity index 99%
rename from _manual/05_ardours-interface/22_the-monitor-section.html
rename to include/monitor-section.html
index cfe9b29..f903d72 100644
--- a/_manual/05_ardours-interface/22_the-monitor-section.html
+++ b/include/monitor-section.html
@@ -1,6 +1,3 @@
----
-title: Monitor section
----
 
 <img class="right" src="/images/monitoring-strip.png" alt="The Monitoring strip">
 
@@ -117,3 +114,4 @@ title: Monitor section
   Clicking on this button shows a menu that allows quick and convenient routing of the Monitor Section's outputs to audio hardware outputs, e.g. to feed control room monitors.
   It also has an option to open Ardours routing matrix, where more detailed connectivity is available if routing to something other than hardware is required.
 </p>
+
diff --git a/_manual/16_recording/01_monitoring/03_monitor-setup-in-ardour.html b/include/monitor-setup-in-ardour.html
similarity index 94%
rename from _manual/16_recording/01_monitoring/03_monitor-setup-in-ardour.html
rename to include/monitor-setup-in-ardour.html
index d112e9e..b27f0ad 100644
--- a/_manual/16_recording/01_monitoring/03_monitor-setup-in-ardour.html
+++ b/include/monitor-setup-in-ardour.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Monitor Setup in Ardour
-menu_title: Setup in Ardour
----                        
 
 <p>Ardour has three main settings which affect how
   monitoring is performed. The first is 
@@ -54,3 +49,4 @@ Ardour's monitoring behaviour is simple: it does not do any.
 </p>
   
 {% children %}
+
diff --git a/_manual/16_recording/01_monitoring/02_monitor-signal-flow.html b/include/monitor-signal-flow.html
similarity index 94%
rename from _manual/16_recording/01_monitoring/02_monitor-signal-flow.html
rename to include/monitor-signal-flow.html
index 9cbe088..336adbf 100644
--- a/_manual/16_recording/01_monitoring/02_monitor-signal-flow.html
+++ b/include/monitor-signal-flow.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Monitor Signal Flow
-menu_title: Signal Flow
----                        
 
 <p>There are three basic ways to approach monitoring: </p>
 
@@ -38,3 +33,4 @@ src="/images/external-monitoring.png" />
 </p> 
 
 {% children %}
+
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/07_monitoring.html b/include/monitoring-tab.html
similarity index 86%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/07_monitoring.html
rename to include/monitoring-tab.html
index d4f3094..e4075b9 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/07_monitoring.html
+++ b/include/monitoring-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Monitoring Tab
-menu_title: Monitoring Tab
----                        
 
 <p>
   Provides options affecting monitoring.
@@ -23,3 +18,4 @@ menu_title: Monitoring Tab
   window that is modelled on the similiarly named section on large analog consoles.
 </p>
 
+
diff --git a/_manual/16_recording/01_monitoring.html b/include/monitoring.html
similarity index 83%
rename from _manual/16_recording/01_monitoring.html
rename to include/monitoring.html
index 584bd5c..b079aff 100644
--- a/_manual/16_recording/01_monitoring.html
+++ b/include/monitoring.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Monitoring
----                        
 
 <p>
   When recording, it is important that performers hear themselves, and to 
@@ -12,3 +8,4 @@ title: Monitoring
 </p>
 
 {% children %}
+
diff --git a/_manual/20_mixing/02_panning/01_mono_panner.html b/include/mono-panner.html
similarity index 97%
rename from _manual/20_mixing/02_panning/01_mono_panner.html
rename to include/mono-panner.html
index 2a4d535..27ae9c9 100644
--- a/_manual/20_mixing/02_panning/01_mono_panner.html
+++ b/include/mono-panner.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Mono Panner
----                        
 
 <p>
 The default <dfn>mono panner</dfn> distributes 1 input to 2 outputs. Its
@@ -78,3 +74,4 @@ wheel may be used as follows:
   <dt><kbd class="mod1 mouse">&dArr;</kbd> or <kbd class="mod1 mouse">&rArr;</kbd></dt>
   <dd>move position to the right by 5&deg;</dd>
 </dl>
+
diff --git a/_manual/03_setting-up-your-system/02_mouse.html b/include/mouse.html
similarity index 96%
rename from _manual/03_setting-up-your-system/02_mouse.html
rename to include/mouse.html
index 1329780..77e402d 100644
--- a/_manual/03_setting-up-your-system/02_mouse.html
+++ b/include/mouse.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Mouse
----
 
 <p>
   Ardour is designed to work best with a <dfn>three button mouse</dfn>
@@ -27,3 +23,4 @@ title: Mouse
   For more detailed instructions, see
   <a href="/introducing-ardour/basic-gui-operations/using-the-mouse//">Using the mouse</a>.
 </p>
+
diff --git a/_manual/18_editing-and-arranging/06_move-regions/01_move-regions-with-the-mouse.html b/include/move-regions-with-the-mouse.html
similarity index 94%
rename from _manual/18_editing-and-arranging/06_move-regions/01_move-regions-with-the-mouse.html
rename to include/move-regions-with-the-mouse.html
index 7c6ee98..1e740ec 100644
--- a/_manual/18_editing-and-arranging/06_move-regions/01_move-regions-with-the-mouse.html
+++ b/include/move-regions-with-the-mouse.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Move Regions With the Mouse
----                        
 
 <p>
   To move or copy a region, make sure you are in object mode. If you are 
@@ -37,3 +33,4 @@ title: Move Regions With the Mouse
   <kbd class="mouse">Middle</kbd>-drag instead.
 </p>
   
+
diff --git a/_manual/18_editing-and-arranging/06_move-regions.html b/include/move-regions.html
similarity index 96%
rename from _manual/18_editing-and-arranging/06_move-regions.html
rename to include/move-regions.html
index 3e6e8fb..b1036ce 100644
--- a/_manual/18_editing-and-arranging/06_move-regions.html
+++ b/include/move-regions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Move Regions
----
 
 <p>
   Ardour has a global <dfn>edit mode</dfn> selector at the left of the
@@ -35,3 +31,4 @@ title: Move Regions
 
 
 {% children %}
+
diff --git a/_manual/07_working-with-markers/03_moving-markers.html b/include/moving-markers.html
similarity index 88%
rename from _manual/07_working-with-markers/03_moving-markers.html
rename to include/moving-markers.html
index 77e93bd..f9f873c 100644
--- a/_manual/07_working-with-markers/03_moving-markers.html
+++ b/include/moving-markers.html
@@ -1,26 +1,23 @@
----
-layout: default
-title: Moving Markers
----                        
-  
-<h2>Single marker</h2>
-<p>
-  <kbd class="mouse">Left</kbd>-click and drag to move a single marker to a 
-  new location on the timeline.
-</p>
-
-<h2>Multiple markers</h2>
-<p>
-  It is possible to move multiple markers by the same distance. <kbd
-  class="mouse mod1">Left</kbd>-click each marker you want to move, then drag 
-  one of the selected markers to a new location. All selected markers will
-  then move together. Note that the markers are bounded by the zero point on 
-  the timeline. In other words, the first marker in your selection cannot move 
-  to the left of zero on the timeline.
-</p>
-
-<h2>Both ends of a range marker</h2>
-<p>
-  <kbd class="mod1 mouse">Left</kbd>-drag either end of the range marker. The 
-  other end will move by the same distance.
-</p>
+  
+<h2>Single marker</h2>
+<p>
+  <kbd class="mouse">Left</kbd>-click and drag to move a single marker to a 
+  new location on the timeline.
+</p>
+
+<h2>Multiple markers</h2>
+<p>
+  It is possible to move multiple markers by the same distance. <kbd
+  class="mouse mod1">Left</kbd>-click each marker you want to move, then drag 
+  one of the selected markers to a new location. All selected markers will
+  then move together. Note that the markers are bounded by the zero point on 
+  the timeline. In other words, the first marker in your selection cannot move 
+  to the left of zero on the timeline.
+</p>
+
+<h2>Both ends of a range marker</h2>
+<p>
+  <kbd class="mod1 mouse">Left</kbd>-drag either end of the range marker. The 
+  other end will move by the same distance.
+</p>
+
diff --git a/include/multichannel-tracks-and-signal-routing.html b/include/multichannel-tracks-and-signal-routing.html
index 5a816ff..3c1813d 100644
--- a/include/multichannel-tracks-and-signal-routing.html
+++ b/include/multichannel-tracks-and-signal-routing.html
@@ -1,7 +1,5 @@
----
-title: Multichannel Tracks and Signal Routing
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/_manual/20_mixing/01_muting-and-soloing.html b/include/muting-and-soloing.html
similarity index 98%
rename from _manual/20_mixing/01_muting-and-soloing.html
rename to include/muting-and-soloing.html
index 92806fe..952ce3e 100644
--- a/_manual/20_mixing/01_muting-and-soloing.html
+++ b/include/muting-and-soloing.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Muting and Soloing
----                        
 
 <p>
   Each track and bus has two buttons which have important implications 
@@ -132,3 +128,4 @@ title: Muting and Soloing
   bus) and to the main outputs.
 </p>
   
+
diff --git a/_manual/08_working-with-sessions/01_new-session-dialog.html b/include/newopen-session-dialog.html
similarity index 98%
rename from _manual/08_working-with-sessions/01_new-session-dialog.html
rename to include/newopen-session-dialog.html
index c551cf8..92ee565 100644
--- a/_manual/08_working-with-sessions/01_new-session-dialog.html
+++ b/include/newopen-session-dialog.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: New/Open Session Dialog
----                        
 
 <p>
   The initial <dfn>Session</dfn> dialog consists of several consecutive pages:
@@ -112,3 +108,4 @@ Setup Dialog"/>
 </dl>
 
 {% children %}
+
diff --git a/_manual/12_working-with-midi/07_note-cut-copy-and-paste-.html b/include/note-cut-copy-and-paste.html
similarity index 78%
rename from _manual/12_working-with-midi/07_note-cut-copy-and-paste-.html
rename to include/note-cut-copy-and-paste.html
index 8168edb..6b533f3 100644
--- a/_manual/12_working-with-midi/07_note-cut-copy-and-paste-.html
+++ b/include/note-cut-copy-and-paste.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Note Cut, Copy and Paste 
----                        
   
 <p>
   While in note edit mode, selected notes can be cut using 
@@ -11,3 +7,4 @@ title: Note Cut, Copy and Paste
   <kbd class="mod1">v</kbd>.
 </p>
   
+
diff --git a/_manual/12_working-with-midi/08_note-selection.html b/include/note-selection.html
similarity index 95%
rename from _manual/12_working-with-midi/08_note-selection.html
rename to include/note-selection.html
index 2e24288..f3bb0a9 100644
--- a/_manual/12_working-with-midi/08_note-selection.html
+++ b/include/note-selection.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Note Selection
----                        
 
 <h2>Selecting/Navigating note-by-note</h2>
 <p>
@@ -45,3 +41,4 @@ title: Note Selection
   hear each note as it is selected.
 </p>
   
+
diff --git a/_manual/05_ardours-interface/11_the-nudge-controls.html b/include/nudge-controls.html
similarity index 95%
rename from _manual/05_ardours-interface/11_the-nudge-controls.html
rename to include/nudge-controls.html
index f439e9e..fe1ec3e 100644
--- a/_manual/05_ardours-interface/11_the-nudge-controls.html
+++ b/include/nudge-controls.html
@@ -1,6 +1,3 @@
----
-title: Nudge Controls
----
 
 
 
@@ -31,3 +28,4 @@ title: Nudge Controls
   used to move the playhead backward or forward by the amount shown on the clock.
 
 </p>
+
diff --git a/_manual/22_synchronization/01_on-clock-and-time.html b/include/on-clock-and-time.html
similarity index 98%
rename from _manual/22_synchronization/01_on-clock-and-time.html
rename to include/on-clock-and-time.html
index 6c86377..c2a7465 100644
--- a/_manual/22_synchronization/01_on-clock-and-time.html
+++ b/include/on-clock-and-time.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: On Clock and Time
----
 
 <p>
   <dfn>Synchronization</dfn> in multimedia involves two concepts which are 
@@ -71,3 +67,4 @@ title: On Clock and Time
   and speed from it.
 </p>
 
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/09_osc-control-in-ardour-4.7-and-prior.html b/include/osc-control-for-ardour-4.7-and-prior.html
similarity index 99%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/09_osc-control-in-ardour-4.7-and-prior.html
rename to include/osc-control-for-ardour-4.7-and-prior.html
index d5221ae..eabf192 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/09_osc-control-in-ardour-4.7-and-prior.html
+++ b/include/osc-control-for-ardour-4.7-and-prior.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC control for Ardour 4.7 and Prior
----
 
 <p class="note">
 	This page is what was available before version 5.* was added. It has
@@ -693,3 +689,4 @@ here</em>"/&gt;</kbd>
   <dt><kbd class="osc">Zoom/zoom-focus-playhead</kbd></dt><dd>Zoom Focus Playhead</dd>
   <dt><kbd class="osc">Zoom/zoom-focus-right</kbd></dt><dd>Zoom Focus Right</dd>
 </dl>
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/01_osc-control.html b/include/osc58-controlling-ardour-with-osc.html
similarity index 99%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/01_osc-control.html
rename to include/osc58-controlling-ardour-with-osc.html
index 3fc9c97..e6ab893 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/01_osc-control.html
+++ b/include/osc58-controlling-ardour-with-osc.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC&#58; Controlling Ardour with OSC
----
 
 <p>
   <abbr title="Open Sound Control"><dfn>OSC</dfn></abbr> lets synthesizers
@@ -512,3 +508,4 @@ here</em>"/&gt;</kbd>
   </p>
 
 {% children %}
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/05_calculating-feedback-and-strip-types-values.html b/include/osc58-feedback-and-strip-types-values.html
similarity index 98%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/05_calculating-feedback-and-strip-types-values.html
rename to include/osc58-feedback-and-strip-types-values.html
index 91a9b70..e90a54d 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/05_calculating-feedback-and-strip-types-values.html
+++ b/include/osc58-feedback-and-strip-types-values.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC&#58; Feedback and Strip-types Values
----
 
 <p><em>/set_surface</em> has two values the user needs to calculate before
   use. In general these will not be calculated at run time, but
@@ -141,3 +137,4 @@ title: OSC&#58; Feedback and Strip-types Values
   So using a value of 19 would turn on feedback for strip and master
   controls, but leave meters, timecode and bar/beat feedback off.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/04_feedback-in-osc.html b/include/osc58-feedback.html
similarity index 99%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/04_feedback-in-osc.html
rename to include/osc58-feedback.html
index 1b40557..380e993 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/04_feedback-in-osc.html
+++ b/include/osc58-feedback.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC&#58; Feedback
----
 
 <p>
   Feedback from the Ardour to the the control surface is very useful for
@@ -241,3 +237,4 @@ title: OSC&#58; Feedback
   that OSC does track will show on those OSC controls. Examples of this
   might be track record enable for tracks 1 to 32, play or stop.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/07_parameter-types-in-osc.html b/include/osc58-parameter-types.html
similarity index 95%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/07_parameter-types-in-osc.html
rename to include/osc58-parameter-types.html
index 7af30f0..b89eb15 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/07_parameter-types-in-osc.html
+++ b/include/osc58-parameter-types.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC&#58; Parameter Types
----
 
 <p>
   An OSC message is laid out in this form:
@@ -31,3 +27,4 @@ title: OSC&#58; Parameter Types
 	These controllers should have no problem sending bool or int values
 	as floats. Ardour will interpret the values as required.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/06_osc-personal-monitoring.html b/include/osc58-personal-monitoring-control.html
similarity index 98%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/06_osc-personal-monitoring.html
rename to include/osc58-personal-monitoring-control.html
index 04e0f5a..2c948c3 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/06_osc-personal-monitoring.html
+++ b/include/osc58-personal-monitoring-control.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC&#58; Personal Monitoring Control
----
 
 <p>
 	Personal monitoring can allow a performer with a smart phone to set
@@ -111,3 +107,4 @@ title: OSC&#58; Personal Monitoring Control
 	While a fader is being adjusted, the corresponding <em>/*/name</em>
 	text will give the level in db.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/03_querying-ardour-with-osc.html b/include/osc58-querying-ardour.html
similarity index 98%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/03_querying-ardour-with-osc.html
rename to include/osc58-querying-ardour.html
index 5496142..9229229 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/03_querying-ardour-with-osc.html
+++ b/include/osc58-querying-ardour.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC&#58; Querying Ardour
----
 
 <p>
   In order to make a custom controller that knows what strips Ardour
@@ -151,3 +147,4 @@ title: OSC&#58; Querying Ardour
 	While this seems complex, it is really not that bad. Minimum,
 	maximum and value will in most cases give you all you need.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/08_selection-considerations-in-osc.html b/include/osc58-selection-and-expansion-considerations.html
similarity index 97%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/08_selection-considerations-in-osc.html
rename to include/osc58-selection-and-expansion-considerations.html
index 3996b49..056c2ad 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/08_selection-considerations-in-osc.html
+++ b/include/osc58-selection-and-expansion-considerations.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC&#58; Selection and Expansion Considerations
----
 
 <p>
   Ardour does not send every possible feedback value for each channel.
@@ -70,3 +66,4 @@ title: OSC&#58; Selection and Expansion Considerations
   to switch between the GUI select and the local expand to compare two
   strips settings.
 </p>
+
diff --git a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/02_osc-setup-dialog.html b/include/osc58-using-the-setup-dialog.html
similarity index 98%
rename from _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/02_osc-setup-dialog.html
rename to include/osc58-using-the-setup-dialog.html
index d21edf8..9eb0b54 100644
--- a/_manual/25_using-control-surfaces/01_controlling-ardour-with-osc/02_osc-setup-dialog.html
+++ b/include/osc58-using-the-setup-dialog.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: OSC&#58; Using the Setup Dialog
----
 
 <p>
   Starting with Ardour 5.1 OSC has a graphic setup dialog. This dialog
@@ -123,3 +119,4 @@ title: OSC&#58; Using the Setup Dialog
   should be left blank. In the case of metering, Metering as a LED strip
   only works if Metering as a Float is disabled.
 </p>
+
diff --git a/_manual/22_synchronization/04_overview-of-timecode-related-settings.html b/include/overview-of-all-timecode-related-settings.html
similarity index 97%
rename from _manual/22_synchronization/04_overview-of-timecode-related-settings.html
rename to include/overview-of-all-timecode-related-settings.html
index 03c6945..2319148 100644
--- a/_manual/22_synchronization/04_overview-of-timecode-related-settings.html
+++ b/include/overview-of-all-timecode-related-settings.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Overview of all Timecode related settings
-menu_title: Overview of Timecode settings
----
 
 <p>
   Timecode settings are accessed from the menu in three places:
@@ -106,3 +101,4 @@ menu_title: Overview of Timecode settings
 </dl>
 <p>These settings are also common to all sessions.</p>
 
+
diff --git a/_manual/20_mixing/02_panning.html b/include/panning.html
similarity index 96%
rename from _manual/20_mixing/02_panning.html
rename to include/panning.html
index e26a297..71bd769 100644
--- a/_manual/20_mixing/02_panning.html
+++ b/include/panning.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Panning
----                        
 
 <p>
   <dfn>Panning</<dfn> is the process of distributing one or more signals
@@ -45,3 +41,4 @@ title: Panning
 </p>
 
 {% children %}
+
diff --git a/_manual/12_working-with-midi/11_patch-change.html b/include/patch-change.html
similarity index 97%
rename from _manual/12_working-with-midi/11_patch-change.html
rename to include/patch-change.html
index b87d005..5f9fd2d 100644
--- a/_manual/12_working-with-midi/11_patch-change.html
+++ b/include/patch-change.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Patch Change
----
 
 <p>
   A <dfn>patch change</dfn> is Ardour's description for a combination
@@ -54,3 +50,4 @@ title: Patch Change
 <p>
   ...
 </p>
+
diff --git a/_manual/17_signal-routing/07_Patchbay.html b/include/patchbay.html
similarity index 98%
rename from _manual/17_signal-routing/07_Patchbay.html
rename to include/patchbay.html
index 24c3f1c..50f9694 100644
--- a/_manual/17_signal-routing/07_Patchbay.html
+++ b/include/patchbay.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Patchbay
----                        
   
 <p>
   The <dfn>patchbay</dfn> is the main way to make connections to, from and 
@@ -135,3 +131,4 @@ title: Patchbay
     no matching tabs on both axes, flipping will be impossible.
   </dd>
 </dl>
+
diff --git a/_manual/03_setting-up-your-system/07_platform-specifics.html b/include/platform-specifics.html
similarity index 74%
rename from _manual/03_setting-up-your-system/07_platform-specifics.html
rename to include/platform-specifics.html
index ef6b154..ef8c7eb 100644
--- a/_manual/03_setting-up-your-system/07_platform-specifics.html
+++ b/include/platform-specifics.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Platform Specifics
----                        
 
 <h2>Platform Specifics</h2>
 <p>
@@ -11,3 +7,4 @@ title: Platform Specifics
 </p>
 
 {% children %}
+
diff --git a/include/playing-back-track-material.html b/include/playing-back-track-material.html
index a4692c0..b28b04f 100644
--- a/include/playing-back-track-material.html
+++ b/include/playing-back-track-material.html
@@ -1,5 +1,3 @@
----
-title: Playing Back Track Material
----
+
 
 
diff --git a/_manual/10_working-with-playlists/02_playlist-operations.html b/include/playlist-operations.html
similarity index 97%
rename from _manual/10_working-with-playlists/02_playlist-operations.html
rename to include/playlist-operations.html
index 34f8fa0..c22f4df 100644
--- a/_manual/10_working-with-playlists/02_playlist-operations.html
+++ b/include/playlist-operations.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Playlist Operations
----                        
 
 <p>
   In the track header (editor window, left pane) is a button labelled <kbd
@@ -69,3 +65,4 @@ title: Playlist Operations
   that track. You can then edit this playlist without affecting the original.
 </p>
 
+
diff --git a/_manual/10_working-with-playlists/03_playlist_usecases.html b/include/playlist-usecases.html
similarity index 96%
rename from _manual/10_working-with-playlists/03_playlist_usecases.html
rename to include/playlist-usecases.html
index f14915f..fa701c7 100644
--- a/_manual/10_working-with-playlists/03_playlist_usecases.html
+++ b/include/playlist-usecases.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Playlist Usecases
----                        
 
 <h3>Using Playlists for Parallel Processing</h3>
 <p>
@@ -48,3 +44,4 @@ title: Playlist Usecases
   Select the appropriate language before exporting the session.
 </p>
 
+
diff --git a/include/playlists.html b/include/playlists.html
index 4d12f78..b28b04f 100644
--- a/include/playlists.html
+++ b/include/playlists.html
@@ -1,5 +1,3 @@
----
-title: Playlists
----
+
 
 
diff --git a/include/plugin-and-hardware-inserts.html b/include/plugin-and-hardware-inserts.html
index e647238..b28b04f 100644
--- a/include/plugin-and-hardware-inserts.html
+++ b/include/plugin-and-hardware-inserts.html
@@ -1,5 +1,3 @@
----
-title: Plugin and Hardware Inserts
----
+
 
 
diff --git a/_manual/13_working-with-plugins/02_plugin-manager.html b/include/plugin-manager.html
similarity index 97%
rename from _manual/13_working-with-plugins/02_plugin-manager.html
rename to include/plugin-manager.html
index da92570..c2ed9db 100644
--- a/_manual/13_working-with-plugins/02_plugin-manager.html
+++ b/include/plugin-manager.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Plugin Manager
----
 
 <p>
   The <dfn>Plugin Manager</dfn> serves two purposes. Primarily it is used to
@@ -57,3 +53,4 @@ title: Plugin Manager
   Plugins can be removed from the bottom half with a double click, or, if
   already selected, by clicking <kbd class="button">Remove</kbd>.
 </p>
+
diff --git a/include/plugins-bundled-with-ardour.html b/include/plugins-bundled-with-ardour.html
index bafa92b..a549d0e 100644
--- a/include/plugins-bundled-with-ardour.html
+++ b/include/plugins-bundled-with-ardour.html
@@ -1,6 +1,3 @@
----
-title: Plugins Bundled With Ardour
----
 
 <p>
   Ardour now comes with the following plugins as part of a standard installation:
@@ -29,3 +26,4 @@ title: Plugins Bundled With Ardour
   <dd>A reverb that finds a balance between sounding good, using a lot of CPU and having too many controls</dd>
 </dl>
 
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/10_plugins.html b/include/plugins-tab.html
similarity index 96%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/10_plugins.html
rename to include/plugins-tab.html
index 59e9997..6d96260 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/10_plugins.html
+++ b/include/plugins-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Plugins Tab
-menu_title: Plugins Tab
----
 
 <p>
   This tab contains settings that control the discovery and availability of
@@ -75,3 +70,4 @@ plugins tab"/>
     </ul>
   </li>
 </ul>
+
diff --git a/_manual/24_preferences-and-session-properties.html b/include/preferences-and-session-properties.html
similarity index 87%
rename from _manual/24_preferences-and-session-properties.html
rename to include/preferences-and-session-properties.html
index 4362c57..093d80c 100644
--- a/_manual/24_preferences-and-session-properties.html
+++ b/include/preferences-and-session-properties.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Preferences and Session Properties
----                        
 
 <p>
   Ardour splits its configuration options into two categories:
@@ -21,3 +17,4 @@ title: Preferences and Session Properties
 </ul>
 
 {% children %}
+
diff --git a/include/preferences.html b/include/preferences.html
index 0e30f4c..b28b04f 100644
--- a/include/preferences.html
+++ b/include/preferences.html
@@ -1,5 +1,3 @@
----
-title: Preferences
----
+
 
 
diff --git a/_manual/13_working-with-plugins/03_processor-box.html b/include/processor-box.html
similarity index 97%
rename from _manual/13_working-with-plugins/03_processor-box.html
rename to include/processor-box.html
index b47eaf1..3b79271 100644
--- a/_manual/13_working-with-plugins/03_processor-box.html
+++ b/include/processor-box.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Processor Box
----                        
 
 <p>
   In Ardour terminology, a <dfn>processor</dfn> is anything which treats the
@@ -60,3 +56,4 @@ title: Processor Box
   class="menu">Delete</kbd>, or <kbd class="mod3 mouse">Right</kbd>-click on it. 
 </p>
   
+
diff --git a/_manual/07_working-with-markers/06_punch-range.html b/include/punch-range.html
similarity index 87%
rename from _manual/07_working-with-markers/06_punch-range.html
rename to include/punch-range.html
index 5cbf32e..862960c 100644
--- a/_manual/07_working-with-markers/06_punch-range.html
+++ b/include/punch-range.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Punch Range
----
 
 <p>
   The <dfn>punch range</dfn> is a special range used to define where
@@ -12,3 +8,4 @@ title: Punch Range
   <a href="/ardours-interface/editor-lists/ranges-and-marks-list/">Ranges &amp; Marks</a> 
   list.
 </p>
+
diff --git a/include/punch-recording-modes.html b/include/punch-recording-modes.html
index 9495e33..b28b04f 100644
--- a/include/punch-recording-modes.html
+++ b/include/punch-recording-modes.html
@@ -1,5 +1,3 @@
----
-title: Punch Recording Modes
----
+
 
 
diff --git a/_manual/18_editing-and-arranging/04_change-region-lengths/01_pushpull-trimming.html b/include/pushpull-trimming.html
similarity index 95%
rename from _manual/18_editing-and-arranging/04_change-region-lengths/01_pushpull-trimming.html
rename to include/pushpull-trimming.html
index 3531a3c..eb02dbf 100644
--- a/_manual/18_editing-and-arranging/04_change-region-lengths/01_pushpull-trimming.html
+++ b/include/pushpull-trimming.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Push/Pull Trimming
----                        
 
 <p>
   Normally, when you trim regions by dragging with the mouse, it affects 
@@ -38,3 +34,4 @@ title: Push/Pull Trimming
   adjoin each other.
 </p>
   
+
diff --git a/_manual/12_working-with-midi/09_quantize-midi.html b/include/quantize-midi.html
similarity index 88%
rename from _manual/12_working-with-midi/09_quantize-midi.html
rename to include/quantize-midi.html
index f2ccc99..afa2694 100644
--- a/_manual/12_working-with-midi/09_quantize-midi.html
+++ b/include/quantize-midi.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Quantize MIDI
----                        
 
   
 <p><img src="/images/a3_quantize.png" alt="quantize dialog" /></p>
@@ -14,3 +10,4 @@ title: Quantize MIDI
   <li>Strength (how close to move a note to its new position, as a percentage of the nominal distance)</li>
   <li>Swing</li>
 </ul>
+
diff --git a/include/record-setup.html b/include/record-setup.html
index 356a5f4..b28b04f 100644
--- a/include/record-setup.html
+++ b/include/record-setup.html
@@ -1,5 +1,3 @@
----
-title: Record Setup
----
+
 
 
diff --git a/_manual/09_working-with-regions/03_region-context-menu.html b/include/region-context-menu.html
similarity index 97%
rename from _manual/09_working-with-regions/03_region-context-menu.html
rename to include/region-context-menu.html
index 0c92f63..feaf5d4 100644
--- a/_manual/09_working-with-regions/03_region-context-menu.html
+++ b/include/region-context-menu.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Region Context Menu
----                        
 
 <p>
   In the editor window, right clicking (context clicking) on a region
@@ -178,3 +174,4 @@ title: Region Context Menu
 <dt>Remove</dt>
 <dd></dd>
 </dl>
+
diff --git a/include/region-loops-and-groups.html b/include/region-loops-and-groups.html
index 274cf7a..3c1813d 100644
--- a/include/region-loops-and-groups.html
+++ b/include/region-loops-and-groups.html
@@ -1,7 +1,5 @@
----
-title: Region Loops and Groups
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/_manual/09_working-with-regions/01_region-naming.html b/include/region-naming.html
similarity index 97%
rename from _manual/09_working-with-regions/01_region-naming.html
rename to include/region-naming.html
index 1ebbdd9..56751b9 100644
--- a/_manual/09_working-with-regions/01_region-naming.html
+++ b/include/region-naming.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Region Naming
----                        
   
 <p><dfn>Region names</dfn> are initially derived from either</p>
 <ul>
@@ -66,3 +62,4 @@ title: Region Naming
   version number in the future if needed (e.g. if you copy or split the region).
 </p>
   
+
diff --git a/_manual/08_working-with-sessions/06_renaming-a-session.html b/include/renaming-a-session.html
similarity index 89%
rename from _manual/08_working-with-sessions/06_renaming-a-session.html
rename to include/renaming-a-session.html
index 6e3cd41..f0adbe1 100644
--- a/_manual/08_working-with-sessions/06_renaming-a-session.html
+++ b/include/renaming-a-session.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Renaming a Session
----                        
   
 <p>
   Use <kbd class="menu">Session &gt; Rename</kbd> to give your session a 
@@ -20,3 +16,4 @@ title: Renaming a Session
 </p>
 
   
+
diff --git a/_manual/11_working-with-tracks/05_controlling-track-ordering/01_reordering-tracks.html b/include/reordering-tracks.html
similarity index 97%
rename from _manual/11_working-with-tracks/05_controlling-track-ordering/01_reordering-tracks.html
rename to include/reordering-tracks.html
index 31da451..62cb41f 100644
--- a/_manual/11_working-with-tracks/05_controlling-track-ordering/01_reordering-tracks.html
+++ b/include/reordering-tracks.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Reordering Tracks
----
 
 <p>
   The <dfn>track ordering</dfn> of the Editor and Mixer is <dfn>synchronized</dfn>: if you
@@ -47,3 +43,4 @@ title: Reordering Tracks
   Because new tracks are automatically selected, you can quickly reorder them
   in the editor window via the keyboard shortcuts after adding them (see above).
 </p>
+
diff --git a/include/rhythm-ferret.html b/include/rhythm-ferret.html
index 894b3f4..3c1813d 100644
--- a/include/rhythm-ferret.html
+++ b/include/rhythm-ferret.html
@@ -1,7 +1,5 @@
----
-title: Rhythm Ferret
----
 
 <p class="fixme">Add content</p>
 
 
+
diff --git a/_manual/05_ardours-interface/12_the-ruler.html b/include/ruler.html
similarity index 98%
rename from _manual/05_ardours-interface/12_the-ruler.html
rename to include/ruler.html
index a1b234c..e4a569f 100644
--- a/_manual/05_ardours-interface/12_the-ruler.html
+++ b/include/ruler.html
@@ -1,6 +1,3 @@
----
-title: Ruler
----
 
 <img src="/images/ruler.png" alt="Ardour's Ruler">
 
@@ -24,3 +21,4 @@ title: Ruler
 </dl>
 
 <p>Most of the operations on the markers are described in <a href="/working-with-markers/">Working with Markers</a>, while the Meter, Tempo, Bars:Beats and Timecode use are described in <a href="/working-with-tempo-and-meter/">Tempo and Meter</a>.</p>
+
diff --git a/include/score-editor.html b/include/score-editor.html
index 1d50ffa..b28b04f 100644
--- a/include/score-editor.html
+++ b/include/score-editor.html
@@ -1,5 +1,3 @@
----
-title: Score Editor
----
+
 
 
diff --git a/_manual/27_lua-scripting/01_brain_dump.html b/include/scripting-documentation.html
similarity index 99%
rename from _manual/27_lua-scripting/01_brain_dump.html
rename to include/scripting-documentation.html
index 529b70f..1c8e9e3 100644
--- a/_manual/27_lua-scripting/01_brain_dump.html
+++ b/include/scripting-documentation.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Scripting Documentation
----
 
 <p class="warning">
 This Documentation is Work in Progress and far from complete. Also the documented API may be subject to change.
@@ -410,3 +406,4 @@ close_session()
 
 </code></pre>
 </div>
+
diff --git a/_manual/15_adding-pre-existing-material/03_searching-for-files-using-tags.html b/include/searching-for-files-using-tags.html
similarity index 94%
rename from _manual/15_adding-pre-existing-material/03_searching-for-files-using-tags.html
rename to include/searching-for-files-using-tags.html
index e7870e5..ae093ef 100644
--- a/_manual/15_adding-pre-existing-material/03_searching-for-files-using-tags.html
+++ b/include/searching-for-files-using-tags.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Searching for Files Using Tags
----                        
 
 <p>
   A <dfn>tag</dfn> is bit of information, or metadata, that is associated 
@@ -34,3 +30,4 @@ title: Searching for Files Using Tags
     
 
 {% children %}
+
diff --git a/_manual/18_editing-and-arranging/01_select-regions.html b/include/select-regions.html
similarity index 98%
rename from _manual/18_editing-and-arranging/01_select-regions.html
rename to include/select-regions.html
index 8dd5321..d0e62b3 100644
--- a/_manual/18_editing-and-arranging/01_select-regions.html
+++ b/include/select-regions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Select Regions
----
 
 <p>
   Many editing operations in Ardour require you to first <dfn>select one or more
@@ -89,3 +85,4 @@ title: Select Regions
   Note that this will do nothing for whole-file regions, since they do not exist
   anywhere in a playlist or track.
 </p>
+
diff --git a/_manual/11_working-with-tracks/03_selecting-tracks.html b/include/selecting-tracks.html
similarity index 94%
rename from _manual/11_working-with-tracks/03_selecting-tracks.html
rename to include/selecting-tracks.html
index 266675e..aa453cd 100644
--- a/_manual/11_working-with-tracks/03_selecting-tracks.html
+++ b/include/selecting-tracks.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Selecting Tracks
----                        
 
 <p>
   Tracks are <dfn>selected</dfn> by clicking on the Track header at the left
@@ -32,3 +28,4 @@ title: Selecting Tracks
   Preferences &gt; Editor &gt; Link selection of regions and tracks</kbd>.
 </p>
   
+
diff --git a/_manual/05_ardours-interface/05_selection-and-punch-clocks.html b/include/selection-and-punch-clocks.html
similarity index 96%
rename from _manual/05_ardours-interface/05_selection-and-punch-clocks.html
rename to include/selection-and-punch-clocks.html
index d898777..1390c88 100644
--- a/_manual/05_ardours-interface/05_selection-and-punch-clocks.html
+++ b/include/selection-and-punch-clocks.html
@@ -1,6 +1,3 @@
----
-title: Selection and Punch Clocks
----
 
 <img src="/images/selectionpunchclocks.png" alt="An image of the the selection and punch clocks in Ardour" />
 
@@ -28,3 +25,4 @@ title: Selection and Punch Clocks
   allowing to change the type of time display between the <a href="/introducing-ardour/basic-gui-operations/editing-clocks/">
   4 clock modes</a>, and to copy the selected clock's time to the clipboard.
 </p>
+
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations/02_selection-techniques.html b/include/selection-techniques.html
similarity index 96%
rename from _manual/02_introducing-ardour/03_basic-gui-operations/02_selection-techniques.html
rename to include/selection-techniques.html
index cf569ed..ef78d48 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations/02_selection-techniques.html
+++ b/include/selection-techniques.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Selection Techniques
----                        
   
 <p>
   Ardour follows the conventions used by most other computer software
@@ -55,3 +51,4 @@ title: Selection Techniques
   <kbd class="menu">Edit &gt; Redo Selection Change</kbd> will take you back
   to where you were before you chose <kbd class="menu">Edit &gt; Undo Selection Change</kbd>.
 </p>
+
diff --git a/_manual/18_editing-and-arranging/08_separation/02_separate-range.html b/include/separate-range.html
similarity index 84%
rename from _manual/18_editing-and-arranging/08_separation/02_separate-range.html
rename to include/separate-range.html
index ee5c65d..30111d2 100644
--- a/_manual/18_editing-and-arranging/08_separation/02_separate-range.html
+++ b/include/separate-range.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Separate Range
----                        
 
 <p>
   A final new editing feature is an operation in the context menu of a 
@@ -12,3 +8,4 @@ title: Separate Range
   precisely to a range.
 </p>
   
+
diff --git a/_manual/18_editing-and-arranging/08_separation/01_separate-under.html b/include/separate-under.html
similarity index 94%
rename from _manual/18_editing-and-arranging/08_separation/01_separate-under.html
rename to include/separate-under.html
index 9d5292b..491fb1c 100644
--- a/_manual/18_editing-and-arranging/08_separation/01_separate-under.html
+++ b/include/separate-under.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Separate Under
----                        
 
 <p>
   You may have a situation where you have positioned one region over another, 
@@ -26,3 +22,4 @@ title: Separate Under
   depending on which end is covered.
 </p>
   
+
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/09_misc.html b/include/session-misc-tab.html
similarity index 93%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/09_misc.html
rename to include/session-misc-tab.html
index 6aed271..87353e7 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/09_misc.html
+++ b/include/session-misc-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Misc Tab
-menu_title: Misc Tab
----                        
 
 <p>
   This tab has several things that don't fit on the other tabs.
@@ -48,3 +43,4 @@ menu_title: Misc Tab
   </li>
 </ul>
 
+
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog.html b/include/session-properties-dialog.html
similarity index 75%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog.html
rename to include/session-properties-dialog.html
index 0c9ee26..b582c3d 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog.html
+++ b/include/session-properties-dialog.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Session Properties Dialog
-menu_title: Session Properties
----                        
 
 <img src="/images/a4_session_properties_timecode.png" alt="session properties dialog"/>
 
@@ -17,3 +12,4 @@ menu_title: Session Properties
 
 
   
+
diff --git a/_manual/08_working-with-sessions/07_session-templates.html b/include/session-templates.html
similarity index 93%
rename from _manual/08_working-with-sessions/07_session-templates.html
rename to include/session-templates.html
index d55b3fe..1e163b0 100644
--- a/_manual/08_working-with-sessions/07_session-templates.html
+++ b/include/session-templates.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Session Templates
----                        
   
 <p>
   <dfn>Session templates</dfn> are a way to store the setup of a session 
@@ -33,3 +29,4 @@ title: Session Templates
   on templates for individual tracks or busses.
 </p>
   
+
diff --git a/include/sessions.html b/include/sessions.html
index 4f4b84e..b28b04f 100644
--- a/include/sessions.html
+++ b/include/sessions.html
@@ -1,5 +1,3 @@
----
-title: Sessions
----
+
 
 
diff --git a/_manual/03_setting-up-your-system/05_setting-up-midi.html b/include/setting-up-midi.html
similarity index 95%
rename from _manual/03_setting-up-your-system/05_setting-up-midi.html
rename to include/setting-up-midi.html
index 4172ba9..e2af1bb 100644
--- a/_manual/03_setting-up-your-system/05_setting-up-midi.html
+++ b/include/setting-up-midi.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Setting Up MIDI
----                        
 
 <h2>What Can Ardour Do With MIDI?</h2>
 <p>
@@ -54,3 +50,4 @@ below.
 </p>
 
 {% children %}
+
diff --git a/_manual/03_setting-up-your-system.html b/include/setting-up-your-system.html
similarity index 77%
rename from _manual/03_setting-up-your-system.html
rename to include/setting-up-your-system.html
index 84c4a86..a0e8445 100644
--- a/_manual/03_setting-up-your-system.html
+++ b/include/setting-up-your-system.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Setting Up Your System
----                        
   
 <p>
   Using a general purpose computer for recording digital audio is not
@@ -11,3 +7,4 @@ title: Setting Up Your System
 </p>
 
 {% children %}
+
diff --git a/_manual/17_signal-routing/09_sidechaining.html b/include/sidechaining.html
similarity index 99%
rename from _manual/17_signal-routing/09_sidechaining.html
rename to include/sidechaining.html
index 12a732f..482e25c 100644
--- a/_manual/17_signal-routing/09_sidechaining.html
+++ b/include/sidechaining.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Sidechaining
----
 <p>
   Dynamic Processors &ndash; such as compressors &ndash; in general use the the original
   input signal for analysis and operate on the same signal.
@@ -113,3 +109,4 @@ title: Sidechaining
   to place the EQ on. This track won't be connected to the Master, as its content is of no musical
   interest except for it's use as a trigger, allowing for some extreme EQ.
 </p>
+
diff --git a/_manual/17_signal-routing.html b/include/signal-routing.html
similarity index 95%
rename from _manual/17_signal-routing.html
rename to include/signal-routing.html
index 1836da8..30a8b69 100644
--- a/_manual/17_signal-routing.html
+++ b/include/signal-routing.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Signal Routing
----                        
 
 <p>
   Ardour does most of its internal <dfn>signal routing</dfn> via JACK: 
@@ -46,3 +42,4 @@ title: Signal Routing
 </p>
 
 {% children %}
+
diff --git a/_manual/08_working-with-sessions/08_snapshots.html b/include/snapshots.html
similarity index 98%
rename from _manual/08_working-with-sessions/08_snapshots.html
rename to include/snapshots.html
index b2f1b29..c624cc2 100644
--- a/_manual/08_working-with-sessions/08_snapshots.html
+++ b/include/snapshots.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Snapshots
----
 
 <p>
   Sometimes you will want to save a <dfn>snapshot</dfn> of the current state of a session for possible
@@ -58,3 +54,4 @@ title: Snapshots
   be stored in this new snapshot, and existing snapshots (and the main
   session) will be left unaffected.
 </p>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/05_solomute.html b/include/solomute-tab.html
similarity index 98%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/05_solomute.html
rename to include/solomute-tab.html
index 9d1dd05..b97ec13 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/05_solomute.html
+++ b/include/solomute-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Solo/Mute Tab
-menu_title: Solo/Mute Tab
----
 
 <p>
   This tab contains settings that affect the use of
@@ -133,3 +128,4 @@ solo/mute tab"/>
     </ul>
   </li>
 </ul>
+
diff --git a/_manual/25_using-control-surfaces/02_mackie-control-protocol/02_ssl-nucleus.html b/include/ssl-nucleus.html
similarity index 99%
rename from _manual/25_using-control-surfaces/02_mackie-control-protocol/02_ssl-nucleus.html
rename to include/ssl-nucleus.html
index 83c98e2..1fdcd3c 100644
--- a/_manual/25_using-control-surfaces/02_mackie-control-protocol/02_ssl-nucleus.html
+++ b/include/ssl-nucleus.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: SSL Nucleus
----
 
 <p>
   The Nucleus, from Solid State Logic, is a 16 fader Mackie Control
@@ -217,3 +213,4 @@ title: SSL Nucleus
   computers. But who is going to spend $5000 on a Nucleus that
   doesn't have this already?</dd>
 </dl>
+
diff --git a/_manual/03_setting-up-your-system/08_starting-ardour.html b/include/starting-ardour.html
similarity index 97%
rename from _manual/03_setting-up-your-system/08_starting-ardour.html
rename to include/starting-ardour.html
index a04323f..bf9d255 100644
--- a/_manual/03_setting-up-your-system/08_starting-ardour.html
+++ b/include/starting-ardour.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Starting Ardour
----
 
 <p>
   There are several ways of <dfn>starting Ardour</dfn>, which may vary
@@ -51,3 +47,4 @@ title: Starting Ardour
   To start Ardour with a new, named session:
 </p>
 <kbd class="cmd lin">Ardour5 -N <em>/path/to/session</em></kbd>
+
diff --git a/_manual/05_ardours-interface/02_status-bar.html b/include/status-bar.html
similarity index 98%
rename from _manual/05_ardours-interface/02_status-bar.html
rename to include/status-bar.html
index 439f03e..ecad719 100644
--- a/_manual/05_ardours-interface/02_status-bar.html
+++ b/include/status-bar.html
@@ -1,6 +1,3 @@
----
-title: Status Bar
----
 
 <img src="/images/status-bar.png" alt="The Status Bar">
 
@@ -35,3 +32,4 @@ title: Status Bar
 <p>
   The log button turns yellow when a warning is shown, and red when an error occurs. Clicking the log button gives acces to the log.
 </p>
+
diff --git a/_manual/05_ardours-interface/06_status-indicators.html b/include/status-indicators-and-mode-buttons.html
similarity index 96%
rename from _manual/05_ardours-interface/06_status-indicators.html
rename to include/status-indicators-and-mode-buttons.html
index 3207a71..df8ba80 100644
--- a/_manual/05_ardours-interface/06_status-indicators.html
+++ b/include/status-indicators-and-mode-buttons.html
@@ -1,6 +1,3 @@
----
-title: Status indicators and Mode buttons
----
 
 <img src="/images/status-and-mode-buttons.png" alt="The Status buttons, the Mode buttons and " />
 
@@ -26,3 +23,4 @@ title: Status indicators and Mode buttons
   and also shows a peak indicator, that turns red when  any level exceeds 0dB. It can
   be reset by a <kbd class="mouse">Left</kbd> click.
 </p>
+
diff --git a/_manual/08_working-with-sessions/05_interchange-with-other-daws/02_stem-exports.html b/include/stem-exports.html
similarity index 86%
rename from _manual/08_working-with-sessions/05_interchange-with-other-daws/02_stem-exports.html
rename to include/stem-exports.html
index efa35a6..1db59e4 100644
--- a/_manual/08_working-with-sessions/05_interchange-with-other-daws/02_stem-exports.html
+++ b/include/stem-exports.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Stem Exports
----                        
   
 <p>
   <dfn>Stem exports</dfn> are covered fully in the 
@@ -12,3 +8,4 @@ title: Stem Exports
   the most common methods of interchange because it works between all DAWs.
 </p>
   
+
diff --git a/_manual/12_working-with-midi/10_step-entry.html b/include/step-entry.html
similarity index 96%
rename from _manual/12_working-with-midi/10_step-entry.html
rename to include/step-entry.html
index 6db6c8f..bea5151 100644
--- a/_manual/12_working-with-midi/10_step-entry.html
+++ b/include/step-entry.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Step Entry
----                        
 
 <p>
   Sometimes you will  want to edit MIDI data directly from a connected 
@@ -50,3 +46,4 @@ title: Step Entry
   directly from the keyboard, so you do not need to keep moving back 
   and forth from keyboard to mouse to do complex data insertion.
 </p>
+
diff --git a/_manual/20_mixing/02_panning/03_stereo_panner.html b/include/stereo-panner.html
similarity index 99%
rename from _manual/20_mixing/02_panning/03_stereo_panner.html
rename to include/stereo-panner.html
index c25feb7..8c33e2c 100644
--- a/_manual/20_mixing/02_panning/03_stereo_panner.html
+++ b/include/stereo-panner.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Stereo Panner
----                        
 
 <p>
   The default <dfn>stereo panner</dfn> distributes two inputs to two outputs. Its
@@ -247,3 +243,4 @@ orchestra sample libraries for example do contain time-delay components.
 </p>
 
 
+
diff --git a/_manual/18_editing-and-arranging/09_strip-silence-from-audio-regions.html b/include/strip-silence-from-audio-regions.html
similarity index 87%
rename from _manual/18_editing-and-arranging/09_strip-silence-from-audio-regions.html
rename to include/strip-silence-from-audio-regions.html
index 8062c32..dd1b04f 100644
--- a/_manual/18_editing-and-arranging/09_strip-silence-from-audio-regions.html
+++ b/include/strip-silence-from-audio-regions.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Strip Silence from Audio Regions
-menu_title: Stripping Silence
----                        
 
 <p>
   From the region context menu, choose <kbd class="menu">Edit &gt; Strip
@@ -21,3 +16,4 @@ menu_title: Stripping Silence
   shortest segments.
 </p>
   
+
diff --git a/_manual/05_ardours-interface/16_the-strips-list.html b/include/strips-list.html
similarity index 97%
rename from _manual/05_ardours-interface/16_the-strips-list.html
rename to include/strips-list.html
index e4226d6..8adbe72 100644
--- a/_manual/05_ardours-interface/16_the-strips-list.html
+++ b/include/strips-list.html
@@ -1,6 +1,3 @@
----
-title: Strips List
----
 
 <p>
   The <dfn>Strips List</dfn> is a quick way to manage big sessions, with lots of tracks,
@@ -39,3 +36,4 @@ title: Strips List
   The <kbd class="menu">&plus;</kbd> button under the list is a shortcut to create a new track,
   bus or VCA, as in clicking <kbd class="menu">Track &gt; Add Track, Bus or VCA...</kbd>.
 </p>
+
diff --git a/_manual/17_signal-routing/06_subgrouping.html b/include/subgrouping.html
similarity index 96%
rename from _manual/17_signal-routing/06_subgrouping.html
rename to include/subgrouping.html
index 7bf7007..22ec212 100644
--- a/_manual/17_signal-routing/06_subgrouping.html
+++ b/include/subgrouping.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Subgrouping
----                        
 
 <p>
   <dfn>Subgrouping</dfn> (sometimes known as "Grouping" or "Audio Grouping")  
@@ -36,3 +32,4 @@ title: Subgrouping
   routing to the way it was before the addition of the subgroup bus &mdash; tracks 
   that had been subgrouped will be left with their main outputs disconncted.
 </p>  
+
diff --git a/_manual/05_ardours-interface/13_the-summary.html b/include/summary.html
similarity index 98%
rename from _manual/05_ardours-interface/13_the-summary.html
rename to include/summary.html
index 26371fc..5efa236 100644
--- a/_manual/05_ardours-interface/13_the-summary.html
+++ b/include/summary.html
@@ -1,6 +1,3 @@
----
-title: Summary
----
 
 
 <img src="/images/summary.png" alt="Ardour's Summary">
@@ -29,3 +26,4 @@ title: Summary
 	<li>the white rectangle can be dragged anywhere on the session, moving the view accordingly</li>
 	<li>each border and corner of the white square can be resized, zooming in and out accordingly</li>
 </ul>
+
diff --git a/_manual/15_adding-pre-existing-material/04_supported-file-formats.html b/include/supported-file-formats.html
similarity index 93%
rename from _manual/15_adding-pre-existing-material/04_supported-file-formats.html
rename to include/supported-file-formats.html
index 794431a..15f1eea 100644
--- a/_manual/15_adding-pre-existing-material/04_supported-file-formats.html
+++ b/include/supported-file-formats.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Supported File Formats
----
 
 <p>
   The list of audio file formats that Ardour can understand is quite long.
@@ -19,3 +15,4 @@ title: Supported File Formats
 <p>
   For MIDI import, Ardour will read any Standard MIDI Format (SMF) file. 
 </p>
+
diff --git a/include/surround-panning-and-mixing.html b/include/surround-panning-and-mixing.html
index 2adf828..b28b04f 100644
--- a/include/surround-panning-and-mixing.html
+++ b/include/surround-panning-and-mixing.html
@@ -1,5 +1,3 @@
----
-title: Surround Panning and Mixing
----
+
 
 
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/02_sync.html b/include/sync-tab.html
similarity index 74%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/02_sync.html
rename to include/sync-tab.html
index d79932e..bb5b059 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/02_sync.html
+++ b/include/sync-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Sync Tab
-menu_title: Sync Tab
----                        
 
 <img src="/images/a4_session_properties_sync.png" alt="session properties sync tab"/>
 
@@ -10,3 +5,4 @@ menu_title: Sync Tab
   This tab is used to modify the timecode settings when working with video to 
   use the imported video's timecode settings instead of the session defaults.
 </p>
+
diff --git a/include/system-setup.html b/include/system-setup.html
index 6a4e449..b28b04f 100644
--- a/include/system-setup.html
+++ b/include/system-setup.html
@@ -1,5 +1,3 @@
----
-title: System Setup
----
+
 
 
diff --git a/include/techniques-for-working-with-tempo-and-meter.html b/include/techniques-for-working-with-tempo-and-meter.html
index 1cf1b1f..0d28377 100644
--- a/include/techniques-for-working-with-tempo-and-meter.html
+++ b/include/techniques-for-working-with-tempo-and-meter.html
@@ -1,6 +1,3 @@
----
-title: Techniques for Working with Tempo and Meter
----
 
 <h3>Techniques </h3>
 
@@ -86,3 +83,4 @@ title: Techniques for Working with Tempo and Meter
 </p>
 
 
+
diff --git a/_manual/14_working-with-tempo-and-meter.html b/include/tempo-and-meter.html
similarity index 98%
rename from _manual/14_working-with-tempo-and-meter.html
rename to include/tempo-and-meter.html
index 01031b0..1f46182 100644
--- a/_manual/14_working-with-tempo-and-meter.html
+++ b/include/tempo-and-meter.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Working with Tempo and Meter
-menu_title: Working with Tempo and Meter
----
 
 <p>Tempo and meter belong together. without both, there is no way to know where a beat lies in time.</p>
 
@@ -159,3 +154,4 @@ you dragged the BBT ruler, making the second tempo provide enough pulses over th
 isolated segments, preventing the listening fatigue of a fixed form.
 Reassembly is left as an excercise for the reader.
 </p>
+
diff --git a/_manual/05_ardours-interface/01_main-menu/03_Edit-menu.html b/include/the-edit-menu.html
similarity index 99%
rename from _manual/05_ardours-interface/01_main-menu/03_Edit-menu.html
rename to include/the-edit-menu.html
index fea1378..2c5b5e7 100644
--- a/_manual/05_ardours-interface/01_main-menu/03_Edit-menu.html
+++ b/include/the-edit-menu.html
@@ -1,6 +1,3 @@
----
-title: The Edit Menu
----
 
 <p>
 	The <dfn>Edit</dfn> menu groups together the actions related to the edition, and so will be mostly used while in Editor mode.
@@ -105,3 +102,4 @@ title: The Edit Menu
 
 	<dt>Preferences</dt><dd>Displays the <a href="/preferences-and-session-properties/preferences-dialog/">Preferences</a> panels, allowing to change Ardour's behaviour</dd>
 </dl>
+
diff --git a/_manual/05_ardours-interface/01_main-menu/08_Help-menu.html b/include/the-help-menu.html
similarity index 97%
rename from _manual/05_ardours-interface/01_main-menu/08_Help-menu.html
rename to include/the-help-menu.html
index c8992c0..32a7f74 100644
--- a/_manual/05_ardours-interface/01_main-menu/08_Help-menu.html
+++ b/include/the-help-menu.html
@@ -1,6 +1,3 @@
----
-title: The Help Menu
----
 
 <p>
 	The <dfn>Help</dfn> Menu gives acces to usefull information about Ardour.
@@ -17,3 +14,4 @@ title: The Help Menu
 	<dt>Ardour Website</dt><dd>Link to Ardour's main and official website</dd>
 	<dt>Ardour Development</dt><dd>Link to the developpers' part of the official website</dd>
 </dl>
+
diff --git a/_manual/07_working-with-markers/04_loop-range.html b/include/the-loop-range.html
similarity index 86%
rename from _manual/07_working-with-markers/04_loop-range.html
rename to include/the-loop-range.html
index a5ca1eb..06b8038 100644
--- a/_manual/07_working-with-markers/04_loop-range.html
+++ b/include/the-loop-range.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: The Loop Range
----
 
 <p>
   The <dfn>loop range</dfn> is a special range that defines the start and end points
@@ -12,3 +8,4 @@ title: The Loop Range
   href="/ardours-interface/editor-lists/ranges-and-marks-list/">Ranges &amp; Marks
   list</a>.
 </p>
+
diff --git a/_manual/05_ardours-interface/14_editor-lists/05_ranges-and-marks-list.html b/include/the-ranges-and-marks-lists.html
similarity index 98%
rename from _manual/05_ardours-interface/14_editor-lists/05_ranges-and-marks-list.html
rename to include/the-ranges-and-marks-lists.html
index d0f1ca2..a068d75 100644
--- a/_manual/05_ardours-interface/14_editor-lists/05_ranges-and-marks-list.html
+++ b/include/the-ranges-and-marks-lists.html
@@ -1,6 +1,3 @@
----
-title: The Ranges and Marks List
----
 
 <p>
   The <dfn>Ranges &amp; Marks List</dfn> is a tab in the <dfn>Editor
@@ -72,3 +69,4 @@ title: The Ranges and Marks List
   exported TOC or CUE files. This is relevant for Disk-At-Once recordings
   that may contain audio data between tracks.</dd>
 </dl>
+
diff --git a/_manual/05_ardours-interface/14_editor-lists/01_region-list.html b/include/the-region-list.html
similarity index 98%
rename from _manual/05_ardours-interface/14_editor-lists/01_region-list.html
rename to include/the-region-list.html
index 1b8cec4..2c3fb54 100644
--- a/_manual/05_ardours-interface/14_editor-lists/01_region-list.html
+++ b/include/the-region-list.html
@@ -1,6 +1,3 @@
----
-title: The Region List
----
 
 
 
@@ -81,3 +78,4 @@ title: The Region List
   A handy feature of the region list is that its regions can be dragged and dropped into a suitable track in the session.
 
 </p>
+
diff --git a/_manual/05_ardours-interface/01_main-menu/04_Region-menu.html b/include/the-region-menu.html
similarity index 99%
rename from _manual/05_ardours-interface/01_main-menu/04_Region-menu.html
rename to include/the-region-menu.html
index 39e941b..3937d6f 100644
--- a/_manual/05_ardours-interface/01_main-menu/04_Region-menu.html
+++ b/include/the-region-menu.html
@@ -1,6 +1,3 @@
----
-title: The Region Menu
----
 
 <p>
 	The <kbd class="menu">Region</kbd> Menu is where the user can tweak its regions, the parts of audio or MIDI that sit on the timeline.
@@ -88,3 +85,4 @@ title: The Region Menu
 
 	<dt>Remove</dt><dd>Deletes the region from the edit (no file is harmed in the process, and the region stays in the Editor for later use)</dd>
 </dl>
+
diff --git a/_manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html b/include/the-right-computer-system-for-digital-audio.html
similarity index 95%
rename from _manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html
rename to include/the-right-computer-system-for-digital-audio.html
index d09a5f2..7db25cd 100644
--- a/_manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html
+++ b/include/the-right-computer-system-for-digital-audio.html
@@ -1,110 +1,106 @@
----
-layout: default
-title: The Right Computer System for Digital Audio
-menu_title: The Right Computer System
----                        
-
-<p>
-  It would be nice to think that you could just go and buy any computer,
-  install a bit of software on it and start using it to record and create
-  music. This idea isn't wrong, but there some important details that it
-  misses.
-</p>
-<p>
-  Any computer that you can buy today (since somewhere around the end of
-  2012) is capable of recording and processing a lot of audio data. It 
-  will come with a builtin audio interface that can accept inputs from
-  microphones or electrical instruments. It will have a disk with a huge
-  amount of space for storing audio files.
-</p>
-<p>
-  When you are recording, editing and mixing music, you generally want to
-  work with very little <dfn>latency</dfn> between the time that
-  a sound is generated and when you can hear it. When the audio signal
-  flows through a computer, that means that the computer has to be able to
-  receive the signal, process it and send it back out again as fast as
-  possible.<br /> 
-  And that is where it becomes very important <em>what</em> computer system
-  you have, because it is <strong>absolutely not</strong> the case that any
-  computer can do this job well.
-</p>
-<p>
-  Routing audio through a computer will always cause some delay, but if it
-  is small, you will generally never notice it. There are also ways to work
-  in which the delay does not matter at all (for example, not sending the
-  output from the computer to speakers).
-</p>
-<p>
-  The latency that you want for working with digital audio is typically in
-  the 1&ndash;5&nbsp;ms range. For comparison, if you are sitting 1&nbsp;m 
-  (3&nbsp;ft) from your speakers, the time the sound takes to reach your
-  ears is about 3&nbsp;ms. Any modern computer can limit the delay to 
-  100&nbsp;ms. Most can keep it under 50&nbsp;ms. Many will be able to get
-  down to 10&nbsp;ms without too much effort. If you try to reduce the delay
-  on a computer that cannot meet your goal, you will get clicks and
-  glitches in the audio, which is clearly extremely undesirable.
-</p>
-
-<h2>Hardware-related Considerations</h2>
-<dl class="wide-table">
-  <dt>Video interface</dt>
-  <dd>Poorly engineered video interfaces (and/or their device drivers) can
-  "steal" computer resources for a long time, preventing the audio interface
-  from keeping up with the flow of data</dd>
-  <dt>Wireless interface</dt>
-  <dd>Poorly engineered wireless networking interfaces (and/or their device
-  drivers) can also block the audio interface from keeping up with the flow
-  of data</dd>
-  <dt><abbr title="Universal Serial Bus">USB</abbr> ports</dt>
-  <dd>If you are using an audio interface connected via USB, and sometimes
-  even if you are not, the precise configuration of your system's USB ports
-  can make a big difference. There are many cases where plugging the 
-  interface into one port will work, but using different USB port results
-  in much worse performance. This has been seen even on Apple systems.
-  </dd>
-  <dt>Internal USB Hubs</dt>
-  <dd>Ideally, you'd like your USB ports to all connect directly to the
-  main bus inside the computer. Some laptops (and possibly some
-  desktop systems) come wired with an internal USB hub between the
-  ports and the system bus, which can then cause problems for various
-  kinds of external USB devices, including some models of audio
-  interfaces. It is very difficult to discover whether this is true or
-  not, without simplying trying it out.</dd>
-  <dt><abbr title="Central Processing Unit">CPU</abbr> speed control</dt>
-  <dd>Handling audio with low latency requires that your processor keeps
-  running at its highest speed at all times. Many portable systems try to
-  regulate processor speed in order to save power &mdash; for low latency
-  audio, you want this totally disabled, either in the BIOS or at the OS
-  level.</dd>
-  <dt>Excessive Interrupt Sharing</dt>
-  <dd>If your audio interface is forced by your computer to share an
-  interrupt line (basically a way to tell the CPU that something needs
-  its attention) with too many, or the wrong, other devices, this can also
-  prevent the audio interface from keeping up with the flow of data. In
-  laptops it is generally impossible to do anything about this. In many
-  desktop systems, it is possible at the BIOS level to reassign interrupts
-  to work around the problem.</dd>
-  <dt><abbr title="System Management Interrupt">SMI</abbr>s</dt>
-  <dd>SMIs are interrupts sent by the motherboard to tell the computer
-  about the state of various hardware. They cannot safely be disabled,
-  but they can also take a relatively long time to process. It is better
-  to have a motherboard which never sends SMIs at all &mdash;  this is
-  also a requirement for realtime stock trading systems, which have
-  similar issues with latency.</dd>
-  <dt>Hyperthreading</dt>
-  <dd>This technology is becoming less common as actual multi-core CPUs
-  become the norm, but it still exists and is generally not good for
-  realtime performance. Sometimes you can disable this in the BIOS,
-  sometimes you cannot. A processor that uses hyperthreading will be
-  less stable in very low latency situations than one without.</dd>
-  <dt>Excessive vibration</dt>
-  <dd>This doesn't affect the flow of data to/from the audio interface,
-  but it can cause the flow of data to/from your disk storage to become
-  <em>much</em> slower. If you are going to use a computer in an
-  environment with loud live sound (specifically, high bass volume),
-  make sure to place it so that the disk is not subject to noticeable
-  vibration. The vibrations will physically displace the head-write
-  heads of disk, and the resulting errors will force a retry of the
-  reading from the disk. Retrying over and over massively reduces the
-  rate at which data can be read from the disk. Avoid this.</dd>
-</dl>
+
+<p>
+  It would be nice to think that you could just go and buy any computer,
+  install a bit of software on it and start using it to record and create
+  music. This idea isn't wrong, but there some important details that it
+  misses.
+</p>
+<p>
+  Any computer that you can buy today (since somewhere around the end of
+  2012) is capable of recording and processing a lot of audio data. It 
+  will come with a builtin audio interface that can accept inputs from
+  microphones or electrical instruments. It will have a disk with a huge
+  amount of space for storing audio files.
+</p>
+<p>
+  When you are recording, editing and mixing music, you generally want to
+  work with very little <dfn>latency</dfn> between the time that
+  a sound is generated and when you can hear it. When the audio signal
+  flows through a computer, that means that the computer has to be able to
+  receive the signal, process it and send it back out again as fast as
+  possible.<br /> 
+  And that is where it becomes very important <em>what</em> computer system
+  you have, because it is <strong>absolutely not</strong> the case that any
+  computer can do this job well.
+</p>
+<p>
+  Routing audio through a computer will always cause some delay, but if it
+  is small, you will generally never notice it. There are also ways to work
+  in which the delay does not matter at all (for example, not sending the
+  output from the computer to speakers).
+</p>
+<p>
+  The latency that you want for working with digital audio is typically in
+  the 1&ndash;5&nbsp;ms range. For comparison, if you are sitting 1&nbsp;m 
+  (3&nbsp;ft) from your speakers, the time the sound takes to reach your
+  ears is about 3&nbsp;ms. Any modern computer can limit the delay to 
+  100&nbsp;ms. Most can keep it under 50&nbsp;ms. Many will be able to get
+  down to 10&nbsp;ms without too much effort. If you try to reduce the delay
+  on a computer that cannot meet your goal, you will get clicks and
+  glitches in the audio, which is clearly extremely undesirable.
+</p>
+
+<h2>Hardware-related Considerations</h2>
+<dl class="wide-table">
+  <dt>Video interface</dt>
+  <dd>Poorly engineered video interfaces (and/or their device drivers) can
+  "steal" computer resources for a long time, preventing the audio interface
+  from keeping up with the flow of data</dd>
+  <dt>Wireless interface</dt>
+  <dd>Poorly engineered wireless networking interfaces (and/or their device
+  drivers) can also block the audio interface from keeping up with the flow
+  of data</dd>
+  <dt><abbr title="Universal Serial Bus">USB</abbr> ports</dt>
+  <dd>If you are using an audio interface connected via USB, and sometimes
+  even if you are not, the precise configuration of your system's USB ports
+  can make a big difference. There are many cases where plugging the 
+  interface into one port will work, but using different USB port results
+  in much worse performance. This has been seen even on Apple systems.
+  </dd>
+  <dt>Internal USB Hubs</dt>
+  <dd>Ideally, you'd like your USB ports to all connect directly to the
+  main bus inside the computer. Some laptops (and possibly some
+  desktop systems) come wired with an internal USB hub between the
+  ports and the system bus, which can then cause problems for various
+  kinds of external USB devices, including some models of audio
+  interfaces. It is very difficult to discover whether this is true or
+  not, without simplying trying it out.</dd>
+  <dt><abbr title="Central Processing Unit">CPU</abbr> speed control</dt>
+  <dd>Handling audio with low latency requires that your processor keeps
+  running at its highest speed at all times. Many portable systems try to
+  regulate processor speed in order to save power &mdash; for low latency
+  audio, you want this totally disabled, either in the BIOS or at the OS
+  level.</dd>
+  <dt>Excessive Interrupt Sharing</dt>
+  <dd>If your audio interface is forced by your computer to share an
+  interrupt line (basically a way to tell the CPU that something needs
+  its attention) with too many, or the wrong, other devices, this can also
+  prevent the audio interface from keeping up with the flow of data. In
+  laptops it is generally impossible to do anything about this. In many
+  desktop systems, it is possible at the BIOS level to reassign interrupts
+  to work around the problem.</dd>
+  <dt><abbr title="System Management Interrupt">SMI</abbr>s</dt>
+  <dd>SMIs are interrupts sent by the motherboard to tell the computer
+  about the state of various hardware. They cannot safely be disabled,
+  but they can also take a relatively long time to process. It is better
+  to have a motherboard which never sends SMIs at all &mdash;  this is
+  also a requirement for realtime stock trading systems, which have
+  similar issues with latency.</dd>
+  <dt>Hyperthreading</dt>
+  <dd>This technology is becoming less common as actual multi-core CPUs
+  become the norm, but it still exists and is generally not good for
+  realtime performance. Sometimes you can disable this in the BIOS,
+  sometimes you cannot. A processor that uses hyperthreading will be
+  less stable in very low latency situations than one without.</dd>
+  <dt>Excessive vibration</dt>
+  <dd>This doesn't affect the flow of data to/from the audio interface,
+  but it can cause the flow of data to/from your disk storage to become
+  <em>much</em> slower. If you are going to use a computer in an
+  environment with loud live sound (specifically, high bass volume),
+  make sure to place it so that the disk is not subject to noticeable
+  vibration. The vibrations will physically displace the head-write
+  heads of disk, and the resulting errors will force a retry of the
+  reading from the disk. Retrying over and over massively reduces the
+  rate at which data can be read from the disk. Avoid this.</dd>
+</dl>
+
diff --git a/_manual/05_ardours-interface/01_main-menu/01_Session-menu.html b/include/the-session-menu.html
similarity index 99%
rename from _manual/05_ardours-interface/01_main-menu/01_Session-menu.html
rename to include/the-session-menu.html
index b6c3f58..4857f41 100644
--- a/_manual/05_ardours-interface/01_main-menu/01_Session-menu.html
+++ b/include/the-session-menu.html
@@ -1,6 +1,3 @@
----
-title: The Session Menu
----
 
 <p>
   The <kbd class="menu">Session</kbd> menu groups together everything related to the session and the file operations.
@@ -47,3 +44,4 @@ title: The Session Menu
 
 	<dt>Quit</dt><dd>Exits Ardour. Prompts for saving the session if it has been modified.</dd>
 </dl>
+
diff --git a/_manual/05_ardours-interface/14_editor-lists/03_snapshot-list.html b/include/the-snapshot-list.html
similarity index 88%
rename from _manual/05_ardours-interface/14_editor-lists/03_snapshot-list.html
rename to include/the-snapshot-list.html
index a1f97ff..6267760 100644
--- a/_manual/05_ardours-interface/14_editor-lists/03_snapshot-list.html
+++ b/include/the-snapshot-list.html
@@ -1,6 +1,3 @@
----
-title: The Snapshot List
----
 
 
 
@@ -21,3 +18,4 @@ title: The Snapshot List
   information on snapshots.
 
 </p>
+
diff --git a/_manual/05_ardours-interface/14_editor-lists/04_track-and-bus-group-list.html b/include/the-track-and-bus-group-list.html
similarity index 96%
rename from _manual/05_ardours-interface/14_editor-lists/04_track-and-bus-group-list.html
rename to include/the-track-and-bus-group-list.html
index c6b1501..215970b 100644
--- a/_manual/05_ardours-interface/14_editor-lists/04_track-and-bus-group-list.html
+++ b/include/the-track-and-bus-group-list.html
@@ -1,6 +1,3 @@
----
-title: The Track and Bus Group List
----
 
 
 
@@ -71,3 +68,4 @@ title: The Track and Bus Group List
   <dd>whether the constituents share active status. </dd>
 
 </dl>
+
diff --git a/_manual/05_ardours-interface/01_main-menu/05_Track-menu.html b/include/the-track-menu.html
similarity index 98%
rename from _manual/05_ardours-interface/01_main-menu/05_Track-menu.html
rename to include/the-track-menu.html
index 0d9a3d5..a430d8b 100644
--- a/_manual/05_ardours-interface/01_main-menu/05_Track-menu.html
+++ b/include/the-track-menu.html
@@ -1,6 +1,3 @@
----
-title: The Track Menu
----
 
 <p>
 	The <kbd class="menu">Track</kbd> menu is where one can deal with the tracks, busses and control masters.
@@ -29,3 +26,4 @@ title: The Track Menu
 	<dt>Toggle Active</dt><dd>Toggles the active state of a track. An inactive track will be grayed and wont play any sound. That can be seen in the <kbd class="menu">A</kbd> colomn of the <a href="/ardours-interface/editor-lists/tracks-and-busses-list/">Tracks and Busses List</a></dd>
 	<dt>Remove</dt><dd>Deletes this track and its playlist (no file is harmed in the process, and the regions from the playlist stay in the Editor for later use)</dd>
 </dl>
+
diff --git a/_manual/05_ardours-interface/14_editor-lists/02_tracks-and-busses-list.html b/include/the-tracks-and-busses-list.html
similarity index 97%
rename from _manual/05_ardours-interface/14_editor-lists/02_tracks-and-busses-list.html
rename to include/the-tracks-and-busses-list.html
index c99bd93..6af8799 100644
--- a/_manual/05_ardours-interface/14_editor-lists/02_tracks-and-busses-list.html
+++ b/include/the-tracks-and-busses-list.html
@@ -1,6 +1,3 @@
----
-title: The Tracks and Busses List
----
 
 
 
@@ -67,3 +64,4 @@ title: The Tracks and Busses List
   As with the region list, hovering the mouse pointer over a column heading shows a tool-tip which can be handy to remember what the columns are for.
 
 </p>
+
diff --git a/_manual/05_ardours-interface/01_main-menu/02_Transport-menu.html b/include/the-transport-menu.html
similarity index 99%
rename from _manual/05_ardours-interface/01_main-menu/02_Transport-menu.html
rename to include/the-transport-menu.html
index e825df6..ed4f36d 100644
--- a/_manual/05_ardours-interface/01_main-menu/02_Transport-menu.html
+++ b/include/the-transport-menu.html
@@ -1,6 +1,3 @@
----
-title: The Transport Menu
----
 
 <p>
 	The <dfn>Transport</dfn> menu handles how Ardour handles the playback and playhead.
@@ -83,3 +80,4 @@ title: The Transport Menu
 	<dt>[] Stationary Playhead</dt><dd>If checked <em>and</em> if <kbd class="menu">Follow playhead</kbd> is checked, on playback, the playhead stays at the center of the screen, and the session scrolls</dd>
 	<dt>Panic</dt><dd>Immediately stops all MIDI playback (usefull e.g. when a MIDI bug in encountered)</dd>
 </dl>
+
diff --git a/_manual/05_ardours-interface/01_main-menu/06_View-menu.html b/include/the-view-menu.html
similarity index 99%
rename from _manual/05_ardours-interface/01_main-menu/06_View-menu.html
rename to include/the-view-menu.html
index e3eac54..47c86b7 100644
--- a/_manual/05_ardours-interface/01_main-menu/06_View-menu.html
+++ b/include/the-view-menu.html
@@ -1,6 +1,3 @@
----
-title: The View Menu
----
 
 <p>
 		The <dfn>View</dfn> menu sets how the session is seen, and what's visible or not.
@@ -81,3 +78,4 @@ title: The View Menu
 	<dt>[] Show Group Tabs</dt><dd>If checked, makes the groups visible as tabs on the left in the Editor, and on the top in the mixer</dd>
 	<dt>[] Show Marker Lines</dt><dd>If checked, each marker is extended across all the tracks in the editor with a line of the same color</dd>
 </dl>
+
diff --git a/_manual/05_ardours-interface/01_main-menu/07_Window-menu.html b/include/the-window-menu.html
similarity index 99%
rename from _manual/05_ardours-interface/01_main-menu/07_Window-menu.html
rename to include/the-window-menu.html
index c6fb5a7..3b6c72e 100644
--- a/_manual/05_ardours-interface/01_main-menu/07_Window-menu.html
+++ b/include/the-window-menu.html
@@ -1,6 +1,3 @@
----
-title: The Window Menu
----
 
 <p>
 	The <dfn>Window</dfn> menu deals with the layout of the different windows, and their visibility.
@@ -34,3 +31,4 @@ title: The Window Menu
 	<dt>[] MIDI Connections</dt><dd>Same as above, for the MIDI connections</dd>
 	<dt>[] Log</dt><dd>Shows the <kbd class="menu">Log</kbd> window, where Ardour lists usefull information, warnings and errors</dd>
 </dl>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/13_theme.html b/include/theme-tab.html
similarity index 98%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/13_theme.html
rename to include/theme-tab.html
index b854a34..baf4ec5 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/13_theme.html
+++ b/include/theme-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Theme Tab
-menu_title: Theme Tab
----
 
 <p>
   This tab contains settings that change the visual appearence of Ardour.
@@ -121,3 +116,4 @@ theme tab"/>
     </ul>
   </li>
 </ul>
+
diff --git a/include/time-tempo-and-meter.html b/include/time-tempo-and-meter.html
new file mode 100644
index 0000000..b28b04f
--- /dev/null
+++ b/include/time-tempo-and-meter.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/include/time_-tempo-and-meter.html b/include/time_-tempo-and-meter.html
deleted file mode 100644
index 5c3fd26..0000000
--- a/include/time_-tempo-and-meter.html
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Time, Tempo and Meter
----
-
-
diff --git a/_manual/22_synchronization/03_timecode-generators-and-slaves.html b/include/timecode-generators-and-slaves.html
similarity index 99%
rename from _manual/22_synchronization/03_timecode-generators-and-slaves.html
rename to include/timecode-generators-and-slaves.html
index e68a22a..65ba5c6 100644
--- a/_manual/22_synchronization/03_timecode-generators-and-slaves.html
+++ b/include/timecode-generators-and-slaves.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Timecode Generators and Slaves
----
 
 
 <p>
@@ -291,3 +287,4 @@ title: Timecode Generators and Slaves
   configures Ardour to act as translator from timecode to BBT information.
 </p>
 
+
diff --git a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/01_timecode.html b/include/timecode-tab.html
similarity index 89%
rename from _manual/24_preferences-and-session-properties/02_session-properties-dialog/01_timecode.html
rename to include/timecode-tab.html
index f5b369a..8202673 100644
--- a/_manual/24_preferences-and-session-properties/02_session-properties-dialog/01_timecode.html
+++ b/include/timecode-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Timecode Tab
-menu_title: Timecode Tab
----                        
 
 <img src="/images/a4_session_properties_timecode.png" alt="session properties timecode tab"/>
 
@@ -28,3 +23,4 @@ menu_title: Timecode Tab
   </li>
 
 </ul>
+
diff --git a/_manual/05_ardours-interface/07_the-toolbox.html b/include/toolbox.html
similarity index 99%
rename from _manual/05_ardours-interface/07_the-toolbox.html
rename to include/toolbox.html
index 0bced06..ebc6807 100644
--- a/_manual/05_ardours-interface/07_the-toolbox.html
+++ b/include/toolbox.html
@@ -1,6 +1,3 @@
----
-title: Toolbox
----
 
 <img src="/images/toolbar-tools.png" alt="Editor toolbar's tools, aka toolbox">
 
@@ -106,3 +103,4 @@ title: Toolbox
   cross-hairs. This tool acts on gegion gain and automation as the Draw tool.<br>
   On a MIDI region, it allows to lasso-select multiple notes at a time.</dd>
 </dl>
+
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations/03_tooltips.html b/include/tooltips.html
similarity index 89%
rename from _manual/02_introducing-ardour/03_basic-gui-operations/03_tooltips.html
rename to include/tooltips.html
index 45699cd..08a547c 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations/03_tooltips.html
+++ b/include/tooltips.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Tooltips
----                        
 
 <p>
   By default, Ardour will show helpful <dfn>tooltips</dfn> about
@@ -17,3 +13,4 @@ title: Tooltips
   Show tooltip if mouse hovers over a control</kbd>.
 </p>
   
+
diff --git a/_manual/11_working-with-tracks/09_track-and-bus-groups.html b/include/track-and-bus-groups.html
similarity index 99%
rename from _manual/11_working-with-tracks/09_track-and-bus-groups.html
rename to include/track-and-bus-groups.html
index 31dd949..26926ee 100644
--- a/_manual/11_working-with-tracks/09_track-and-bus-groups.html
+++ b/include/track-and-bus-groups.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Track and Bus Groups
----
 
 <p>
   Tracks and busses can be put into <dfn>groups</dfn>. Members of a group
@@ -147,3 +143,4 @@ title: Track and Bus Groups
 <dt>Disable All Groups</dt>
 <dd>makes all groups inactive, including any hidden groups.</dd>
 </dl>
+
diff --git a/_manual/11_working-with-tracks/04_controlling-track-appearance/02_track-coloring.html b/include/track-color.html
similarity index 94%
rename from _manual/11_working-with-tracks/04_controlling-track-appearance/02_track-coloring.html
rename to include/track-color.html
index 1945bb5..9bfa14a 100644
--- a/_manual/11_working-with-tracks/04_controlling-track-appearance/02_track-coloring.html
+++ b/include/track-color.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Track Color
----                        
 
 <p>
   New tracks in Ardour are assigned a random color from a pastel color
@@ -37,3 +33,4 @@ title: Track Color
   that is displayed. 
  </p>
   
+
diff --git a/_manual/11_working-with-tracks/10_track-context-menu.html b/include/track-context-menu.html
similarity index 97%
rename from _manual/11_working-with-tracks/10_track-context-menu.html
rename to include/track-context-menu.html
index 521c72c..1b144b6 100644
--- a/_manual/11_working-with-tracks/10_track-context-menu.html
+++ b/include/track-context-menu.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Track Context Menu
----
 
 <p>
   Within the editor window, context-click (right-click) on either a region
@@ -72,3 +68,4 @@ title: Track Context Menu
 </dd>
 <dt>Freeze</dt>
 </dl>
+
diff --git a/_manual/11_working-with-tracks/04_controlling-track-appearance/03_track-height.html b/include/track-height.html
similarity index 95%
rename from _manual/11_working-with-tracks/04_controlling-track-appearance/03_track-height.html
rename to include/track-height.html
index 227fc28..08ab532 100644
--- a/_manual/11_working-with-tracks/04_controlling-track-appearance/03_track-height.html
+++ b/include/track-height.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Track Height
----                        
 
 <p> 
   Depending on the stage of your production, you may require a quick
@@ -36,3 +32,4 @@ title: Track Height
   to revert this operation.
 </p>
   
+
diff --git a/_manual/11_working-with-tracks/05_controlling-track-ordering/02_track-ordering-and-remote-control-ids.html b/include/track-ordering-and-remote-control-ids.html
similarity index 89%
rename from _manual/11_working-with-tracks/05_controlling-track-ordering/02_track-ordering-and-remote-control-ids.html
rename to include/track-ordering-and-remote-control-ids.html
index 026fbfb..be1f2e2 100644
--- a/_manual/11_working-with-tracks/05_controlling-track-ordering/02_track-ordering-and-remote-control-ids.html
+++ b/include/track-ordering-and-remote-control-ids.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Track Ordering and Remote Control IDs
----
   
 <p>
   Every track and bus in Ardour is assigned a <dfn>remote control ID</dfn>. 
@@ -15,3 +11,4 @@ title: Track Ordering and Remote Control IDs
   Manual assignment of remote IDs is not possible.
   The master bus and monitor section can be accessed by name.
 </p>
+
diff --git a/_manual/16_recording/02_track-recording-modes.html b/include/track-recording-modes.html
similarity index 79%
rename from _manual/16_recording/02_track-recording-modes.html
rename to include/track-recording-modes.html
index 774e517..79258cf 100644
--- a/_manual/16_recording/02_track-recording-modes.html
+++ b/include/track-recording-modes.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Track Recording Modes
----                        
   
 <p>
   The <dfn>Recording mode</dfn> is a per-track property (applies to audio 
@@ -13,4 +9,4 @@ title: Track Recording Modes
   for a detailed explanation.
 </p>
 
-{% children %}
\ No newline at end of file
+{% children %}
diff --git a/_manual/11_working-with-tracks/01_track-types.html b/include/track-types.html
similarity index 98%
rename from _manual/11_working-with-tracks/01_track-types.html
rename to include/track-types.html
index 4d3e74b..090dc44 100644
--- a/_manual/11_working-with-tracks/01_track-types.html
+++ b/include/track-types.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Track Types
----                        
 
 <p>
   Ardour offers three <dfn>track types</dfn> depending on the type of 
@@ -123,3 +119,4 @@ title: Track Types
 </p>
   
   
+
diff --git a/_manual/17_signal-routing/08_signal-flow.html b/include/trackbus-signal-flow.html
similarity index 99%
rename from _manual/17_signal-routing/08_signal-flow.html
rename to include/trackbus-signal-flow.html
index 966e80d..d316c37 100644
--- a/_manual/17_signal-routing/08_signal-flow.html
+++ b/include/trackbus-signal-flow.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Track/Bus Signal Flow
----
 <h2>Overview</h2>
 <p>
 In each individual Track or Bus the signal flow is top to bottom. Consider the following diagram:
@@ -114,3 +110,4 @@ User customization override all automatic (flexible/strict i/o mode) inferred ou
 <p>
 	The sidechain ports can then be connected, as other inputs, to a pin of the plugin, or an output port for a "thru".
 </p>
+
diff --git a/include/tracks.html b/include/tracks.html
index 233c26d..b28b04f 100644
--- a/include/tracks.html
+++ b/include/tracks.html
@@ -1,5 +1,3 @@
----
-title: Tracks
----
+
 
 
diff --git a/_manual/26_video-timeline/02_transcoding_formats_codecs.html b/include/transcoding-formats-amp-codecs.html
similarity index 97%
rename from _manual/26_video-timeline/02_transcoding_formats_codecs.html
rename to include/transcoding-formats-amp-codecs.html
index ba5ae17..905bae8 100644
--- a/_manual/26_video-timeline/02_transcoding_formats_codecs.html
+++ b/include/transcoding-formats-amp-codecs.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Transcoding, Formats &amp; Codecs
----
 
 <p>
   This chapter provides a short primer on video files, formats and 
@@ -60,3 +56,4 @@ title: Transcoding, Formats &amp; Codecs
   title="Multiplexing Audio and Video">muxing</abbr> process, one should 
   always to back and use the original source of the video.
 </p>
+
diff --git a/_manual/12_working-with-midi/15_transformation-midi.html b/include/transforming-midi---mathematical-operations.html
similarity index 95%
rename from _manual/12_working-with-midi/15_transformation-midi.html
rename to include/transforming-midi---mathematical-operations.html
index bbc9af7..e179823 100644
--- a/_manual/12_working-with-midi/15_transformation-midi.html
+++ b/include/transforming-midi---mathematical-operations.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Transforming MIDI - Mathematical operations
-menu_title: Transforming MIDI
----                        
 
 <p>Considering the numerical nature of MIDI events, it can be tempting to apply mathematical transformations to our MIDI regions by using mathematical operations. Ardour makes it very easy and powerfull with the Transform tool.</p>
   
@@ -56,3 +51,4 @@ menu_title: Transforming MIDI
 <p>All this operations can be very handy, as long as you find a mathematical way to achieve your goal. Beware though of odd "border cases" : division by zero (which does nothing), using the note's index and forgetting it starts at 0 and not 1, etc.<p>
 
 <p>You can nevertheless create very interesting results, like humanizing (randomizing the velocity, start time and duration of all the notes), creating arpeggios, automating tedious tasks, transposing, etc.</p>
+
diff --git a/_manual/05_ardours-interface/03_the-transport-bar.html b/include/transport-bar.html
similarity index 99%
rename from _manual/05_ardours-interface/03_the-transport-bar.html
rename to include/transport-bar.html
index 4e57da6..4162c1e 100644
--- a/_manual/05_ardours-interface/03_the-transport-bar.html
+++ b/include/transport-bar.html
@@ -1,6 +1,3 @@
----
-title: Transport Bar
----
 
 
 <p>
@@ -77,3 +74,4 @@ title: Transport Bar
 </dl>
 
 Go to the <kdb class="menu">Transport</kbd> and <kdb class="menu">Transport &gt; Playhead</kbd> to find more.
+
diff --git a/_manual/05_ardours-interface/04_transport-clocks.html b/include/transport-clocks.html
similarity index 99%
rename from _manual/05_ardours-interface/04_transport-clocks.html
rename to include/transport-clocks.html
index 53e886f..f2c724c 100644
--- a/_manual/05_ardours-interface/04_transport-clocks.html
+++ b/include/transport-clocks.html
@@ -1,6 +1,3 @@
----
-title: Transport Clocks
----
 
 <img src="/images/new_main_clocks.png" alt="An image of the transport clocks in Ardour" />
 
@@ -82,3 +79,4 @@ title: Transport Clocks
 
 <a href="/images/bigclock.png"><img src="/images/bigclock.png" height="100" alt="an image of the big clock filling a screen"></a>
 <a href="/images/bigclock-recording.png"><img src="/images/bigclock-recording.png" height="100" alt="an image of the big clock while recording"></a>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/02_transport.html b/include/transport-tab.html
similarity index 98%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/02_transport.html
rename to include/transport-tab.html
index 04279b3..83730f0 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/02_transport.html
+++ b/include/transport-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Transport Tab
-menu_title: Transport Tab
----
 
 <p>
   This tab contains settings that relate to the behavior of the
@@ -175,3 +170,4 @@ transport tab"/>
     </ul>
   </li>
 </ul>
+
diff --git a/_manual/12_working-with-midi/13_transpose-midi.html b/include/transposing-midi.html
similarity index 81%
rename from _manual/12_working-with-midi/13_transpose-midi.html
rename to include/transposing-midi.html
index 4eefd2c..f5e37dd 100644
--- a/_manual/12_working-with-midi/13_transpose-midi.html
+++ b/include/transposing-midi.html
@@ -1,11 +1,7 @@
----
-layout: default
-title: Transposing MIDI
-menu_title: Transposing MIDI
----                        
 
 <img src="/images/transpose_midi.png" alt="transpose dialog" />
 
 <p>To transpose a whole region at once, you can access the "transpose" dialog, by right clicking a region &gt; <em>name_of_the_midi_region</em> &gt; MIDI &gt; Transpose...</p>
 
 <p>This very simple dialog allows to choose either a number of semitones to add or substract to all the notes inside the region, and/or for more significant changes, octaves (12 semitones).</p>
+
diff --git a/_manual/18_editing-and-arranging/04_change-region-lengths.html b/include/trimming-regions.html
similarity index 98%
rename from _manual/18_editing-and-arranging/04_change-region-lengths.html
rename to include/trimming-regions.html
index a9cafaa..7fb065a 100644
--- a/_manual/18_editing-and-arranging/04_change-region-lengths.html
+++ b/include/trimming-regions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Trimming Regions
----
 
 <p>
   Changing the <dfn>length</dfn> of a region is a very common editing
@@ -77,3 +73,4 @@ title: Trimming Regions
 </dl>
 
 {% children %}
+
diff --git a/_manual/03_setting-up-your-system/07_platform-specifics/01_ubuntu-linux.html b/include/ubuntu-linux.html
similarity index 99%
rename from _manual/03_setting-up-your-system/07_platform-specifics/01_ubuntu-linux.html
rename to include/ubuntu-linux.html
index 349142c..a127709 100644
--- a/_manual/03_setting-up-your-system/07_platform-specifics/01_ubuntu-linux.html
+++ b/include/ubuntu-linux.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Ubuntu Linux
----
 
 <p>
   <dfn>Ubuntu Linux</dfn> is the most popular variety of Linux in use on desktop
@@ -149,3 +145,4 @@ title: Ubuntu Linux
 <p><a href="http://ubuntuforums.org/forumdisplay.php?f=335">The Ubuntu Studio Forums.</a></p>
 <p><a href="https://help.ubuntu.com/community/UbuntuStudio/MailLists">Information on the Ubuntu Studio Mailing Lists.</a></p>
 <p><a href="https://help.ubuntu.com/community/UbuntuStudio/IRC">Information on the Ubuntu Studio IRC channel.</a> #ubuntustudio on irc.freenode.net</p>
+
diff --git a/_manual/02_introducing-ardour/02_understanding-basic-concepts-and-terminology.html b/include/understanding-basic-concepts-and-terminology.html
similarity index 98%
rename from _manual/02_introducing-ardour/02_understanding-basic-concepts-and-terminology.html
rename to include/understanding-basic-concepts-and-terminology.html
index 8394174..f7c9c2f 100644
--- a/_manual/02_introducing-ardour/02_understanding-basic-concepts-and-terminology.html
+++ b/include/understanding-basic-concepts-and-terminology.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Understanding Basic Concepts and Terminology
----                        
 
 <p>
   This section will help you get acquainted with the basic terminology and
@@ -152,3 +148,4 @@ title: Understanding Basic Concepts and Terminology
   More details can be found at
   <a href="/working-with-plugins/">Working With Plugins</a>.
 </p>
+
diff --git a/_manual/10_working-with-playlists/01_understanding-playlists.html b/include/understanding-playlists.html
similarity index 97%
rename from _manual/10_working-with-playlists/01_understanding-playlists.html
rename to include/understanding-playlists.html
index 77d9f0a..ba3796c 100644
--- a/_manual/10_working-with-playlists/01_understanding-playlists.html
+++ b/include/understanding-playlists.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Understanding Playlists
----                        
   
 <p>
   A <dfn>playlist</dfn> is a list of regions ordered in time. It defines 
@@ -58,3 +54,4 @@ title: Understanding Playlists
   nothing more.
 </p>
   
+
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations/04_undoredo-for-editing-.html b/include/undoredo-for-editing.html
similarity index 96%
rename from _manual/02_introducing-ardour/03_basic-gui-operations/04_undoredo-for-editing-.html
rename to include/undoredo-for-editing.html
index 4b03fdf..6c88255 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations/04_undoredo-for-editing-.html
+++ b/include/undoredo-for-editing.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Undo/Redo for Editing
----
 
 <p>
   While editing, it happens that you apply an unintended change, or make
@@ -34,3 +30,4 @@ title: Undo/Redo for Editing
   There is also an undo for selection. See
   <a href="/introducing-ardour/basic-gui-operations/selection-techniques/">Selection Techniques</a> for more information.
 </p>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/07_interaction.html b/include/user-interaction-tab.html
similarity index 92%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/07_interaction.html
rename to include/user-interaction-tab.html
index d8e6dfb..b628998 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/07_interaction.html
+++ b/include/user-interaction-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: User Interaction Tab
-menu_title: User Interaction Tab
----
 
 <p>
   This tab contains settings that affect the user's interaction with
@@ -57,3 +52,4 @@ user interaction tab"/>
     </ul>
   </li>
 </ul>
+
diff --git a/_manual/08_working-with-sessions/05_interchange-with-other-daws/03_using-aatranslator.html b/include/using-aatranslator.html
similarity index 92%
rename from _manual/08_working-with-sessions/05_interchange-with-other-daws/03_using-aatranslator.html
rename to include/using-aatranslator.html
index 1350be5..941fcdf 100644
--- a/_manual/08_working-with-sessions/05_interchange-with-other-daws/03_using-aatranslator.html
+++ b/include/using-aatranslator.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Using AATranslator
----                        
   
 <p>
   <dfn>AATranslator</dfn> is a Windows 
@@ -23,3 +19,4 @@ title: Using AATranslator
 <img src="/images/No_problem.gif" alt="AATranslator Demo Animation"/>
 
   
+
diff --git a/include/using-external-midi-devices.html b/include/using-external-midi-devices.html
new file mode 100644
index 0000000..83d0fa2
--- /dev/null
+++ b/include/using-external-midi-devices.html
@@ -0,0 +1,6 @@
+
+
+  
+  
+  
+
diff --git a/include/using-key-bindings.html b/include/using-key-bindings.html
index 80e7f00..1df2348 100644
--- a/include/using-key-bindings.html
+++ b/include/using-key-bindings.html
@@ -1,6 +1,3 @@
----
-title: Using Key Bindings
----
 
 <p>
   Ardour has many available commands for playback control that can be bound
@@ -29,3 +26,4 @@ title: Using Key Bindings
 
 
 
+
diff --git a/_manual/03_setting-up-your-system/06_using_more_than_one_audio_device.html b/include/using-more-than-one-audio-device.html
similarity index 97%
rename from _manual/03_setting-up-your-system/06_using_more_than_one_audio_device.html
rename to include/using-more-than-one-audio-device.html
index b979a86..d322929 100644
--- a/_manual/03_setting-up-your-system/06_using_more_than_one_audio_device.html
+++ b/include/using-more-than-one-audio-device.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Using More Than One Audio Device
----                        
     
 <p>
   Ardour will only ever deal with a single <dfn>audio device</dfn>. If you 
@@ -81,3 +77,4 @@ title: Using More Than One Audio Device
   title="http://jackaudio.org/faq/">http://jackaudio.org/faq</a>
 </p>
   
+
diff --git a/_manual/25_using-control-surfaces/05_Ableton_Push2.html b/include/using-the-ableton-push-2.html
similarity index 99%
rename from _manual/25_using-control-surfaces/05_Ableton_Push2.html
rename to include/using-the-ableton-push-2.html
index 92549ef..c5a959c 100644
--- a/_manual/25_using-control-surfaces/05_Ableton_Push2.html
+++ b/include/using-the-ableton-push-2.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Using the Ableton Push 2
-menu_title: Ableton Push 2
----                        
 
 <p>
   <img alt="the Ableton Push 2 surface" src="/images/push2-main.jpg">
@@ -364,3 +359,4 @@ menu_title: Ableton Push 2
   </dl>
 </p>
 
+
diff --git a/_manual/02_introducing-ardour/03_basic-gui-operations/05_using-the-mouse.html b/include/using-the-mouse.html
similarity index 98%
rename from _manual/02_introducing-ardour/03_basic-gui-operations/05_using-the-mouse.html
rename to include/using-the-mouse.html
index 10f1c25..a6c73ad 100644
--- a/_manual/02_introducing-ardour/03_basic-gui-operations/05_using-the-mouse.html
+++ b/include/using-the-mouse.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Using the Mouse
----                        
 
 <h2>Clicking</h2>
 <p>
@@ -124,3 +120,4 @@ title: Using the Mouse
   vertically or horizontally inside a window.
 </p>
   
+
diff --git a/_manual/25_using-control-surfaces/04_Presonus_FaderPort.html b/include/using-the-presonus-faderport.html
similarity index 99%
rename from _manual/25_using-control-surfaces/04_Presonus_FaderPort.html
rename to include/using-the-presonus-faderport.html
index 9acf374..2f8eb2e 100644
--- a/_manual/25_using-control-surfaces/04_Presonus_FaderPort.html
+++ b/include/using-the-presonus-faderport.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Using the Presonus Faderport
-menu_title: Presonus Faderport
----                        
 
 <p>
   Since version 4.5, Ardour has had full support for the Presonus
@@ -374,3 +369,4 @@ menu_title: Presonus Faderport
     </dd>
   </dl>
 </p>
+
diff --git a/_manual/13_working-with-plugins/05_windows-vst-support.html b/include/using-windows-vst-plugins-on-linux.html
similarity index 96%
rename from _manual/13_working-with-plugins/05_windows-vst-support.html
rename to include/using-windows-vst-plugins-on-linux.html
index e6c375e..e3646b3 100644
--- a/_manual/13_working-with-plugins/05_windows-vst-support.html
+++ b/include/using-windows-vst-plugins-on-linux.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Using Windows VST Plugins on Linux
----                        
 
 <p>
   Thanks to the combined work of Torben Hohn, Kjetil Mattheusen, Paul
@@ -61,3 +57,4 @@ and <a href="http://www.loomer.co.uk/">Loomer</a>.
   ultimately more flexible but probably more work. We have users -
   thousands of users - on Linux who would like to use your plugins. 
 </p>
+
diff --git a/_manual/20_mixing/02_panning/04_vbap_panner.html b/include/vbap-panner.html
similarity index 98%
rename from _manual/20_mixing/02_panning/04_vbap_panner.html
rename to include/vbap-panner.html
index 132628f..ac6e6dd 100644
--- a/_manual/20_mixing/02_panning/04_vbap_panner.html
+++ b/include/vbap-panner.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: VBAP Panner
----                        
 
 <p class="warning">
   Ardour's VBAP panner is currently in development, and its semantics may
@@ -87,3 +83,4 @@ panner in 4 in, 5 out mode"/>
   the panner direction. The width parameter controls the opening angle of
   the distribution sector.
 </p>
+
diff --git a/_manual/24_preferences-and-session-properties/01_preferences-dialog/09_video.html b/include/video-tab.html
similarity index 90%
rename from _manual/24_preferences-and-session-properties/01_preferences-dialog/09_video.html
rename to include/video-tab.html
index 74248b4..9df47d9 100644
--- a/_manual/24_preferences-and-session-properties/01_preferences-dialog/09_video.html
+++ b/include/video-tab.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Video Tab
-menu_title: Video Tab
----
 
 <p>
   This tab contains settings related to handling of Video.
@@ -40,3 +35,4 @@ video tab"/>
     </p>
   </li>
 </ul>
+
diff --git a/_manual/26_video-timeline.html b/include/video-timeline-and-monitoring.html
similarity index 94%
rename from _manual/26_video-timeline.html
rename to include/video-timeline-and-monitoring.html
index b072c15..a82cb87 100644
--- a/_manual/26_video-timeline.html
+++ b/include/video-timeline-and-monitoring.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Video Timeline and Monitoring
----                        
 
 <p>
   Ardour offers a <dfn>video timeline</dfn> and <dfn>video monitoring</dfn>
@@ -46,3 +42,4 @@ title: Video Timeline and Monitoring
 </ul>
 
 {% children %}
+
diff --git a/_manual/26_video-timeline/01_setup.html b/include/video-timeline-setup.html
similarity index 98%
rename from _manual/26_video-timeline/01_setup.html
rename to include/video-timeline-setup.html
index b17a68b..67c0336 100644
--- a/_manual/26_video-timeline/01_setup.html
+++ b/include/video-timeline-setup.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Video Timeline Setup
----
 
 <p>
   No configuration is required if you intend to run everything on a single 
@@ -83,3 +79,4 @@ title: Video Timeline Setup
 Ideally the machines have a common shared folder (NFS or similar).  Ardour&#039;s import (audio-extract) and export (mux) functionality depends on having access to the video file.  Also Ardour's video-import transcodes the file into a suitable proxy-format that allows reliable seeking to any frame…
 </li>
 </ul>
+
diff --git a/_manual/11_working-with-tracks/04_controlling-track-appearance/04_waveform-display.html b/include/waveform-display.html
similarity index 95%
rename from _manual/11_working-with-tracks/04_controlling-track-appearance/04_waveform-display.html
rename to include/waveform-display.html
index 61c53c8..b8efe83 100644
--- a/_manual/11_working-with-tracks/04_controlling-track-appearance/04_waveform-display.html
+++ b/include/waveform-display.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Waveform display
----                        
 
 <p>
   The display of <dfn>waveforms</dfn> (or, more correctly, <dfn>peak
@@ -43,3 +39,4 @@ title: Waveform display
 
 
 {% children %}
+
diff --git a/include/welcome-to-ardour.html b/include/welcome-to-ardour.html
index 7db80b7..139597f 100644
--- a/include/welcome-to-ardour.html
+++ b/include/welcome-to-ardour.html
@@ -1,4 +1,2 @@
----
-title: Welcome to Ardour
----
+
 
diff --git a/_manual/01_welcome-to-ardour.html b/include/welcome-to-ardour_2.html
similarity index 97%
rename from _manual/01_welcome-to-ardour.html
rename to include/welcome-to-ardour_2.html
index 80eb9e2..85cd1a2 100644
--- a/_manual/01_welcome-to-ardour.html
+++ b/include/welcome-to-ardour_2.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Welcome to Ardour!
----                        
 
 
   
@@ -92,3 +88,4 @@ current-session.
 </p>
 
 {% children %}
+
diff --git a/_manual/25_using-control-surfaces/02_mackie-control-protocol/04_devices-not-listed.html b/include/what-to-do-if-your-device-is-not-listed.html
similarity index 87%
rename from _manual/25_using-control-surfaces/02_mackie-control-protocol/04_devices-not-listed.html
rename to include/what-to-do-if-your-device-is-not-listed.html
index 579ca6e..b65fff5 100644
--- a/_manual/25_using-control-surfaces/02_mackie-control-protocol/04_devices-not-listed.html
+++ b/include/what-to-do-if-your-device-is-not-listed.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: What to do if your Device is not Listed
-menu_title: Unlisted devices
----
 
 <p>
   All Mackie Control devices are based on the original Logic Control and the
@@ -16,3 +11,4 @@ menu_title: Unlisted devices
   should be tried with any unlisted device before attemping to create a
   custom definition file.
 </p>
+
diff --git a/_manual/08_working-with-sessions/02_whats-in-a-session.html b/include/whats-in-a-session.html
similarity index 95%
rename from _manual/08_working-with-sessions/02_whats-in-a-session.html
rename to include/whats-in-a-session.html
index 5655239..24aa9ee 100644
--- a/_manual/08_working-with-sessions/02_whats-in-a-session.html
+++ b/include/whats-in-a-session.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: What's in a Session?
----                        
   
 <p>
   The <dfn>Session</dfn> is the fundamental document type that is created and 
@@ -37,3 +33,4 @@ title: What's in a Session?
   Tracks and Buses, and all the Regions and Plug-Ins they contain.
 </p>
   
+
diff --git a/_manual/08_working-with-sessions/03_where-are-sessions-stored.html b/include/where-are-sessions-stored.html
similarity index 88%
rename from _manual/08_working-with-sessions/03_where-are-sessions-stored.html
rename to include/where-are-sessions-stored.html
index 6d2505b..f32569b 100644
--- a/_manual/08_working-with-sessions/03_where-are-sessions-stored.html
+++ b/include/where-are-sessions-stored.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Where Are Sessions Stored?
----                        
 
 <p>
   <dfn>Sessions</dfn> are stored in a single folder on your computer's filesystem. 
@@ -19,3 +15,4 @@ title: Where Are Sessions Stored?
   <a href="/working-with-sessions/new-session-dialog/">New Session dialog</a>.
 </p>
   
+
diff --git a/_manual/18_editing-and-arranging/02_which-regions-are-affected.html b/include/which-regions-are-affected.html
similarity index 93%
rename from _manual/18_editing-and-arranging/02_which-regions-are-affected.html
rename to include/which-regions-are-affected.html
index 23b5df6..d9ba157 100644
--- a/_manual/18_editing-and-arranging/02_which-regions-are-affected.html
+++ b/include/which-regions-are-affected.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Which Regions Are Affected?
-menu_title: Affected Regions
----                        
   
 <p>
   This section explains the rules used to decide which regions are affected
@@ -46,3 +41,4 @@ menu_title: Affected Regions
   edit points (Playhead,Marker) indicate a time only.
 </p>
   
+
diff --git a/_manual/01_welcome-to-ardour/01_about-ardour/03_why-is-it-called-ardour.html b/include/why-is-it-called-ardour.html
similarity index 94%
rename from _manual/01_welcome-to-ardour/01_about-ardour/03_why-is-it-called-ardour.html
rename to include/why-is-it-called-ardour.html
index aaa0e2b..e097b15 100644
--- a/_manual/01_welcome-to-ardour/01_about-ardour/03_why-is-it-called-ardour.html
+++ b/include/why-is-it-called-ardour.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Why is it called Ardour?
----                        
   
 <p>
   The name <dfn>"Ardour"</dfn> came from considerations of how to pronounce the acronym
@@ -32,3 +28,4 @@ title: Why is it called Ardour?
   group of collaborators.
 </p>
   
+
diff --git a/_manual/01_welcome-to-ardour/01_about-ardour/02_why-write-a-daw-for-linux.html b/include/why-write-a-daw-for-linux.html
similarity index 95%
rename from _manual/01_welcome-to-ardour/01_about-ardour/02_why-write-a-daw-for-linux.html
rename to include/why-write-a-daw-for-linux.html
index 48cbb4d..6e33b9d 100644
--- a/_manual/01_welcome-to-ardour/01_about-ardour/02_why-write-a-daw-for-linux.html
+++ b/include/why-write-a-daw-for-linux.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Why Write a DAW for Linux?
----                        
 
 <p>
 It is fairly understandable that existing proprietary DAWs do not run on 
@@ -49,3 +45,4 @@ ease of use and its presence in many studios already makes it a
 worthwhile platform.
 </p>
   
+
diff --git a/_manual/01_welcome-to-ardour/01_about-ardour/04_why-write-another-daw.html b/include/why-write-another-daw.html
similarity index 90%
rename from _manual/01_welcome-to-ardour/01_about-ardour/04_why-write-another-daw.html
rename to include/why-write-another-daw.html
index 5faf16f..d2cf957 100644
--- a/_manual/01_welcome-to-ardour/01_about-ardour/04_why-write-another-daw.html
+++ b/include/why-write-another-daw.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Why write another DAW?
----                        
 
 <p>
 There are already a number of excellent digital audio workstations. To
@@ -19,3 +15,4 @@ perspective of Ardour's development group:
   improvements, bugfixes by technically inclined users or their friends
   or consultants impossible.</li>
 </ul>
+
diff --git a/_manual/26_video-timeline/03_operations.html b/include/workflow-amp-operations.html
similarity index 98%
rename from _manual/26_video-timeline/03_operations.html
rename to include/workflow-amp-operations.html
index adb5ded..45bedd4 100644
--- a/_manual/26_video-timeline/03_operations.html
+++ b/include/workflow-amp-operations.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Workflow &amp; Operations
----
 
 <h2>Overview of Operations</h2>
 
@@ -116,3 +112,4 @@ title: Workflow &amp; Operations
   devede or dvdauthor to mux &amp; master. Nevertheless this video-export c
   omes in handy to do quick snapshots, intermediates, dailies or online videos.
 </p>
+
diff --git a/_manual/13_working-with-plugins/06_working-with-ardour-built-plugin-editors.html b/include/working-with-ardour-built-plugin-editors.html
similarity index 90%
rename from _manual/13_working-with-plugins/06_working-with-ardour-built-plugin-editors.html
rename to include/working-with-ardour-built-plugin-editors.html
index 89cfff0..57ad9ba 100644
--- a/_manual/13_working-with-plugins/06_working-with-ardour-built-plugin-editors.html
+++ b/include/working-with-ardour-built-plugin-editors.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Working with Ardour-built Plugin Editors
----                        
 
 <p>
   To view a plugin editor, double-click on the plugin within the 
@@ -27,3 +23,4 @@ title: Working with Ardour-built Plugin Editors
 </p>
 
   
+
diff --git a/_manual/25_using-control-surfaces/02_mackie-control-protocol/05_working-with-extenders.html b/include/working-with-extenders.html
similarity index 97%
rename from _manual/25_using-control-surfaces/02_mackie-control-protocol/05_working-with-extenders.html
rename to include/working-with-extenders.html
index 7d11df8..f936fae 100644
--- a/_manual/25_using-control-surfaces/02_mackie-control-protocol/05_working-with-extenders.html
+++ b/include/working-with-extenders.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Working With Extenders
-menu_title: Working With Extenders
----
 
 <p>
   There are currently 5 devices preconfigured to work with extenders.
@@ -74,3 +69,4 @@ menu_title: Working With Extenders
   physical position and MIDI port, the master fader and global controls will
   not work. The master unit will act like an extender.
 </p>
+
diff --git a/include/working-with-field-recorders-in-ardour.html b/include/working-with-field-recorders-in-ardour.html
index eab4310..b28b04f 100644
--- a/include/working-with-field-recorders-in-ardour.html
+++ b/include/working-with-field-recorders-in-ardour.html
@@ -1,5 +1,3 @@
----
-title: Working with Field Recorders in Ardour
----
+
 
 
diff --git a/_manual/07_working-with-markers.html b/include/working-with-markers.html
similarity index 91%
rename from _manual/07_working-with-markers.html
rename to include/working-with-markers.html
index cb8a13c..56cfdf8 100644
--- a/_manual/07_working-with-markers.html
+++ b/include/working-with-markers.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Working With Markers
----                        
   
 <p>
   It is very useful to be able to tag different locations in a session for
@@ -29,3 +25,4 @@ title: Working With Markers
 </ul>
 
 {% children %}
+
diff --git a/_manual/13_working-with-plugins.html b/include/working-with-plugins.html
similarity index 97%
rename from _manual/13_working-with-plugins.html
rename to include/working-with-plugins.html
index 071519d..73a515d 100644
--- a/_manual/13_working-with-plugins.html
+++ b/include/working-with-plugins.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Working With Plugins
----                        
 
 
 
@@ -70,3 +66,4 @@ the <a href="/working-with-plugins/processor-box/">Processor
 Box</a> page.</p>
 
 {% children %}
+
diff --git a/_manual/09_working-with-regions.html b/include/working-with-regions.html
similarity index 96%
rename from _manual/09_working-with-regions.html
rename to include/working-with-regions.html
index 49ea835..5321d07 100644
--- a/_manual/09_working-with-regions.html
+++ b/include/working-with-regions.html
@@ -1,7 +1,3 @@
----
-layout: default
-title: Working With Regions
----                        
 
 <h2>Working With Regions</h2>
 <p>
@@ -51,3 +47,4 @@ title: Working With Regions
   <kbd class="menu">Reverse</kbd> operations create new audio files).</p>
 
 {% children %}
+
diff --git a/include/working-with-synchronization.html b/include/working-with-synchronization.html
index 0d03499..b28b04f 100644
--- a/include/working-with-synchronization.html
+++ b/include/working-with-synchronization.html
@@ -1,5 +1,3 @@
----
-title: Working with Synchronization
----
+
 
 
diff --git a/include/working-with-video-in-ardour.html b/include/working-with-video-in-ardour.html
index 4d3ccd9..b28b04f 100644
--- a/include/working-with-video-in-ardour.html
+++ b/include/working-with-video-in-ardour.html
@@ -1,5 +1,3 @@
----
-title: Working with Video in Ardour
----
+
 
 
diff --git a/_manual/05_ardours-interface/08_the-zoom-controls.html b/include/zoom-controls.html
similarity index 98%
rename from _manual/05_ardours-interface/08_the-zoom-controls.html
rename to include/zoom-controls.html
index 65dcb02..0c48f13 100644
--- a/_manual/05_ardours-interface/08_the-zoom-controls.html
+++ b/include/zoom-controls.html
@@ -1,6 +1,3 @@
----
-title: Zoom Controls
----
 
 
 
@@ -89,3 +86,4 @@ according to you screen vertical size, some high number can have no effect.</p>
 selected tracks. If no track is selected, all the tracks will be shrunk or
 
 expanded each time the button is pushed.
+
diff --git a/master-doc.txt b/master-doc.txt
index edef26a..22b39cb 100644
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -5,7 +5,6 @@ title: Introduction to Ardour
 part: part
 ---
 
-
 ---
 title: Welcome to Ardour
 include: welcome-to-ardour.html
@@ -14,57 +13,57 @@ part: chapter
 
 ---
 title: About Ardour's documentation
-include: _manual/01_welcome-to-ardour/02_about-ardour-documentation.html
-uri: welcome-to-ardour/about-ardour-documentation
 link: about-ardour-doc
+include: about-ardours-documentation.html
+uri: welcome-to-ardour/about-ardour-documentation
 part: subchapter
 ---
 
 ---
 title: Welcome to Ardour!
-include: _manual/01_welcome-to-ardour.html
+include: welcome-to-ardour_2.html
 uri: welcome-to-ardour
 part: subchapter
 ---
 
 ---
 title: Isn't This A Really Complicated Program?
-include: _manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html
+include: isnt-this-a-really-complicated-program.html
 uri: welcome-to-ardour/about-ardour/isnt-this-a-really-complicated-program
 part: subchapter
 ---
 
 ---
 title: Why Write a DAW for Linux?
-include: _manual/01_welcome-to-ardour/01_about-ardour/02_why-write-a-daw-for-linux.html
+include: why-write-a-daw-for-linux.html
 uri: welcome-to-ardour/about-ardour/why-write-a-daw-for-linux
 part: subchapter
 ---
 
 ---
 title: Why is it called Ardour?
-include: _manual/01_welcome-to-ardour/01_about-ardour/03_why-is-it-called-ardour.html
+include: why-is-it-called-ardour.html
 uri: welcome-to-ardour/about-ardour/why-is-it-called-ardour
 part: subchapter
 ---
 
 ---
 title: Why write another DAW?
-include: _manual/01_welcome-to-ardour/01_about-ardour/04_why-write-another-daw.html
+include: why-write-another-daw.html
 uri: welcome-to-ardour/about-ardour/why-write-another-daw
 part: subchapter
 ---
 
 ---
 title: Additional Resources
-include: _manual/01_welcome-to-ardour/03_additional-resources.html
+include: additional-resources.html
 uri: welcome-to-ardour/additional-resources
 part: subchapter
 ---
 
 ---
 title: Creating Music with Ardour
-include: _manual/02_introducing-ardour/01_creating-music-with-ardour.html
+include: creating-music-with-ardour.html
 uri: introducing-ardour/creating-music-with-ardour
 part: subchapter
 ---
@@ -78,70 +77,70 @@ part: chapter
 
 ---
 title: Understanding Basic Concepts and Terminology
-include: _manual/02_introducing-ardour/02_understanding-basic-concepts-and-terminology.html
+include: understanding-basic-concepts-and-terminology.html
 uri: introducing-ardour/understanding-basic-concepts-and-terminology
 part: subchapter
 ---
 
 ---
 title: Basic GUI Operations
-include: _manual/02_introducing-ardour/03_basic-gui-operations.html
+include: basic-gui-operations.html
 uri: introducing-ardour/basic-gui-operations
 part: subchapter
 ---
 
 ---
 title: Interface Elements
-include: _manual/02_introducing-ardour/03_basic-gui-operations/01_interface-elements.html
+include: interface-elements.html
 uri: introducing-ardour/basic-gui-operations/interface-elements
 part: subchapter
 ---
 
 ---
 title: Selection Techniques
-include: _manual/02_introducing-ardour/03_basic-gui-operations/02_selection-techniques.html
+include: selection-techniques.html
 uri: introducing-ardour/basic-gui-operations/selection-techniques
 part: subchapter
 ---
 
 ---
 title: Tooltips
-include: _manual/02_introducing-ardour/03_basic-gui-operations/03_tooltips.html
+include: tooltips.html
 uri: introducing-ardour/basic-gui-operations/tooltips
 part: subchapter
 ---
 
 ---
 title: Undo/Redo for Editing
-include: _manual/02_introducing-ardour/03_basic-gui-operations/04_undoredo-for-editing-.html
+include: undoredo-for-editing.html
 uri: introducing-ardour/basic-gui-operations/undoredo-for-editing-
 part: subchapter
 ---
 
 ---
 title: Using the Mouse
-include: _manual/02_introducing-ardour/03_basic-gui-operations/05_using-the-mouse.html
+include: using-the-mouse.html
 uri: introducing-ardour/basic-gui-operations/using-the-mouse
 part: subchapter
 ---
 
 ---
 title: Cut and Paste Operations
-include: _manual/02_introducing-ardour/03_basic-gui-operations/06_cut-and-paste-operations.html
+include: cut-and-paste-operations.html
 uri: introducing-ardour/basic-gui-operations/cut-and-paste-operations
 part: subchapter
 ---
 
 ---
 title: Deleting Objects
-include: _manual/02_introducing-ardour/03_basic-gui-operations/07_deleting-objects.html
+include: deleting-objects.html
 uri: introducing-ardour/basic-gui-operations/deleting-objects
 part: subchapter
 ---
 
 ---
 title: Starting Ardour
-include: _manual/03_setting-up-your-system/08_starting-ardour.html
+include: starting-ardour.html
 uri: setting-up-your-system/starting-ardour
 part: subchapter
 ---
@@ -155,7 +154,7 @@ part: chapter
 ---
 title: Default Keyboard Bindings
 menu_title: Key Bindings
-include: _manual/23_default-keyboard-bindings.html
+include: default-keyboard-bindings.html
 uri: default-keyboard-bindings
 part: subchapter
 ---
@@ -163,25 +162,23 @@ part: subchapter
 ---
 title: Mnemonic Bindings for Linux
 menu_title: Linux
-include: _manual/23_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html
+include: mnemonic-bindings-for-linux.html
 uri: default-keyboard-bindings/mnemonic-bindings-for-linux
 part: subchapter
 ---
 
 ---
 title: Mnemonic Bindings for OS X
-include: _manual/23_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html
+include: mnemonic-bindings-for-os-x.html
 uri: default-keyboard-bindings/mnemonic-bindings-for-os-x
 part: subchapter
 ---
 
-
 ---
 title: Ardour Configuration
 part: part
 ---
 
-
 ---
 title: Ardour Systems
 include: ardour-systems.html
@@ -191,14 +188,14 @@ part: chapter
 ---
 title: The Right Computer System for Digital Audio
 menu_title: The Right Computer System
-include: _manual/03_setting-up-your-system/01_the-right-computer-system-for-digital-audio.html
+include: the-right-computer-system-for-digital-audio.html
 uri: setting-up-your-system/the-right-computer-system-for-digital-audio
 part: subchapter
 ---
 
 ---
 title: Mouse
-include: _manual/03_setting-up-your-system/02_mouse.html
+include: mouse.html
 uri: setting-up-your-system/mouse
 part: subchapter
 ---
@@ -211,28 +208,28 @@ part: chapter
 
 ---
 title: Setting Up Your System
-include: _manual/03_setting-up-your-system.html
+include: setting-up-your-system.html
 uri: setting-up-your-system
 part: subchapter
 ---
 
 ---
 title: Platform Specifics
-include: _manual/03_setting-up-your-system/07_platform-specifics.html
+include: platform-specifics.html
 uri: setting-up-your-system/platform-specifics
 part: subchapter
 ---
 
 ---
 title: Ubuntu Linux
-include: _manual/03_setting-up-your-system/07_platform-specifics/01_ubuntu-linux.html
+include: ubuntu-linux.html
 uri: setting-up-your-system/platform-specifics/ubuntu-linux
 part: subchapter
 ---
 
 ---
 title: Microsoft Windows
-include: _manual/03_setting-up-your-system/07_platform-specifics/02_microsoft-windows.html
+include: microsoft-windows.html
 uri: setting-up-your-system/platform-specifics/microsoft-windows
 part: subchapter
 ---
@@ -245,20 +242,20 @@ part: subchapter
 
 ---
 title: I/O Setup
-include: i_o-setup.html
+include: io-setup.html
 part: chapter
 ---
 
 ---
 title: Connecting Audio and MIDI Devices
-include: _manual/03_setting-up-your-system/04_connecting-audio-and-midi-devices.html
+include: connecting-audio-and-midi-devices.html
 uri: setting-up-your-system/connecting-audio-and-midi-devices
 part: subchapter
 ---
 
 ---
 title: Using More Than One Audio Device
-include: _manual/03_setting-up-your-system/06_using_more_than_one_audio_device.html
+include: using-more-than-one-audio-device.html
 uri: setting-up-your-system/using_more_than_one_audio_device
 part: subchapter
 ---
@@ -271,7 +268,7 @@ part: chapter
 
 ---
 title: Preferences and Session Properties
-include: _manual/24_preferences-and-session-properties.html
+include: preferences-and-session-properties.html
 uri: preferences-and-session-properties
 part: subchapter
 ---
@@ -279,7 +276,7 @@ part: subchapter
 ---
 title: Global Preferences Dialog
 menu_title: Global Preferences
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog.html
+include: global-preferences-dialog.html
 uri: preferences-and-session-properties/preferences-dialog
 part: subchapter
 ---
@@ -287,7 +284,7 @@ part: subchapter
 ---
 title: Global Misc Tab
 menu_title: Misc Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/01_misc.html
+include: global-misc-tab.html
 uri: preferences-and-session-properties/preferences-dialog/misc
 part: subchapter
 ---
@@ -295,7 +292,7 @@ part: subchapter
 ---
 title: Transport Tab
 menu_title: Transport Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/02_transport.html
+include: transport-tab.html
 uri: preferences-and-session-properties/preferences-dialog/transport
 part: subchapter
 ---
@@ -303,7 +300,7 @@ part: subchapter
 ---
 title: Editor Tab
 menu_title: Editor Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/03_editor.html
+include: editor-tab.html
 uri: preferences-and-session-properties/preferences-dialog/editor
 part: subchapter
 ---
@@ -311,7 +308,7 @@ part: subchapter
 ---
 title: Audio Tab
 menu_title: Audio Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/04_audio.html
+include: audio-tab.html
 uri: preferences-and-session-properties/preferences-dialog/audio
 part: subchapter
 ---
@@ -319,7 +316,7 @@ part: subchapter
 ---
 title: Solo/Mute Tab
 menu_title: Solo/Mute Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/05_solomute.html
+include: solomute-tab.html
 uri: preferences-and-session-properties/preferences-dialog/solomute
 part: subchapter
 ---
@@ -327,7 +324,7 @@ part: subchapter
 ---
 title: MIDI Tab
 menu_title: MIDI Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/06_midi.html
+include: midi-tab.html
 uri: preferences-and-session-properties/preferences-dialog/midi
 part: subchapter
 ---
@@ -335,7 +332,7 @@ part: subchapter
 ---
 title: User Interaction Tab
 menu_title: User Interaction Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/07_interaction.html
+include: user-interaction-tab.html
 uri: preferences-and-session-properties/preferences-dialog/interaction
 part: subchapter
 ---
@@ -343,7 +340,7 @@ part: subchapter
 ---
 title: Control Surfaces Tab
 menu_title: Control Surfaces Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/08_control_surfaces.html
+include: control-surfaces-tab.html
 uri: preferences-and-session-properties/preferences-dialog/control_surfaces
 part: subchapter
 ---
@@ -351,7 +348,7 @@ part: subchapter
 ---
 title: Video Tab
 menu_title: Video Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/09_video.html
+include: video-tab.html
 uri: preferences-and-session-properties/preferences-dialog/video
 part: subchapter
 ---
@@ -359,7 +356,7 @@ part: subchapter
 ---
 title: Plugins Tab
 menu_title: Plugins Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/10_plugins.html
+include: plugins-tab.html
 uri: preferences-and-session-properties/preferences-dialog/plugins
 part: subchapter
 ---
@@ -367,7 +364,7 @@ part: subchapter
 ---
 title: GUI Tab
 menu_title: GUI Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/11_gui.html
+include: gui-tab.html
 uri: preferences-and-session-properties/preferences-dialog/gui
 part: subchapter
 ---
@@ -375,7 +372,7 @@ part: subchapter
 ---
 title: Metering Tab
 menu_title: Metering Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/12_metering.html
+include: metering-tab.html
 uri: preferences-and-session-properties/preferences-dialog/metering
 part: subchapter
 ---
@@ -383,7 +380,7 @@ part: subchapter
 ---
 title: Theme Tab
 menu_title: Theme Tab
-include: _manual/24_preferences-and-session-properties/01_preferences-dialog/13_theme.html
+include: theme-tab.html
 uri: preferences-and-session-properties/preferences-dialog/theme
 part: subchapter
 ---
@@ -391,7 +388,7 @@ part: subchapter
 ---
 title: Session Properties Dialog
 menu_title: Session Properties
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog.html
+include: session-properties-dialog.html
 uri: preferences-and-session-properties/session-properties-dialog
 part: subchapter
 ---
@@ -399,7 +396,7 @@ part: subchapter
 ---
 title: Timecode Tab
 menu_title: Timecode Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/01_timecode.html
+include: timecode-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/timecode
 part: subchapter
 ---
@@ -407,7 +404,7 @@ part: subchapter
 ---
 title: Sync Tab
 menu_title: Sync Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/02_sync.html
+include: sync-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/sync
 part: subchapter
 ---
@@ -415,7 +412,7 @@ part: subchapter
 ---
 title: Fades Tab
 menu_title: Fades Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/03_fades.html
+include: fades-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/fades
 part: subchapter
 ---
@@ -423,7 +420,7 @@ part: subchapter
 ---
 title: Media Tab
 menu_title: Media Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/04_media.html
+include: media-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/media
 part: subchapter
 ---
@@ -431,7 +428,7 @@ part: subchapter
 ---
 title: Locations Tab
 menu_title: Locations Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/05_locations.html
+include: locations-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/locations
 part: subchapter
 ---
@@ -439,7 +436,7 @@ part: subchapter
 ---
 title: Filenames Tab
 menu_title: Filenames Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/06_filenames.html
+include: filenames-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/filenames
 part: subchapter
 ---
@@ -447,7 +444,7 @@ part: subchapter
 ---
 title: Monitoring Tab
 menu_title: Monitoring Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/07_monitoring.html
+include: monitoring-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/monitoring
 part: subchapter
 ---
@@ -455,7 +452,7 @@ part: subchapter
 ---
 title: Meterbridge Tab
 menu_title: Meterbridge Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/08_meterbridge.html
+include: meterbridge-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/meterbridge
 part: subchapter
 ---
@@ -463,7 +460,7 @@ part: subchapter
 ---
 title: Session Misc Tab
 menu_title: Misc Tab
-include: _manual/24_preferences-and-session-properties/02_session-properties-dialog/09_misc.html
+include: session-misc-tab.html
 uri: preferences-and-session-properties/session-properties-dialog/misc
 part: subchapter
 ---
@@ -476,119 +473,117 @@ part: chapter
 
 ---
 title: Using External MIDI Devices
-include: _manual/03_setting-up-your-system/03_using-external-midi-devices.html
+include: using-external-midi-devices.html
 uri: setting-up-your-system/using-external-midi-devices
 part: subchapter
 ---
 
 ---
 title: Setting Up MIDI
-include: _manual/03_setting-up-your-system/05_setting-up-midi.html
+include: setting-up-midi.html
 uri: setting-up-your-system/setting-up-midi
 part: subchapter
 ---
 
 ---
 title: MIDI on Linux
-include: _manual/03_setting-up-your-system/05_setting-up-midi/02_midi-on-linux.html
+include: midi-on-linux.html
 uri: setting-up-your-system/setting-up-midi/midi-on-linux
 part: subchapter
 ---
 
 ---
 title: MIDI on OS X
-include: _manual/03_setting-up-your-system/05_setting-up-midi/01_midi-on-os-x.html
+include: midi-on-os-x.html
 uri: setting-up-your-system/setting-up-midi/midi-on-os-x
 part: subchapter
 ---
 
-
 ---
 title: Ardour's Interface
 part: part
 ---
 
-
 ---
 title: About Ardour's Interface
-include: _manual/05_ardours-interface.html
+include: about-ardours-interface.html
 uri: ardours-interface
 part: chapter
 ---
 
 ---
 title: Main Menu
-include: _manual/05_ardours-interface/01_main-menu.html
+include: main-menu.html
 uri: ardours-interface/main-menu
 part: chapter
 ---
 
 ---
 title: The Session Menu
-include: _manual/05_ardours-interface/01_main-menu/01_Session-menu.html
+include: the-session-menu.html
 uri: ardours-interface/main-menu/Session-menu
 part: subchapter
 ---
 
 ---
 title: The Transport Menu
-include: _manual/05_ardours-interface/01_main-menu/02_Transport-menu.html
+include: the-transport-menu.html
 uri: ardours-interface/main-menu/Transport-menu
 part: subchapter
 ---
 
 ---
 title: The Edit Menu
-include: _manual/05_ardours-interface/01_main-menu/03_Edit-menu.html
+include: the-edit-menu.html
 uri: ardours-interface/main-menu/Edit-menu
 part: subchapter
 ---
 
 ---
 title: The Region Menu
-include: _manual/05_ardours-interface/01_main-menu/04_Region-menu.html
+include: the-region-menu.html
 uri: ardours-interface/main-menu/Region-menu
 part: subchapter
 ---
 
 ---
 title: The Track Menu
-include: _manual/05_ardours-interface/01_main-menu/05_Track-menu.html
+include: the-track-menu.html
 uri: ardours-interface/main-menu/Track-menu
 part: subchapter
 ---
 
 ---
 title: The View Menu
-include: _manual/05_ardours-interface/01_main-menu/06_View-menu.html
+include: the-view-menu.html
 uri: ardours-interface/main-menu/View-menu
 part: subchapter
 ---
 
 ---
 title: The Window Menu
-include: _manual/05_ardours-interface/01_main-menu/07_Window-menu.html
+include: the-window-menu.html
 uri: ardours-interface/main-menu/Window-menu
 part: subchapter
 ---
 
 ---
 title: The Help Menu
-include: _manual/05_ardours-interface/01_main-menu/08_Help-menu.html
+include: the-help-menu.html
 uri: ardours-interface/main-menu/Help-menu
 part: subchapter
 ---
 
 ---
 title: Status Bar
-include: _manual/05_ardours-interface/02_status-bar.html
+include: status-bar.html
 uri: ardours-interface/status-bar
 part: chapter
 ---
 
 ---
 title: Transport Bar
-include: _manual/05_ardours-interface/03_the-transport-bar.html
+include: transport-bar.html
 uri: ardours-interface/the-transport-bar
 part: chapter
 ---
@@ -601,28 +596,28 @@ part: chapter
 
 ---
 title: Transport Clocks
-include: _manual/05_ardours-interface/04_transport-clocks.html
+include: transport-clocks.html
 uri: ardours-interface/transport-clocks
 part: subchapter
 ---
 
 ---
 title: Selection and Punch Clocks
-include: _manual/05_ardours-interface/05_selection-and-punch-clocks.html
+include: selection-and-punch-clocks.html
 uri: ardours-interface/selection-and-punch-clocks
 part: subchapter
 ---
 
 ---
 title: Status Indicators and Mode Buttons
-include: _manual/05_ardours-interface/06_status-indicators.html
+include: status-indicators-and-mode-buttons.html
 uri: ardours-interface/status-indicators
 part: chapter
 ---
 
 ---
 title: Toolbox
-include: _manual/05_ardours-interface/07_the-toolbox.html
+include: toolbox.html
 uri: ardours-interface/the-toolbox
 part: chapter
 ---
@@ -635,105 +630,105 @@ part: chapter
 
 ---
 title: Zoom Controls
-include: _manual/05_ardours-interface/08_the-zoom-controls.html
+include: zoom-controls.html
 uri: ardours-interface/the-zoom-controls
 part: subchapter
 ---
 
 ---
 title: Grid Controls
-include: _manual/05_ardours-interface/09_the-grid-controls.html
+include: grid-controls.html
 uri: ardours-interface/the-grid-controls
 part: subchapter
 ---
 
 ---
 title: Edit Point Control
-include: _manual/05_ardours-interface/10_the-edit-point-control.html
+include: edit-point-control.html
 uri: ardours-interface/the-edit-point-control
 part: subchapter
 ---
 
 ---
 title: Nudge Controls
-include: _manual/05_ardours-interface/11_the-nudge-controls.html
+include: nudge-controls.html
 uri: ardours-interface/the-nudge-controls
 part: subchapter
 ---
 
 ---
 title: Ruler
-include: _manual/05_ardours-interface/12_the-ruler.html
+include: ruler.html
 uri: ardours-interface/the-ruler
 part: chapter
 ---
 
 ---
 title: Summary
-include: _manual/05_ardours-interface/13_the-summary.html
+include: summary.html
 uri: ardours-interface/the-summary
 part: chapter
 ---
 
 ---
 title: Editor Lists
-include: _manual/05_ardours-interface/14_editor-lists.html
+include: editor-lists.html
 uri: ardours-interface/editor-lists
 part: chapter
 ---
 
 ---
 title: The Region List
-include: _manual/05_ardours-interface/14_editor-lists/01_region-list.html
+include: the-region-list.html
 uri: ardours-interface/editor-lists/region-list
 part: subchapter
 ---
 
 ---
 title: The Tracks and Busses List
-include: _manual/05_ardours-interface/14_editor-lists/02_tracks-and-busses-list.html
+include: the-tracks-and-busses-list.html
 uri: ardours-interface/editor-lists/tracks-and-busses-list
 part: subchapter
 ---
 
 ---
 title: The Snapshot List
-include: _manual/05_ardours-interface/14_editor-lists/03_snapshot-list.html
+include: the-snapshot-list.html
 uri: ardours-interface/editor-lists/snapshot-list
 part: subchapter
 ---
 
 ---
 title: The Track and Bus Group List
-include: _manual/05_ardours-interface/14_editor-lists/04_track-and-bus-group-list.html
+include: the-track-and-bus-group-list.html
 uri: ardours-interface/editor-lists/track-and-bus-group-list
 part: subchapter
 ---
 
 ---
 title: The Ranges and Marks Lists
-include: _manual/05_ardours-interface/14_editor-lists/05_ranges-and-marks-list.html
+include: the-ranges-and-marks-lists.html
 uri: ardours-interface/editor-lists/ranges-and-marks-list
 part: subchapter
 ---
 
 ---
 title: Favorite Plugins Window
-include: _manual/05_ardours-interface/15_favorite-plugins-window.html
+include: favorite-plugins-window.html
 uri: ardours-interface/favorite-plugins-window
 part: chapter
 ---
 
 ---
 title: Strips list
-include: _manual/05_ardours-interface/16_the-strips-list.html
+include: strips-list.html
 uri: ardours-interface/the-strips-list
 part: chapter
 ---
 
 ---
 title: Groups list
-include: _manual/05_ardours-interface/17_the-groups-list.html
+include: groups-list.html
 uri: ardours-interface/the-groups-list
 part: chapter
 ---
@@ -746,46 +741,44 @@ part: chapter
 
 ---
 title: Audio/MIDI Mixer Strips
-include: _manual/05_ardours-interface/18_audio-midi-mixer-strips.html
+include: audiomidi-mixer-strips.html
 uri: ardours-interface/audio-midi-mixer-strips
 part: subchapter
 ---
 
 ---
 title: Audio/MIDI Busses Mixer Strips
-include: _manual/05_ardours-interface/19_busses-mixer-strips.html
+include: audiomidi-busses-mixer-strips.html
 uri: ardours-interface/busses-mixer-strips
 part: subchapter
 ---
 
 ---
 title: Control Masters Mixer Strips
-include: _manual/05_ardours-interface/20_control-masters.html
+include: control-masters-mixer-strips.html
 uri: ardours-interface/control-masters
 part: subchapter
 ---
 
 ---
 title: Master Bus Strip
-include: _manual/05_ardours-interface/21_the-master-bus-strip.html
+include: master-bus-strip.html
 uri: ardours-interface/the-master-bus-strip
 part: subchapter
 ---
 
 ---
 title: Monitor Section
-include: _manual/05_ardours-interface/22_the-monitor-section.html
+include: monitor-section.html
 uri: ardours-interface/the-monitor-section
 part: chapter
 ---
 
-
 ---
 title: Sessions & Tracks
 part: part
 ---
 
-
 ---
 title: Sessions
 include: sessions.html
@@ -795,126 +788,126 @@ part: chapter
 
 ---
 title: New/Open Session Dialog
-include: _manual/08_working-with-sessions/01_new-session-dialog.html
+include: newopen-session-dialog.html
 uri: working-with-sessions/new-session-dialog
 part: subchapter
 ---
 
 ---
 title: What's in a Session?
-include: _manual/08_working-with-sessions/02_whats-in-a-session.html
+include: whats-in-a-session.html
 uri: working-with-sessions/whats-in-a-session
 part: subchapter
 ---
 
 ---
 title: Where Are Sessions Stored?
-include: _manual/08_working-with-sessions/03_where-are-sessions-stored.html
+include: where-are-sessions-stored.html
 uri: working-with-sessions/where-are-sessions-stored
 part: subchapter
 ---
 
 ---
 title: Backup and Sharing of Sessions
-include: _manual/08_working-with-sessions/04_backup-and-sharing-of-sessions.html
+include: backup-and-sharing-of-sessions.html
 uri: working-with-sessions/backup-and-sharing-of-sessions
 part: subchapter
 ---
 
 ---
 title: Interchange with other DAWs
-include: _manual/08_working-with-sessions/05_interchange-with-other-daws.html
+include: interchange-with-other-daws.html
 uri: working-with-sessions/interchange-with-other-daws
 part: subchapter
 ---
 
 ---
 title: Copying The Interchange Folder
-include: _manual/08_working-with-sessions/05_interchange-with-other-daws/01_copying-the-interchange-folder.html
+include: copying-the-interchange-folder.html
 uri: working-with-sessions/interchange-with-other-daws/copying-the-interchange-folder
 part: subchapter
 ---
 
 ---
 title: Stem Exports
-include: _manual/08_working-with-sessions/05_interchange-with-other-daws/02_stem-exports.html
+include: stem-exports.html
 uri: working-with-sessions/interchange-with-other-daws/stem-exports
 part: subchapter
 ---
 
 ---
 title: Using AATranslator
-include: _manual/08_working-with-sessions/05_interchange-with-other-daws/03_using-aatranslator.html
+include: using-aatranslator.html
 uri: working-with-sessions/interchange-with-other-daws/using-aatranslator
 part: subchapter
 ---
 
 ---
 title: Renaming a Session
-include: _manual/08_working-with-sessions/06_renaming-a-session.html
+include: renaming-a-session.html
 uri: working-with-sessions/renaming-a-session
 part: subchapter
 ---
 
 ---
 title: Session Templates
-include: _manual/08_working-with-sessions/07_session-templates.html
+include: session-templates.html
 uri: working-with-sessions/session-templates
 part: subchapter
 ---
 
 ---
 title: Snapshots
-include: _manual/08_working-with-sessions/08_snapshots.html
+include: snapshots.html
 uri: working-with-sessions/snapshots
 part: subchapter
 ---
 
 ---
 title: Metadata
-include: _manual/08_working-with-sessions/09_metadata.html
+include: metadata.html
 uri: working-with-sessions/metadata
 part: subchapter
 ---
 
 ---
 title: Cleaning up Sessions
-include: _manual/08_working-with-sessions/10_cleaning_up.html
+include: cleaning-up-sessions.html
 uri: working-with-sessions/cleaning_up
 part: subchapter
 ---
 
 ---
 title: Copying versus Linking
-include: _manual/15_adding-pre-existing-material/02_copying-versus-linking.html
+include: copying-versus-linking.html
 uri: adding-pre-existing-material/copying-versus-linking
 part: subchapter
 ---
 
 ---
 title: Adding Pre-existing Material
-include: _manual/15_adding-pre-existing-material.html
+include: adding-pre-existing-material.html
 uri: adding-pre-existing-material
 part: subchapter
 ---
 
 ---
 title: Import Dialog
-include: _manual/15_adding-pre-existing-material/01_import-dialog.html
+include: import-dialog.html
 uri: adding-pre-existing-material/import-dialog
 part: subchapter
 ---
 
 ---
 title: Searching for Files Using Tags
-include: _manual/15_adding-pre-existing-material/03_searching-for-files-using-tags.html
+include: searching-for-files-using-tags.html
 uri: adding-pre-existing-material/searching-for-files-using-tags
 part: subchapter
 ---
 
 ---
 title: Supported File Formats
-include: _manual/15_adding-pre-existing-material/04_supported-file-formats.html
+include: supported-file-formats.html
 uri: adding-pre-existing-material/supported-file-formats
 part: subchapter
 ---
@@ -928,105 +921,105 @@ part: chapter
 
 ---
 title: Track Types
-include: _manual/11_working-with-tracks/01_track-types.html
+include: track-types.html
 uri: working-with-tracks/track-types
 part: subchapter
 ---
 
 ---
 title: Adding Tracks, Busses and VCAs
-include: _manual/11_working-with-tracks/02_adding-tracks-and-busses.html
+include: adding-tracks-busses-and-vcas.html
 uri: working-with-tracks/adding-tracks-and-busses
 part: subchapter
 ---
 
 ---
 title: Selecting Tracks
-include: _manual/11_working-with-tracks/03_selecting-tracks.html
+include: selecting-tracks.html
 uri: working-with-tracks/selecting-tracks
 part: subchapter
 ---
 
 ---
 title: Controlling Track Appearance
-include: _manual/11_working-with-tracks/04_controlling-track-appearance.html
+include: controlling-track-appearance.html
 uri: working-with-tracks/controlling-track-appearance
 part: subchapter
 ---
 
 ---
 title: Layering Display
-include: _manual/11_working-with-tracks/04_controlling-track-appearance/01_layering-display.html
+include: layering-display.html
 uri: working-with-tracks/controlling-track-appearance/layering-display
 part: subchapter
 ---
 
 ---
 title: Track Color
-include: _manual/11_working-with-tracks/04_controlling-track-appearance/02_track-coloring.html
+include: track-color.html
 uri: working-with-tracks/controlling-track-appearance/track-coloring
 part: subchapter
 ---
 
 ---
 title: Track Height
-include: _manual/11_working-with-tracks/04_controlling-track-appearance/03_track-height.html
+include: track-height.html
 uri: working-with-tracks/controlling-track-appearance/track-height
 part: subchapter
 ---
 
 ---
 title: Waveform display
-include: _manual/11_working-with-tracks/04_controlling-track-appearance/04_waveform-display.html
+include: waveform-display.html
 uri: working-with-tracks/controlling-track-appearance/waveform-display
 part: subchapter
 ---
 
 ---
 title: Controlling Track Ordering
-include: _manual/11_working-with-tracks/05_controlling-track-ordering.html
+include: controlling-track-ordering.html
 uri: working-with-tracks/controlling-track-ordering
 part: subchapter
 ---
 
 ---
 title: Reordering Tracks
-include: _manual/11_working-with-tracks/05_controlling-track-ordering/01_reordering-tracks.html
+include: reordering-tracks.html
 uri: working-with-tracks/controlling-track-ordering/reordering-tracks
 part: subchapter
 ---
 
 ---
 title: Track Ordering and Remote Control IDs
-include: _manual/11_working-with-tracks/05_controlling-track-ordering/02_track-ordering-and-remote-control-ids.html
+include: track-ordering-and-remote-control-ids.html
 uri: working-with-tracks/controlling-track-ordering/track-ordering-and-remote-control-ids
 part: subchapter
 ---
 
 ---
 title: Bus Controls
-include: _manual/11_working-with-tracks/06_bus-controls.html
+include: bus-controls.html
 uri: working-with-tracks/bus-controls
 part: subchapter
 ---
 
 ---
 title: Audio Track Controls
-include: _manual/11_working-with-tracks/07_audio-track-controls.html
+include: audio-track-controls.html
 uri: working-with-tracks/audio-track-controls
 part: subchapter
 ---
 
 ---
 title: MIDI Track Controls
-include: _manual/11_working-with-tracks/08_midi-track-controls.html
+include: midi-track-controls.html
 uri: working-with-tracks/midi-track-controls
 part: subchapter
 ---
 
 ---
 title: Track Context Menu
-include: _manual/11_working-with-tracks/10_track-context-menu.html
+include: track-context-menu.html
 uri: working-with-tracks/track-context-menu
 part: subchapter
 ---
@@ -1039,7 +1032,7 @@ part: chapter
 
 ---
 title: Track and Bus Groups
-include: _manual/11_working-with-tracks/09_track-and-bus-groups.html
+include: track-and-bus-groups.html
 uri: working-with-tracks/track-and-bus-groups
 part: subchapter
 ---
@@ -1056,14 +1049,12 @@ include: file-and-session-management-and-compatibility.html
 part: chapter
 ---
 
-
 ---
 title: Playback & Recording
 uri: recording
 part: part
 ---
 
-
 ---
 title: Playing Back Track Material
 include: playing-back-track-material.html
@@ -1072,7 +1063,7 @@ part: chapter
 
 ---
 title: Controlling Playback
-include: _manual/06_controlling-playback.html
+include: controlling-playback.html
 uri: controlling-playback
 part: subchapter
 ---
@@ -1091,7 +1082,7 @@ part: chapter
 
 ---
 title: Track Recording Modes
-include: _manual/16_recording/02_track-recording-modes.html
+include: track-recording-modes.html
 uri: recording/track-recording-modes
 part: subchapter
 ---
@@ -1104,7 +1095,7 @@ part: chapter
 
 ---
 title: Monitoring
-include: _manual/16_recording/01_monitoring.html
+include: monitoring.html
 uri: recording/monitoring
 part: subchapter
 ---
@@ -1112,7 +1103,7 @@ part: subchapter
 ---
 title: Latency Considerations
 menu_title: Latency
-include: _manual/16_recording/01_monitoring/01_latency-considerations.html
+include: latency-considerations.html
 uri: recording/monitoring/latency-considerations
 part: subchapter
 ---
@@ -1120,7 +1111,7 @@ part: subchapter
 ---
 title: Monitor Signal Flow
 menu_title: Signal Flow
-include: _manual/16_recording/01_monitoring/02_monitor-signal-flow.html
+include: monitor-signal-flow.html
 uri: recording/monitoring/monitor-signal-flow
 part: subchapter
 ---
@@ -1128,7 +1119,7 @@ part: subchapter
 ---
 title: Monitor Setup in Ardour
 menu_title: Setup in Ardour
-include: _manual/16_recording/01_monitoring/03_monitor-setup-in-ardour.html
+include: monitor-setup-in-ardour.html
 uri: recording/monitoring/monitor-setup-in-ardour
 part: subchapter
 ---
@@ -1147,61 +1138,59 @@ part: chapter
 
 ---
 title: Working With Markers
-include: _manual/07_working-with-markers.html
+include: working-with-markers.html
 uri: working-with-markers
 part: subchapter
 ---
 
 ---
 title: Creating Location Markers
-include: _manual/07_working-with-markers/01_creating-location-markers.html
+include: creating-location-markers.html
 uri: working-with-markers/creating-location-markers
 part: subchapter
 ---
 
 ---
 title: Creating Range Markers
-include: _manual/07_working-with-markers/02_creating-range-markers.html
+include: creating-range-markers.html
 uri: working-with-markers/creating-range-markers
 part: subchapter
 ---
 
 ---
 title: Moving Markers
-include: _manual/07_working-with-markers/03_moving-markers.html
+include: moving-markers.html
 uri: working-with-markers/moving-markers
 part: subchapter
 ---
 
 ---
 title: The Loop Range
-include: _manual/07_working-with-markers/04_loop-range.html
+include: the-loop-range.html
 uri: working-with-markers/loop-range
 part: subchapter
 ---
 
 ---
 title: Marker Context Menu
-include: _manual/07_working-with-markers/05_marker-context-menu.html
+include: marker-context-menu.html
 uri: working-with-markers/marker-context-menu
 part: subchapter
 ---
 
 ---
 title: Punch Range
-include: _manual/07_working-with-markers/06_punch-range.html
+include: punch-range.html
 uri: working-with-markers/punch-range
 part: subchapter
 ---
 
-
 ---
 title: Editing
 uri: editing-and-arranging
 part: part
 ---
 
-
 ---
 title: Editing Basics
 include: editing-basics.html
@@ -1210,28 +1199,28 @@ part: chapter
 
 ---
 title: Working With Regions
-include: _manual/09_working-with-regions.html
+include: working-with-regions.html
 uri: working-with-regions
 part: subchapter
 ---
 
 ---
 title: Region Naming
-include: _manual/09_working-with-regions/01_region-naming.html
+include: region-naming.html
 uri: working-with-regions/region-naming
 part: subchapter
 ---
 
 ---
 title: Corresponding Regions Selection
-include: _manual/09_working-with-regions/02_corresponding-regions-selection.html
+include: corresponding-regions-selection.html
 uri: working-with-regions/corresponding-regions-selection
 part: subchapter
 ---
 
 ---
 title: Region Context Menu
-include: _manual/09_working-with-regions/03_region-context-menu.html
+include: region-context-menu.html
 uri: working-with-regions/region-context-menu
 part: subchapter
 ---
@@ -1239,35 +1228,35 @@ part: subchapter
 ---
 title: Common Region Edit Operations
 menu_title: Region Editing
-include: _manual/18_editing-and-arranging/03_common-region-edit-operations.html
+include: common-region-edit-operations.html
 uri: editing-and-arranging/common-region-edit-operations
 part: subchapter
 ---
 
 ---
 title: Copy Regions
-include: _manual/18_editing-and-arranging/05_copy-regions.html
+include: copy-regions.html
 uri: editing-and-arranging/copy-regions
 part: subchapter
 ---
 
 ---
 title: Move Regions
-include: _manual/18_editing-and-arranging/06_move-regions.html
+include: move-regions.html
 uri: editing-and-arranging/move-regions
 part: subchapter
 ---
 
 ---
 title: Move Regions With the Mouse
-include: _manual/18_editing-and-arranging/06_move-regions/01_move-regions-with-the-mouse.html
+include: move-regions-with-the-mouse.html
 uri: editing-and-arranging/move-regions/move-regions-with-the-mouse
 part: subchapter
 ---
 
 ---
 title: Align (Spot) Regions
-include: _manual/18_editing-and-arranging/06_move-regions/02_align-spotting-regions.html
+include: align-spot-regions.html
 uri: editing-and-arranging/move-regions/align-spotting-regions
 part: subchapter
 ---
@@ -1280,7 +1269,7 @@ part: chapter
 
 ---
 title: Editing Clocks
-include: _manual/02_introducing-ardour/03_basic-gui-operations/08_editing-clocks.html
+include: editing-clocks.html
 uri: introducing-ardour/basic-gui-operations/editing-clocks
 part: subchapter
 ---
@@ -1288,7 +1277,7 @@ part: subchapter
 ---
 title: Which Regions Are Affected?
 menu_title: Affected Regions
-include: _manual/18_editing-and-arranging/02_which-regions-are-affected.html
+include: which-regions-are-affected.html
 uri: editing-and-arranging/which-regions-are-affected
 part: subchapter
 ---
@@ -1301,7 +1290,7 @@ part: chapter
 
 ---
 title: Select Regions
-include: _manual/18_editing-and-arranging/01_select-regions.html
+include: select-regions.html
 uri: editing-and-arranging/select-regions
 part: subchapter
 ---
@@ -1314,28 +1303,28 @@ part: chapter
 
 ---
 title: Trimming Regions
-include: _manual/18_editing-and-arranging/04_change-region-lengths.html
+include: trimming-regions.html
 uri: editing-and-arranging/change-region-lengths
 part: subchapter
 ---
 
 ---
 title: Push/Pull Trimming
-include: _manual/18_editing-and-arranging/04_change-region-lengths/01_pushpull-trimming.html
+include: pushpull-trimming.html
 uri: editing-and-arranging/change-region-lengths/pushpull-trimming
 part: subchapter
 ---
 
 ---
 title: Separate Under
-include: _manual/18_editing-and-arranging/08_separation/01_separate-under.html
+include: separate-under.html
 uri: editing-and-arranging/separation/separate-under
 part: subchapter
 ---
 
 ---
 title: Separate Range
-include: _manual/18_editing-and-arranging/08_separation/02_separate-range.html
+include: separate-range.html
 uri: editing-and-arranging/separation/separate-range
 part: subchapter
 ---
@@ -1343,7 +1332,7 @@ part: subchapter
 ---
 title: Strip Silence from Audio Regions
 menu_title: Stripping Silence
-include: _manual/18_editing-and-arranging/09_strip-silence-from-audio-regions.html
+include: strip-silence-from-audio-regions.html
 uri: editing-and-arranging/strip-silence-from-audio-regions
 part: subchapter
 ---
@@ -1356,7 +1345,7 @@ part: chapter
 
 ---
 title: Create Region Fades and Crossfades
-include: _manual/18_editing-and-arranging/07_create-region-fades-and-crossfades.html
+include: create-region-fades-and-crossfades.html
 uri: editing-and-arranging/create-region-fades-and-crossfades
 part: subchapter
 ---
@@ -1370,21 +1359,21 @@ part: chapter
 
 ---
 title: Understanding Playlists
-include: _manual/10_working-with-playlists/01_understanding-playlists.html
+include: understanding-playlists.html
 uri: working-with-playlists/understanding-playlists
 part: subchapter
 ---
 
 ---
 title: Playlist Operations
-include: _manual/10_working-with-playlists/02_playlist-operations.html
+include: playlist-operations.html
 uri: working-with-playlists/playlist-operations
 part: subchapter
 ---
 
 ---
 title: Playlist Usecases
-include: _manual/10_working-with-playlists/03_playlist_usecases.html
+include: playlist-usecases.html
 uri: working-with-playlists/playlist_usecases
 part: subchapter
 ---
@@ -1395,13 +1384,11 @@ include: rhythm-ferret.html
 part: chapter
 ---
 
-
 ---
 title: MIDI
 part: part
 ---
 
-
 ---
 title: MIDI Editing
 include: midi-editing.html
@@ -1410,42 +1397,42 @@ part: chapter
 
 ---
 title: Edit MIDI
-include: _manual/12_working-with-midi.html
+include: edit-midi.html
 uri: working-with-midi
 part: subchapter
 ---
 
 ---
 title: Fundamental Concepts
-include: _manual/12_working-with-midi/01_fundamental-concepts.html
+include: fundamental-concepts.html
 uri: working-with-midi/fundamental-concepts
 part: subchapter
 ---
 
 ---
 title: Create MIDI Tracks
-include: _manual/12_working-with-midi/02_create-midi-tracks.html
+include: create-midi-tracks.html
 uri: working-with-midi/create-midi-tracks
 part: subchapter
 ---
 
 ---
 title: Create MIDI Regions
-include: _manual/12_working-with-midi/03_create-midi-regions.html
+include: create-midi-regions.html
 uri: working-with-midi/create-midi-regions
 part: subchapter
 ---
 
 ---
 title: Add New Notes
-include: _manual/12_working-with-midi/04_add-new-notes.html
+include: add-new-notes.html
 uri: working-with-midi/add-new-notes
 part: subchapter
 ---
 
 ---
 title: Change Note Properties
-include: _manual/12_working-with-midi/05_change-note-properties.html
+include: change-note-properties.html
 uri: working-with-midi/change-note-properties
 part: subchapter
 ---
@@ -1453,42 +1440,42 @@ part: subchapter
 ---
 title: Handling Overlapping Notes
 menu_title: Overlapping Notes
-include: _manual/12_working-with-midi/06_handle-overlapping-notes.html
+include: handling-overlapping-notes.html
 uri: working-with-midi/handle-overlapping-notes
 part: subchapter
 ---
 
 ---
 title: Note Cut, Copy and Paste
-include: _manual/12_working-with-midi/07_note-cut-copy-and-paste-.html
+include: note-cut-copy-and-paste.html
 uri: working-with-midi/note-cut-copy-and-paste-
 part: subchapter
 ---
 
 ---
 title: Note Selection
-include: _manual/12_working-with-midi/08_note-selection.html
+include: note-selection.html
 uri: working-with-midi/note-selection
 part: subchapter
 ---
 
 ---
 title: Quantize MIDI
-include: _manual/12_working-with-midi/09_quantize-midi.html
+include: quantize-midi.html
 uri: working-with-midi/quantize-midi
 part: subchapter
 ---
 
 ---
 title: Step Entry
-include: _manual/12_working-with-midi/10_step-entry.html
+include: step-entry.html
 uri: working-with-midi/step-entry
 part: subchapter
 ---
 
 ---
 title: Patch Change
-include: _manual/12_working-with-midi/11_patch-change.html
+include: patch-change.html
 uri: working-with-midi/patch-change
 part: subchapter
 ---
@@ -1496,14 +1483,14 @@ part: subchapter
 ---
 title: Independent and Dependent MIDI Region Copies
 menu_title: Copy MIDI Region
-include: _manual/12_working-with-midi/12_copy-midi-region.html
+include: independent-and-dependent-midi-region-copies.html
 uri: working-with-midi/copy-midi-region
 part: subchapter
 ---
 
 ---
 title: Transposing MIDI
-include: _manual/12_working-with-midi/13_transpose-midi.html
+include: transposing-midi.html
 uri: working-with-midi/transpose-midi
 part: subchapter
 ---
@@ -1511,7 +1498,7 @@ part: subchapter
 ---
 title: Automating MIDI - Pitch bending and aftertouch
 menu_title: Automating MIDI
-include: _manual/12_working-with-midi/14_automation-midi.html
+include: automating-midi---pitch-bending-and-aftertouch.html
 uri: working-with-midi/automation-midi
 part: subchapter
 ---
@@ -1519,7 +1506,7 @@ part: subchapter
 ---
 title: Transforming MIDI - Mathematical operations
 menu_title: Transforming MIDI
-include: _manual/12_working-with-midi/15_transformation-midi.html
+include: transforming-midi---mathematical-operations.html
 uri: working-with-midi/transformation-midi
 part: subchapter
 ---
@@ -1532,7 +1519,7 @@ part: chapter
 
 ---
 title: MIDI Scene Automation
-include: _manual/19_automation/01_midi-scenes.html
+include: midi-scene-automation.html
 uri: automation/midi-scenes
 part: subchapter
 ---
@@ -1549,22 +1536,20 @@ include: midi-event-list.html
 part: chapter
 ---
 
-
 ---
 title: Arranging
 part: part
 ---
 
-
 ---
 title: Time, Tempo and Meter
-include: time_-tempo-and-meter.html
+include: time-tempo-and-meter.html
 part: chapter
 ---
 
 ---
 title: Tempo and Meter
-include: _manual/14_working-with-tempo-and-meter.html
+include: tempo-and-meter.html
 uri: working-with-tempo-and-meter
 part: subchapter
 ---
@@ -1593,13 +1578,11 @@ include: region-loops-and-groups.html
 part: chapter
 ---
 
-
 ---
 title: Mixing
 part: part
 ---
 
-
 ---
 title: Basic Mixing
 include: basic-mixing.html
@@ -1608,21 +1591,21 @@ part: chapter
 
 ---
 title: Metering in Ardour
-include: _manual/04_meters.html
+include: metering-in-ardour.html
 uri: meters
 part: subchapter
 ---
 
 ---
 title: Signal Routing
-include: _manual/17_signal-routing.html
+include: signal-routing.html
 uri: signal-routing
 part: subchapter
 ---
 
 ---
 title: Aux Sends
-include: _manual/17_signal-routing/01_aux-sends.html
+include: aux-sends.html
 uri: signal-routing/aux-sends
 part: subchapter
 ---
@@ -1630,84 +1613,84 @@ part: subchapter
 ---
 title: Comparing Aux Sends and Subgroups
 menu_title: Auxes vs. Groups
-include: _manual/17_signal-routing/02_comparing-aux-sends-and-subgroups.html
+include: comparing-aux-sends-and-subgroups.html
 uri: signal-routing/comparing-aux-sends-and-subgroups
 part: subchapter
 ---
 
 ---
 title: External Sends
-include: _manual/17_signal-routing/03_external-sends.html
+include: external-sends.html
 uri: signal-routing/external-sends
 part: subchapter
 ---
 
 ---
 title: Inserts
-include: _manual/17_signal-routing/04_inserts.html
+include: inserts.html
 uri: signal-routing/inserts
 part: subchapter
 ---
 
 ---
 title: Subgrouping
-include: _manual/17_signal-routing/06_subgrouping.html
+include: subgrouping.html
 uri: signal-routing/subgrouping
 part: subchapter
 ---
 
 ---
 title: Patchbay
-include: _manual/17_signal-routing/07_Patchbay.html
+include: patchbay.html
 uri: signal-routing/Patchbay
 part: subchapter
 ---
 
 ---
 title: Track/Bus Signal Flow
-include: _manual/17_signal-routing/08_signal-flow.html
+include: trackbus-signal-flow.html
 uri: signal-routing/signal-flow
 part: subchapter
 ---
 
 ---
 title: Sidechaining
-include: _manual/17_signal-routing/09_sidechaining.html
+include: sidechaining.html
 uri: signal-routing/sidechaining
 part: subchapter
 ---
 
 ---
 title: Muting and Soloing
-include: _manual/20_mixing/01_muting-and-soloing.html
+include: muting-and-soloing.html
 uri: mixing/muting-and-soloing
 part: subchapter
 ---
 
 ---
 title: Panning
-include: _manual/20_mixing/02_panning.html
+include: panning.html
 uri: mixing/panning
 part: subchapter
 ---
 
 ---
 title: Mono Panner
-include: _manual/20_mixing/02_panning/01_mono_panner.html
+include: mono-panner.html
 uri: mixing/panning/mono_panner
 part: subchapter
 ---
 
 ---
 title: Balance Control
-include: _manual/20_mixing/02_panning/02_balance_control.html
+include: balance-control.html
 uri: mixing/panning/balance_control
 part: subchapter
 ---
 
 ---
 title: Stereo Panner
-include: _manual/20_mixing/02_panning/03_stereo_panner.html
+include: stereo-panner.html
 uri: mixing/panning/stereo_panner
 part: subchapter
 ---
@@ -1720,7 +1703,7 @@ part: chapter
 
 ---
 title: Working With Plugins
-include: _manual/13_working-with-plugins.html
+include: working-with-plugins.html
 uri: working-with-plugins
 part: subchapter
 ---
@@ -1728,7 +1711,7 @@ part: subchapter
 ---
 title: Processor Box
 link: processor-box
-include: _manual/13_working-with-plugins/03_processor-box.html
+include: processor-box.html
 uri: working-with-plugins/processor-box
 part: subchapter
 ---
@@ -1736,27 +1719,27 @@ part: subchapter
 ---
 title: Plugin Manager
 link: plugin-manager
-include: _manual/13_working-with-plugins/02_plugin-manager.html
+include: plugin-manager.html
 uri: working-with-plugins/plugin-manager
 part: subchapter
 ---
 
 ---
 title: Favorite Plugins Window
-include: favorite-plugins-window.html
+include: favorite-plugins-window_2.html
 part: subchapter
 ---
 
 ---
 title: Managing Plugin Presets
-include: _manual/13_working-with-plugins/01_managing-plugin-presets.html
+include: managing-plugin-presets.html
 uri: working-with-plugins/managing-plugin-presets
 part: subchapter
 ---
 
 ---
 title: Working with Ardour-built Plugin Editors
-include: _manual/13_working-with-plugins/06_working-with-ardour-built-plugin-editors.html
+include: working-with-ardour-built-plugin-editors.html
 uri: working-with-plugins/working-with-ardour-built-plugin-editors
 part: subchapter
 ---
@@ -1769,14 +1752,14 @@ part: subchapter
 
 ---
 title: Getting More Plugins
-include: _manual/13_working-with-plugins/07_getting-plugins.html
+include: getting-more-plugins.html
 uri: working-with-plugins/getting-plugins
 part: subchapter
 ---
 
 ---
 title: Using Windows VST Plugins on Linux
-include: _manual/13_working-with-plugins/05_windows-vst-support.html
+include: using-windows-vst-plugins-on-linux.html
 uri: working-with-plugins/windows-vst-support
 part: subchapter
 ---
@@ -1797,25 +1780,23 @@ part: chapter
 
 ---
 title: Export Dialog
-include: _manual/21_exporting/01_export-dialog.html
+include: export-dialog.html
 uri: exporting/export-dialog
 part: subchapter
 ---
 
 ---
 title: Export Format Profiles
-include: _manual/21_exporting/02_edit-export-format-profile.html
+include: export-format-profiles.html
 uri: exporting/edit-export-format-profile
 part: subchapter
 ---
 
-
 ---
 title: Surround
 part: part
 ---
 
-
 ---
 title: Ardour Setup for Surround
 include: ardour-setup-for-surround.html
@@ -1836,18 +1817,16 @@ part: chapter
 
 ---
 title: VBAP Panner
-include: _manual/20_mixing/02_panning/04_vbap_panner.html
+include: vbap-panner.html
 uri: mixing/panning/vbap_panner
 part: subchapter
 ---
 
-
 ---
 title: Sync & Video
 part: part
 ---
 
-
 ---
 title: Working with Synchronization
 include: working-with-synchronization.html
@@ -1857,7 +1836,7 @@ part: chapter
 
 ---
 title: On Clock and Time
-include: _manual/22_synchronization/01_on-clock-and-time.html
+include: on-clock-and-time.html
 uri: synchronization/on-clock-and-time
 part: subchapter
 ---
@@ -1865,14 +1844,14 @@ part: subchapter
 ---
 title: Latency and Latency-Compensation
 menu_title: Latency
-include: _manual/22_synchronization/02_latency-and-latency-compensation.html
+include: latency-and-latency-compensation.html
 uri: synchronization/latency-and-latency-compensation
 part: subchapter
 ---
 
 ---
 title: Timecode Generators and Slaves
-include: _manual/22_synchronization/03_timecode-generators-and-slaves.html
+include: timecode-generators-and-slaves.html
 uri: synchronization/timecode-generators-and-slaves
 part: subchapter
 ---
@@ -1880,7 +1859,7 @@ part: subchapter
 ---
 title: Overview of all Timecode related settings
 menu_title: Overview of Timecode settings
-include: _manual/22_synchronization/04_overview-of-timecode-related-settings.html
+include: overview-of-all-timecode-related-settings.html
 uri: synchronization/overview-of-timecode-related-settings
 part: subchapter
 ---
@@ -1899,228 +1878,203 @@ part: chapter
 
 ---
 title: Video Timeline and Monitoring
-include: _manual/26_video-timeline.html
+include: video-timeline-and-monitoring.html
 uri: video-timeline
 part: subchapter
 ---
 
 ---
 title: Video Timeline Setup
-include: _manual/26_video-timeline/01_setup.html
+include: video-timeline-setup.html
 uri: video-timeline/setup
 part: subchapter
 ---
 
 ---
 title: Transcoding, Formats &amp; Codecs
-include: _manual/26_video-timeline/02_transcoding_formats_codecs.html
+include: transcoding-formats-amp-codecs.html
 uri: video-timeline/transcoding_formats_codecs
 part: subchapter
 ---
 
 ---
 title: Workflow &amp; Operations
-include: _manual/26_video-timeline/03_operations.html
+include: workflow-amp-operations.html
 uri: video-timeline/operations
 part: subchapter
 ---
 
-
 ---
 title: Control Surfaces
 uri: using-control-surfaces
 part: part
 ---
 
-
 ---
 title: Controlling Ardour with OSC
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc.html
+include: controlling-ardour-with-osc.html
 uri: using-control-surfaces/controlling-ardour-with-osc
-exclude: yes
 part: chapter
 ---
 
 ---
 title: OSC&#58; Controlling Ardour with OSC
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/01_osc-control.html
+include: osc58-controlling-ardour-with-osc.html
 uri: using-control-surfaces/controlling-ardour-with-osc/osc-control
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: OSC&#58; Using the Setup Dialog
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/02_osc-setup-dialog.html
+include: osc58-using-the-setup-dialog.html
 uri: using-control-surfaces/controlling-ardour-with-osc/osc-setup-dialog
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: OSC&#58; Querying Ardour
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/03_querying-ardour-with-osc.html
+include: osc58-querying-ardour.html
 uri: using-control-surfaces/controlling-ardour-with-osc/querying-ardour-with-osc
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: OSC&#58; Feedback
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/04_feedback-in-osc.html
+include: osc58-feedback.html
 uri: using-control-surfaces/controlling-ardour-with-osc/feedback-in-osc
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: OSC&#58; Feedback and Strip-types Values
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/05_calculating-feedback-and-strip-types-values.html
+include: osc58-feedback-and-strip-types-values.html
 uri: using-control-surfaces/controlling-ardour-with-osc/calculating-feedback-and-strip-types-values
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: OSC&#58; Personal Monitoring Control
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/06_osc-personal-monitoring.html
+include: osc58-personal-monitoring-control.html
 uri: using-control-surfaces/controlling-ardour-with-osc/osc-personal-monitoring
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: OSC&#58; Parameter Types
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/07_parameter-types-in-osc.html
+include: osc58-parameter-types.html
 uri: using-control-surfaces/controlling-ardour-with-osc/parameter-types-in-osc
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: OSC&#58; Selection and Expansion Considerations
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/08_selection-considerations-in-osc.html
+include: osc58-selection-and-expansion-considerations.html
 uri: using-control-surfaces/controlling-ardour-with-osc/selection-considerations-in-osc
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: OSC control for Ardour 4.7 and Prior
-include: _manual/25_using-control-surfaces/01_controlling-ardour-with-osc/09_osc-control-in-ardour-4.7-and-prior.html
+include: osc-control-for-ardour-4.7-and-prior.html
 uri: using-control-surfaces/controlling-ardour-with-osc/osc-control-in-ardour-4.7-and-prior
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: Controlling Ardour with Mackie Control Devices
-include: _manual/25_using-control-surfaces/02_mackie-control-protocol.html
+include: controlling-ardour-with-mackie-control-devices.html
 uri: using-control-surfaces/mackie-control-protocol
-exclude: yes
 part: chapter
 ---
 
 ---
 title: Devices Using Mackie/Logic Control Protocol
-include: _manual/25_using-control-surfaces/02_mackie-control-protocol/01_mackie-control-configure.html
+include: devices-using-mackielogic-control-protocol.html
 uri: using-control-surfaces/mackie-control-protocol/mackie-control-configure
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: SSL Nucleus
-include: _manual/25_using-control-surfaces/02_mackie-control-protocol/02_ssl-nucleus.html
+include: ssl-nucleus.html
 uri: using-control-surfaces/mackie-control-protocol/ssl-nucleus
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: Behringer Devices in Mackie/Logic Control Mode
 menu_title: Behringer Devices
-include: _manual/25_using-control-surfaces/02_mackie-control-protocol/03_behringer-devices-in-mackielogic-control-mode.html
+include: behringer-devices-in-mackielogic-control-mode.html
 uri: using-control-surfaces/mackie-control-protocol/behringer-devices-in-mackielogic-control-mode
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: What to do if your Device is not Listed
 menu_title: Unlisted Devices
-include: _manual/25_using-control-surfaces/02_mackie-control-protocol/04_devices-not-listed.html
+include: what-to-do-if-your-device-is-not-listed.html
 uri: using-control-surfaces/mackie-control-protocol/devices-not-listed
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: Working With Extenders
 menu_title: Working With Extenders
-include: _manual/25_using-control-surfaces/02_mackie-control-protocol/05_working-with-extenders.html
+include: working-with-extenders.html
 uri: using-control-surfaces/mackie-control-protocol/working-with-extenders
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: Generic MIDI
-include: _manual/25_using-control-surfaces/03_generic-midi.html
+include: generic-midi.html
 uri: using-control-surfaces/generic-midi
 part: chapter
 ---
 
 ---
 title: Generic MIDI Binding Maps
-include: _manual/25_using-control-surfaces/03_generic-midi/01_midi-binding-maps.html
+include: generic-midi-binding-maps.html
 uri: using-control-surfaces/generic-midi/midi-binding-maps
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: Generic MIDI Learn
-include: _manual/25_using-control-surfaces/03_generic-midi/02_midi-learn.html
+include: generic-midi-learn.html
 uri: using-control-surfaces/generic-midi/midi-learn
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: Generic MIDI and Encoders
 menu_title: Working With Encoders
-include: _manual/25_using-control-surfaces/03_generic-midi/03_working-with-encoders.html
+include: generic-midi-and-encoders.html
 uri: using-control-surfaces/generic-midi/working-with-encoders
-exclude: yes
 part: subchapter
 ---
 
 ---
 title: Using the Presonus Faderport
 menu_title: Presonus Faderport
-include: _manual/25_using-control-surfaces/04_Presonus_FaderPort.html
+include: using-the-presonus-faderport.html
 uri: using-control-surfaces/Presonus_FaderPort
-exclude: yes
 part: chapter
 ---
 
 ---
 title: Using the Ableton Push 2
 menu_title: Ableton Push 2
-include: _manual/25_using-control-surfaces/05_Ableton_Push2.html
+include: using-the-ableton-push-2.html
 uri: using-control-surfaces/Ableton_Push2
-exclude: yes
 part: chapter
 ---
 
-
 ---
 title: Scripting
 part: part
 ---
 
-
 ---
 title: Lua Scripting in Ardour
 include: lua-scripting-in-ardour.html
@@ -2129,14 +2083,16 @@ part: chapter
 
 ---
 title: Lua Scripting
-include: _manual/27_lua-scripting.html
+include: lua-scripting.html
+exclude: yes
 uri: lua-scripting
 part: subchapter
 ---
 
 ---
 title: Scripting Documentation
-include: _manual/27_lua-scripting/01_brain_dump.html
+include: scripting-documentation.html
+exclude: yes
 uri: lua-scripting/brain_dump
 part: subchapter
 ---
@@ -2144,40 +2100,34 @@ part: subchapter
 ---
 title: Class Reference
 style: luadoc
-include: _manual/27_lua-scripting/02_class_reference.html
-uri: lua-scripting/class_reference
+include: class-reference.html
 exclude: yes
+uri: lua-scripting/class_reference
 part: subchapter
 ---
 
-
 ---
 title: Appendix
 part: part
 ---
 
-
 ---
 title: List of Menu Actions
-include: _manual/28_appendix/01_menu-actions-list.html
+include: list-of-menu-actions.html
 uri: appendix/menu-actions-list
-exclude: yes
 part: chapter
 ---
 
 ---
 title: Ardour Monitor Modes
-include: _manual/28_appendix/02_monitor-modes.html
+include: ardour-monitor-modes.html
 uri: appendix/monitor-modes
-exclude: yes
 part: chapter
 ---
 
 ---
 title: Files and Directories Ardour Knows About
-include: _manual/28_appendix/03_files-and-directories.html
+include: files-and-directories-ardour-knows-about.html
 uri: appendix/files-and-directories
-exclude: yes
 part: chapter
 ---
-