Remove "talks." namespace.

diff --git a/chicago-talk/chicago-talk.factor b/chicago-talk/chicago-talk.factor
index 02ddc421af21e7835b555ffaf8e3f779d217e503..aa6208cf936ab8f9558ba81d0cc6c5c5477ee97b 100644 (file)
--- a/chicago-talk/chicago-talk.factor
+++ b/chicago-talk/chicago-talk.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: slides help.markup ;
-IN: talks.chicago-talk
+IN: chicago-talk
 
 CONSTANT: chicago-slides
 {

diff --git a/galois-talk/galois-talk.factor b/galois-talk/galois-talk.factor
index 87e7914693be660497b39a97c455ce4a55616d78..a942419e160ee28d937e01bf310343d871901973 100644 (file)
--- a/galois-talk/galois-talk.factor
+++ b/galois-talk/galois-talk.factor
@@ -6,7 +6,7 @@ locals kernel.private help.vocabs assocs quotations
 urls peg.ebnf tools.annotations tools.crossref
 help.topics math.functions compiler.tree.optimizer
 compiler.cfg.optimizer fry ;
-IN: talks.galois-talk
+IN: galois-talk
 
 CONSTANT: galois-slides
 {
@@ -230,7 +230,7 @@ CONSTANT: galois-slides
         "Help markup is just literal data"
         { "Look at the help for " { $link T{ link f + } } }
         "These slides are built with the help system and a custom style sheet"
-        { $vocab-link "talks.galois-talk" }
+        { $vocab-link "galois-talk" }
     }
     { $slide "Why stack-based?"
         "Because nobody else is doing it"

diff --git a/google-tech-talk/google-tech-talk.factor b/google-tech-talk/google-tech-talk.factor
index a0b511f4cf8c5fc364ac48dd95054bd2c50ae2f3..8c8524fe2d04244f2c1fafec29cbabe1a720a392 100644 (file)
--- a/google-tech-talk/google-tech-talk.factor
+++ b/google-tech-talk/google-tech-talk.factor
@@ -6,7 +6,7 @@ locals kernel.private help.vocabs assocs quotations
 urls peg.ebnf tools.annotations tools.crossref
 help.topics math.functions compiler.tree.optimizer
 compiler.cfg.optimizer fry ;
-IN: talks.google-tech-talk
+IN: google-tech-talk
 
 CONSTANT: google-slides
 {

diff --git a/hmc-talk/hmc-talk.factor b/hmc-talk/hmc-talk.factor
index 9a225f9f595c89b3628986d3a534877e783b4ec0..18a7e5f274a65286519182bd2ed919742f95d9a7 100644 (file)
--- a/hmc-talk/hmc-talk.factor
+++ b/hmc-talk/hmc-talk.factor
@@ -1,6 +1,6 @@
 USING: fry help.markup help.topics kernel locals math
 math.functions memoize peg.ebnf slides ;
-IN: talks.hmc-talk
+IN: hmc-talk
 
 CONSTANT: hmc-slides
 {
@@ -35,14 +35,14 @@ CONSTANT: hmc-slides
 
     { $slide "Words and the stack"
         { $code
-            "\"/usr/local/opt/fortune/share/games/fortunes/science\""
+            "\"/opt/homebrew/share/games/fortunes/science\""
             "ascii file-lines"
             "{ \"%\" } split random"
             "[ print ] each"
         }
         { $code
             ": fortune ( -- )"
-            "    \"/usr/local/opt/fortune/share/games/fortunes/science\""
+            "    \"/opt/homebrew/share/games/fortunes/science\""
             "    ascii file-lines"
             "    { \"%\" } split random"
             "    [ print ] each ;"
@@ -253,7 +253,7 @@ CONSTANT: hmc-slides
         "Help markup is just literal data"
         { "Look at the help for " { $link T{ link f + } } }
         "These slides are built with the help system and a custom style sheet"
-        { $vocab-link "talks.hmc-talk" }
+        { $vocab-link "hmc-talk" }
     }
     { $slide "Why stack-based?"
         "Because nobody else is doing it"

diff --git a/jvm-summit-talk/jvm-summit-talk.factor b/jvm-summit-talk/jvm-summit-talk.factor
index b91bf01f7a131325bd7fa0f4fd59190479032bf5..4eda5c28e357b6a55e6b099f1dd1b6d7a6e0161e 100644 (file)
--- a/jvm-summit-talk/jvm-summit-talk.factor
+++ b/jvm-summit-talk/jvm-summit-talk.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: slides help.markup math math.private kernel sequences
 slots.private ;
-IN: talks.jvm-summit-talk
+IN: jvm-summit-talk
 
 CONSTANT: jvm-summit-slides
 {

diff --git a/minneapolis-talk/minneapolis-talk.factor b/minneapolis-talk/minneapolis-talk.factor
index 4cae92b4a7d9128ae354cc0079e10b0e6b735e6c..7c0a02cdfd3320d91155a03fe5798ac40e8cb2b9 100644 (file)
--- a/minneapolis-talk/minneapolis-talk.factor
+++ b/minneapolis-talk/minneapolis-talk.factor
@@ -1,6 +1,6 @@
 USING: slides help.markup math arrays hashtables namespaces
 sequences kernel parser memoize ;
-IN: talks.minneapolis-talk
+IN: minneapolis-talk
 
 CONSTANT: minneapolis-slides
 {

diff --git a/otug-talk/otug-talk.factor b/otug-talk/otug-talk.factor
index bb18d724dee146630f78190ccd58adff3320df01..59c81543d97879830dd37302b2fe6090848770a5 100644 (file)
--- a/otug-talk/otug-talk.factor
+++ b/otug-talk/otug-talk.factor
@@ -7,7 +7,7 @@ tools.annotations tools.crossref help.topics math.functions
 compiler.tree.optimizer compiler.cfg.optimizer fry
 ui.gadgets.panes tetris tetris.game combinators generalizations
 multiline sequences.private ;
-IN: talks.otug-talk
+IN: otug-talk
 
 : $tetris ( element -- )
     drop [ <default-tetris> <tetris-gadget> gadget. ] ($block) ;
@@ -78,11 +78,11 @@ CONSTANT: otug-slides
     }
     { $slide "Data flow combinators - cleave family"
         { { $link bi } ", " { $link tri } ", " { $link cleave } }
-        { $image "resource:extra/talks/otug-talk/bi.tiff" }
+        { $image "vocab:otug-talk/bi.tiff" }
     }
     { $slide "Data flow combinators - cleave family"
         { { $link 2bi } ", " { $link 2tri } ", " { $link 2cleave } }
-        { $image "resource:extra/talks/otug-talk/2bi.tiff" }
+        { $image "vocab:otug-talk/2bi.tiff" }
     }
     { $slide "Data flow combinators"
         "First, let's define a data type:"
@@ -101,19 +101,19 @@ CONSTANT: otug-slides
     }
     { $slide "Data flow combinators - spread family"
         { { $link bi* } ", " { $link tri* } ", " { $link spread } }
-        { $image "resource:extra/talks/otug-talk/bi_star.tiff" }
+        { $image "vocab:otug-talk/bi_star.tiff" }
     }
     { $slide "Data flow combinators - spread family"
         { { $link 2bi* } }
-        { $image "resource:extra/talks/otug-talk/2bi_star.tiff" }
+        { $image "vocab:otug-talk/2bi_star.tiff" }
     }
     { $slide "Data flow combinators - apply family"
         { { $link bi@ } ", " { $link tri@ } ", " { $link napply } }
-        { $image "resource:extra/talks/otug-talk/bi_at.tiff" }
+        { $image "vocab:otug-talk/bi_at.tiff" }
     }
     { $slide "Data flow combinators - apply family"
         { { $link 2bi@ } }
-        { $image "resource:extra/talks/otug-talk/2bi_at.tiff" }
+        { $image "vocab:otug-talk/2bi_at.tiff" }
     }
     { $slide "Shuffle words"
         "When data flow combinators are not enough"
@@ -258,7 +258,7 @@ var price = (order == null ? null : order.price);" }
         "Help markup is just literal data"
         { "Look at the help for " { $link T{ link f + } } }
         "These slides are built with the help system and a custom style sheet"
-        { $vocab-link "talks.otug-talk" }
+        { $vocab-link "otug-talk" }
     }
     { $slide "The VM"
         "Lowest level is the VM: ~12,000 lines of C"

diff --git a/tc-lisp-talk/tc-lisp-talk.factor b/tc-lisp-talk/tc-lisp-talk.factor
index 8d60e109069a40fc507830c45302d1acc8627f20..8bda96005a21dcce0ac48676ff90ce39b9e14d9c 100644 (file)
--- a/tc-lisp-talk/tc-lisp-talk.factor
+++ b/tc-lisp-talk/tc-lisp-talk.factor
@@ -3,7 +3,7 @@
 USING: assocs combinators constructors eval help.markup kernel
 multiline namespaces parser sequences sequences.private slides
 vocabs.refresh words fry ;
-IN: talks.tc-lisp-talk
+IN: tc-lisp-talk
 
 CONSTANT: tc-lisp-slides
 {

diff --git a/vpri-talk/vpri-talk.factor b/vpri-talk/vpri-talk.factor
index 9903d225c96a32a22fb79f1dfe6866d1eb0a77a4..bd081580d7d0ef99845b999f85cbb15e34f65156 100644 (file)
--- a/vpri-talk/vpri-talk.factor
+++ b/vpri-talk/vpri-talk.factor
@@ -6,7 +6,7 @@ locals kernel.private help.vocabs assocs quotations urls
 peg.ebnf tools.annotations tools.crossref help.topics
 math.functions compiler.tree.optimizer compiler.cfg.optimizer
 fry ;
-IN: talks.vpri-talk
+IN: vpri-talk
 
 CONSTANT: vpri-slides
 {
@@ -273,7 +273,7 @@ CONSTANT: vpri-slides
         "Help markup is just literal data"
         { "Look at the help for " { $link T{ link f + } } }
         "These slides are built with the help system and a custom style sheet"
-        { $vocab-link "talks.vpri-talk" }
+        { $vocab-link "vpri-talk" }
     }
     { $slide "Some line counts"
         "VM: 12,000 lines of C"