Permalink
Browse files

Merge branch 'next'

  • Loading branch information...
2 parents deb9b2a + aa9a5ce commit 5d4c76a7960f55b861311bff3790f8b10a796193 @pedersen pedersen committed Jan 24, 2013
View
@@ -33,41 +33,44 @@ help:
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
+scrubgitclone:
+ -rm -rf $(BUILDDIR)/gitclone
+
clean:
-rm -rf $(BUILDDIR)/*
-html:
+html: scrubgitclone
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-dirhtml:
+dirhtml: scrubgitclone
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-singlehtml:
+singlehtml: scrubgitclone
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-pickle:
+pickle: scrubgitclone
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
-json:
+json: scrubgitclone
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
-htmlhelp:
+htmlhelp: scrubgitclone
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."
-qthelp:
+qthelp: scrubgitclone
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
@@ -76,7 +79,7 @@ qthelp:
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/BuildingAppswithTurboGears.qhc"
-devhelp:
+devhelp: scrubgitclone
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@@ -85,46 +88,46 @@ devhelp:
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/BuildingAppswithTurboGears"
@echo "# devhelp"
-epub:
+epub: scrubgitclone
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-latex:
+latex: scrubgitclone
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
-latexpdf:
+latexpdf: scrubgitclone
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
make -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-text:
+text: scrubgitclone
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo
@echo "Build finished. The text files are in $(BUILDDIR)/text."
-man:
+man: scrubgitclone
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-changes:
+changes: scrubgitclone
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."
-linkcheck:
+linkcheck: scrubgitclone
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."
-doctest:
+doctest: scrubgitclone
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
@@ -1,5 +0,0 @@
-====
-pytz
-====
-
-.. automodule:: pytz
@@ -1,5 +0,0 @@
-==============
-zope.component
-==============
-
-.. automodule:: zope.component
@@ -1,5 +0,0 @@
-=========
-zope.i18n
-=========
-
-.. automodule:: zope.i18n
@@ -1,5 +0,0 @@
-===========
-zope.schema
-===========
-
-.. automodule:: zope.schema
View
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '2.2'
# The full version, including alpha/beta/rc tags.
-release = '2.2.0'
+release = '2.2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -1,4 +1,4 @@
-====================================================
+=====================================================
Installing TurboGears2: From Nothing to Serving Pages
=====================================================
View
@@ -1,8 +1,8 @@
[aliases]
# A handy alias to make a release to pypi
release = egg_info -RDb "" sdist bdist_egg register upload
-tgdevelop = develop -i http://tg.gy/220rc2
-tgdeps = easy_install -i http://tg.gy/220rc2 AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid PEAK_Rules repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemy
+tgdevelop = develop -i http://tg.gy/221
+tgdeps = easy_install -i http://tg.gy/221 AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid PEAK_Rules repoze.tm2 repoze.what repoze.what.plugins.sql repoze.what_pylons repoze.what_quickstart repoze.who repoze.who_friendlyform repoze.who.plugins.sa repoze.who_testutil simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemy
[egg_info]
#tag_build = dev
View
@@ -2,7 +2,7 @@
setup(
name='TurboGears2Docs',
- version='2.2.0',
+ version='2.2.1',
author='TurboGears Community',
url='http://www.turbogears.org/',
license='MIT',
@@ -15,6 +15,6 @@
'dulwich',
],
dependency_links=[
- "http://tg.gy/220"
+ "http://tg.gy/221"
]
)
View
@@ -47,7 +47,7 @@
# built documents.
#
# The short X.Y version.
-version = '2.2.0'
+version = '2.2.1'
# The full version, including alpha/beta/rc tags.
release = max(tg_release_version, version)
View
@@ -1,2 +1,2 @@
--e git://git.code.sf.net/p/turbogears2/tg2@development#egg=TurboGears2
+-e git://github.com/TurboGears/tg2.git@development#egg=TurboGears2

0 comments on commit 5d4c76a

Please sign in to comment.