Skip to content

Commit

Permalink
updates for sitemerge
Browse files Browse the repository at this point in the history
  • Loading branch information
kay-kim committed May 3, 2016
1 parent 8a37af9 commit a66734c
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions conf-sitemap.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<site
base_url="https://docs.mongodb.org/ecosystem/"
base_url="https://docs.mongodb.com/ecosystem/"
store_into="build/master/sitemap.xml.gz"
verbose="1"
>

<directory
path="build/public/"
url="https://docs.mongodb.org/ecosystem/"
url="https://docs.mongodb.com/ecosystem/"
default_file="index.html"
/>
<filter action="drop" type="wildcard" pattern="*~" />
Expand Down
2 changes: 1 addition & 1 deletion config/build_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ git:
project:
name: 'ecosystem'
tag: 'ecosystem'
url: 'http://docs.mongodb.org'
url: 'http://docs.mongodb.com'
title: "MongoDB Ecosystem"
branched: false
system:
Expand Down
2 changes: 1 addition & 1 deletion config/intersphinx.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: mongodb
url: https://docs.mongodb.org/manual/
url: https://docs.mongodb.com/manual/
path: mongodb.inv
---
name: pymongo
Expand Down
2 changes: 1 addition & 1 deletion source/includes/fact-authenticate-with-java.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ or in the connection string:
MongoDB supports various different authentication mechanisms. See the `access control tutorials`_ for more information.

.. _`access control tutorials`: http://docs.mongodb.org/manual/administration/security-access-control
.. _`access control tutorials`: http://docs.mongodb.com/manual/administration/security-access-control
4 changes: 2 additions & 2 deletions source/platforms/rackspace-cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ following command:
SECONDARY> db.fsyncLock()
{
"info" : "now locked against writes, use db.fsyncUnlock() to unlock",
"seeAlso" : "http://docs.mongodb.org/manual/reference/command/fsync/",
"seeAlso" : "http://docs.mongodb.com/manual/reference/command/fsync/",
"ok" : 1
}

Expand Down Expand Up @@ -396,4 +396,4 @@ on a live database instance however for the sake of data consistency, it
is wise to use the ``--oplog`` option when calling mongodump. This allows
for point-in-time backups that catch any data that was written while
``mongodump`` was working. For more information about live data backups,
see the `mongodump <http://docs.mongodb.org/manual/reference/mongodump/>`_ documentation.
see the `mongodump <http://docs.mongodb.com/manual/reference/mongodump/>`_ documentation.
4 changes: 2 additions & 2 deletions source/platforms/red-hat-openshift.txt
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,9 @@ in hand, here's how you should connect to the database:
From here you can query your data as needed for your application.
Finally, to backup your app's data, follow the instructions found on
the `MongoDB Backup docs
<http://docs.mongodb.org/manual/administration/backups>`_.
<http://docs.mongodb.com/manual/administration/backups>`_.
Specifically you'll need to use the `mongodump
<http://docs.mongodb.org/manual/administration/import-export/#ImportExpo
<http://docs.mongodb.com/manual/administration/import-export/#ImportExpo
rtTools-mongodump>`_ command to do a live backup of your data.

Backing up your app is a simple single step where we create a
Expand Down
2 changes: 1 addition & 1 deletion source/platforms/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ page</installation>`.
Running as a Service
--------------------

See the `Windows Service <http://docs.mongodb.org/manual/tutorial/install-mongodb-on-windows/#mongodb-as-a-windows-service>`_ page.
See the `Windows Service <http://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows/#mongodb-as-a-windows-service>`_ page.

.. `Windows Service <mongodb:std:label:`mongodb manual:tutorial-mongod-as-windows-service`>

Expand Down
2 changes: 1 addition & 1 deletion source/tutorial/mongoid-documents.txt
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Hash Fields
***********

When using a field of type Hash, be wary of adhering to the
`legal key names for mongoDB <http://docs.mongodb.org/manual/reference/limits/#naming-restrictions>`_,
`legal key names for mongoDB <http://docs.mongodb.com/manual/reference/limits/#naming-restrictions>`_,
or else the values will not store properly.

