diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Etc/zsh-development-guide | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 0ae88be25..7ae9476ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2012-12-17 Phil Pennock <pdpennock@users.sourceforge.net> - * 30901: Etc/zsh-development-guide: document git usage + * 30901, 30906: Etc/zsh-development-guide: document git usage, + update patch descriptions, mention editorconfig. 2012-12-16 Peter Stephenson <p.w.stephenson@ntlworld.com> @@ -387,5 +388,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5772 $ +* $Revision: 1.5773 $ ***************************************************** diff --git a/Etc/zsh-development-guide b/Etc/zsh-development-guide index 201dda93a..9546f284a 100644 --- a/Etc/zsh-development-guide +++ b/Etc/zsh-development-guide @@ -39,7 +39,7 @@ Patches intelligently. Please make sure the filenames in the diff header are relative to the top-level directory of the zsh distribution; for example, it should say "Src/init.c" rather than "init.c" or - "zsh/Src/init.c". + "zsh/Src/init.c". Git-style naming of diffs is also acceptable. * Please put only one bug fix or feature enhancement in a single patch and only one patch per mail message. This helps me to multiplex the many @@ -52,9 +52,8 @@ Patches * Please test your patch and make sure it applies cleanly. It takes considerably more time to manually merge a patch into the baseline code. -* There is now a zsh patch archive. To have your patches appear in the - archive, send them to the mailing list with a Subject: line starting - with "PATCH:". +* By convention, patches should be sent with a Subject: line starting with + one of "PATCH:", "[PATCH]" or "[PATCH n/m]" (for a patch series). Testing ------- @@ -167,6 +166,11 @@ C coding style also #include other system headers. It *must not* #include any other module's headers or any other .pro files. +* The repository includes a `.editorconfig' file with whitespace/indent + control settings. Information about text editor plugins and this file + can be found at <http://editorconfig.org/>. + + Modules ------- |