Skip to content

Commit

Permalink
Merge from 3.x: PR #36
Browse files Browse the repository at this point in the history
  • Loading branch information
CAM-Gerlach committed May 14, 2018
2 parents bfbec0f + dde7ecb commit e7e1a8a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
6 changes: 0 additions & 6 deletions AUTHORS

This file was deleted.

9 changes: 9 additions & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
The Spyder Doc Contributors are composed of:

* Pierre Raybaut <[email protected]> (Original Spyder author).
* Carlos Cordoba <[email protected]> (Current Spyder maintainer).
* C.A.M. Gerlach <[email protected]> (Current docs maintainer).
* All other developers who have contributed to the spyder-docs repository:
<https://github.com/spyder-ide/spyder-docs/graphs/contributors>
and those editing the original documentation on the main spyder repository:
<https://github.com/spyder-ide/spyder/commits/master/doc>
2 changes: 1 addition & 1 deletion LICENSE → LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 20092018 Spyder Project Contributors
Copyright (c) 2009-2018 The Spyder Doc Contributors

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![Spyder Docs — Documentation for the Scientific Python Development Environment](
./doc/_static/spyder_readme_banner.png)

*Copyright © 2009–2018 Spyder Project Contributors*
*Copyright © 2009–2018 The Spyder Doc Contributors*


[![license](https://img.shields.io/pypi/l/spyder.svg)](./LICENSE)
Expand Down
6 changes: 3 additions & 3 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@

# General information about the project.
project = 'Spyder'
copyright = '2009–2018 The Spyder Project Contributors'
author = 'The Spyder Project Contributors'
copyright = '2009–2018 The Spyder Doc Contributors'
author = 'The Spyder Doc Contributors'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down Expand Up @@ -245,7 +245,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', 'Spyder.tex', 'Spyder Documentation',
'The Spyder Project Contributors', 'manual'),
author, 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down

0 comments on commit e7e1a8a

Please sign in to comment.