fixed use of docstrings + added section in whats_new.rst + added data…

… dir to .gitignore
neurodata · Jun 13, 2013 · d8cf157 · d8cf157
1 parent 775bfc1
commit d8cf157
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ nips2010_pdf/
 *.tgz
 
 examples/cluster/joblib
+examples/applications/reuters/
 benchmarks/bench_covertype_data/
 
 *.prefs

diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -107,6 +107,9 @@ Changelog
  and can be used for latent semantic analysis (LSA).
  By `Lars Buitinck`_.
 
+ - Added self-contained example of out-of-core learning on text data
+ :ref:`example_applications_plot_out_of_core_classification.py`.
+ By `Eustache Diemert`_.
 
 API changes summary
 -------------------
@@ -1946,4 +1949,9 @@ David Huard, Dave Morrill, Ed Schofield, Travis Oliphant, Pearu Peterson.
 
 .. _Joel Nothman: https://joelnothman.com
 
+<<<<<<< HEAD
 .. _Norbert Crombach: https://github.com/norbert
+=======
+.. _Eustache Diemert: https://github.com/oddskool
+
+>>>>>>> fixed use of docstrings + added section in whats_new.rst + added data dir to .gitignore