Permalink
Browse files

Merge branch 'master' of git@github.com:tjweir/liftbook

Conflicts:

	chap-JPA.lyx
  • Loading branch information...
2 parents 1b925ab + 314e0c2 commit 0c43d0017d928f23b3c8fee2402888c0204b35c5 @dchenbecker dchenbecker committed Dec 22, 2008
Showing with 1,140 additions and 41 deletions.
  1. +23 −0 chap-JPA.lyx
  2. +42 −3 chap-actors.lyx
  3. +701 −8 chap-advanced.lyx
  4. +24 −1 chap-ajax_comet.lyx
  5. +25 −3 chap-js_commands.lyx
  6. +25 −3 chap-json.lyx
  7. +46 −1 chap-lift_architecture.lyx
  8. +42 −3 chap-lucene_compass.lyx
  9. +47 −7 chap-openid.lyx
  10. +45 −6 chap-tagging.lyx
  11. +37 −2 chap-url_rewrite.lyx
  12. +41 −2 chap-web_services.lyx
  13. +42 −2 chap-widgets.lyx
View
@@ -46,6 +46,29 @@
JPA Integration
\end_layout
+\begin_layout Standard
+\begin_inset Box Framed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+width "100col%"
+special "none"
+height "1in"
+height_special "totalheight"
+status collapsed
+
+\begin_layout Plain Layout
+This chapter is still under active development.
+ The contents will change.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
The Java Persistence API
\begin_inset Foot
View
@@ -1,8 +1,9 @@
-#LyX 1.5.6 created this file. For more info see http://www.lyx.org/
-\lyxformat 276
+#LyX 1.6.0 created this file. For more info see http://www.lyx.org/
+\lyxformat 345
\begin_document
\begin_header
\textclass book
+\use_default_options false
\language english
\inputencoding auto
\font_roman default
@@ -13,9 +14,11 @@
\font_osf false
\font_sf_scale 100
\font_tt_scale 100
+
\graphics default
\paperfontsize default
\spacing single
+\use_hyperref false
\papersize default
\use_geometry false
\use_amsmath 1
@@ -43,6 +46,37 @@
Using Scala Actors
\end_layout
+\begin_layout Standard
+\begin_inset Box Framed
+position "t"
+hor_pos "c"
+has_inner_box 0
+inner_pos "t"
+use_parbox 0
+width "100col%"
+special "none"
+height "1in"
+height_special "totalheight"
+status collapsed
+
+\begin_layout Plain Layout
+This chapter is still under active development.
+ The contents will change.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
\begin_layout Itemize
Intro to Concurrency
\end_layout
@@ -69,7 +103,7 @@ Complex: Pulling RSS feeds?
\begin_inset Note Note
status open
-\begin_layout Standard
+\begin_layout Plain Layout
We need a better example.
-Ty
\end_layout
@@ -80,6 +114,11 @@ We need a better example.
\end_layout
\end_deeper
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
\end_layout
Oops, something went wrong.

0 comments on commit 0c43d00

Please sign in to comment.