EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #629 from darkrho/fix-typo-verison 

Fixed "verison" typo in docs.
refactor-builder
Eric Holscher 2014-01-18 06:37:40 -08:00
parent b6f2d04933 956352440c
commit 912c5e7684
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deploy/nginx/app.nginx.conf
View File

@ -46,14 +46,14 @@ server {
}
# Forcibly redirect doc links so we never serve them
location ~* /docs/(?P<project>.+)/(?P<doc_lang>\w\w)/(?P<doc_verison>.+/?)(?P<path>.+) {
location ~* /docs/(?P<project>.+)/(?P<doc_lang>\w\w)/(?P<doc_version>.+/?)(?P<path>.+) {
add_header X-You-Got-Served Nginx;
add_header X-Deity %(host)s;
set $proto http;
if ( $http_x_ssl = Yup ) {
set $proto https;
}
rewrite ^ $proto://$project.readthedocs.org/$doc_lang/$doc_verison$path permanent;
rewrite ^ $proto://$project.readthedocs.org/$doc_lang/$doc_version$path permanent;
}
location / {
@ -105,8 +105,8 @@ server {
rewrite $ /;
}
location ~ ^/projects/(?P<subproject>.+)/en/(?P<doc_verison>.+)/(?P<path>.*) {
alias /home/docs/checkouts/readthedocs.org/user_builds/$domain/subprojects/$subproject/../translations/en/$doc_verison/$path;
location ~ ^/projects/(?P<subproject>.+)/en/(?P<doc_version>.+)/(?P<path>.*) {
alias /home/docs/checkouts/readthedocs.org/user_builds/$domain/subprojects/$subproject/../translations/en/$doc_version/$path;
add_header X-Served Nginx;
add_header X-Subdomain-SubProject-TryFiles True;
add_header X-Deity %(host)s;
@ -163,8 +163,8 @@ server {
break;
}
location ~ ^/projects/(?P<subproject>.+)/en/(?P<doc_verison>.+)/(?P<path>.*) {
alias /home/docs/checkouts/readthedocs.org/cnametoproject/$host/subprojects/$subproject/../translations/en/$doc_verison/$path;
location ~ ^/projects/(?P<subproject>.+)/en/(?P<doc_version>.+)/(?P<path>.*) {
alias /home/docs/checkouts/readthedocs.org/cnametoproject/$host/subprojects/$subproject/../translations/en/$doc_version/$path;
add_header X-Served Nginx;
add_header X-Subdomain-SubProject-TryFiles True;
add_header X-Deity %(host)s;

4
docs/symlinks.rst
View File

@ -69,8 +69,8 @@ $host would be ``docs.fabfile.org``:
.. code-block:: nginx
location ~ ^/en/(?P<doc_verison>.+)/(?P<path>.*) {
alias /home/docs/checkouts/readthedocs.org/cnames/$host/$doc_verison/$path;
location ~ ^/en/(?P<doc_version>.+)/(?P<path>.*) {
alias /home/docs/checkouts/readthedocs.org/cnames/$host/$doc_version/$path;
error_page 404 = @fallback;
error_page 500 = @fallback;
}

2
docs/versions.rst
View File

@ -29,7 +29,7 @@ Redirects on root URLs
When a user hits the root URL for your documentation,
for example ``http://pip.readthedocs.org/``,
they will be redirected to the **Default verison**.
they will be redirected to the **Default version**.
This defaults to **latest**,
but could also point to your latest released version.