summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-06-19 14:22:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-06-19 14:22:21 -0400
commitae1686e3bfab9a79dcfa3298bff9ed0be5c1f8df (patch)
tree9f163626b2021b90cb90cd7d3e5da86c04a477b8 /doc
parentac2adad70182ea90cd14a0bb9dd28d6a2f54d1ef (diff)
parentb67d688e0aa82b20d658c533f9ec210d30dbeca7 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
-rw-r--r--doc/devblog/day_187__release_prep/comment_1_206692d16177c2a9ca11c0eeff545697._comment13
-rw-r--r--doc/forum/How_to_make_a_server_store_the_files.mdwn1
-rw-r--r--doc/install/fromscratch/comment_1_9d085e460553fa045999ab7cb945cdec._comment13
3 files changed, 27 insertions, 0 deletions
diff --git a/doc/devblog/day_187__release_prep/comment_1_206692d16177c2a9ca11c0eeff545697._comment b/doc/devblog/day_187__release_prep/comment_1_206692d16177c2a9ca11c0eeff545697._comment
new file mode 100644
index 000000000..a9e982a21
--- /dev/null
+++ b/doc/devblog/day_187__release_prep/comment_1_206692d16177c2a9ca11c0eeff545697._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlnoH5btjn_BLib3_IhES5uMhrzuOiwCYo"
+ nickname="AndrĂ¡s"
+ subject="sync options?"
+ date="2014-06-19T13:16:51Z"
+ content="""
+What options will we have in this beta for windows <=> windows (local network) and windows <=> linux (remote server) synchronization? I'm interested only in non-cloud sync possibilities.
+
+(I tried to follow the developments but apparently failed...)
+
+Also thank you for working on the windows port!
+
+"""]]
diff --git a/doc/forum/How_to_make_a_server_store_the_files.mdwn b/doc/forum/How_to_make_a_server_store_the_files.mdwn
new file mode 100644
index 000000000..1af29381f
--- /dev/null
+++ b/doc/forum/How_to_make_a_server_store_the_files.mdwn
@@ -0,0 +1 @@
+How can I make one of my servers keep a copy of the files on the server, so I can easily SFTP in and download the files. I don't want to see the .git folder, I want to see the files synced there.
diff --git a/doc/install/fromscratch/comment_1_9d085e460553fa045999ab7cb945cdec._comment b/doc/install/fromscratch/comment_1_9d085e460553fa045999ab7cb945cdec._comment
new file mode 100644
index 000000000..1b68d0f8c
--- /dev/null
+++ b/doc/install/fromscratch/comment_1_9d085e460553fa045999ab7cb945cdec._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="azul"
+ ip="91.36.153.149"
+ subject="cabal fails to resolve dependencies"
+ date="2014-06-19T08:49:05Z"
+ content="""
+I tried this on ubuntu 14.04 without any previous haskell installs and cabal failed to resolve the dependencies:
+
+rejecting: optparse-applicative-0.9.0 (conflict: hjsmin =>
+optparse-applicative>=0.7 && <0.9)
+
+[full log](paste.debian.net/105771/)
+"""]]