Skip to content

Commit 6c88a96

Browse files
gregmuelleggergregmuellegger
committed
Merge branch 'master' into async-github-repo-syncing
2 parents bcb8906 + 1f2c785 commit 6c88a96

File tree

194 files changed

+2705
-1297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+2705
-1297
lines changed

‎docs/api/bookmarks.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
:mod:`bookmarks`
2-
================
1+
:mod:`readthedocs.bookmarks`
2+
============================
33

4-
:mod:`bookmarks.admin`
4+
:mod:`readthedocs.bookmarks.admin`
55
----------------------------------
6-
.. automodule:: bookmarks.admin
6+
.. automodule:: readthedocs.bookmarks.admin
77
:members:
88

9-
:mod:`bookmarks.models`
10-
----------------------------------
11-
.. automodule:: bookmarks.models
9+
:mod:`readthedocs.bookmarks.models`
10+
-----------------------------------
11+
.. automodule:: readthedocs.bookmarks.models
1212
:members:
1313

14-
:mod:`bookmarks.urls`
15-
----------------------------------
16-
.. automodule:: bookmarks.urls
14+
:mod:`readthedocs.bookmarks.urls`
15+
---------------------------------
16+
.. automodule:: readthedocs.bookmarks.urls
1717
:members:
1818

19-
:mod:`bookmarks.views`
19+
:mod:`readthedocs.bookmarks.views`
2020
----------------------------------
21-
.. automodule:: bookmarks.views
21+
.. automodule:: readthedocs.bookmarks.views
2222
:members:
2323

2424

‎docs/api/builds.rst

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
:mod:`builds`
2-
=============
1+
:mod:`readthedocs.builds`
2+
=========================
33

4-
:mod:`builds.admin`
5-
----------------------------------
6-
.. automodule:: builds.admin
4+
:mod:`readthedocs.builds.admin`
5+
-------------------------------
6+
.. automodule:: readthedocs.builds.admin
77
:members:
88

9-
:mod:`builds.models`
10-
----------------------------------
11-
.. automodule:: builds.models
9+
:mod:`readthedocs.builds.models`
10+
--------------------------------
11+
.. automodule:: readthedocs.builds.models
1212
:members:
1313

14-
:mod:`builds.urls`
15-
----------------------------------
16-
.. automodule:: builds.urls
14+
:mod:`readthedocs.builds.urls`
15+
------------------------------
16+
.. automodule:: readthedocs.builds.urls
1717
:members:
1818

19-
:mod:`builds.views`
20-
----------------------------------
21-
.. automodule:: builds.views
19+
:mod:`readthedocs.builds.views`
20+
-------------------------------
21+
.. automodule:: readthedocs.builds.views
2222
:members:
2323

‎docs/api/core.rst

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
:mod:`core`
2-
===========
1+
:mod:`readthedocs.core`
2+
=======================
33

4-
:mod:`core.admin`
5-
----------------------------------
6-
.. automodule:: core.admin
4+
:mod:`readthedocs.core.admin`
5+
-----------------------------
6+
.. automodule:: readthedocs.core.admin
77
:members:
88

9-
:mod:`core.forms`
10-
----------------------------------
11-
.. automodule:: core.forms
9+
:mod:`readthedocs.core.forms`
10+
-----------------------------
11+
.. automodule:: readthedocs.core.forms
1212
:members:
1313

14-
:mod:`core.middleware`
14+
:mod:`readthedocs.core.middleware`
1515
----------------------------------
16-
.. automodule:: core.middleware
16+
.. automodule:: readthedocs.core.middleware
1717
:members:
1818

19-
:mod:`core.models`
20-
----------------------------------
21-
.. automodule:: core.models
19+
:mod:`readthedocs.core.models`
20+
------------------------------
21+
.. automodule:: readthedocs.core.models
2222
:members:
2323

24-
:mod:`core.search_sites`
25-
----------------------------------
26-
.. automodule:: core.search_sites
24+
:mod:`readthedocs.core.search_sites`
25+
------------------------------------
26+
.. automodule:: readthedocs.core.search_sites
2727
:members:
2828

29-
:mod:`core.views`
30-
----------------------------------
31-
.. automodule:: core.views
29+
:mod:`readthedocs.core.views`
30+
-----------------------------
31+
.. automodule:: readthedocs.core.views
3232
:members:
3333

3434

35-
:mod:`core.management.commands`
36-
----------------------------------
35+
:mod:`readthedocs.core.management.commands`
36+
-------------------------------------------
3737
This is where custom ``manage.py`` commands are defined.
3838

39-
.. automodule:: core.management.commands.build_files
39+
.. automodule:: readthedocs.core.management.commands.build_files
4040
:members:
4141

42-
.. automodule:: core.management.commands.update_repos
42+
.. automodule:: readthedocs.core.management.commands.update_repos
4343
:members:
4444

‎docs/api/doc_builder.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
:mod:`doc_builder`
2-
==================
1+
:mod:`readthedocs.doc_builder`
2+
==============================
33

4-
:mod:`doc_builder.base`
5-
----------------------------------
6-
.. automodule:: doc_builder.base
4+
:mod:`readthedocs.doc_builder.base`
5+
-----------------------------------
6+
.. automodule:: readthedocs.doc_builder.base
77
:members:
88

9-
:mod:`doc_builder.envrionments`
10-
-------------------------------
11-
.. automodule:: doc_builder.environments
9+
:mod:`readthedocs.doc_builder.envrionments`
10+
-------------------------------------------
11+
.. automodule:: readthedocs.doc_builder.environments
1212
:members:
1313

14-
:mod:`doc_builder.backends`
15-
----------------------------------
14+
:mod:`readthedocs.doc_builder.backends`
15+
---------------------------------------
1616

1717

18-
:mod:`doc_builder.backends.sphinx`
19-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20-
.. automodule:: doc_builder.backends.sphinx
18+
:mod:`readthedocs.doc_builder.backends.sphinx`
19+
----------------------------------------------
20+
.. automodule:: readthedocs.doc_builder.backends.sphinx
2121
:members:

‎docs/api/projects.rst

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
:mod:`projects`
2-
===============
1+
:mod:`readthedocs.projects`
2+
===========================
33

4-
:mod:`projects.admin`
5-
----------------------------------
6-
.. automodule:: projects.admin
4+
:mod:`readthedocs.projects.admin`
5+
---------------------------------
6+
.. automodule:: readthedocs.projects.admin
77
:members:
88

9-
:mod:`projects.constants`
10-
----------------------------------
11-
.. automodule:: projects.constants
9+
:mod:`readthedocs.projects.constants`
10+
-------------------------------------
11+
.. automodule:: readthedocs.projects.constants
1212
:members:
1313

14-
:mod:`projects.forms`
15-
----------------------------------
16-
.. automodule:: projects.forms
14+
:mod:`readthedocs.projects.forms`
15+
---------------------------------
16+
.. automodule:: readthedocs.projects.forms
1717
:members:
1818

19-
:mod:`projects.models`
19+
:mod:`readthedocs.projects.models`
2020
----------------------------------
21-
.. automodule:: projects.models
21+
.. automodule:: readthedocs.projects.models
2222
:members:
2323

24-
:mod:`projects.search_indexes`
25-
----------------------------------
26-
.. automodule:: projects.search_indexes
24+
:mod:`readthedocs.projects.search_indexes`
25+
------------------------------------------
26+
.. automodule:: readthedocs.projects.search_indexes
2727
:members:
2828

29-
:mod:`projects.tasks`
30-
----------------------------------
31-
.. automodule:: projects.tasks
29+
:mod:`readthedocs.projects.tasks`
30+
---------------------------------
31+
.. automodule:: readthedocs.projects.tasks
3232
:members:
3333

34-
:mod:`projects.utils`
35-
----------------------------------
36-
.. automodule:: projects.utils
34+
:mod:`readthedocs.projects.utils`
35+
---------------------------------
36+
.. automodule:: readthedocs.projects.utils
3737
:members:
3838

39-
:mod:`projects.views`
40-
----------------------------------
39+
:mod:`readthedocs.projects.views`
40+
---------------------------------
4141

42-
:mod:`projects.views.public`
43-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44-
.. automodule:: projects.views.public
42+
:mod:`readthedocs.projects.views.public`
43+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44+
.. automodule:: readthedocs.projects.views.public
4545
:members:
4646

47-
:mod:`projects.views.private`
48-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
49-
.. automodule:: projects.views.private
47+
:mod:`readthedocs.projects.views.private`
48+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
49+
.. automodule:: readthedocs.projects.views.private
5050
:members:
5151

‎docs/api/vcs_support.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
:mod:`vcs_support`
2-
==================
1+
:mod:`readthedocs.vcs_support`
2+
==============================
33

4-
:mod:`vcs_support.base`
5-
-----------------------
4+
:mod:`readthedocs.vcs_support.base`
5+
-----------------------------------
66

7-
.. automodule:: vcs_support.base
7+
.. automodule:: readthedocs.vcs_support.base
88
:members:
99

‎docs/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
from recommonmark.parser import CommonMarkParser
77

