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

Fix docs links #7005

Merged
merged 16 commits into from
Jul 27, 2016
Merged

Fix docs links #7005

merged 16 commits into from
Jul 27, 2016

Conversation

nateGeorge
Copy link
Contributor

@nateGeorge nateGeorge commented Jul 16, 2016

Fix broken and redirect links. Checked broken links by hand because many of them actually worked.

See #7000
also see #6835

@@ -33,34 +33,34 @@ The following people have been core contributors to scikit-learn's development a
* Edouard Duchesnay
* `Tom Dupré la Tour <https://github.com/TomDLT>`_
* Alexander Fabisch
* `Virgile Fritsch <http://parietal.saclay.inria.fr/Members/virgile-fritsch>`_
* `Virgile Fritsch <http://web.archive.org/web/20101019075308/http://parietal.saclay.inria.fr/Members/virgile-fritsch>`_
Copy link
Member

Choose a reason for hiding this comment

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

that looks wrong

Copy link
Member

Choose a reason for hiding this comment

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

@amueller
Copy link
Member

I didn't check all the links but commented on some that looked odd. Otherwise lgtm.

@nelson-liu
Copy link
Contributor

this looks good to me as well, i checked most of the links that weren't http to https

@amueller
Copy link
Member

conflicts... otherwise good wit hme.

@nelson-liu
Copy link
Contributor

can you rebase on master and solve merge conflicts?

:func:`sklearn.datasets.fetch_olivetti_faces` function is the data
fetching / caching function that downloads the data
archive from AT&T.

.. _the Internet Archive's Wayback Machine: http://wayback.archive.org/web/*/http://www.uk.research.att.com/facedatabase.html
.. _This dataset contains a set of face images: http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html
Copy link
Contributor

Choose a reason for hiding this comment

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

this link actually doesn't look correct...i think you need to replace the text This dataset contains a set of face images in the paragraph above with This dataset contains a set of face images_...

@@ -11,7 +11,7 @@ This dataset contains a set of face images taken between April 1992 and April
fetching / caching function that downloads the data
archive from AT&T.

.. _This dataset contains a set of face images: http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html
.. _This dataset contains a set of face images_: http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry I was unclear. Remove the_ you added in the link, but put it in the text in the paragraph above. Model it after the previous link that was there (note the markup around the "Internet way back machine" text that you removed in the diff)
I'd encourage you to build the docs by running make html-noplotin the docs directory and seeing if the generated html looks right.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah ok. Thanks, I didn't know how to make the docs yet.

1994 at AT&T Laboratories Cambridge. The website describing the original
dataset is now defunct, but archived copies can be accessed through
`the Internet Archive's Wayback Machine`_. The
`This dataset contains a set of face image`_ taken between April 1992 and April
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you're missing an s at the end of image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whoops, forgot to push the commit earlier

@nelson-liu
Copy link
Contributor

Now this LGTM


A good starting point is the discussion on `good freely available
textbooks on machine learning`_
http://meta.stackexchange.com/questions/130524/which-stack-exchange-website-for-machine-learning-and-computational-algorithms
Copy link
Member

Choose a reason for hiding this comment

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

What's this URL doing here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Metaoptimize doesn't seem to exist anymore so I was trying to offer another resource.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't fully catch how the links were working before though, so I'll add that line back in. Maybe the stack exchange should be a separate PR if anybody cares about putting it in? I'm indifferent.

@@ -13,9 +13,16 @@ ask on the `Mailing List <http://scikit-learn.org/stable/support.html>`_
Q&A communities with Machine Learning practitioners
----------------------------------------------------

:Metaoptimize/QA:
Copy link
Member

Choose a reason for hiding this comment

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

I think we may just need to drop this section. Certainly it does not belong first. The textbooks on machine learning will be increasingly outdated, and certainly are not pertinent to the Q&A communities headline.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Dropping it like its hot...

@amueller
Copy link
Member

Merging as this looks good and is a minor doc change. Also @nelson-liu checked.

@amueller amueller merged commit 9b25f5d into scikit-learn:master Jul 27, 2016
staubda pushed a commit to staubda/scikit-learn that referenced this pull request Aug 23, 2016
* docs: fix broken and redirect links

see scikit-learn#7000

* docs: fix links

see scikit-learn#7000

* docs: merge with master

* docs: fix fnrs and tinyclues logo links

* docs: fix link reference in text

* docs: fix typo

* docs: added back in metaoptimize-qa paragraph

* docs: update language for defunct site

* docs: update stackexchange section

* docs: remove defunct site, move quora to top

* docs: remove defunct link and rearrange links
olologin pushed a commit to olologin/scikit-learn that referenced this pull request Aug 24, 2016
* docs: fix broken and redirect links

see scikit-learn#7000

* docs: fix links

see scikit-learn#7000

* docs: merge with master

* docs: fix fnrs and tinyclues logo links

* docs: fix link reference in text

* docs: fix typo

* docs: added back in metaoptimize-qa paragraph

* docs: update language for defunct site

* docs: update stackexchange section

* docs: remove defunct site, move quora to top

* docs: remove defunct link and rearrange links
TomDLT pushed a commit to TomDLT/scikit-learn that referenced this pull request Oct 3, 2016
* docs: fix broken and redirect links

see scikit-learn#7000

* docs: fix links

see scikit-learn#7000

* docs: merge with master

* docs: fix fnrs and tinyclues logo links

* docs: fix link reference in text

* docs: fix typo

* docs: added back in metaoptimize-qa paragraph

* docs: update language for defunct site

* docs: update stackexchange section

* docs: remove defunct site, move quora to top

* docs: remove defunct link and rearrange links
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants