Re-order sections.

1 files changed, 175 insertions, 131 deletions

diff --git a/runtime/tutor.txt b/runtime/tutor.txt
index c9e23ad4..8a424fe1 100644
--- a/runtime/tutor.txt
+++ b/runtime/tutor.txt
@@ -109,29 +109,7 @@ _________________________________________________________________
        Notice that when you type i, 'NOR' changes to 'INS'.
 
 =================================================================
-=                   1.5 MORE ON INSERT MODE                     =
-=================================================================
-
- As you saw, you can type i to enter Insert mode at the current
- position of the cursor. There are a few other ways you can
- enter Insert mode at different locations.
-
- Common examples of insertion commands include:
-   i - Insert before the selection.
-   a - Insert after the selection. (a means 'append')
-   I - Insert at the start of the line.
-   A - Insert at the end of the line.
-
- 1. Move to anywhere in the line below marked -->.
- 2. Type A (<SHIFT> + a), your cursor will move to the end of
-    the line and you will be able to type.
- 3. Type the text necessary to match the line below.
-
- --> This sentence is miss
-     This sentence is missing some text.
-
-=================================================================
-=                      1.6 SAVING A FILE                        =
+=                      1.5 SAVING A FILE                        =
 =================================================================
 
  Type :w/:write to save a file.
@@ -169,13 +147,79 @@ _________________________________________________________________
 
  * Type i to enter Insert mode and type text. Type <ESC> to
    return to Normal mode.
-   * Use a to enter Insert mode after the current selection.
-   * Use I to enter Insert mode at the first non-whitespace
-     character at the start of a line.
-   * Use A to enter Insert mode at the end of a line.
+
+
+
+
 
 =================================================================
-=                  2.1 MOTIONS AND SELECTIONS                   =
+=                   2.1 MORE INSERT COMMANDS                    =
+=================================================================
+
+ As you saw, you can type i to enter Insert mode at the current
+ position of the cursor. There are a few other ways you can
+ enter Insert mode at different locations.
+
+ Common examples of insertion commands include:
+   i - Insert before the selection.
+   a - Insert after the selection. (a means 'append')
+   I - Insert at the start of the line.
+   A - Insert at the end of the line.
+
+ 1. Move to anywhere in the line below marked -->.
+ 2. Type A (<SHIFT> + a), your cursor will move to the end of
+    the line and you will be able to type.
+ 3. Type the text necessary to match the line below.
+
+ --> This sentence is miss
+     This sentence is missing some text.
+
+=================================================================
+=                      2.2 OPENING LINES                        =
+=================================================================
+
+ Type o to add a newline and insert below the cursor.
+ Type O to add a newline and insert above the cursor.
+
+ 1. Move the cursor to the line below marked -->.
+ 2. Type o to open a line below and type your answer.
+
+ --> What is the best editor?
+
+
+
+
+
+
+
+
+
+
+
+=================================================================
+=                        CHAPTER 2 RECAP                        =
+=================================================================
+
+ * Type a to append to the selection.
+
+ * Type I to enter Insert mode at the first non-whitespace
+   character at the start of a line.
+
+ * Type A to enter Insert mode at the end of a line.
+
+ * Use o and O to open lines below/above the cursor respectively.
+
+
+
+
+
+
+
+
+
+
+=================================================================
+=                  3.1 MOTIONS AND SELECTIONS                   =
 =================================================================
 
  Type w to select forward until the next word.
@@ -197,7 +241,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                     2.2 MORE ON MOTIONS                       =
+=                     3.2 MORE ON MOTIONS                       =
 =================================================================
 
  As you saw, typing w moves the cursor forward until the start
@@ -219,7 +263,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                    2.3 THE CHANGE COMMAND                     =
+=                    3.3 THE CHANGE COMMAND                     =
 =================================================================
 
  Type c to change the current selection.
@@ -241,7 +285,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                   2.4 COUNTS WITH MOTIONS                     =
+=                   3.4 COUNTS WITH MOTIONS                     =
 =================================================================
 
  Type a number before a motion to repeat it that many times.
@@ -263,7 +307,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                     2.5 SELECTING LINES                       =
+=                     3.5 SELECTING LINES                       =
 =================================================================
 
  Type x to select a whole line. Type x again to select the next.
@@ -285,7 +329,29 @@ _________________________________________________________________
 
 
 =================================================================