8-
sys.path.insert(0, os.path.abspath('../readthedocs'))
9-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.sqlite")
8+
sys.path.insert(0, os.path.abspath('..'))
9+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "readthedocs.settings.sqlite")
10+
1011
from django.conf import settings
1112

1213
import django

‎docs/custom_installs/local_rtd_vm.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Possible Error and Resolution
5555

5656
1. Run the following commands. ::
5757

58-
$ cd readthedocs
5958
$ ./manage.py migrate
6059

6160
2. This will prompt you to create a superuser account for Django. Enter appropriate details. For example: ::
@@ -67,7 +66,7 @@ Possible Error and Resolution
6766
3. RTD Server Administration.
6867
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6968

70-
Navigate to the ``../checkouts/readthedocs.org/readthedocs`` folder in your VM and run the following command. ::
69+
Navigate to the ``../checkouts/readthedocs.org`` folder in your VM and run the following command. ::
7170

7271
$ ./manage.py runserver [VM IP ADDRESS]:8000
7372
$ curl -i http://[VM IP ADDRESS]:8000

‎docs/i18n.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Updating Localization Files
250250

251251
To update the translation source files (eg if you changed or added translatable
252252
strings in the templates or Python code) you should run ``python manage.py
253-
makemessages -l <language>`` in the ``readthedocs/`` directory (substitute
253+
makemessages -l <language>`` in the project's root directory (substitute
254254
``<language>`` with a valid language code).
255255

256256
The updated files can now be localized in a `PO editor

‎docs/issue-labels.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,3 @@ what they stand for.
9898
that only require a one time action on the server will have this label.
9999
See the documentation about our :ref:`triage process
100100
<triage-support-tickets>` for more information.
101-
102-
103-
.. include:: _includes/issue-labels.rst

‎gulpfile.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ gulp.task('build', function (done) {
127127
}))
128128
.pipe(es.wait(function (err, body) {
129129
gulp_util.log('Collecting static files');
130-
run('readthedocs/manage.py collectstatic --noinput')
130+
run('./manage.py collectstatic --noinput')
131131
.exec('', function (err) { done(err); });
132132
}));
133133
});
@@ -141,16 +141,15 @@ gulp.task('dev', function (done) {
141141

142142
es
143143
.merge(Object.keys(sources).map(function (application) {
144-
var files = sources[application].map(function (n) {
145-
return path.join(
146-
pkg_config.name, application, 'static-src', '**', n
147-
);
148-
});
144+
var files = [
145+
path.join(pkg_config.name, application, 'static-src', '**', '*.js'),
146+
path.join(pkg_config.name, application, 'static-src', '**', '*.css')
147+
];
149148
return watch(files, {verbose: true, name: 'dev'}, function () {
150149
build_app_sources(application, false)
151150
.pipe(es.wait(function (err, body) {
152151
gulp_util.log('Collecting static files');
153-
run('readthedocs/manage.py collectstatic --noinput').exec('');
152+
run('./manage.py collectstatic --noinput').exec('');
154153
}));
155154
});
156155
}))

‎readthedocs/manage.py renamed to ‎manage.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import sys
44

55
if __name__ == "__main__":
6-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.sqlite")
6+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "readthedocs.settings.sqlite")
77
sys.path.append(os.getcwd())
8-
sys.path.append(os.path.join(os.getcwd(), 'readthedocs'))
98

109
from django.core.management import execute_from_command_line
1110

‎media/css/core.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ hr { height: 1px; border: 0; border: none; width: 100%; background: #bfbfbf; col
1717

1818
/* general layout */
1919

20-
body { position: relative; text-align: center; z-index: 0; background: #fafafa url(../images/body-bg.png) top left repeat; }
20+
body { position: relative; text-align: center; z-index: 0; background: #fafafa url(../images/body-bg.svg) top left repeat; }
2121
.wrapper { position: relative; text-align: left; margin: 0 auto; padding: 0 10px; width: 800px; }
2222

2323
div.wrapper > div.col-major {
@@ -267,7 +267,7 @@ div.menu-user div.menu-dropdown.menu-dropped {
267267

268268
/* home */
269269

270-
#home-header { background: url(../images/header-home-bg.png) top left repeat #465158; border-bottom: 1px solid #333; padding: 65px 0 35px 0; color: #fff; }
270+
#home-header { background: url(../images/header-home-bg.svg) top left repeat #465158; border-bottom: 1px solid #333; padding: 65px 0 35px 0; color: #fff; }
271271
.home.splash #content { padding-top: 80px; }
272272

273273
/* title */

0 commit comments

Comments
 (0)