mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-08 01:07:30 -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
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From da94a8b504d981cb5f877219811d169823a2095e Mon Sep 17 00:00:00 2001
|
|
From: Armin Ronacher <armin.ronacher@active-4.com>
|
|
Date: Mon, 20 May 2013 14:06:59 +0100
|
|
Subject: [PATCH] Fixed docs not building
|
|
|
|
---
|
|
docs/faq.rst | 2 +-
|
|
docs/jinjaext.py | 2 +-
|
|
docs/templates.rst | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/docs/faq.rst b/docs/faq.rst
|
|
index 4db5079..00a4d0d 100644
|
|
--- a/docs/faq.rst
|
|
+++ b/docs/faq.rst
|
|
@@ -157,7 +157,7 @@ Python 2.3 support you either have to use `Jinja 1`_ or other templating
|
|
engines that still support 2.3.
|
|
|
|
My Macros are overridden by something
|
|
-------------------------------------
|
|
+-------------------------------------
|
|
|
|
In some situations the Jinja scoping appears arbitrary:
|
|
|
|
diff --git a/docs/jinjaext.py b/docs/jinjaext.py
|
|
index 8395a55..3c217f8 100644
|
|
--- a/docs/jinjaext.py
|
|
+++ b/docs/jinjaext.py
|
|
@@ -23,7 +23,7 @@
|
|
from pygments.token import Keyword, Name, Comment, String, Error, \
|
|
Number, Operator, Generic
|
|
from jinja2 import Environment, FileSystemLoader
|
|
-from jinja2.utils import next
|
|
+from jinja2._compat import next
|
|
|
|
|
|
def parse_rst(state, content_offset, doc):
|
|
diff --git a/docs/templates.rst b/docs/templates.rst
|
|
index e0a19fa..4a6a379 100644
|
|
--- a/docs/templates.rst
|
|
+++ b/docs/templates.rst
|
|
@@ -579,7 +579,7 @@ Inside of a for-loop block you can access some special variables:
|
|
| `loop.depth` | Indicates how deep in deep in a recursive loop |
|
|
| | the rendering currently is. Starts at level 1 |
|
|
+-----------------------+---------------------------------------------------+
|
|
-| `loop.depth0 | Indicates how deep in deep in a recursive loop |
|
|
+| `loop.depth0` | Indicates how deep in deep in a recursive loop |
|
|
| | the rendering currently is. Starts at level 0 |
|
|
+-----------------------+---------------------------------------------------+
|
|
|
|
--
|
|
1.8.1.6
|
|
|