From 0f2bbe521970aac9bf41f5ab9069256dac9f9cc5 Mon Sep 17 00:00:00 2001
From: Paul Winkler <paul@bitly.com>
Date: Thu, 29 Nov 2012 13:15:26 -0500
Subject: Fix broken link to contributor docs

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/index.rst')

diff --git a/docs/index.rst b/docs/index.rst
index faf8258c1..406cc9b03 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -200,7 +200,7 @@ To check out the trunk via ``git``, use this command:
 
 To find out how to become a contributor to :app:`Pyramid`, please see the
 `contributor's section of the documentation
-<http://docs.pylonsproject.org/index.html#contributing>`_.
+<http://docs.pylonsproject.org/en/latest/#contributing>`_.
 
 Index and Glossary
 ==================
-- 
cgit v1.2.3


From 812f65b895269f0c6b015af0276eef86b0b9b518 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Tue, 8 Jan 2013 23:14:20 +0200
Subject: the sample apps do not run on Py3k

---
 docs/index.rst | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/index.rst')

diff --git a/docs/index.rst b/docs/index.rst
index 406cc9b03..0d6113c15 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -138,6 +138,11 @@ Design Documents
 Sample Applications
 ===================
 
+.. note::
+
+   These applications run only on Python 2.x, and so do some of their
+   dependencies.
+
 `cluegun <https://github.com/Pylons/cluegun>`_ is a simple pastebin
 application based on Rocky Burt's `ClueBin
 <http://pypi.python.org/pypi/ClueBin/0.2.3>`_.  It demonstrates form
-- 
cgit v1.2.3


From e241c7e479b411a7f465b0a3d86021301702f8af Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Fri, 18 Jan 2013 23:58:04 +0200
Subject: make example links clickable, for convenience

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/index.rst')

diff --git a/docs/index.rst b/docs/index.rst
index 0d6113c15..d4b7ed492 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,7 +14,7 @@ Here is one of the simplest :app:`Pyramid` applications you can make:
 .. literalinclude:: narr/helloworld.py
 
 After you install :app:`Pyramid` and run this application, when you visit
-``http://localhost:8080/hello/world`` in a browser, you will see the text
+`<http://localhost:8080/hello/world>`_ in a browser, you will see the text
 ``Hello, world!``
 
 See :ref:`firstapp_chapter` for a full explanation of how this application
-- 
cgit v1.2.3