From: keni <keni@his.com>
Date: Tue, 31 Mar 2015 16:29:58 +0000 (-0400)
Subject: Update docs for NHDT V2.
X-Git-Tag: NetHack-3.6.0_RC01~497
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdd49dde86f935dbade9dffa633655357850cc48;p=nethack

Update docs for NHDT V2.
---

diff --git a/DEVEL/Developer.txt b/DEVEL/Developer.txt
index 5e9e76356..49cebe12f 100644
--- a/DEVEL/Developer.txt
+++ b/DEVEL/Developer.txt
@@ -136,9 +136,9 @@ B. Enabling variable expansion
    Variable expansion is controlled by the .gitattributes file.
 
    To enable variable expansion:
-        pattern filter=NHtext merge=NHsubst
+        pattern NHSUBST
    To disable variable expansion:
-	pattern -filter
+	pattern -NHSUBST
 
    More information: "git help gitattributes"
 
@@ -147,8 +147,8 @@ C. Oddities
    instead of "git add" or "git commit."  Nothing terrible will happen if you
    use the wrong one, but the values will not be updated.
 
-   Due to the way this abuses git filters, the updated values are not visible
-   in your working tree.
+   Variable expansion modifies the files in the work tree - your editor or
+   IDE may or may not be happy with this.
 
 D. Using your own hooks
    You can use your own hooks - put them in .git/hooks as usual BUT name them
diff --git a/DEVEL/git_recipes.txt b/DEVEL/git_recipes.txt
index 5e8d872f9..1a2ec0acf 100644
--- a/DEVEL/git_recipes.txt
+++ b/DEVEL/git_recipes.txt
@@ -42,9 +42,12 @@ you specify:
 
 Adds the changes you've made in (filename) to the pre-commit staging area.
 (also referred to as the 'index')
+ OR
+Make a new file be tracked by git.
 
 "nhadd" is the preferred syntax and will automatically update the source file
-headers with the latest date, branch, and version.
+headers with the latest date, branch, and version.  See Developer.txt for
+details.
 
 
 [*] git commit [-a] [-m "text"]
@@ -57,7 +60,8 @@ Including -m will use "text" as the commit message instead of opening an
 editor window for you to create one.
 
 "nhcommit" is the preferred syntax and will automatically update the source file
-headers with the latest date, branch, and version.
+headers with the latest date, branch, and version.  See Developer.txt for
+details.
 
 
 [*] git push [--all] [-u origin (branch)]