Andy Rothfusz 9af351f520 Merge pull request #3248 from lsm5/docker-fedora-conflict ...

Docker fedora conflict
Upstream-commit: 2deb0c3365a5d0f8825c7fd2139f3a6cdcba2016
Component: engine

2013-12-17 11:01:37 -08:00

..

api

Merge pull request #3099 from vieux/fix_pull_build

2013-12-16 10:53:10 -08:00

commandline

Merge pull request #3213 from metalivedev/1695-dockerlogs

2013-12-13 14:29:14 -08:00

contributing

Small typo fixes

2013-12-12 01:23:16 -08:00

examples

Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts

2013-12-04 18:25:58 -08:00

installation

Fedora first letter capitalize and misc. rewording

2013-12-17 11:32:40 -06:00

static_files

Clean up build warnings. Remove redundant files.

2013-10-17 17:57:01 -07:00

terms

make all image ID and container ID API responses use the Long ID (Closes #2098)

2013-11-09 12:16:49 +10:00

use

Minor spelling fix

2013-12-12 01:09:24 -05:00

conf.py

Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page

2013-11-19 10:10:42 -07:00

faq.rst

Information about data persistence

2013-09-16 16:44:54 -07:00

index.rst

Updated Introduction link

2013-12-15 03:13:41 -05:00

toctree.rst

Changes to a new style for the docs. Includes version switcher.

2013-09-27 19:54:52 -07:00