Martin Cech b4cdce925b Merge branch 'release_18.01' into dev ...

I removed the conflicted file that was modified
 in dev after removal in 18.01

2018-02-01 15:57:38 -05:00

..

special_topics

update webhooks docs

2018-02-01 12:22:21 -05:00

_inc_proxy_prereq.rst

Attempt to reduce duplication in the proxy documentation through the use

2018-01-12 16:44:40 -05:00

_inc_proxy_serving_root.rst

Attempt to reduce duplication in the proxy documentation through the use

2018-01-12 16:44:40 -05:00

_inc_proxy_ssl.rst

Attempt to reduce duplication in the proxy documentation through the use

2018-01-12 16:44:40 -05:00

apache.md

Attempt to reduce duplication in the proxy documentation through the use

2018-01-12 16:44:40 -05:00

authentication.md

yaml_config - update admin docs for switch to YAML config.

2017-12-06 20:28:20 -05:00

cluster.md

Update newer deployer config docs for switch to YAML config.

2017-12-06 20:57:09 -05:00

conda_faq.rst

yaml_config - Update Conda FAQ to link out to last .ini variant of docs for those who need them.

2017-12-06 20:28:21 -05:00

config_logging.rst

Finish Galaxy logging configuration documentation

2018-01-10 16:26:09 -05:00

config.rst

Galaxy config doc corrections

2018-01-10 16:23:54 -05:00

dependency_resolvers.rst

Merge branch 'release_17.09' into release_18.01

2018-01-31 10:38:53 +00:00

framework_dependencies.rst

Doc corrections from @nsoranzo

2018-01-26 10:18:53 -05:00

galaxy_options.rst

Merge branch 'release_18.01' into dev

2018-01-31 11:46:53 +00:00

index.rst

Update Apache documentation for uWSGI

2018-01-11 16:38:48 -05:00

jobs.md

Correct the handlers section of the job conf documentation.

2018-01-10 16:47:09 -05:00

nginx.md

Attempt to reduce duplication in the proxy documentation through the use

2018-01-12 16:44:40 -05:00

options.rst

yaml_config - Add RST docs for Galaxy options.

2017-12-06 20:28:20 -05:00

production.md

Merge remote-tracking branch 'origin/dev' into ini_to_yaml_config

2018-01-18 12:30:05 -05:00

proxy_package_layout.rst

Attempt to reduce duplication in the proxy documentation through the use

2018-01-12 16:44:40 -05:00

reports_options.rst

Add reports documentation to `doc/`.

2017-08-10 13:15:30 -04:00

reports.md

yaml_config - update admin docs for switch to YAML config.

2017-12-06 20:28:20 -05:00

reports.rst

WIP admin docs updates for 18.01

2017-12-07 16:47:52 -05:00

scaling.md

Finish updates to framework dependencies doc

2018-01-25 12:36:11 -05:00

tool_panel.rst

Update newer deployer config docs for switch to YAML config.

2017-12-06 20:57:09 -05:00

useful_scripts.rst

reword topic

2017-03-16 15:55:17 -04:00