Merge branch 'master' into windows

2 files changed, 37 insertions, 7 deletions

diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn
index 788f3b27d..249dccafa 100644
--- a/doc/install/Windows.mdwn
+++ b/doc/install/Windows.mdwn
@@ -1,10 +1,26 @@
-git-annex has recently been ported to Windows.
+git-annex has recently been ported to Windows!
 
-This port is in an alpha state; many things will not work. See
-[[todo/windows_support]] for current status. Note especially that
-git-annex always uses [[direct_mode]] on Windows.
+* First, [install git](http://git-scm.com/downloads)
+* Then, [install git-annex](http://downloads.kitenet.net/git-annex/windows/current/)
+
+This port is in an early state. While it works well enough to use
+git-annex, many things will not work. See [[todo/windows_support]] for
+current status. Note especially that git-annex always uses [[direct_mode]]
+on Windows.
+
+## building it yourself
 
 To build git-annex from source on Windows, you need to install
-the Haskell Platform and Cygwin. When installing Cygwin, select
-to install gcc, make, rsync, and ssh. Then, within Cygwin, git-annex
-can be compiled following the instructions for [[using cabal|cabal]].
+the Haskell Platform and Cygwin. Use Cygwin to install gcc, rsync, git,
+ssh, and gpg.
+
+Then, within Cygwin, git-annex can be compiled following the instructions
+for [[using cabal|cabal]].
+
+Once git-annex is built, the NullSoft installer can be built, as follows:
+
+<pre>
+	cabal install ncis
+	ghc --make Build/NullSoftInstaller.hs
+	Build/NullSoftInstaller.exe
+</pre>
diff --git a/doc/install/Windows/comment_1_77e6b1023fee32277f1890def86b0106._comment b/doc/install/Windows/comment_1_77e6b1023fee32277f1890def86b0106._comment
new file mode 100644
index 000000000..aa78d28ca
--- /dev/null
+++ b/doc/install/Windows/comment_1_77e6b1023fee32277f1890def86b0106._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM"
+ nickname="Bruno"
+ subject="comment 1"
+ date="2013-05-15T18:29:19Z"
+ content="""
+Did you have any problem installing unix-2.6.0.1?
+
+I got :
+
+    cabal.exe: Missing dependencies on foreign libraries:
+    * Missing (or bad) header file: HsUnix.h
+    * Missing C libraries: rt, dl
+"""]]