Skip to content

Commit b7791b0

Browse files
Rollup merge of #48274 - GuillaumeGomez:remove-hoedown, r=QuietMisdreavus
Remove hoedown from rustdoc Finally the time has come! r? @QuietMisdreavus
2 parents 715030f + 6661ebb commit b7791b0

File tree

20 files changed

+114
-1372
lines changed

20 files changed

+114
-1372
lines changed

.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
path = src/llvm
33
url = https://github.com/rust-lang/llvm.git
44
branch = master
5-
[submodule "src/rt/hoedown"]
6-
path = src/rt/hoedown
7-
url = https://github.com/rust-lang/hoedown.git
8-
branch = rust-2015-09-21-do-not-delete
95
[submodule "src/jemalloc"]
106
path = src/jemalloc
117
url = https://github.com/rust-lang/jemalloc.git

COPYRIGHT

-22
Original file line numberDiff line numberDiff line change
@@ -192,28 +192,6 @@ their own copyright notices and license terms:
192192
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
193193
OF SUCH DAMAGE.
194194

195-
* Hoedown, the markdown parser, under src/rt/hoedown, is
196-
licensed as follows.
197-
198-
Copyright (c) 2008, Natacha Porté
199-
Copyright (c) 2011, Vicent Martí
200-
Copyright (c) 2013, Devin Torres and the Hoedown authors
201-
202-
Permission to use, copy, modify, and distribute this
203-
software for any purpose with or without fee is hereby
204-
granted, provided that the above copyright notice and
205-
this permission notice appear in all copies.
206-
207-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR
208-
DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
209-
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
210-
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
211-
SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR
212-
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
213-
OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
214-
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
215-
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
216-
217195
* libbacktrace, under src/libbacktrace:
218196

219197
Copyright (C) 2012-2014 Free Software Foundation, Inc.

0 commit comments

Comments
 (0)