Skip to content

Commit

Permalink
Cdmsdocsmerge (#223)
Browse files Browse the repository at this point in the history
* First cdms2 documentation revamp

* latest changes

* add new files and work on avariable documentations

* fix index order

* revamp documentation

* Fixing cdms documentation (docstrings)

* update documentation

* continue to work on docs

* sphinx doctest in manual.rst

* chapter 1 continu

* add requirments.txt for read-the-doc

* move requirements.txt into docs dir

* add requirements

* Chapter 2

* add chapter 3

* finish chapter 3 started chapter 4

* flake8 python files

* chapter 4 regridding

* cdms_4 doctest

* add other chapters

* finish chapter 4

* add chapter 5

* add chapter 6

* cdms chapter 6

* fix TOC

* add chapter 7 and appendix

* merge docs

* add requirements.txt

* remove cdat_info

* remote cdat_info

* fix latex_logo png

* pin pyopenssl to 17.2.0 due to myproxyclient failure in py3

* update TOC

* work on tables and setup

* try to force jquery 3.1

* just copy js script in _static

* add highlight python

* add sample dataset page

* add sample dataset page

* work on tables for cdms_2.rst

* continue cdms2 documentations

* update cdms2 tables

* update sections

* update table

* finish chapter 2

* fix litteral error

* unlink .dodsrc for cdscan

* First changes from Tanya

* some change in chapter 1 and 2

* some changes in Chapter 2

* fix tables

* Some changes to Chapter 2

* Some Changes to Chapter 2

* Some changes made to Chapters 1, 2 and 4

* Some changes to Chapter 2

* Some Changes made to Chapter 2

* Some changes to Chapters 2, 3 and 4

* Some changes made to 1 through Appendix

* Some Changes made to Chapter 2

* Some Changes to Chapters 1, 2, 3, 6 and Appendix

* Some changes made to Chapters 1 thru 7 and appendix

* Some changes to Chpaters 1, 2 and 3

* Changes made to Chapters 1, 4, 5 and Appendix

* Some changes to Chapter 2 and 4

* Some Changes to Images, Chapter 3 and Appendix

* update logo

* add my logo

* fix chapter 1 test
  • Loading branch information
dnadeau4 committed Jun 20, 2018
1 parent 3d614dd commit e2a12a8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def side_effect(*args, **kwargs):

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
html_logo = 'manual/images/uvcdat.png'
html_logo = 'manual/images/cdms_logo2_nocube.png'

# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e2a12a8

Please sign in to comment.