-=                         2.6 UNDOING                           =
+=                        CHAPTER 3 RECAP                        =
+=================================================================
+
+ * Type w to select forward until the next word.
+   * Type e to select to the end of the current word.
+   * Type b to select backward to the start of the current word.
+   * Use uppercase counterparts, W,E,B, to traverse WORDS.
+
+ * Typing d deletes the entire selection, so you can delete a
+   word forward by typing wd.
+
+ * Type c to delete the selection and enter Insert mode.
+
+ * Type a number before a motion to repeat it that many times.
+
+ * Type x to select the entire current line. Type x again to
+   select the next line.
+
+
+
+
+=================================================================
+=                         4.1 UNDOING                           =
 =================================================================
 
  Type u to undo. Type U to redo.
@@ -307,29 +373,73 @@ _________________________________________________________________
 
 
 =================================================================
-=                        CHAPTER 2 RECAP                        =
+=                 4.2 COPYING AND PASTING TEXT                  =
 =================================================================
 
- * Type w to select forward until the next word.
-   * Type e to select to the end of the current word.
-   * Type b to select backward to the start of the current word.
-   * Use uppercase counterparts, W,E,B, to traverse WORDS.
+ Type y to yank (copy) the selection.
+ Type p to paste the yanked selection after the cursor.
+ Type P to paste the yanked text before the cursor.
 
- * Typing d deletes the entire selection, so you can delete a
-   word forward by typing wd.
+ 1. Move the cursor to the line below marked -->.
+    Make sure your cursor is on the "b" of banana.
+ 2. Type w to select "banana" and y to yank it.
+ 3. Move to the space between "2" and "3" and type p to paste.
+ 4. Repeat between "3" and "4".
 
- * Type c to delete the selection and enter Insert mode.
+ --> 1 banana 2 3 4
+     1 banana 2 banana 3 banana 4
 
- * Type a number before a motion to repeat it that many times.
+ Note: Whenever you delete or change text, Helix will copy the
+       altered text. Use alt-d/c instead to avoid this.
+ Note: Helix doesn't share the system clipboard by default. Type
+       space-y/p to yank/paste on your computer's main clipboard.
 
- * Type x to select the entire current line. Type x again to
-   select the next line.
+=================================================================
+=                     4.3 SEARCHING IN FILE                     =
+=================================================================
+
+ Type / to search forward in file, enter to confirm search.
+ Type n to go to the next search match.
+ Type N to go to the previous search match.
+
+ 1. Type / and type in a common word, like 'banana'.
+ 2. Type enter to confirm the search.
+ 3. Use n and N to cycle through the matches.
+
+ Like the select command, searching also uses regex.
+
+ Note: To search backwards, type ? (shift-/).
+
+ Note: Unlike Vim, N doesn't change the search direction.
+       N always goes backwards and n always goes forwards.
+
+
+
+
+=================================================================
+=                        CHAPTER 4 RECAP                        =
+=================================================================
 
  * Type u to undo. Type U to redo.
 
+ * Type y to yank (copy) text and p to paste.
+   * Use space-Y and space-P to yank/paste on the system
+     clipboard.
+
+ * Type / to search forward in file, and ? to search backwards.
+   * Use n and N to cycle through search matches.
+
+
+
+
+
+
+
+
+
 
 =================================================================
-=                     3.1 MULTIPLE CURSORS                      =
+=                     5.1 MULTIPLE CURSORS                      =
 =================================================================
 
  Type C to duplicate the cursor to the next suitable line.
@@ -351,7 +461,7 @@ _________________________________________________________________
  Note: Type alt-C to do the same above the cursor.
 
 =================================================================
-=                    3.2 THE SELECT COMMAND                     =
+=                    5.2 THE SELECT COMMAND                     =
 =================================================================
 
  Type s to select matches in the selection.
@@ -373,7 +483,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                    3.3 SELECTING VIA REGEX                    =
+=                    5.3 SELECTING VIA REGEX                    =
 =================================================================
 
  The select command selects regular expressions, not just exact
@@ -395,7 +505,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                   3.4 COLLAPSING SELECTIONS                   =
+=                   5.4 COLLAPSING SELECTIONS                   =
 =================================================================
 
  Type ; to collapse selections to single cursors.
@@ -417,7 +527,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                 3.5 SELECTING TO A CHARACTER                  =
+=                 5.5 SELECTING TO A CHARACTER                  =
 =================================================================
 
  Type f<ch> to select up to and including (find) a character.
@@ -439,7 +549,7 @@ _________________________________________________________________
        current line. It searches for the character in the file.
 
 =================================================================
