Imported Upstream version 3.3.1

[debian/amanda] / man / xml-source / amanda-devices.7.xml

diff --git a/man/xml-source/amanda-devices.7.xml b/man/xml-source/amanda-devices.7.xml
index 170b90128c6df6869dbe847d1634e8d2f346d94c..575b0651c7588526c38bc8d7576fc8a6af452b04 100644 (file)
--- a/man/xml-source/amanda-devices.7.xml
+++ b/man/xml-source/amanda-devices.7.xml
@@ -442,6 +442,10 @@ writing long enough to bring the average below this value.
  <!-- ==== -->
  <varlistentry><term>NB_THREADS_RECOVERY</term><listitem>
 (read-write) The number of thread that read data from the s3 device, higher value can provide more throutput.
+</listitem></varlistentry>
+ <!-- ==== -->
+ <varlistentry><term>OPENSTACK_SWIFT_API</term><listitem>
+ (read-write) Set to yes if it is an openstack storage device.
 </listitem></varlistentry>
  <!-- ==== -->
  <varlistentry><term>S3_ACCESS_KEY</term><listitem>
@@ -453,7 +457,7 @@ writing long enough to bring the average below this value.
 As of this writing, it can be set to "*" (US Standard, i.e. lowest-latency
 choice of US East or West), "us-west-1" (US West, Northern California), "EU"
 (European Union), or "ap-southeast-1" (Asia Pacific).  See <ulink
-url="http://docs.amazonwebservices.com/AmazonS3/latest/index.html?LocationSelection.html"
+url="http://docs.amazonwebservices.com/general/latest/gr/index.html?rande.html"
 /> for the most up-to-date list.
 </listitem></varlistentry>
  <!-- ==== -->
@@ -472,6 +476,14 @@ The value is passed to curl_easy_setopt(3) as CURLOPT_CAINFO.
  <!-- ==== -->
  <varlistentry><term>S3_SECRET_KEY</term><listitem>
 (read-write) This property gives the Amazon S3 secret key used to access the service.
+</listitem></varlistentry>
+ <!-- ==== -->
+ <varlistentry><term>S3_SERVER_SIDE_ENCRYPTION</term><listitem>
+(read-write) Set to the server side encryption algorithm to use.
+There is actually only one algorithm, it is "AES256".  The encryption is done
+by Amazon on their server. See
+<ulink url="http://docs.amazonwebservices.com/AmazonS3/latest/API/index.html?RESTObjectPUT.html" />
+for the most up-to-date list.
 </listitem></varlistentry>
  <!-- ==== -->
  <varlistentry><term>S3_SERVICE_PATH</term><listitem>
@@ -585,7 +597,7 @@ operations can be emulated with the MTREW and read data operations.</para>
 </listitem></varlistentry>
  <!-- ==== -->
  <varlistentry><term>NONBLOCKING_OPEN</term><listitem>
- (read-write) Set this boolean property to "true" if O_NONBLOCK must be used on the open call. Default to "true" on Linux and "false" on all others machines. Witout it, Linux wait for a few seconds if no tape are loaded. Solaris have strange error it is set to "yes".
+ (read-write) Set this boolean property to "true" if O_NONBLOCK must be used on the open call. Default to "true" on Linux and "false" on all others machines. Without it, Linux wait for a few seconds if no tape are loaded. Solaris have strange error it is set to "yes".
 </listitem></varlistentry>
  <!-- ==== -->
  <varlistentry><term>READ_BLOCK_SIZE</term><listitem>