diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-13 15:24:59 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-13 15:24:59 -0400 |
| commit | 1d09e8b4f1be938a3415329f4fd93e4f6936b16a (patch) | |
| tree | b14feac978e2bbd2eb9f79a81ce220cf51356f76 /docs/source/siteadmin | |
| parent | b5dd2459893fd1e7ae1376a7573a36bf15c983f7 (diff) | |
| parent | cc7c9091acf4103d5a0e9a910eeb07bfb01b2916 (diff) | |
| download | mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.lz mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.xz mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata
Conflicts:
mediagoblin/gmg_commands/__init__.py
Diffstat (limited to 'docs/source/siteadmin')
| -rw-r--r-- | docs/source/siteadmin/commandline-upload.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/source/siteadmin/commandline-upload.rst b/docs/source/siteadmin/commandline-upload.rst index d67c19dd..742c0cb2 100644 --- a/docs/source/siteadmin/commandline-upload.rst +++ b/docs/source/siteadmin/commandline-upload.rst @@ -63,16 +63,16 @@ The csv file ============ The media:location column ------------------------- -The media:location column is the one column that is absolutely necessary for +The media:location column is the one column that is absolutely necessary for uploading your media. This gives a path to each piece of media you upload. This -can either a path to a local file or a direct link to remote media (with the +can either a path to a local file or a direct link to remote media (with the link in http format). As you can see in the example above the (fake) media was stored remotely on "www.example.net". Other columns ------------- Other columns can be used to provide detailed metadata about each media entry. -Our metadata system accepts any information provided for in the +Our metadata system accepts any information provided for in the `RDFa Core Initial Context`_, and the batchupload script recognizes all of the resources provided within it. @@ -89,4 +89,4 @@ information of uploaded media entries. - **dc:description** sets a description of your media entry. If this is left blank the media entry's description will not be filled in. - **dc:rights** will set a license for your media entry `if` the data provided is a valid URI. If this is left blank 'All Rights Reserved' will be selected. -You can of course, change these values later. +You can of course, change these values later. |