19688: Set label so subwf isn't displayed as "step"

[arvados.git] / doc / architecture / keep-data-lifecycle.html.textile.liquid

diff --git a/doc/architecture/keep-data-lifecycle.html.textile.liquid b/doc/architecture/keep-data-lifecycle.html.textile.liquid
index c86e63c47b129d7982584c8dc6bcf0e7845ced71..e3253277cba658e289db45e8a86b95e1795c3a2e 100644 (file)
--- a/doc/architecture/keep-data-lifecycle.html.textile.liquid
+++ b/doc/architecture/keep-data-lifecycle.html.textile.liquid
@@ -24,7 +24,9 @@ The nominal state is *persisted* which means the data can be can be accessed nor
 
 A collection is *expiring* when it has a *trash_at* time in the future. An expiring collection can be accessed as normal, but is scheduled to be trashed automatically at the *trash_at* time.
 
-A collection is *trashed* when it has a *trash_at* time in the past. The *is_trashed* attribute will also be "true". The delete operation immediately puts the collection in the trash by setting the *trash_at* time to "now". Once trashed, the collection is no longer readable through normal data access APIs. The collection will have *delete_at* set to some time in the future. The trashed collection is recoverable until the delete_at time passes, at which point the collection is permanently deleted.
+A collection is *trashed* when it has a *trash_at* time in the past. The *is_trashed* attribute will also be "true". The delete operation immediately puts the collection in the trash by setting the *trash_at* time to "now", and *delete_at* defaults to "now" + @Collections.DefaultTrashLifetime@. Once trashed, the collection is no longer readable through normal data access APIs. The collection will have *delete_at* set to some time in the future. The trashed collection is recoverable until the *delete_at* time passes, at which point the collection is permanently deleted.
+
+See "Recovering trashed collections":{{ site.baseurl }}/user/tutorials/tutorial-keep-collection-lifecycle.html#trash-recovery for instructions to recover trashed collections.
 
 h3(#collection_attributes). Collection lifecycle attributes
 
@@ -34,7 +36,7 @@ table(table table-bordered table-condensed).
 |_. collection state|_. is_trashed|_. trash_at|_. delete_at|_. get|_. list|_. list?include_trash=true|_. can be modified|
 |persisted collection|false |null |null |yes |yes |yes |yes |
 |expiring collection|false |future |future |yes  |yes |yes |yes |
-|trashed collection|true |past |future |no |no |yes |only is_trashed, trash_at and delete_at attribtues|
+|trashed collection|true |past |future |no |no |yes |only is_trashed, trash_at and delete_at attributes|
 |deleted collection|true|past |past |no |no |no |no |
 
 h2(#block_lifecycle). Block lifecycle