Permalink
Browse files

Fixed the README

Turned out we had two README.md files by accident.
I had been updating the wrong copy, in the Source/ dir.
Moved that copy to the root and removed the other one.
  • Loading branch information...
1 parent 6deca88 commit 0e6705d54f4f1840f0bcfafe6334af572c9574c7 @snej snej committed Sep 6, 2011
Showing with 8 additions and 68 deletions.
  1. +2 −0 CouchDemo.xcodeproj/project.pbxproj
  2. +0 −3 CouchDemo.xcworkspace/contents.xcworkspacedata
  3. +6 −5 README.md
  4. +0 −60 Source/README.md
@@ -47,6 +47,7 @@
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
27167F6113C4FA57001CC5B6 /* GrocerySync.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GrocerySync.app; sourceTree = BUILT_PRODUCTS_DIR; };
273A739613BE918A0078870D /* Couchbase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Couchbase.framework; path = Frameworks/Couchbase.framework; sourceTree = SOURCE_ROOT; };
+ 27637C011416E78D001E30CA /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
276A43C613F088B700E5743A /* ConfigViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConfigViewController.h; sourceTree = "<group>"; };
276A43C713F088B700E5743A /* ConfigViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConfigViewController.m; sourceTree = "<group>"; };
276A43C813F088B700E5743A /* ConfigViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ConfigViewController.xib; path = ../Source/ConfigViewController.xib; sourceTree = "<group>"; };
@@ -122,6 +123,7 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
+ 27637C011416E78D001E30CA /* README.md */,
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -24,9 +24,9 @@ Prerequisite: Xcode 4.0.2 or later with the SDK for iOS 4 or later. (It's possib
### Get the frameworks (CouchCocoa as well as the embedded Couchbase server)
-1. Download [the Frameworks.zip][5], unzip it, and
-2. Unzip the archive.
-3. Move the uncompressed Frameworks into the root of the iOS-Couchbase-Demo git repo. The `.gitignore` file is already set up.
+1. [Download and unzip the latest][7] compiled Couchbase.framework. (Building this is messy, you probably don't want to do it yourself.)
+2. Either [download and unzip the latest][5] compiled CouchCocoa.framework, or [check out the source code][6] and build it yourself.
+3. Copy both Couchbase.framework and CouchCocoa.framework into the Frameworks directory of this repo.
### Open the Xcode workspace
@@ -54,6 +54,7 @@ Copyright 2011, Couchbase, Inc.
[1]: https://github.com/couchbaselabs/iOS-Couchbase
[2]: http://couchdb.apache.org
-[3]: https://github.com/couchbaselabs/iOS-Couchbase/blob/master/doc/using_mobile_couchbase.md
[4]: https://groups.google.com/group/mobile-couchbase
-[5]: http://jchris.iriscouch.com/files/iOS-Couchbase/Frameworks.zip
+[5]: https://github.com/couchbaselabs/CouchCocoa/downloads
+[6]: https://github.com/couchbaselabs/CouchCocoa/
+[7]: https://github.com/couchbaselabs/iOS-Couchbase/
View
@@ -1,60 +0,0 @@
-## Grocery Sync for iOS
-
-This is a simple demo app showing how to use the [Couchbase Mobile][1] framework to run [Apache CouchDB][2] on iOS. The app just presents a simple editable list of textual items, which are stored persistently in a local database, and shared in realtime via a syncpoint in the cloud.
-
-**Keep in mind that the default is to share the globally shared grocery list.** To use a private grocery list, the user must create a password protected database and then direct Grocery Sync at it via the Settings application. URLs are specified in the form `http://username:password@myhost.iriscouch.com/grocery-sync`
-
-So this dude is at the grocery store picking up produce and checking it off on his phone. He's all proud looking when he is about to check off the last item on the list, but then... suddenly new items start appearing. Cut to his wife at home with the kids and she's adding items.
-
-Okra? Ok. Coconut milk. But I already got regular milk! He checks them off as he goes. Cut to his wife who sees them marked done, she gets a big grin and starts adding cookies and ice cream and paper towels or whatever.
-
-## Getting Started
-
-These instructions assume you are familiar with how to make an iPhone app. Please follow them fully and in order the first time you build.
-
-If you have questions or get stuck or just want to say hi, please visit the [Mobile Couchbase group][4] on Google Groups.
-
-Prerequisite: Xcode 4.0.2 or later with the SDK for iOS 4 or later. (It's possible the project might still work with Xcode 3, but we're not testing or supporting this anymore.)
-
-## Building The Demo App
-
-### Get the main repository
-
- git clone git://github.com/couchbaselabs/iOS-Couchbase-Demo.git
-
-### Get the frameworks (CouchCocoa as well as the embedded Couchbase server)
-
-1. [Download and unzip the latest][7] compiled Couchbase.framework. (Building this is messy, you probably don't want to do it yourself.)
-2. Either [download and unzip the latest][5] compiled CouchCocoa.framework, or [check out the source code][6] and build it yourself.
-3. Copy both Couchbase.framework and CouchCocoa.framework into the Frameworks directory of this repo.
-
-### Open the Xcode workspace
-
- open CouchDemo.xcworkspace
-
-### Build and run the demo app
-
-1. Select the "CouchDemo" scheme and the appropriate destination (an iOS device or simulator) from the pop-up menu in the Xcode toolbar.
-2. Click the Run button
-
-That's it! Now that you're set up, you can just use the Run command again after making changes to the demo code.
-
-## To add the framework to your existing Xcode project
-
-Please see the documentation in the [Couchbase Mobile][1] repository.
-
-## License
-
-Portions under Apache, Erlang, and other licenses.
-
-The overall package is released under the Apache license, 2.0.
-
-Copyright 2011, Couchbase, Inc.
-
-
-[1]: https://github.com/couchbaselabs/iOS-Couchbase
-[2]: http://couchdb.apache.org
-[4]: https://groups.google.com/group/mobile-couchbase
-[5]: https://github.com/couchbaselabs/CouchCocoa/downloads
-[6]: https://github.com/couchbaselabs/CouchCocoa/
-[7]: https://github.com/couchbaselabs/iOS-Couchbase/

0 comments on commit 0e6705d

Please sign in to comment.