From 7a63f51ee0014a4220ddd7b845f755502fbb225e Mon Sep 17 00:00:00 2001 From: "Steffen \"Daode\" Nurpmeso" Date: Sat, 6 Oct 2012 23:09:43 +0200 Subject: [PATCH] README: tarball download, change branch description --- README | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/README b/README index 277e9cf9..f8463253 100644 --- a/README +++ b/README @@ -3,34 +3,32 @@ Welcome to S-nail S-nail(1) is a fork of Heirloom mailx(1), formerly known as nail(1). It was forked from Heirloom mailx 12.5 on 2012-05-08. -S-nail is only a git(1) repository on git.code.sf.net/p/s-nail/code (or -browse it at http://sourceforge.net/p/s-nail/code/), anything else is -supposed to live on nail-devel@lists.sourceforge.net. + +S-nail is only a git(1) repository on + git.code.sf.net/p/s-nail/code +(or browse it at + http://sourceforge.net/p/s-nail/code/ +) and a release tarball to be downloaded from + http://internode.dl.sourceforge.net/sourceforge/s-nail/s-nail.tar.gz. + +Mail contact is supposed to live on nail-devel@lists.sourceforge.net. + The git(1) repository consists of three branches: +- master: rooted on top of *heirloom*, this adapts Heirloom mailx(1) as + S-nail(1). It thus changes the name and Makefile stuff and adds some + changes that i don't think will ever go into Heirloom mailx(1). + - heirloom: a full git(1) cvsimport of the Heirloom mailx(1) cvs(1) repository. - heirloom-plus: rooted on top of *heirloom*, this branch contains patches that i or others have send to nail-devel@ and that i've integrated into the code. - These are patches that i think would be integrated by Gunnar Ritter - into plain Heirloom mailx(1). Sometimes i may be mistaken here. - -- master: rooted on top of *heirloom*, this adapts Heirloom mailx(1) as - S-nail(1). It thus changes the name and Makefile stuff and adds some - changes that i don't think will ever go into Heirloom mailx(1). - Besides these *master* and *heirloom-plus* are somewhat identical. - -Note: -when i write "on top" above i mean just that. Should Gunnar Ritter ever -continue his work on Heirloom mailx(1) it is planned that the branches -are rebased on top of that work again. This is at least the plan. -Should the changes be too drastical it may happen that no real rebasing -occurs but only cherry-picking. But still it has to be expected that -git(1) SHA1 commit hashes change due to tree rebasing "on top" of work -that is integrated deeper in the tree! + Note that due to heavy diverging of code maintenance of this branch + will be restricted to really security critical bugs. +[Heirloom file content follows] Welcome to Heirloom mailx! ========================== -- 2.11.4.GIT