Browse code

add expire and excludes examples to the manpage

Matt Domsch authored on 2014/03/16 14:20:44
Showing 2 changed files
... ...
@@ -172,6 +172,16 @@ about matching file names against exclude and include rules.
172 172
 For example to exclude all files with \".jpg\" extension except those beginning with a number use:
173 173
 .PP
174 174
 	\\-\\-exclude '*.jpg' \\-\\-rinclude '[0-9].*\\.jpg'
175
+.PP
176
+To exclude all files except \"*.jpg\" extension, use:
177
+.PP
178
+	\\-\\-exclude '*' \\-\\-include '*.jpg'
179
+.PP
180
+To exclude local directory 'somedir', be sure to use a trailing forward slash, as such:
181
+.PP
182
+	\\-\\-exclude 'somedir/'
183
+.PP
184
+
175 185
 .SH SEE ALSO
176 186
 For the most up to date list of options run 
177 187
 .B s3cmd \\-\\-help
... ...
@@ -90,6 +90,9 @@ Sign an S3 URL to provide limited public access with expiry
90 90
 .TP
91 91
 s3cmd \fBfixbucket\fR \fIs3://BUCKET[/PREFIX]\fR
92 92
 Fix invalid file names in a bucket
93
+.TP
94
+s3cmd \fBexpire\fR \fIs3://BUCKET\fR
95
+Set or delete expiration rule for the bucket
93 96
 
94 97
 
95 98
 .PP
... ...
@@ -381,6 +384,20 @@ Name of index-document (only for [ws-create] command)
381 381
 \fB\-\-ws\-error\fR=WEBSITE_ERROR
382 382
 Name of error-document (only for [ws-create] command)
383 383
 .TP
384
+\fB\-\-expiry\-date\fR=EXPIRY_DATE
385
+Indicates when the expiration rule take effect. (only
386
+for [expire] comman)
387
+.TP
388
+\fB\-\-expiry\-days\fR=EXPIRY_DAYS
389
+Indicates the number of days after object creation the
390
+expiration rule take effect. (only for [expire]
391
+command)
392
+.TP
393
+\fB\-\-expiry\-prefix\fR=EXPIRY_PREFIX
394
+Identifying one or more objects with the prefix to
395
+which the expiration rule applies. (only for [expire]
396
+command)
397
+.TP
384 398
 \fB\-\-progress\fR
385 399
 Display progress meter (default on TTY).
386 400
 .TP
... ...
@@ -520,6 +537,16 @@ about matching file names against exclude and include rules.
520 520
 For example to exclude all files with ".jpg" extension except those beginning with a number use:
521 521
 .PP
522 522
 	\-\-exclude '*.jpg' \-\-rinclude '[0-9].*\.jpg'
523
+.PP
524
+To exclude all files except "*.jpg" extension, use:
525
+.PP
526
+	\-\-exclude '*' \-\-include '*.jpg'
527
+.PP
528
+To exclude local directory 'somedir', be sure to use a trailing forward slash, as such:
529
+.PP
530
+	\-\-exclude 'somedir/'
531
+.PP
532
+
523 533
 .SH SEE ALSO
524 534
 For the most up to date list of options run 
525 535
 .B s3cmd \-\-help