img: use presence dependency when linking to a page

[git.ikiwiki.info.git] / IkiWiki / Plugin / amazon_s3.pm

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index 0482178eab3e4e5b61f2a2217722f53e79c70d61..3571c4189e43fe5b70e1032832a6978cded1af6b 100644 (file)
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -63,7 +63,7 @@ sub getsetup () {
                amazon_s3_bucket => {
                        type => "string",
                        example => "mywiki",
                amazon_s3_bucket => {
                        type => "string",
                        example => "mywiki",

-                       description => "globally unique name of bucket to store wiki into",
+                       description => "globally unique name of bucket to store wiki in",

                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },


@@ -133,7 +133,7 @@ sub getbucket {
        }
 
        if (! $bucket) {
        }
 
        if (! $bucket) {

-               error(gettext("Failed to create bucket inside S3: ").
+               error(gettext("Failed to create S3 bucket: ").

                        $s3->err.": ".$s3->errstr."\n");
        }
 
                        $s3->err.": ".$s3->errstr."\n");
        }
 


@@ -218,7 +218,7 @@ sub writefile ($$$;$$) {
                                }
                        }
                        if (! $res) {
                                }
                        }
                        if (! $res) {

-                               error(gettext("Failed to save file into S3: ").
+                               error(gettext("Failed to save file to S3: ").

                                        $bucket->err.": ".$bucket->errstr."\n");
                        }
                }
                                        $bucket->err.": ".$bucket->errstr."\n");
                        }
                }


@@ -240,7 +240,7 @@ sub prune ($) {
                foreach my $key (@keys) {
                        my $res=$bucket->delete_key($key);
                        if (! $res) {
                foreach my $key (@keys) {
                        my $res=$bucket->delete_key($key);
                        if (! $res) {

-                               error(gettext("Failed to delete file inside S3: ").
+                               error(gettext("Failed to delete file from S3: ").

                                        $bucket->err.": ".$bucket->errstr."\n");
                        }
                }
                                        $bucket->err.": ".$bucket->errstr."\n");
                        }
                }