@@ -39,8 +39,6 @@ When you need to add images, try to make them as small as possible (e.g. as gif)

 Notes

 -----

-* The index.html and gettingstarted.html files are copied from the source dir to the output dir without modification.

-So changes to those pages should be made directly in html

 * For the template the css is compiled from less. When changes are needed they can be compiled using

 lessc ``lessc main.less`` or watched using watch-lessc ``watch-lessc -i main.less -o main.css``

@@ -75,3 +73,6 @@ Guides on using sphinx

 * Code examples

   Start without $, so it's easy to copy and paste.

+

+* To make the manpages, simply run 'make man'. Pleae note there is a bug in spinx 1.1.3 which makes this fail.

+Upgrade to the latest version of sphinx.

\ No newline at end of file

@@ -203,7 +203,7 @@ latex_elements = {

 # Grouping the document tree into LaTeX files. List of tuples

 # (source start file, target name, title, author, documentclass [howto/manual]).

 latex_documents = [

-  ('index', 'Docker.tex', u'Docker Documentation',

+  ('toctree', 'Docker.tex', u'Docker Documentation',

    u'Team Docker', 'manual'),

 ]

@@ -233,7 +233,7 @@ latex_documents = [

 # One entry per manual page. List of tuples

 # (source start file, name, description, authors, manual section).

 man_pages = [

-    ('index', 'docker', u'Docker Documentation',

+    ('toctree', 'docker', u'Docker Documentation',

      [u'Team Docker'], 1)

 ]

@@ -247,7 +247,7 @@ man_pages = [

 # (source start file, target name, title, author,

 #  dir menu entry, description, category)

 texinfo_documents = [

-  ('index', 'Docker', u'Docker Documentation',

+  ('toctree', 'Docker', u'Docker Documentation',

    u'Team Docker', 'Docker', 'One line description of project.',

    'Miscellaneous'),

 ]

@@ -107,8 +107,8 @@ the image.  This is functionally equivalent to running ``docker commit

 -run '{"Cmd": <command>}'`` outside the builder.

 .. note::

-    Don't confuse `RUN` with `CMD`. `RUN` actually runs a

-    command and commits the result; `CMD` does not execute anything at

+    Don't confuse ``RUN`` with ``CMD``. ``RUN`` actually runs a

+    command and commits the result; ``CMD`` does not execute anything at

     build time, but specifies the intended command for the image.

 3.5 EXPOSE