summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-02-07 14:15:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-02-07 14:15:37 -0400
commit2dcce5a8bb1fcc2be5f844b782158406dc419221 (patch)
tree8631ab5b59478e32b622150b5032b71aeaa9347c /doc
parentb51d7de6085603599f97e7c69038328f036cd861 (diff)
merged ghc 7.4 support into master
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/problems_with_utf8_names.mdwn5
-rw-r--r--doc/download.mdwn3
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/bugs/problems_with_utf8_names.mdwn b/doc/bugs/problems_with_utf8_names.mdwn
index fbdca41cd..aeeb16be6 100644
--- a/doc/bugs/problems_with_utf8_names.mdwn
+++ b/doc/bugs/problems_with_utf8_names.mdwn
@@ -3,10 +3,9 @@ This bug is reopened to track some new UTF-8 filename issues caused by GHC
encoding no longer works. Even unicode filenames fail to work when
git-annex is built with 7.4. --[[Joey]]
-I now have a `ghc7.4` branch in git that seems to solve this,
+This bug is now fixed in current master. Once again, git-annex will work
for all filename encodings, and all system encodings. It will
-only build with the new GHC. If you have this problem, give it a try!
---[[Joey]]
+only build with the new GHC. [[done]] --[[Joey]]
----
diff --git a/doc/download.mdwn b/doc/download.mdwn
index bfde849f8..120e0a517 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -28,7 +28,8 @@ The git repository has some branches:
library.
* `tweak-fetch` adds support for the git tweak-fetch hook, which has
been proposed and implemented but not yet accepted into git.
-* `ghc7.4` is for use this that version of ghc.
+* `ghc7.0` supports versions of ghc older than 7.4, which
+ had a major change to filename encoding.
* `setup` contains configuration for this website
* `pristine-tar` contains [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
data to create tarballs of any past git-annex release.