mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-31 22:47:28 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
Remove un-needed objects.inv files from d'loading during doc build
|
|
diff -ur Django-1.5.1.orig/docs/conf.py Django-1.5.1/docs/conf.py
|
|
--- docs/conf.py 2013-03-29 04:10:14.000000000 +0800
|
|
+++ docs/conf.py 2013-05-28 01:54:49.695008477 +0800
|
|
@@ -91,12 +91,6 @@
|
|
|
|
# Links to Python's docs should reference the most recent version of the 2.x
|
|
# branch, which is located at this URL.
|
|
-intersphinx_mapping = {
|
|
- 'python': ('http://docs.python.org/2.7', None),
|
|
- 'sphinx': ('http://sphinx.pocoo.org/', None),
|
|
- 'six': ('http://pythonhosted.org/six/', None),
|
|
- 'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
|
|
-}
|
|
|
|
# Python's docs don't change every week.
|
|
intersphinx_cache_limit = 90 # days
|
|
# Fix creation of html docs on python 3
|
|
# https://github.com/django/django/commit/a5733fcd7be7adb8b236825beff4ccda19900f9e
|
|
diff -ur Django-1.5.1.orig/docs/_ext/djangodocs.py Django-1.5.1/docs/_ext/djangodocs.py
|
|
--- docs/_ext/djangodocs.py 2013-03-29 04:07:21.000000000 +0800
|
|
+++ docs/_ext/djangodocs.py 2013-05-28 02:34:59.057009144 +0800
|
|
@@ -204,7 +204,7 @@
|
|
if t == "templatefilter" and l == "ref/templates/builtins"],
|
|
}
|
|
outfilename = os.path.join(self.outdir, "templatebuiltins.js")
|
|
- with open(outfilename, 'wb') as fp:
|
|
+ with open(outfilename, 'w') as fp:
|
|
fp.write('var django_template_builtins = ')
|
|
json.dump(templatebuiltins, fp)
|
|
fp.write(';\n')
|