diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2014-08-11 17:39:42 +0200 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2014-08-11 17:39:42 +0200 |
commit | 382c26acfc62a56744ab9eb603efc56130764fd3 (patch) | |
tree | 1b7cb9d3e372481007fc4546e7d06ce5bb1bc104 /Etc | |
parent | 73508e345b4925f33b7f652aba9bd313169e5ac2 (diff) | |
parent | f8ae47f29b766dc0330b19d7fdb35859d6aab930 (diff) | |
download | zsh-382c26acfc62a56744ab9eb603efc56130764fd3.tar.gz zsh-382c26acfc62a56744ab9eb603efc56130764fd3.zip |
New upstream release candidate: Merge branch 'upstream' into debian
Diffstat (limited to 'Etc')
-rw-r--r-- | Etc/.distfiles | 4 | ||||
-rw-r--r-- | Etc/FAQ.yo | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Etc/.distfiles b/Etc/.distfiles index 2f9d7cd12..8c1218e72 100644 --- a/Etc/.distfiles +++ b/Etc/.distfiles @@ -26,3 +26,7 @@ relnote_4.3.12.txt relnote_5.0.0.txt zsh-development-guide ' + +DISTFILES_DOC=' +FAQ*.html +' diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo index 82053d003..ed703c68b 100644 --- a/Etc/FAQ.yo +++ b/Etc/FAQ.yo @@ -302,7 +302,7 @@ sect(On what machines will it run?) sect(What's the latest version?) - Zsh 5.0.5 is the latest production version. For details of all the + Zsh 5.0.6 is the latest production version. For details of all the changes, see the NEWS file in the source distribution. A beta of the next version is sometimes available. Development of zsh is |