Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs and minor code fixes #1805

Merged
merged 52 commits into from
Aug 21, 2017
Merged

Conversation

ea42gh
Copy link
Contributor

@ea42gh ea42gh commented Aug 13, 2017

struggled with git, hope I did not mess up too badly:
Minor documentation changes to improve readability.

ea42gh and others added 30 commits July 26, 2017 21:11
* Removed inner divs in logo to fix export

* Removed vertical-align style as it has no effect
* Enabled warnings about the use of __call__ on travis

* Replaced uses of __call__ with opts in Bokeh Elements notebook

* Replaced uses of __call__ with opts in Columnar Data notebook

* Replaced uses of __call__ with opts in Elements notebook

* Replaced uses of __call__ with opts in Options notebook

* Replaced uses of __call__ with opts in Sampling Data notebook

* Replaced remaining uses of __call__ in doc/Tutorials

* Replaced uses of __call__ in the legend_example notebooks

* Replaced uses of __call__ with .opts in store option tests
* Moved examples function to setup.py to avoid dependencies install

* Restored copy of examples function in util

* Added comment about duplication of the examples function

* Fixed message about holoviews command dependencies
* Fixed problems in rst links

* Used pandoc to convert CHANGELOG to Markdown

* Added CHANGELOG entry for 1.8.2
@philippjfr philippjfr added the type: docs Related to the documentation and examples label Aug 13, 2017
@jlstevens
Copy link
Contributor

@philippjfr Should be merge for 1.8.3?

@philippjfr
Copy link
Member

Yes, let's merge it.

@philippjfr philippjfr merged commit 4e842f4 into holoviz:master Aug 21, 2017
@jlstevens jlstevens added this to the 1.8.3 milestone Aug 21, 2017
@ea42gh
Copy link
Contributor Author

ea42gh commented Aug 22, 2017

Since I am new to git, let me verify the steps I need to take:

  • push the "Delete branch" button below, the branch will be deleted
    from ioam/holoviews.
  • pull ioam/holoviews into my local master and do a rebase to delete the branch from my local copy
  • push my local copy to my github copy of holoviews to delete the branch from my github repository??

Then, if I want to suggest further documentation changes, just start a new branch?

@philippjfr
Copy link
Member

Pressing the "Delete Branch" button above should delete your branch, your branch isn't on ioam. All you should have to do is 1) press the button 2) switch to master locally then pull from ioam/holoviews and 3) delete your local branch with git branch -d docs_and_minor_code_fixes. Now you're free to make a new branch based off master.

@ea42gh ea42gh deleted the docs_and_minor_code_fixes branch August 22, 2017 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: docs Related to the documentation and examples
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants