yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1244 from cldwalker/fix-typos

Browse source 
Fix typos
This commit is contained in:
Michael Klishin 2013-07-01 06:16:52 -07:00
commit f55b52e8fb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/MIXED_PROJECTS.md
View file

@ -76,18 +76,18 @@ version in mixed Clojure/Java projects.
## Interleaving Compilation Steps ## Interleaving Compilation Steps
In some cases it may be necessary to alternate between compiling In some cases it may be necessary to alternate between compiling
different languagess. For instance, systems that generate and different languages. For instance, systems that generate and
reference Java sources may also provide Clojure code for the generated reference Java sources may also provide Clojure code for the generated
sources to use. sources to use.
Any Clojure code referenced by Java sources must be Any Clojure code referenced by Java sources must be
[AOT compiled](http://clojure.org/compilation) to make it available to [AOT compiled](http://clojure.org/compilation) to make it available to
the Java compiler. Similarly, the Java classes produced by `javac` the Java compiler. Similarly, the Java classes produced by `javac`
must be available for Clojure code that dependends on it. This results must be available for Clojure code that depends on it. This results
in steps of `compile` `javac` `compile`, whereas the default task in steps of `compile` `javac` `compile`, whereas the default task
order is simply `javac` `compile`. order is simply `javac` `compile`.
This sequence can be accompished by executing lein with different This sequence can be accomplished by executing lein with different
profiles. A profile can be built to perform the initial steps, while profiles. A profile can be built to perform the initial steps, while
another profile continues to the final compilation stage. For another profile continues to the final compilation stage. For
instance, the following is an example of a profile called `:precomp` instance, the following is an example of a profile called `:precomp`

2
leiningen-core/src/leiningen/core/ssl.clj
View file

@ -68,7 +68,7 @@
;; TODO: honor settings from project.clj, not just user profile ;; TODO: honor settings from project.clj, not just user profile
(defn make-sslcontext (defn make-sslcontext
"Construct an SSLContext that trusts a collection of certificatess." "Construct an SSLContext that trusts a collection of certificates."
[trusted-certs] [trusted-certs]
(let [ks (make-keystore trusted-certs) (let [ks (make-keystore trusted-certs)
kmf (key-manager-factory (key-manager-props)) kmf (key-manager-factory (key-manager-props))