u r + h

README.md

@@ -301,7 +301,7 @@ require('telekasten').setup({
     --              (default)
     --
     --     - prefer_home: put all notes in home except for goto_today(), goto_thisweek()
-    --                    except for notes/with/subdirs/in/title.
+    --                    except for notes with subdirs/in/title.
     --
     --     - same_as_current: put all new notes in the dir of the current note if
     --                        present or else in home

doc/telekasten.txt

@@ -145,6 +145,14 @@ telekasten.setup({opts})
         `filetype=telekasten`, no matter if opened by telekasten or another
         way.
 
+        Default: `true`
+
+                                   *telekasten.settings.auto_set_filetype*
+    auto_set_filetype: ~
+        If `false` (not recommended), the telekasten filetype will not be used
+        and the telekasten syntax not be loaded; markdown files will get the
+        markdown filetype.
+
         Default: `true`
 
                                                *telekasten.settings.daily*
@@ -260,8 +268,50 @@ telekasten.setup({opts})
     subdirs_in_links:~
         Include subdirs (if applicable) in generated (yanked, inserted) links.
 
+        Valid options are:
+        - `'tag'`
+        - `':tag:'`
+        - `'yaml-bare'`
+
         Default: `true`
 
+                                   *telekasten.settings.template_handling*
+    template_handling:~
+        Strategy for telekasten to pick a template when a new note is created
+        via `new_note()`, or by `follow_link()` to a non-existing note.
+
+        Valid options are:
+        - `'smart'`:     if day or week is detected in title, use daily / weekly
+                       templates, else the new note template.
+
+        - `'prefer_new_note'`: use the new note template.
+
+        - `'always_ask'`: always ask for a template via template picker.
+
+        Default: `smart`
+
+                                   *telekasten.settings.new_note_location*
+    new_note_location:~
+        Path handling for `new_note()`, `new_templated_note()`, `follow_link()`
+        to non-existing note.
+
+        Valid options are:
+        - `'smart'`: put daily-looking (date as title) into the daily folder, 
+                   weekly-looking notes into the weekly folder, all other notes
+                   into the home folder, except for notes with `sub/folders` in 
+                   the title.
+
+        - `'prefer_home'`: put all notes in home folder except for
+                         `goto_today()` and `goto_thisweek()`, and notes with 
+                         `sub/folders` in the title.
+
+        - `'same_as_current'`: put all new notes in the directory of the
+                             currently open note (where the cursor is) if 
+                             present or else into the home folder, except for 
+                             notes with `sub/folders` in the title.
+
+        Default: `smart`
+
                                                *telekasten.calendar_opts*
     -----------------------------------
     Valid keys for {opts.calendar_opts}