diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 10:34:48 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 10:34:48 +0100 |
| commit | 99fd2469fba1a38b2a65b4694f337d92e559df01 (patch) | |
| tree | 20491590ccb07223afd9d1f6a6546213b0f43577 /docs/comm | |
| parent | d260d919eef22654b1af61334feed0545f64cea5 (diff) | |
| parent | 0d19922acd724991b7b97871b1404f3db5058b49 (diff) | |
| download | haskell-99fd2469fba1a38b2a65b4694f337d92e559df01.tar.gz | |
Merge remote-tracking branch 'origin/master' into newcg
* origin/master: (756 commits)
don't crash if argv[0] == NULL (#7037)
-package P was loading all versions of P in GHCi (#7030)
Add a Note, copying text from #2437
improve the --help docs a bit (#7008)
Copy Data.HashTable's hashString into our Util module
Build fix
Build fixes
Parse error: suggest brackets and indentation.
Don't build the ghc DLL on Windows; works around trac #5987
On Windows, detect if DLLs have too many symbols; trac #5987
Add some more Integer rules; fixes #6111
Fix PA dfun construction with silent superclass args
Add silent superclass parameters to the vectoriser
Add silent superclass parameters (again)
Mention Generic1 in the user's guide
Make the GHC API a little more powerful.
tweak llvm version warning message
New version of the patch for #5461.
Fix Word64ToInteger conversion rule.
Implemented feature request on reconfigurable pretty-printing in GHCi (#5461)
...
Conflicts:
compiler/basicTypes/UniqSupply.lhs
compiler/cmm/CmmBuildInfoTables.hs
compiler/cmm/CmmLint.hs
compiler/cmm/CmmOpt.hs
compiler/cmm/CmmPipeline.hs
compiler/cmm/CmmStackLayout.hs
compiler/cmm/MkGraph.hs
compiler/cmm/OldPprCmm.hs
compiler/codeGen/CodeGen.lhs
compiler/codeGen/StgCmm.hs
compiler/codeGen/StgCmmBind.hs
compiler/codeGen/StgCmmLayout.hs
compiler/codeGen/StgCmmUtils.hs
compiler/main/CodeOutput.lhs
compiler/main/HscMain.hs
compiler/nativeGen/AsmCodeGen.lhs
compiler/simplStg/SimplStg.lhs
Diffstat (limited to 'docs/comm')
| -rw-r--r-- | docs/comm/genesis/modules.html | 2 | ||||
| -rw-r--r-- | docs/comm/rts-libs/threaded-rts.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/comm/genesis/modules.html b/docs/comm/genesis/modules.html index de59cce6d3..10cd7a8490 100644 --- a/docs/comm/genesis/modules.html +++ b/docs/comm/genesis/modules.html @@ -110,7 +110,7 @@ identifiers, expressions, rules, and their operations.</strong> </ul></tt> <p><li> <strong>That is the end of the infrastructure. Now we get the - main layer of mdoules that perform useful work.</strong> + main layer of modules that perform useful work.</strong> <tt><ul> <p><li> diff --git a/docs/comm/rts-libs/threaded-rts.html b/docs/comm/rts-libs/threaded-rts.html index 499aeec767..739dc8d58a 100644 --- a/docs/comm/rts-libs/threaded-rts.html +++ b/docs/comm/rts-libs/threaded-rts.html @@ -57,7 +57,7 @@ GhcLibWays += s</pre> <tt>Capability</tt>. The available pool of capabilities is managed by the <tt>Capability</tt> API, described below.</p> - <p>In the threaded runtime, there is only a single <tt>Capabililty</tt> in the + <p>In the threaded runtime, there is only a single <tt>Capability</tt> in the system, indicating that only a single thread can be executing Haskell code at any one time. In the SMP runtime, there can be an arbitrary number of capabilities selectable at runtime with the <tt>+RTS -N<em>n</em></tt> |