-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
PR: Update links to docs when they are ready #7007
Conversation
48695ad
to
b0f8d4b
Compare
This needs a merge with 3.x now. |
I assume you mean |
I really prefer merges unless there's a strong reason not to do it. In the case of #7141, I asked for a rebase because it's really odd to start a PR in 3.x and then merge it with master.
Really great to know! |
Oh, okay...I guess I assumed that because before I always recall you asking for a rebase when a PR needed to be updated for one reason or another, and I figured you wouldn't want to pollute the mainline's history with a pointless merge. I generally regarded anything merged to the main repo as inviolate, but PR branches as malleable to conform properly to the latest mainline. |
It's easier to handle merges for developers and newcomers alike. Besides, rebases usually tamper with history. I usually ask for rebases when the rebase is very simple to do (e.g. to pick up a change in our CIs done the same day or so). |
@CAM-Gerlach, I'm going to merge this even if the footer is not ready. I hope @dalthviz can finish it next week. |
Closes #5986
In preparation for the official public release of our new docs, this PR updates the links to them from PythonHosted to our own site. Currently blocked by
Baseline copyediting and correctness pass to update existing doc content spyder-docs#13Update screenshots to those from modern Spyder, and add additional shots of different Main Window layouts, etc spyder-docs#14Add the same banner used in the website and use the same fonts in its content spyder-docs#19so presumably shouldn't be merged until those are ready.