wt-status.h: drop stdio.h include

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e735f1a9a092eef091aaa4c7536aecff1f2807f..7e2a6f61f593921450c311b05269a3555baa97ad 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -292,13 +292,6 @@ include::config/advice.txt[]
 
 include::config/core.txt[]
 
-extensions.worktreeConfig::
-       If set, by default "git config" reads from both "config" and
-       "config.worktree" file from GIT_DIR in that order. In
-       multiple working directory mode, "config" file is shared while
-       "config.worktree" is per-working directory (i.e., it's in
-       GIT_COMMON_DIR/worktrees/<id>/config.worktree)
-
 include::config/add.txt[]
 
 include::config/alias.txt[]
@@ -429,6 +422,8 @@ include::config/submodule.txt[]
 
 include::config/tag.txt[]
 
+include::config/trace2.txt[]
+
 include::config/transfer.txt[]
 
 include::config/uploadarchive.txt[]