Skip to content

Commit

Permalink
Merge pull request #419 from MongoEngine/travis-update
Browse files Browse the repository at this point in the history
Travis updated to use focal ubuntu images
  • Loading branch information
insspb committed Nov 21, 2020
2 parents 0c1c030 + 3366994 commit e090909
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,4 +1,4 @@
dist: xenial
dist: focal
os: linux

language: python
Expand Down
8 changes: 4 additions & 4 deletions docs/index.rst
Expand Up @@ -44,10 +44,10 @@ Or, if you are setting up your database before your app is initialized, as is th
db.init_app(app)


By default, Flask-MongoEngine assumes that the :program:`mongod` instance is running
By default, Flask-MongoEngine assumes that the `mongod` instance is running
on **localhost** on port **27017**, and you wish to connect to the database named **test**.

If MongoDB is running elsewhere, you should provide the :attr:`host` and :attr:`port` settings
If MongoDB is running elsewhere, you should provide the `host` and `port` settings
in the `'MONGODB_SETTINGS'` dictionary wih `app.config`.::

app.config['MONGODB_SETTINGS'] = {
Expand All @@ -56,7 +56,7 @@ in the `'MONGODB_SETTINGS'` dictionary wih `app.config`.::
'port': 12345
}

If the database requires authentication, the :attr:`username` and :attr:`password`
If the database requires authentication, the `username` and `password`
arguments should be provided `'MONGODB_SETTINGS'` dictionary wih `app.config`.::

app.config['MONGODB_SETTINGS'] = {
Expand All @@ -65,7 +65,7 @@ arguments should be provided `'MONGODB_SETTINGS'` dictionary wih `app.config`.::
'password':'pwd123'
}

Uri style connections are also supported, just supply the uri as the :attr:`host`
Uri style connections are also supported, just supply the uri as the `host`
in the `'MONGODB_SETTINGS'` dictionary with `app.config`. **Note that database name from uri has priority over name.** If uri presents and doesn't contain database name db setting entirely ignore and db name set to 'test'. ::

app.config['MONGODB_SETTINGS'] = {
Expand Down

0 comments on commit e090909

Please sign in to comment.