Revert non ready (#244)

* REVERT OSCOSS doc merge (not ready) * REVERT OSCOSS rdf merge (not ready) * fix flake8 errors
fiduswriter · Jun 17, 2016 · 8661a6b · 8661a6b
1 parent cc5dc92
commit 8661a6b
Show file tree

Hide file tree

Showing 51 changed files with 4 additions and 2,399 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,2 +1,2 @@
 [flake8]
-exclude = node_modules/*,*/migrations/*,venv/*,docs/conf.py
+exclude = node_modules/*,*/migrations/*,venv/*
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,3 @@ static-es5/
 *.es5.js
 base/static/css/libs/
 .coverage
-
-#sphinx build folder
-docs/_build/
diff --git a/README.md b/README.md
@@ -135,18 +135,6 @@ Advanced options
 
   6. Restart your server.
 
-### Regenerate the documentation:
-
-  1. Install documentation dependencies:
-
-    > `pip install -r doc-requirements.txt`
-
-  2. Run sphinx:
-
-    > `sphinx-apidoc -f -o ./docs/ ./`
-
-  3. You can find the output in the docs dir.
-
 ### Development/upgrade:
 
   If there are changes to the JavaScript source code of Fidus Writer, you need to run:

diff --git a/book/views.py b/book/views.py
@@ -181,8 +181,6 @@ def get_booklist_js(request):
 
 def add_chapters(book_instance, chapters, status, this_user):
     for chapter in chapters:
-        print chapter
-        print book_instance.id
         new_chapter = Chapter(
             book=book_instance,
             text_id=chapter['text'],

diff --git a/doc-requirements.txt b/doc-requirements.txt
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/base.handlers.rst b/docs/base.handlers.rst
diff --git a/docs/base.management.commands.rst b/docs/base.management.commands.rst
diff --git a/docs/base.management.rst b/docs/base.management.rst
diff --git a/docs/base.rst b/docs/base.rst
diff --git a/docs/base.servers.rst b/docs/base.servers.rst
diff --git a/docs/bibliography.management.commands.rst b/docs/bibliography.management.commands.rst
diff --git a/docs/bibliography.management.rst b/docs/bibliography.management.rst