diff options
| author | Chris McDonough <chrism@plope.com> | 2011-08-10 20:20:05 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-08-10 20:20:05 -0400 |
| commit | 995466c6bc0da04f50d2db83af653362a0dadd6f (patch) | |
| tree | e5e57108a3d751d9e02cbf06ad5eca8902f4a100 /docs/narr/MyProject/myproject | |
| parent | 9a8ba2f09fe3791febbfec2ac383c091aacfbf5b (diff) | |
| parent | 3e3fcdf1376218a4fa6dcffec4f27a41c63d1675 (diff) | |
| download | pyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.tar.gz pyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.tar.bz2 pyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.zip | |
fix merge conflicts
Diffstat (limited to 'docs/narr/MyProject/myproject')
| -rw-r--r-- | docs/narr/MyProject/myproject/templates/mytemplate.pt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 632c34876..97f1e1aa3 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -46,7 +46,7 @@ <div id="left" class="align-right"> <h2>Search documentation</h2> <form method="get" - action="http://docs.pylonsproject.org/pyramid/dev/search.html"> + action="http://docs.pylonsproject.org/pyramid/current/search.html"> <input type="text" id="q" name="q" value="" /> <input type="submit" id="x" value="Go" /> </form> @@ -60,32 +60,32 @@ </a> </li> <li> - <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation"> + <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation"> Narrative Documentation </a> </li> <li> - <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation"> + <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation"> API Documentation </a> </li> <li> - <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials"> + <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials"> Tutorials </a> </li> <li> - <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history"> + <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history"> Change History </a> </li> <li> - <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications"> + <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications"> Sample Applications </a> </li> <li> - <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development"> + <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development"> Support and Development </a> </li> |