5 files changed, 13 insertions, 11 deletions

diff --git a/doc/bugs/direct_command_leaves_repository_inconsistent_if_interrupted.mdwn b/doc/bugs/direct_command_leaves_repository_inconsistent_if_interrupted.mdwn
index 0d81c6778..c19db9727 100644
--- a/doc/bugs/direct_command_leaves_repository_inconsistent_if_interrupted.mdwn
+++ b/doc/bugs/direct_command_leaves_repository_inconsistent_if_interrupted.mdwn
@@ -41,3 +41,5 @@ Similar issues and discussions:
 * [[forum/Cleaning_up_after_aborted_sync_in_direct_mode/]]
 * [[bugs/failure_to_return_to_indirect_mode_on_usb/]]
 * [[forum/git-status_typechange_in_direct_mode/]]
+
+[[!meta title="git annex lock --force deletes only copy of content after interrupted switch to direct mode"]
diff --git a/doc/devblog/day_216__various_minor_bugs.mdwn b/doc/devblog/day_216__various_minor_bugs.mdwn
index 329b32933..0531ddb04 100644
--- a/doc/devblog/day_216__various_minor_bugs.mdwn
+++ b/doc/devblog/day_216__various_minor_bugs.mdwn
@@ -1,8 +1,8 @@
 Working on getting caught up with backlog. 73 messages remain.
 
 Several minor bugs were fixed today. All edge cases. The most edge case one
-of all, I could not fix: git-annex cannot add a file that has a space in its
-filename, because `git cat-file --batch`'s interface does not support such
+of all, I could not fix: git-annex cannot add a file that has a space^Wnewline
+in its filename, because `git cat-file --batch`'s interface does not support such
 filenames.
 
 Added a page [[documenting how verify the signatures of git-annex releases|install/verifying_downloads]].
diff --git a/doc/install.mdwn b/doc/install.mdwn
index f149b4fae..0d8bb1d1e 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -16,7 +16,7 @@ detailed instructions             | quick install
   [[ScientificLinux5]]  |
   [[openSUSE]]          | 
   [[Docker]]            | 
-[[Windows]]                       | [download installer](http://downloads.kitenet.net/git-annex/windows/current/) **alpha**
+[[Windows]]                       | [download installer](http://downloads.kitenet.net/git-annex/windows/current/) **beta**
 """]]
 
 All the downloads above use https for security. For added security, see
diff --git a/doc/install/Linux_standalone.mdwn b/doc/install/Linux_standalone.mdwn
index 4e654febc..f7aca5b9a 100644
--- a/doc/install/Linux_standalone.mdwn
+++ b/doc/install/Linux_standalone.mdwn
@@ -5,9 +5,9 @@ prebuilt tarball of the most recent release.
 This tarball should work on most Linux systems. It has basically no
 dependencies and is self-contained.
 
-* i386: [download tarball](https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-i386.tar.gz)
-* amd64: [download tarball](https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz)
-* armel: [download tarball](https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-armel.tar.gz)
+* x86-32: [download tarball](https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-i386.tar.gz)
+* x86-64: [download tarball](https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz)
+* arm: [download tarball](https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-armel.tar.gz)
 
 To use, just unpack the tarball, `cd git-annex.linux` and run `./runshell`
 -- this sets up an environment where you can use `git annex`, as well
@@ -18,7 +18,7 @@ Alternatively, you can unpack the tarball, and add the directory to your
 PATH. This lets you use `git annex`, without overriding your system's
 own versions of git, etc.
 
-The armel version can be installed on NAS devices and other embedded ARM
+The arm version can be installed on NAS devices and other embedded ARM
 linux systems.
 
 * [[tips/Synology_NAS_and_git_annex]]
@@ -29,6 +29,6 @@ linux systems.
 A daily build is also available, thanks to Mesar Hameed and the University
 of Bath CS department.
 
-* i386: [download tarball](https://downloads.kitenet.net/git-annex/autobuild/i386/git-annex-standalone-i386.tar.gz) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/i386/))
-* amd64: [download tarball](https://downloads.kitenet.net/git-annex/autobuild/amd64/git-annex-standalone-amd64.tar.gz) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/amd64/))
-* armel: [download tarball](https://downloads.kitenet.net/git-annex/autobuild/armel/git-annex-standalone-armel.tar.gz) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/armel/))
+* x86-32: [download tarball](https://downloads.kitenet.net/git-annex/autobuild/i386/git-annex-standalone-i386.tar.gz) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/i386/))
+* x86-64: [download tarball](https://downloads.kitenet.net/git-annex/autobuild/amd64/git-annex-standalone-amd64.tar.gz) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/amd64/))
+* arm: [download tarball](https://downloads.kitenet.net/git-annex/autobuild/armel/git-annex-standalone-armel.tar.gz) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/armel/))
diff --git a/doc/special_remotes/gcrypt.mdwn b/doc/special_remotes/gcrypt.mdwn
index c9a22b01a..d5f3f7b5b 100644
--- a/doc/special_remotes/gcrypt.mdwn
+++ b/doc/special_remotes/gcrypt.mdwn
@@ -46,7 +46,7 @@ force it to re-push everything again, so that the encrypted repository can
 be decrypted by the added keys. Probably this can be done by setting
 `GCRYPT_FULL_REPACK` and doing a forced push of branches.
 
-Recent versions of git-annex configure gcrypt-publish-participants when
+Recent versions of git-annex configure `remote.<name>`gcrypt-publish-participants` when
 setting up a gcrypt repository. This is done to avoid unncessary gpg
 passphrase prompts, but it does publish the gpg keyids that can decrypt the
 repository. Unset it if you need to obscure that.