-=                        CHAPTER 3 RECAP                        =
+=                        CHAPTER 5 RECAP                        =
 =================================================================
 
  * Type C to copy the current selection to below and Alt-C for
@@ -461,29 +571,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                 4.1 COPYING AND PASTING TEXT                  =
-=================================================================
-
- Type y to yank (copy) the selection.
- Type p to paste the yanked selection after the cursor.
- Type P to paste the yanked text before the cursor.
-
- 1. Move the cursor to the line below marked -->.
-    Make sure your cursor is on the "b" of banana.
- 2. Type w to select "banana" and y to yank it.
- 3. Move to the space between "2" and "3" and type p to paste.
- 4. Repeat between "3" and "4".
-
- --> 1 banana 2 3 4
-     1 banana 2 banana 3 banana 4
-
- Note: Whenever you delete or change text, Helix will copy the
-       altered text. Use alt-d/c instead to avoid this.
- Note: Helix doesn't share the system clipboard by default. Type
-       space-y/p to yank/paste on your computer's main clipboard.
-
-=================================================================
-=                     4.2 CHANGING CASE                         =
+=                     6.2 CHANGING CASE                         =
 =================================================================
 
  Type ~ to switch the case of all selected letters.
@@ -505,7 +593,7 @@ _________________________________________________________________
  --> THIS sentence should ALL BE IN uppercase!
 
 =================================================================
-=                          4.3 MACROS                           =
+=                          6.3 MACROS                           =
 =================================================================
 
  Macros are a way to record a set of actions you want to repeat.
@@ -527,13 +615,9 @@ _________________________________________________________________
      This sentence doesn't have it's first and last word.
 
 =================================================================
-=                        CHAPTER 4 RECAP                        =
+=                        CHAPTER 6 RECAP                        =
 =================================================================
 
- * Type y to yank (copy) text and p to paste.
-   * Type space-Y and space-P to yank/paste on the system
-     clipboard.
-
  * Type ~ to alternate case of selected letters.
    * Use ` and alt-` to set the case of selected layers to
      upper and lower respectively.
@@ -548,8 +632,12 @@ _________________________________________________________________
 
 
 
+
+
+
+
 =================================================================
-=                    5.1 USING THE JUMPLIST                     =
+=                    7.1 USING THE JUMPLIST                     =
 =================================================================
 
  Helix can keep track of "jumps" which are big movements, like
@@ -571,36 +659,14 @@ _________________________________________________________________
 
 
 =================================================================
-=                     5.2 SEARCHING IN FILE                     =
-=================================================================
-
- Type / to search forward in file, enter to confirm search.
- Type n to go to the next search match.
- Type N to go to the previous search match.
-
- 1. Type / and type in a common word, like 'banana'.
- 2. Type enter to confirm the search.
- 3. Use n and N to cycle through the matches.
-
- Like the select command, searching also uses regex.
-
- Note: To search backwards, type ? (shift-/).
-
- Note: Unlike Vim, N doesn't change the search direction.
-       N always goes backwards and n always goes forwards.
-
-
-
-
-=================================================================
-=                        CHAPTER 5 RECAP                        =
+=                        CHAPTER 7 RECAP                        =
 =================================================================
 
  * Type C-s to save position to the jumplist.
    * Type C-i and C-o to go forward and backward in the jumplist.
 
- * Type / to search forward in file, and ? to search backwards.
-   * Use n and N to cycle through search matches.
+
+
 
 
 
@@ -615,7 +681,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                       6.1 JOINING LINES                       =
+=                       8.1 JOINING LINES                       =
 =================================================================
 
  Type J to join together lines in selection.
@@ -637,7 +703,7 @@ lines.
 
 
 =================================================================
-=                      6.2 INDENTING LINES                      =
+=                      8.2 INDENTING LINES                      =
 =================================================================
 
  Type > to indent a line and < to outdent it.
@@ -659,36 +725,14 @@ lines.
 
 
 =================================================================
-=                      6.3 OPENING LINES                        =
-=================================================================
-
- Type o to add a newline and insert below the cursor.
- Type O to add a newline and insert above the cursor.
-
- 1. Move the cursor to the line below marked -->.
- 2. Type o to open a line below and type your answer.
-
- --> What is the best editor?
-
-
-
-
-
-
-
-
-
-
-
-=================================================================
-=                        CHAPTER 6 RECAP                        =
+=                        CHAPTER 8 RECAP                        =
 =================================================================
 
  * Type J to join lines within selection.
 
  * Type > and < to indent and outdent selected lines.
 
- * Use o and O to open lines.
+