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.

Sign up for GitHub

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

Jump to bottom

Fixed typos (thanks to Benjamin Weis) #2897

Merged
merged 2 commits into from
Jan 4, 2016
Merged

Fixed typos (thanks to Benjamin Weis) #2897

merged 2 commits into from
Jan 4, 2016

Conversation

PierreRaybaut
Copy link
Contributor

reStructured Text --> reStructuredText
occurence --> occurrence
Occurrence --> Occurrence

@PierreRaybaut
Fixed typos (thanks to Benjamin Weis)
b22c101 
reStructured Text --> reStructuredText
occurence --> occurrence
Occurrence --> Occurrence
@PierreRaybaut
Copy link
Contributor Author

@ccordoba12 (and others): it may break an existing "installation" of Spyder based on latest revision (because of the change of name of some settings related to occurrence highlighting, this kind of thing). Anyway, it seems good to fix those shameful typographical errors ;-) (and I'm responsible for most of them...)

@PierreRaybaut
Copy link
Contributor Author

By the way, this PR is required to be merged in order to add German translation to Spyder which is undoubtedly a good addition.

@PierreRaybaut
Copy link
Contributor Author

@ccordoba12:
After some tests, it seems that it's quite harmless.
So unless you have second thoughts on this, I suggest merging this PR.

ccordoba12
ccordoba12 reviewed Jan 4, 2016
View reviewed changes
spyderlib/config/main.py
@@ -719,7 +719,7 @@ def is_gtk_desktop():
'zenburn/background': "#3f3f3f",
'zenburn/currentline': "#333333",
'zenburn/currentcell': "#2c2c2c",
'zenburn/occurence': "#7a738f",
'zenburn/occurrence': "#7a738f",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing option names requires a major bump in CONF_VERSION number (present below in this same file)

@ccordoba12 ccordoba12 added this to the V3.0beta3 milestone Jan 4, 2016
@ccordoba12
Copy link
Member

Other than the bump to CONF_VERSION, I think this is ready :-)

@PierreRaybaut
Major update of CONF_VERSION (up to 24.0.0)
7542cc1 
Some options have been renamed: this requires a major update in configuration version.
PierreRaybaut added a commit that referenced this pull request Jan 4, 2016
@PierreRaybaut
Merge pull request #2897 from spyder-ide/typos
b2b23df 
Fixed typos (thanks to Benjamin Weis)
@PierreRaybaut PierreRaybaut merged commit b2b23df into master Jan 4, 2016
@ccordoba12 ccordoba12 deleted the typos branch January 5, 2016 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
type:Bug
Projects
None yet
Milestone
v3.0beta3
Development

Successfully merging this pull request may close these issues.
2 participants
@PierreRaybaut @ccordoba12