diff --git a/API_README.md b/API_README.md index b2369253..b3fccb1e 100644 --- a/API_README.md +++ b/API_README.md @@ -2005,7 +2005,7 @@ cog.out(get_template_field_table()) |{lf}|A line feed: '\n', alias for {newline}| |{cr}|A carriage return: '\r'| |{crlf}|a carriage return + line feed: '\r\n'| -|{osxphotos_version}|The osxphotos version, e.g. '0.50.3'| +|{osxphotos_version}|The osxphotos version, e.g. '0.50.4'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/README.md b/README.md index 306c5a42..a20e4d63 100644 --- a/README.md +++ b/README.md @@ -1911,7 +1911,7 @@ Substitution Description {lf} A line feed: '\n', alias for {newline} {cr} A carriage return: '\r' {crlf} a carriage return + line feed: '\r\n' -{osxphotos_version} The osxphotos version, e.g. '0.50.3' +{osxphotos_version} The osxphotos version, e.g. '0.50.4' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -2388,7 +2388,7 @@ The following template field substitutions are availabe for use the templating s |{lf}|A line feed: '\n', alias for {newline}| |{cr}|A carriage return: '\r'| |{crlf}|a carriage return + line feed: '\r\n'| -|{osxphotos_version}|The osxphotos version, e.g. '0.50.3'| +|{osxphotos_version}|The osxphotos version, e.g. '0.50.4'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/docs/.buildinfo b/docs/.buildinfo index 62ad1773..0bd845bc 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 1c1b36a7ffe3b67a9b123c561f63270a +config: ad1b9f346384c93c414bf29025529641 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index 0adba58d..ca11c746 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.50.3 documentation + Overview: module code - osxphotos 0.50.4 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/_modules/osxphotos/personinfo.html b/docs/_modules/osxphotos/personinfo.html index 58f5b5af..4f4248a4 100644 --- a/docs/_modules/osxphotos/personinfo.html +++ b/docs/_modules/osxphotos/personinfo.html @@ -5,7 +5,7 @@ - osxphotos.personinfo - osxphotos 0.50.3 documentation + osxphotos.personinfo - osxphotos 0.50.4 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/_modules/osxphotos/photosdb/photosdb.html b/docs/_modules/osxphotos/photosdb/photosdb.html index f48da2ae..82a34c15 100644 --- a/docs/_modules/osxphotos/photosdb/photosdb.html +++ b/docs/_modules/osxphotos/photosdb/photosdb.html @@ -5,7 +5,7 @@ - osxphotos.photosdb.photosdb - osxphotos 0.50.3 documentation + osxphotos.photosdb.photosdb - osxphotos 0.50.4 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/_sources/template_help.rst.txt b/docs/_sources/template_help.rst.txt index 1f2ea2a5..08b25c0e 100644 --- a/docs/_sources/template_help.rst.txt +++ b/docs/_sources/template_help.rst.txt @@ -346,7 +346,7 @@ Template Substitutions * - {crlf} - a carriage return + line feed: '\r\n' * - {osxphotos_version} - - The osxphotos version, e.g. '0.50.3' + - The osxphotos version, e.g. '0.50.4' * - {osxphotos_cmd_line} - The full command line used to run osxphotos * - {album} diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index e9379980..42d764db 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '0.50.3', + VERSION: '0.50.4', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index 751f3b8b..256da140 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -6,7 +6,7 @@ - OSXPhotos Command Line Interface (CLI) - osxphotos 0.50.3 documentation + OSXPhotos Command Line Interface (CLI) - osxphotos 0.50.4 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/genindex.html b/docs/genindex.html index a9693c9b..73f58060 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -4,7 +4,7 @@ - Index - osxphotos 0.50.3 documentation + Index - osxphotos 0.50.4 documentation @@ -122,7 +122,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -145,7 +145,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/index.html b/docs/index.html index 39724637..7d445d4c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/overview.html b/docs/overview.html index 1ad42a06..4528eb65 100644 --- a/docs/overview.html +++ b/docs/overview.html @@ -6,7 +6,7 @@ - OSXPhotos - osxphotos 0.50.3 documentation + OSXPhotos - osxphotos 0.50.4 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/package_overview.html b/docs/package_overview.html index 31a0d50f..428b9940 100644 --- a/docs/package_overview.html +++ b/docs/package_overview.html @@ -6,7 +6,7 @@ - OSXPhotos Python Package Overview - osxphotos 0.50.3 documentation + OSXPhotos Python Package Overview - osxphotos 0.50.4 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/py-modindex.html b/docs/py-modindex.html index ab0563e5..dc2f7ee4 100644 --- a/docs/py-modindex.html +++ b/docs/py-modindex.html @@ -4,7 +4,7 @@ - Python Module Index - osxphotos 0.50.3 documentation + Python Module Index - osxphotos 0.50.4 documentation @@ -122,7 +122,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -145,7 +145,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/reference.html b/docs/reference.html index fc960863..6a8aef28 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -6,7 +6,7 @@ - OSXPhotos python API - osxphotos 0.50.3 documentation + OSXPhotos python API - osxphotos 0.50.4 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/search.html b/docs/search.html index 0f0ab4e1..a990d2f0 100644 --- a/docs/search.html +++ b/docs/search.html @@ -4,7 +4,7 @@ - Search - osxphotos 0.50.3 documentation + Search - osxphotos 0.50.4 documentation @@ -121,7 +121,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -144,7 +144,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docs/template_help.html b/docs/template_help.html index ccd1e6fa..8c3f433c 100644 --- a/docs/template_help.html +++ b/docs/template_help.html @@ -6,7 +6,7 @@ - OSXPhotos Template System - osxphotos 0.50.3 documentation + OSXPhotos Template System - osxphotos 0.50.4 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation @@ -589,7 +589,7 @@

a carriage return + line feed: ‘rn’

{osxphotos_version}

-

The osxphotos version, e.g. ‘0.50.3’

+

The osxphotos version, e.g. ‘0.50.4’

{osxphotos_cmd_line}

The full command line used to run osxphotos

diff --git a/docs/tutorial.html b/docs/tutorial.html index f073531a..76a88302 100644 --- a/docs/tutorial.html +++ b/docs/tutorial.html @@ -6,7 +6,7 @@ - OSXPhotos Tutorial - osxphotos 0.50.3 documentation + OSXPhotos Tutorial - osxphotos 0.50.4 documentation @@ -124,7 +124,7 @@
-
osxphotos 0.50.3 documentation
 +
osxphotos 0.50.4 documentation
@@ -147,7 +147,7 @@
- osxphotos 0.50.3 documentation + osxphotos 0.50.4 documentation diff --git a/docsrc/source/template_help.rst b/docsrc/source/template_help.rst index 1f2ea2a5..08b25c0e 100644 --- a/docsrc/source/template_help.rst +++ b/docsrc/source/template_help.rst @@ -346,7 +346,7 @@ Template Substitutions * - {crlf} - a carriage return + line feed: '\r\n' * - {osxphotos_version} - - The osxphotos version, e.g. '0.50.3' + - The osxphotos version, e.g. '0.50.4' * - {osxphotos_cmd_line} - The full command line used to run osxphotos * - {album} diff --git a/osxphotos/_version.py b/osxphotos/_version.py index c00f1af5..acb34601 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.50.3" +__version__ = "0.50.4" diff --git a/osxphotos/docs/docs.zip b/osxphotos/docs/docs.zip index 3c449859..e3ea3183 100644 Binary files a/osxphotos/docs/docs.zip and b/osxphotos/docs/docs.zip differ