Merge pull request #437 from untergeek/docs_201507131248

Update docs with latest changes
elastic · Jul 14, 2015 · ce95acd · ce95acd
2 parents 731eed2 + f83cfab
commit ce95acd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/Changelog.rst b/Changelog.rst
@@ -3,6 +3,9 @@
 Changelog
 =========
 
+3.3.0 (? ? ?)
+-------------
+
 3.2.2 (13 July 2015)
 --------------------
 

diff --git a/curator/_version.py b/curator/_version.py
@@ -1 +1 @@
-__version__ = '3.2.2'
+__version__ = '3.3.0.dev2'
diff --git a/docs/asciidoc/flags/timestring.asciidoc b/docs/asciidoc/flags/timestring.asciidoc
@@ -36,3 +36,6 @@ Show indices older than 30 days matching the `--timestring` `%Y%m%d`:
 -------------------------------------------------------------------------
 curator show indices --older-than 30 --time-unit days --timestring %Y%m%d
 -------------------------------------------------------------------------
+
+TIP: See the <<escape-percent,FAQ>> for information about escaping the `%`
+symbol in systemd setups.
diff --git a/docs/asciidoc/misc/faq.asciidoc b/docs/asciidoc/misc/faq.asciidoc
@@ -227,3 +227,16 @@ timeout.  Another potential resolution would be to have Curator connect to a
 client directly, rather than through a load balancer or proxy.
 
 '''''
+
+[[escape-percent]]
+== Q: How do I escape the `%` in the `--timestring` for use with systemd?
+
+[float]
+A: A double percent, `%%`, fixes the problem.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As seen here: https://discuss.elastic.co/t/curator-how-to-escape-characters-of-timestring-in-systemd/25222/2
+
+    --timestring '%%Y.%%m.%%d'
+
+'''''