Merge pull request #85 from brownleej/url-update

Updates URLs and email addresses in documentation and package config.

bindings/go/README.md

@@ -1,12 +1,12 @@
 fdb-go
 ======
 
-[Go language](http://golang.org) bindings for [FoundationDB](http://foundationdb.org/documentation/), a distributed key-value store with ACID transactions.
+[Go language](http://golang.org) bindings for [FoundationDB](https://www.foundationdb.org/documentation/), a distributed key-value store with ACID transactions.
 
 This package requires:
 
 - Go 1.1+ with CGO enabled
-- FoundationDB C API 2.0.x, 3.0.x, or 4.x.y (part of the [FoundationDB clients package](https://files.foundationdb.org/fdb-c/))
+- FoundationDB C API 2.0.x, 3.0.x, or 4.x.y (part of the [FoundationDB clients package](https://www.foundationdb.org/downloads/fdb-c/))
 
 Use of this package requires the selection of a FoundationDB API version at runtime. This package currently supports FoundationDB API versions 200-510.
 
@@ -27,5 +27,5 @@ of downloading from the remote repository.
 Documentation
 -------------
 
-* [API documentation](https://foundationdb.org/documentation/godoc/fdb.html)
-* [Tutorial](https://foundationdb.org/documentation/class-scheduling-go.html)
+* [API documentation](https://www.foundationdb.org/documentation/godoc/fdb.html)
+* [Tutorial](https://www.foundationdb.org/documentation/class-scheduling-go.html)

bindings/go/src/fdb/directory/directory.go

@@ -26,7 +26,7 @@
 //
 // For general guidance on directory usage, see the Directories section of the
 // Developer Guide
-// (https://foundationdb.org/documentation/developer-guide.html#developer-guide-directories).
+// (https://www.foundationdb.org/documentation/developer-guide.html#developer-guide-directories).
 //
 // Directories are identified by hierarchical paths analogous to the paths in a
 // Unix-like file system. A path is represented as a slice of strings. Each

bindings/go/src/fdb/doc.go

@@ -25,12 +25,12 @@ Package fdb provides an interface to FoundationDB databases (version 2.0 or high
 
 To build and run programs using this package, you must have an installed copy of
 the FoundationDB client libraries (version 2.0.0 or later), available for Linux,
-Windows and OS X at https://files.foundationdb.org/fdb-c/.
+Windows and OS X at https://www.foundationdb.org/downloads/fdb-c/.
 
 This documentation specifically applies to the FoundationDB Go binding. For more
 extensive guidance to programming with FoundationDB, as well as API
 documentation for the other FoundationDB interfaces, please see
-https://foundationdb.org/documentation/index.html.
+https://www.foundationdb.org/documentation/index.html.
 
 Basic Usage
 
@@ -198,7 +198,7 @@ operations perform different transformations. Like other database operations, an
 atomic operation is used within a transaction.
 
 For more information on atomic operations in FoundationDB, please see
-https://foundationdb.org/documentation/developer-guide.html#atomic-operations. The
+https://www.foundationdb.org/documentation/developer-guide.html#atomic-operations. The
 operands to atomic operations in this API must be provided as appropriately
 encoded byte slices. To convert a Go type to a byte slice, see the binary
 package.

bindings/go/src/fdb/errors.go

@@ -37,7 +37,7 @@ import (
 // as a panic from any FoundationDB API function whose name ends with OrPanic.
 //
 // You may compare the Code field of an Error against the list of FoundationDB
-// error codes at https://foundationdb.org/documentation/api-error-codes.html,
+// error codes at https://www.foundationdb.org/documentation/api-error-codes.html,
 // but generally an Error should be passed to (Transaction).OnError. When using
 // (Database).Transact, non-fatal errors will be retried automatically.
 type Error struct {

bindings/go/src/fdb/keyselector.go

@@ -34,7 +34,7 @@ type Selectable interface {
 //
 // The most common key selectors are constructed with the functions documented
 // below. For details of how KeySelectors are specified and resolved, see
-// https://foundationdb.org/documentation/developer-guide.html#key-selectors.
+// https://www.foundationdb.org/documentation/developer-guide.html#key-selectors.
 type KeySelector struct {
 	Key     KeyConvertible
 	OrEqual bool

bindings/go/src/fdb/snapshot.go

@@ -28,7 +28,7 @@ package fdb
 // transaction conflicts but making it harder to reason about concurrency.
 //
 // For more information on snapshot reads, see
-// https://foundationdb.org/documentation/developer-guide.html#snapshot-reads.
+// https://www.foundationdb.org/documentation/developer-guide.html#snapshot-reads.
 type Snapshot struct {
 	*transaction
 }

bindings/go/src/fdb/subspace/subspace.go

@@ -29,7 +29,7 @@
 // As a best practice, API clients should use at least one subspace for
 // application data. For general guidance on subspace usage, see the Subspaces
 // section of the Developer Guide
-// (https://foundationdb.org/documentation/developer-guide.html#developer-guide-sub-keyspaces).
+// (https://www.foundationdb.org/documentation/developer-guide.html#developer-guide-sub-keyspaces).
 package subspace
 
 import (

bindings/go/src/fdb/transaction.go

@@ -171,7 +171,7 @@ func (t Transaction) SetReadVersion(version int64) {
 // but making it harder to reason about concurrency.
 //
 // For more information on snapshot reads, see
-// https://foundationdb.org/documentation/developer-guide.html#using-snapshot-reads.
+// https://www.foundationdb.org/documentation/developer-guide.html#using-snapshot-reads.
 func (t Transaction) Snapshot() Snapshot {
 	return Snapshot{t.transaction}
 }
@@ -196,7 +196,7 @@ func (t Transaction) OnError(e Error) FutureNil {
 // As with other client/server databases, in some failure scenarios a client may
 // be unable to determine whether a transaction succeeded. For more information,
 // see
-// https://foundationdb.org/documentation/developer-guide.html#developer-guide-unknown-results.
+// https://www.foundationdb.org/documentation/developer-guide.html#developer-guide-unknown-results.
 func (t Transaction) Commit() FutureNil {
 	return &futureNil{newFuture(C.fdb_transaction_commit(t.ptr))}
 }
@@ -396,7 +396,7 @@ func addConflictRange(t *transaction, er ExactRange, crtype conflictRangeType) e
 // conflict.
 //
 // For more information on conflict ranges, see
-// https://foundationdb.org/documentation/developer-guide.html#conflict-ranges.
+// https://www.foundationdb.org/documentation/developer-guide.html#conflict-ranges.
 func (t Transaction) AddReadConflictRange(er ExactRange) error {
 	return addConflictRange(t.transaction, er, conflictRangeTypeRead)
 }
@@ -413,7 +413,7 @@ func copyAndAppend(orig []byte, b byte) []byte {
 // this key could cause the transaction to fail with a conflict.
 //
 // For more information on conflict ranges, see
-// https://foundationdb.org/documentation/developer-guide.html#conflict-ranges.
+// https://www.foundationdb.org/documentation/developer-guide.html#conflict-ranges.
 func (t Transaction) AddReadConflictKey(key KeyConvertible) error {
 	return addConflictRange(t.transaction, KeyRange{key, Key(copyAndAppend(key.FDBKey(), 0x00))}, conflictRangeTypeRead)
 }
@@ -424,7 +424,7 @@ func (t Transaction) AddReadConflictKey(key KeyConvertible) error {
 // conflict.
 //
 // For more information on conflict ranges, see
-// https://foundationdb.org/documentation/developer-guide.html#conflict-ranges.
+// https://www.foundationdb.org/documentation/developer-guide.html#conflict-ranges.
 func (t Transaction) AddWriteConflictRange(er ExactRange) error {
 	return addConflictRange(t.transaction, er, conflictRangeTypeWrite)
 }
@@ -434,7 +434,7 @@ func (t Transaction) AddWriteConflictRange(er ExactRange) error {
 // read this key could fail with a conflict.
 //
 // For more information on conflict ranges, see
-// https://foundationdb.org/documentation/developer-guide.html#conflict-ranges.
+// https://www.foundationdb.org/documentation/developer-guide.html#conflict-ranges.
 func (t Transaction) AddWriteConflictKey(key KeyConvertible) error {
 	return addConflictRange(t.transaction, KeyRange{key, Key(copyAndAppend(key.FDBKey(), 0x00))}, conflictRangeTypeWrite)
 }

bindings/go/src/fdb/tuple/tuple.go

@@ -27,7 +27,7 @@
 // of higher-level data models.
 //
 // For general guidance on tuple usage, see the Tuple section of Data Modeling
-// (https://foundationdb.org/documentation/data-modeling.html#data-modeling-tuples).
+// (https://www.foundationdb.org/documentation/data-modeling.html#data-modeling-tuples).
 //
 // FoundationDB tuples can currently encode byte and unicode strings, integers
 // and NULL values. In Go these are represented as []byte, string, int64 and

bindings/java/pom.xml.in

@@ -10,13 +10,13 @@
   <packaging>jar</packaging>
 
   <name>foundationdb-java</name>
-  <description>Java bindings for the FoundationDB database. These bindings require the FoundationDB client, which is under a different license. The client can be obtained from https://files.foundationdb.org/fdb-c/.</description>
+  <description>Java bindings for the FoundationDB database. These bindings require the FoundationDB client, which is under a different license. The client can be obtained from https://www.foundationdb.org/downloads/fdb-c/.</description>
   <inceptionYear>2010</inceptionYear>
-  <url>http://foundationdb.org</url>
+  <url>https://www.foundationdb.org</url>
 
   <organization>
     <name>FoundationDB</name>
-    <url>http://foundationdb.org</url>
+    <url>https://www.foundationdb.org</url>
   </organization>
   
   <developers>

bindings/java/src/main/overview.html.in

@@ -19,7 +19,7 @@ pom.xml like: <br>
 }
 </pre>
 Alternatively, simply download the JAR from
-<a href="https://files.foundationdb.org/fdb-java/">Artifactory</a>
+<a href="https://www.foundationdb.org/downloads/fdb-java/">Artifactory</a>
 and add it to your classpath.<br>
 <br>
 <h3>Getting started</h3>

bindings/nodejs/README.md

@@ -1,3 +1,3 @@
-Complete documentation of the FoundationDB Node.js API can be found at [https://foundationdb.org/documentation/api-node.html](https://foundationdb.org/documentation/api-node.html).
+Complete documentation of the FoundationDB Node.js API can be found at [https://www.foundationdb.org/documentation/api-node.html](https://www.foundationdb.org/documentation/api-node.html).
 
-These bindings require the FoundationDB client. The client can be obtained from [https://files.foundationdb.org/fdb-c/](https://files.foundationdb.org/fdb-c/).
+These bindings require the FoundationDB client. The client can be obtained from [https://www.foundationdb.org/downloads/fdb-c/](https://www.foundationdb.org/downloads/fdb-c/).

bindings/nodejs/package.json.in

@@ -4,7 +4,7 @@
         "registry": "https://registry.npmjs.org"
     },
     "version": "VERSION",
-    "author": "FoundationDB <fdbopensource@apple.com> (http://foundationdb.org)",
+    "author": "FoundationDB <fdb-dist@apple.com> (https://www.foundationdb.org)",
     "description": "Node.js bindings for the FoundationDB database",
     "keywords": [ "FoundationDB", "database", "NoSQL", "ACID" ],
     "homepage": "http://17.199.145.104",

bindings/python/README.rst

@@ -1,3 +1,3 @@
-Complete documentation of the FoundationDB Python API can be found at https://foundationdb.org/documentation/api-python.html.
+Complete documentation of the FoundationDB Python API can be found at https://www.foundationdb.org/documentation/api-python.html.
 
-These bindings require the FoundationDB client. The client can be obtained from https://files.foundationdb.org/fdb-c/.
+These bindings require the FoundationDB client. The client can be obtained from https://www.foundationdb.org/downloads/fdb-c/.

bindings/python/fdb/__init__.py

@@ -21,7 +21,7 @@
 # FoundationDB Python API
 
 """Documentation for this API can be found at
-https://foundationdb.org/documentation/api-python.html"""
+https://www.foundationdb.org/documentation/api-python.html"""
 
 
 def open(*args, **kwargs):

bindings/python/fdb/locality.py

@@ -21,7 +21,7 @@
 # FoundationDB Python API
 
 """Documentation for this API can be found at
-https://foundationdb.org/documentation/api-python.html"""
+https://www.foundationdb.org/documentation/api-python.html"""
 
 from fdb import impl as _impl
 

bindings/python/setup.py.in

@@ -9,9 +9,9 @@ except:
 setup(name="foundationdb",
       version="VERSION",
       author="FoundationDB",
-      author_email="fdbopensource@apple.com",
+      author_email="fdb-dist@apple.com",
       description="Python bindings for the FoundationDB database",
-      url="http://foundationdb.org",
+      url="https://www.foundationdb.org",
       packages=['fdb'],
       package_data={'fdb': ["fdb/*.py"]},
       long_description=long_desc,

bindings/ruby/fdb.gemspec.in

@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
 Ruby bindings for the FoundationDB database.
 
 Complete documentation of the FoundationDB Ruby API can be found at:
-https://foundationdb.org/documentation/api-ruby.html.
+https://www.foundationdb.org/documentation/api-ruby.html.
 EOF
   s.authors = ["FoundationDB"]
-  s.email = 'fdbopensource@apple.com'
+  s.email = 'fdb-dist@apple.com'
   s.files = ["LICENSE", "lib/fdb.rb", "lib/fdbdirectory.rb", "lib/fdbimpl.rb", "lib/fdblocality.rb", "lib/fdboptions.rb", "lib/fdbsubspace.rb", "lib/fdbtuple.rb"]
-  s.homepage = 'http://foundationdb.org'
+  s.homepage = 'https://www.foundationdb.org'
   s.license = 'Apache v2'
   s.add_dependency('ffi', '>= 1.1.5')
   s.required_ruby_version = '>= 1.9.3'
-  s.requirements << 'These bindings require the FoundationDB client. The client can be obtained from https://files.foundationdb.org/fdb-c/.'
+  s.requirements << 'These bindings require the FoundationDB client. The client can be obtained from https://www.foundationdb.org/downloads/fdb-c/.'
 end

bindings/ruby/lib/fdb.rb

@@ -21,7 +21,7 @@
 # FoundationDB Ruby API
 
 # Documentation for this API can be found at
-# https://foundationdb.org/documentation/api-ruby.html
+# https://www.foundationdb.org/documentation/api-ruby.html
 
 module FDB
   @@chosen_version = -1

bindings/ruby/lib/fdbdirectory.rb

@@ -23,7 +23,7 @@
 # FoundationDB Ruby API
 
 # Documentation for this API can be found at
-# https://foundationdb.org/documentation/api-ruby.html
+# https://www.foundationdb.org/documentation/api-ruby.html
 
 require 'thread'
 

bindings/ruby/lib/fdbimpl.rb

@@ -23,7 +23,7 @@
 # FoundationDB Ruby API
 
 # Documentation for this API can be found at
-# https://foundationdb.org/documentation/api-ruby.html
+# https://www.foundationdb.org/documentation/api-ruby.html
 
 require 'ffi'
 

bindings/ruby/lib/fdblocality.rb

@@ -23,7 +23,7 @@
 # FoundationDB Ruby API
 
 # Documentation for this API can be found at
-# https://foundationdb.org/documentation/api-ruby.html
+# https://www.foundationdb.org/documentation/api-ruby.html
 
 module FDB
   module Locality

bindings/ruby/lib/fdbsubspace.rb

@@ -23,7 +23,7 @@
 # FoundationDB Ruby API
 
 # Documentation for this API can be found at
-# https://foundationdb.org/documentation/api-ruby.html
+# https://www.foundationdb.org/documentation/api-ruby.html
 
 require_relative 'fdbtuple'
 

bindings/ruby/lib/fdbtuple.rb

@@ -23,7 +23,7 @@
 # FoundationDB Ruby API
 
 # Documentation for this API can be found at
-# https://foundationdb.org/documentation/api-ruby.html
+# https://www.foundationdb.org/documentation/api-ruby.html
 
 module FDB
   module Tuple

documentation/sphinx/source/downloads.rst

@@ -7,10 +7,10 @@ Client & Server Packages
 
 FoundationDB packages are available on Artifactory for the following operating systems:
 
-* `macOS <https://files.foundationdb.org/artifacts/5.1.0/release/osx/>`_. Supported on macOS >= 10.7. Installs client and (optionally) server.
-* `Ubuntu <https://files.foundationdb.org/artifacts/5.1.0/release/ubuntu/>`_.  The server depends on the client. Supported on 64-bit Ubuntu >= 12.04, but beware of the Linux kernel bug in Ubuntu 12.x.
-* `RHEL/CentOS EL6 <https://files.foundationdb.org/artifacts/5.1.0/release/rhel6/>`_. The server depends on the client. Supported on 64-bit RHEL/CentOS (6.x).
-* `RHEL/CentOS EL7 <https://files.foundationdb.org/artifacts/5.1.0/release/rhel7/>`_. The server depends on the client. Supported on 64-bit RHEL/CentOS (7.x).
+* `macOS <https://www.foundationdb.org/downloads/5.1.0/release/osx/>`_. Supported on macOS >= 10.7. Installs client and (optionally) server.
+* `Ubuntu <https://www.foundationdb.org/downloads/5.1.0/release/ubuntu/>`_.  The server depends on the client. Supported on 64-bit Ubuntu >= 12.04, but beware of the Linux kernel bug in Ubuntu 12.x.
+* `RHEL/CentOS EL6 <https://www.foundationdb.org/downloads/5.1.0/release/rhel6/>`_. The server depends on the client. Supported on 64-bit RHEL/CentOS (6.x).
+* `RHEL/CentOS EL7 <https://www.foundationdb.org/downloads/5.1.0/release/rhel7/>`_. The server depends on the client. Supported on 64-bit RHEL/CentOS (7.x).
 
 API Language Bindings
 =====================
@@ -25,22 +25,22 @@ Python 2.7 - 3.4
 
 The FoundationDB Python API is installed as part of your FoundationDB installation.
 
-If you need to use the FoundationDB Python API from other Python installations or paths, download the `package <https://files.foundationdb.org/artifacts/5.1.0/release/python/>`_.
+If you need to use the FoundationDB Python API from other Python installations or paths, download the `package <https://www.foundationdb.org/downloads/5.1.0/release/python/>`_.
 
 Ruby 1.9.3/3.0.2
 ----------------
 
-Download the `gem <https://files.foundationdb.org/artifacts/5.1.0/release/ruby/>`_.
+Download the `gem <https://www.foundationdb.org/downloads/5.1.0/release/ruby/>`_.
 
 Java JRE 1.8+
 -------------
 
-Download the `jar and javadoc.jar <https://files.foundationdb.org/artifacts/5.1.0/release/java/>`_.
+Download the `jar and javadoc.jar <https://www.foundationdb.org/downloads/5.1.0/release/java/>`_.
 
 Node 0.8.x/0.10.x
 -----------------
 
-Download the `node package <https://files.foundationdb.org/artifacts/5.1.0/release/nodejs/>`_.
+Download the `node package <https://www.foundationdb.org/downloads/5.1.0/release/nodejs/>`_.
 
 
 Go 1.1+

fdbclient/vexillographer/ruby.cs

@@ -79,7 +79,7 @@ namespace vexillographer
 # THE SOFTWARE.
 
 # Documentation for this API can be found at
-# https://foundationdb.org/documentation/api-ruby.html
+# https://www.foundationdb.org/documentation/api-ruby.html
 
 module FDB");
                 foreach (Scope s in Enum.GetValues(typeof(Scope)))

packaging/deb/foundationdb-clients.control.in

@@ -5,8 +5,8 @@ Priority: optional
 Architecture: amd64
 Conflicts: foundationdb (<< 0.1.4)
 Depends: libc6 (>= 2.11), adduser
-Maintainer: FoundationDB <fdbdist@apple.com>
-Homepage: https://foundationdb.org
+Maintainer: FoundationDB <fdb-dist@apple.com>
+Homepage: https://www.foundationdb.org
 Description: FoundationDB clients and library
  FoundationDB is a scalable, fault-tolerant, ordered key-value store
  with full ACID transactions.

packaging/deb/foundationdb-server.control.in

@@ -5,8 +5,8 @@ Priority: optional
 Architecture: amd64
 Conflicts: foundationdb (<< 0.1.4)
 Depends: foundationdb-clients (= VERSION-RELEASE), adduser, libc6 (>= 2.11), python (>= 2.6)
-Maintainer: FoundationDB <fdbdist@apple.com>
-Homepage: https://foundationdb.org
+Maintainer: FoundationDB <fdb-dist@apple.com>
+Homepage: https://www.foundationdb.org
 Description: FoundationDB server
  FoundationDB is a scalable, fault-tolerant, ordered key-value store
  with full ACID transactions.

packaging/foundationdb.conf

@@ -2,7 +2,7 @@
 ##
 ## Configuration file for FoundationDB server processes
 ## Full documentation is available at
-## https://foundationdb.org/documentation/configuration.html#foundationdb-conf
+## https://www.foundationdb.org/documentation/configuration.html#foundationdb-conf
 
 [fdbmonitor]
 user = foundationdb

packaging/make_public.py

@@ -38,7 +38,7 @@ def getOrValidateAddress(address):
     if address is None:
         try:
             s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-            s.connect(('foundationdb.org', 80))
+            s.connect(('www.foundationdb.org', 80))
             return s.getsockname()[0]
         except Exception as e:
             print 'ERROR: Could not determine an address'

packaging/msi/FDBInstaller.wxs

@@ -390,7 +390,7 @@
     </InstallExecuteSequence>
 
     <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT"
-              Value="Thank you for installing FoundationDB. For documentation, please visit https://foundationdb.org/documentation.
+              Value="Thank you for installing FoundationDB. For documentation, please visit https://www.foundationdb.org/documentation.
 
 To allow path variables to update, please restart your IDE and any open terminal sessions." />
     <UIRef Id='WixUI_FeatureTree' />

packaging/msi/skeleton.conf

@@ -2,7 +2,7 @@
 ##
 ## Configuration file for FoundationDB server processes
 ## Full documentation is available at
-## https://foundationdb.org/documentation/configuration.html#foundationdb-conf
+## https://www.foundationdb.org/documentation/configuration.html#foundationdb-conf
 
 [fdbmonitor]
 restart_delay = 20

packaging/osx/foundationdb.conf.new

@@ -2,7 +2,7 @@
 ##
 ## Configuration file for FoundationDB server processes
 ## Full documentation is available at
-## https://foundationdb.org/documentation/configuration.html#foundationdb-conf
+## https://www.foundationdb.org/documentation/configuration.html#foundationdb-conf
 
 [general]
 restart_delay = 60

packaging/osx/resources/conclusion.rtf

@@ -3,4 +3,4 @@
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\f0\fs26 \cf0 Thank you for installing FoundationDB. For documentation, please visit {\field{\*\fldinst HYPERLINK "https://foundationdb.org/documentation"}{\fldrslt https://foundationdb.org/documentation}}.}
+\f0\fs26 \cf0 Thank you for installing FoundationDB. For documentation, please visit {\field{\*\fldinst HYPERLINK "https://www.foundationdb.org/documentation"}{\fldrslt https://www.foundationdb.org/documentation}}.}

packaging/rpm/foundationdb.spec.in

@@ -2,9 +2,9 @@ Name: foundationdb
 Version: FDBVERSION
 Release: FDBRELEASE
 Group: Applications/Databases
-License: FoundationDB Community License Agreement (https://foundationdb.org/license)
-URL: https://foundationdb.org
-Packager: FoundationDB <fdbdist@apple.com>
+License: FoundationDB Community License Agreement (https://www.foundationdb.org/license)
+URL: https://www.foundationdb.org
+Packager: FoundationDB <fdb-dist@apple.com>
 BuildArch: x86_64
 Summary: Ordered key-value store with full ACID transactions
 Vendor: FoundationDB