.. code-block:: ruby
Expand Down
2 changes: 1 addition & 1 deletion source/tutorial/ruby-bson-tutorial-4-0.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. http://docs.mongodb.org/ecosystem/tutorial/ruby-bson-tutorial-4-0/
.. http://docs.mongodb.com/ecosystem/tutorial/ruby-bson-tutorial-4-0/

.. _ruby-bson-tutorial-4-0:

Expand Down
2 changes: 1 addition & 1 deletion source/tutorial/ruby-bson-tutorial.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. http://docs.mongodb.org/ecosystem/tutorial/ruby-bson-tutorial/
.. http://docs.mongodb.com/ecosystem/tutorial/ruby-bson-tutorial/

.. _ruby-bson-tutorial:

Expand Down
8 changes: 4 additions & 4 deletions source/tutorial/ruby-driver-tutorial-2-0.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. http://docs.mongodb.org/ecosystem/tutorial/ruby-driver-tutorial-2-0/
.. http://docs.mongodb.com/ecosystem/tutorial/ruby-driver-tutorial-2-0/

.. _ruby-driver-tutorial-2-0:

Expand Down Expand Up @@ -125,7 +125,7 @@ Since the URI options are required in camel case, which is not the Ruby standard
following table shows the option in the URI and its corresponding option if passed
to the constructor in Ruby. Note that the options passed directly should be symbols.

The options are explained in detail `here <http://docs.mongodb.org/master/reference/connection-string/>`_.
The options are explained in detail `here <http://docs.mongodb.com/master/reference/connection-string/>`_.
Note that options that are set in **milliseconds** in the URI, are represented as a ``Float``
in Ruby and the units are **seconds**.

Expand Down Expand Up @@ -662,9 +662,9 @@ To view all the indexes in a collection, iterate over the index view.
Authentication
--------------

MongoDB supports a variety of `authentication mechanisms <http://docs.mongodb.org/master/core/access-control/>`_.
MongoDB supports a variety of `authentication mechanisms <http://docs.mongodb.com/master/core/access-control/>`_.

For more information about configuring your MongoDB server for each of these authentication mechanisms please see MongoDB's `online documentation <http://docs.mongodb.org/master/tutorial/enable-authentication>`_.
For more information about configuring your MongoDB server for each of these authentication mechanisms please see MongoDB's `online documentation <http://docs.mongodb.com/master/tutorial/enable-authentication>`_.

Creating a user
```````````````
Expand Down
8 changes: 4 additions & 4 deletions source/tutorial/ruby-driver-tutorial.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. http://docs.mongodb.org/ecosystem/tutorial/ruby-driver-tutorial/
.. http://docs.mongodb.com/ecosystem/tutorial/ruby-driver-tutorial/

.. _ruby-driver-tutorial:

Expand Down Expand Up @@ -126,7 +126,7 @@ following table shows the option in the URI and its corresponding option if pass
to the constructor in Ruby. Note that the options passed directly should be symbols.

The options are explained in detail in the `Connection URI reference
<http://docs.mongodb.org/master/reference/connection-string/>`_. Note
<http://docs.mongodb.com/master/reference/connection-string/>`_. Note
that options that are set in **milliseconds** in the URI, are
represented as a ``Float`` in Ruby and the units are **seconds**.

Expand Down Expand Up @@ -761,9 +761,9 @@ To view all the indexes in a collection, iterate over the index view.
Authentication
--------------

MongoDB supports a variety of `authentication mechanisms <http://docs.mongodb.org/master/core/access-control/>`_.
MongoDB supports a variety of `authentication mechanisms <http://docs.mongodb.com/master/core/access-control/>`_.

For more information about configuring your MongoDB server for each of these authentication mechanisms please see MongoDB's `online documentation <http://docs.mongodb.org/master/tutorial/enable-authentication>`_.
For more information about configuring your MongoDB server for each of these authentication mechanisms please see MongoDB's `online documentation <http://docs.mongodb.com/master/tutorial/enable-authentication>`_.

Creating a user
```````````````
Expand Down
2 changes: 1 addition & 1 deletion source/tutorial/ruby-mongoid-tutorial.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. http://docs.mongodb.org/ecosystem/tutorial/ruby-mongoid-tutorial/
.. http://docs.mongodb.com/ecosystem/tutorial/ruby-mongoid-tutorial/

.. _ruby-mongoid-tutorial:

Expand Down

0 comments on commit a66734c

Please sign in to comment.