Merge branch 'master' of ssh://git-annex.branchable.com

doc/metadata.mdwn

@@ -12,7 +12,7 @@ Some of the things you can do with metadata include:
   or without particular metadata.
   For example `git annex find --metadata tag=foo --or --metadata tag=bar`
 * Using it in [[preferred_content]] expressions. 
-  For example "tag=important or not author=me"
+  For example "metadata=tag=important or not metadata=author=me"
 
 Each file (actually the underlying key) can have any number of metadata
 fields, which each can have any number of values. For example, to tag

doc/preferred_content.mdwn

@@ -144,6 +144,16 @@ Or, you could make a new group, with your own custom preferred content
 expression tuned for your needs, and every repository you put in this
 group and make its preferred content be "groupwanted" will use it.
 
+### difference: metadata matching
+
+This:
+
+	git annex get --metadata tag=done
+
+becomes
+
+	metadata=tag=done
+
 ## upgrades
 
 It's important that all clones of a repository can understand one-another's

doc/special_remotes/comment_22_6b94018c5e28555b0c931da58cac40b9._comment

@@ -1,25 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawl64jV2rE8GMogJ6XuqESSkz78RVBgVdGw"
- nickname="Mesut"
- subject="I can't add special remotes"
- date="2014-04-07T11:29:28Z"
- content="""
-Hi,
-
-I am new to git-annex. 
-
-I want to add glacier remote but when I run below command I am waiting but not happening anything.
-
-
-`````
-$ git annex initremote glacier type=glacier keyid=51764191 datacenter=eu-west-1 
-
-initremote glacier (encryption setup)
-`````
-
-I tried to add google drive as remote but same thing happening.
-
-What I am doing wrong?
-
-Should I add glacier support to git-annex before adding as remote? How?
-"""]]