Merge branch 'master' into pyramid_tm_3052

Chris Morales

2017-05-24 f41de61e8d962b36bcb72fbc0ff278a550c60733

Merge branch 'master' into pyramid_tm_3052

 docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py

@@ -57,7 +57,7 @@

    """
    settings = config.get_settings()

    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'
    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')


 docs/tutorials/wiki2/src/authentication/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/basiclayout/tutorial/models/__init__.py

@@ -57,6 +57,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/installation/tutorial/models/__init__.py

@@ -57,6 +57,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/models/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/tests/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/views/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')