Merge "Modify redirection URL and broken URL"

doc/source/admin/objectstorage-monitoring.rst

@@ -5,7 +5,7 @@ Object Storage monitoring
 .. note::
 
    This section was excerpted from a `blog post by Darrell
-   Bishop <http://swiftstack.com/blog/2012/04/11/swift-monitoring-with-statsd>`_ and
+   Bishop <https://swiftstack.com/blog/2012/04/11/swift-monitoring-with-statsd>`_ and
    has since been edited.
 
 An OpenStack Object Storage cluster is a collection of many daemons that

doc/source/admin_guide.rst

@@ -817,7 +817,7 @@ resolves to an IPv4 address, an IPv4 socket will be used to send StatsD UDP
 packets, even if the hostname would also resolve to an IPv6 address.
 
 .. _StatsD: http://codeascraft.etsy.com/2011/02/15/measure-anything-measure-everything/
-.. _Graphite: http://graphite.wikidot.com/
+.. _Graphite: http://graphiteapp.org/
 .. _Ganglia: http://ganglia.sourceforge.net/
 
 The sample rate is a real number between 0 and 1 which defines the

doc/source/api/object_api_v1_overview.rst

@@ -171,14 +171,14 @@ The API Reference describes the operations that you can perform with the
 Object Storage API:
 
 -  `Storage
-   accounts <https://developer.openstack.org/api-ref/object-storage/index.html#accounts>`__:
+   accounts <https://developer.openstack.org/api-ref/object-store/index.html#accounts>`__:
    Use to perform account-level tasks.
 
    Lists containers for a specified account. Creates, updates, and
    deletes account metadata. Shows account metadata.
 
 -  `Storage
-   containers <https://developer.openstack.org/api-ref/object-storage/index.html#containers>`__:
+   containers <https://developer.openstack.org/api-ref/object-store/index.html#containers>`__:
    Use to perform container-level tasks.
 
    Lists objects in a specified container. Creates, shows details for,
@@ -186,7 +186,7 @@ Object Storage API:
    container metadata.
 
 -  `Storage
-   objects <https://developer.openstack.org/api-ref/object-storage/index.html#objects>`__:
+   objects <https://developer.openstack.org/api-ref/object-store/index.html#objects>`__:
    Use to perform object-level tasks.
 
    Creates, replaces, shows details for, and deletes objects. Copies

doc/source/api/temporary_url_middleware.rst

@@ -57,7 +57,7 @@ or ISO 8601 UTC timestamp. For example, ``1390852007`` or
 ``Mon, 27 Jan 2014 19:46:47 GMT``.
 
 For more information, see `Epoch & Unix Timestamp Conversion
-Tools <http://www.epochconverter.com/>`__.
+Tools <https://www.epochconverter.com/>`__.
 
 **filename**: Optional. Overrides the default file name. Object Storage
 generates a default file name for **GET** temporary URLs that is based on the

doc/source/associated_projects.rst

@@ -10,20 +10,20 @@ Application Bindings
 
 * OpenStack supported binding:
 
-  * `Python-SwiftClient <http://pypi.python.org/pypi/python-swiftclient>`_
+  * `Python-SwiftClient <https://pypi.python.org/pypi/python-swiftclient>`_
 
 * Unofficial libraries and bindings:
 
   * `PHP-opencloud <http://php-opencloud.com>`_ - Official Rackspace PHP bindings that should work for other Swift deployments too.
-  * `PyRAX <https://github.com/rackspace/pyrax>`_ - Official Rackspace Python bindings for CloudFiles that should work for other Swift deployments too.
+  * `PyRAX <https://github.com/pycontribs/pyrax>`_ - Official Rackspace Python bindings for CloudFiles that should work for other Swift deployments too.
   * `openstack.net <https://github.com/rackspace/openstack.net/>`_ - Official Rackspace .NET bindings that should work for other Swift deployments too.
   * `RSwift <https://github.com/pandemicsyn/RSwift>`_ - R API bindings.
   * `Go language bindings <https://github.com/ncw/swift>`_
   * `supload <https://github.com/selectel/supload>`_ - Bash script to upload file to cloud storage based on OpenStack Swift API.
   * `libcloud <http://libcloud.apache.org>`_ - Apache Libcloud - a unified interface in Python for different clouds with OpenStack Swift support.
   * `SwiftBox <https://github.com/suniln/SwiftBox>`_ - C# library using RestSharp
