Updated ADCTheme (as it was broken by merge)

Changelog

@@ -32,7 +32,7 @@ Changes
 
 * Running unittests: :envvar:`NOSE_VERBOSE` environment var now enables verbose output from Nose.
 
-* :fun:`celery.execute.apply`: Pass logfile/loglevel arguments as task kwargs.
+* :func:`celery.execute.apply`: Pass logfile/loglevel arguments as task kwargs.
 
     Issue #110 http://github.com/ask/celery/issues/issue/110
 
@@ -41,9 +41,9 @@ Changes
 
     Issue #111 http://github.com/ask/celery/issues/issue/111
 
-* Added FAQs:
+* Added new entries to the :doc:`FAQs <faq>`:
 
-    * Should I use retry or acks_late
+    * Should I use retry or acks_late?
     * Can I execute a task by name?
 
 1.0.3 [2010-05-15 03:00 P.M CEST]

docs/_theme/ADCTheme/README.rst

@@ -14,12 +14,6 @@ If you want to install this theme somewhere else, you will have to modify the ``
 
     templates_path = ['/absolute/path/to/dir/','relative/path/']
 
-<<<<<<< HEAD
-Making Sphinx Use the Theme
----------------------------
-
-Edit the ``conf.py`` file and make the following setting: ::
-=======
 Install Directly in Your Documentation
 --------------------------------------
 
@@ -40,7 +34,6 @@ Making Sphinx Use the Theme
 ---------------------------
 
 If you aren't installing the files directly into your documentation, edit the ``conf.py`` file and make the following setting: ::
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 
     html_theme = 'ADCtheme'
 

docs/_theme/ADCTheme/layout.html

@@ -28,10 +28,7 @@
     {%- if prev %}
     <link rel="prev" title="{{ prev.title|striptags }}" href="{{ prev.link|e }}" />
     {%- endif %}
-<<<<<<< HEAD
-=======
     <link media="only screen and (max-device-width: 480px)" href="{{ pathto('_static/mobile.css', 1) }}" type="text/css" rel="stylesheet" />
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 {%- endblock %}
 {%- block extrahead %} {% endblock %}
 {%- block header %}{% endblock %}
@@ -139,18 +136,10 @@
 {%- block footer %}
 	<div id="breadcrumbs">
 		{%- for parent in parents %}
-<<<<<<< HEAD
-		<a href="{{ parent.link|e }}" {{ accesskey("U") }}>{{ parent.title }}</a><img src="triangle_closed.png" alt="Right arrow">
-		{%- endfor %}
-		<a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>
-		</ul>
-	</div>
-=======
 		<a href="{{ parent.link|e }}" {{ accesskey("U") }}>{{ parent.title|safe }}</a><img src="{{ pathto('_static/triangle_closed.png', 1) }}" height="9" width="9" alt="&gt;">
 		{%- endfor %}
 		{{ title|safe|e }}
 		</ul>
 	</div>
 	<script type="text/javascript" charset="utf-8" src="{{ pathto('_static/toc.js', 1) }}"></script>
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 {%- endblock %}

docs/_theme/ADCTheme/static/adctheme.css

@@ -2,16 +2,12 @@
  * Sphinx stylesheet -- basic theme
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
-<<<<<<< HEAD
-
-=======
  h3 {
      color:#000000;
      font-size: 17px;
      margin-bottom:0.5em;
      margin-top:2em;
  }
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 /* -- main layout ----------------------------------------------------------- */
 
 div.clearer {
@@ -81,12 +77,6 @@ li#toc_button .headerButton a {
     float: left;
     padding-left:15px;
     border-right:1px solid #ACACAC;
-<<<<<<< HEAD
-    background:transparent url(triangle_closed.png) no-repeat scroll 4px 6px;
-}
-
-
-=======
     background:transparent url(triangle_open.png) no-repeat scroll 4px 6px;
 }
 
@@ -94,7 +84,6 @@ li#toc_button .headerButton a:hover {
     background-color: #787878;
     color: white;
 }
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 
 li#page_buttons {
 position:absolute;
@@ -123,13 +112,9 @@ right:0;
 #breadcrumbs a:hover {
     text-decoration: underline;
 }
-<<<<<<< HEAD
-
-=======
 #breadcrumbs img {
     padding-left: 3px;
 }
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 /* -- sidebar --------------------------------------------------------------- */
 #sphinxsidebar {
     position: absolute;
@@ -472,10 +457,7 @@ dl {
 
 dd p {
     margin-top: 0px;
-<<<<<<< HEAD
-=======
     font-size: 12px;
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 }
 
 dd ul, dd table {
@@ -486,10 +468,7 @@ dd {
     margin-top: 3px;
     margin-bottom: 10px;
     margin-left: 30px;
-<<<<<<< HEAD
-=======
     font-size: 12px;
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 }
 
 dt:target, .highlight {
@@ -498,18 +477,12 @@ dt:target, .highlight {
 
 dl.glossary dt {
     font-weight: bold;
-<<<<<<< HEAD
-    font-size: 1.1em;
-}
-
-=======
     font-size: 0.8em;
 }
 
 dl.glossary dd {
 	font-size:12px;
 }
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 .field-list ul {
     vertical-align: top;
     margin: 0;
@@ -574,12 +547,6 @@ table.highlighttable td {
     padding: 0 0.5em 0 0.5em;
 }
 
-<<<<<<< HEAD
-tt.descname {
-    background-color: transparent;
-    font-weight: bold;
-    font-size: 1.2em;
-=======
 tt {
 	font-family:"Bitstream Vera Sans Mono",Monaco,"Lucida Console",Courier,Consolas,monospace;
 
@@ -589,7 +556,6 @@ tt.descname {
     background-color: transparent;
     font-weight: bold;
     font-size: 1em;
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 }
 
 tt.descclassname {
@@ -643,15 +609,7 @@ body {
 
 dl.class dt {
     padding: 3px;
-<<<<<<< HEAD
-    border-top: 2px solid #999;
-}
-
-tt.descname {
-    font-size: 1em;
-=======
 /*    border-top: 2px solid #999;*/
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 }
 
 em.property {
@@ -659,10 +617,7 @@ em.property {
 }
 
 dl.class dd p {
-<<<<<<< HEAD
-=======
 	margin-top: 6px;
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 }
 
 dl.class dd dl.exception dt {
@@ -797,12 +752,6 @@ font-variant:normal;
 font-weight:normal;
 line-height:normal;
 }
-<<<<<<< HEAD
-li > p {
-display:inline;
-}
-=======
->>>>>>> 12ce4b1... Updated docs/_theme/ADCTheme
 li p {
 margin-top:8px;
 }

docs/reference/celery.conf.rst

@@ -231,7 +231,7 @@ Configuration - celery.conf
 .. data:: CELERYD_POOL
 
     Name of the task pool class used by the worker.
-    Default is ``"celery.worker.pool.TaskPool"`.
+    Default is ``"celery.worker.pool.TaskPool"``.
 
 .. data:: CELERYD_LISTENER