-  * `jclouds <http://jclouds.incubator.apache.org/documentation/quickstart/openstack/>`_ - Java library offering bindings for all OpenStack projects
+  * `jclouds <http://jclouds.apache.org/guides/openstack/>`_ - Java library offering bindings for all OpenStack projects
-  * `java-openstack-swift <https://github.com/dkocher/java-openstack-swift>`_ - Java bindings for OpenStack Swift
+  * `java-openstack-swift <https://github.com/iterate-ch/java-openstack-swift>`_ - Java bindings for OpenStack Swift
   * `swift_client <https://github.com/mrkamel/swift_client>`_ - Small but powerful Ruby client to interact with OpenStack Swift
   * `nightcrawler_swift <https://github.com/tulios/nightcrawler_swift>`_ - This Ruby gem teleports your assets to a OpenStack Swift bucket/container
   * `swift storage <https://rubygems.org/gems/swift-storage>`_ - Simple OpenStack Swift storage client.
@@ -94,13 +94,13 @@ Storage Backends (DiskFile API implementations)
 
 Developer Tools
 ---------------
-* `SAIO bash scripts <https://github.com/ntata/swift-setup-scripts.git>`_ -
+* `SAIO bash scripts <https://github.com/ntata/swift-setup-scripts>`_ -
   Well commented simple bash scripts for Swift all in one setup.
 * `vagrant-swift-all-in-one
   <https://github.com/swiftstack/vagrant-swift-all-in-one>`_ - Quickly setup a
   standard development environment using Vagrant and Chef cookbooks in an
   Ubuntu virtual machine.
-* `SAIO Ansible playbook <https://github.com/thiagodasilva/swift-aio>`_ -
+* `SAIO Ansible playbook <https://github.com/thiagodasilva/ansible-saio>`_ -
   Quickly setup a standard development environment using Vagrant and Ansible in
   a Fedora virtual machine (with built-in `Swift-on-File
   <https://github.com/openstack/swiftonfile>`_ support).
@@ -111,11 +111,11 @@ Other
 * `Glance <https://github.com/openstack/glance>`_ - Provides services for discovering, registering, and retrieving virtual machine images (for OpenStack Compute [Nova], for example).
 * `Better Staticweb <https://github.com/CloudVPS/better-staticweb>`_ - Makes swift containers accessible by default.
 * `Django Swiftbrowser <https://github.com/cschwede/django-swiftbrowser>`_ - Simple Django web app to access OpenStack Swift.
-* `Swift-account-stats <https://github.com/enovance/swift-account-stats>`_ - Swift-account-stats is a tool to report statistics on Swift usage at tenant and global levels.
+* `Swift-account-stats <https://github.com/redhat-cip/swift-account-stats>`_ - Swift-account-stats is a tool to report statistics on Swift usage at tenant and global levels.
 * `PyECLib <https://github.com/openstack/pyeclib>`_ - High Level Erasure Code library used by Swift
 * `liberasurecode <https://github.com/openstack/liberasurecode>`_ - Low Level Erasure Code library used by PyECLib
-* `Swift Browser <https://github.com/zerovm/swift-browser>`_ - JavaScript interface for Swift
+* `Swift Browser <https://github.com/mgeisler/swift-browser>`_ - JavaScript interface for Swift
 * `swift-ui <https://github.com/fanatic/swift-ui>`_ - OpenStack Swift web browser
-* `Swift Durability Calculator <https://github.com/enovance/swift-durability-calculator>`_ - Data Durability Calculation Tool for Swift
+* `Swift Durability Calculator <https://github.com/redhat-cip/swift-durability-calculator>`_ - Data Durability Calculation Tool for Swift
 * `swiftbackmeup <https://github.com/redhat-cip/swiftbackmeup>`_ -  Utility that allows one to create backups and upload them to OpenStack Swift
 * `Multi Swift <https://github.com/ntata/multi-swift-POC>`_ - Bash scripts to spin up multiple Swift clusters sharing the same hardware