Skip to content

Commit eba8e7f

Browse files
committed
updated readme
1 parent 5d1d04c commit eba8e7f

1 file changed

Lines changed: 16 additions & 17 deletions

File tree

README.markdown

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ repository is named `your_username.github.com` or `your_organization.github.com`
1818
git remote add origin (your repository url)
1919
git push origin master
2020

21-
# If you're using Github user or organization pages,
22-
# rename the master branch to source and then push
23-
git branch -m master source
21+
# Next, if you're using Github user or organization pages,
22+
# Create a source branch and push to origin source.
23+
git branch source
2424
git push origin source
2525

2626

@@ -40,37 +40,36 @@ Next, setup an [RVM](http://beginrescueend.com/) and install dependencies.
4040

4141
rake generate # Generates your blog into the public directory
4242
rake watch # Watches files for changes and regenerates your blog
43-
rake preview # Watches, regenerates, and mounts a webserver at http://localhost:4000
43+
rake preview # Watches, and mounts a webserver at http://localhost:4000
4444

4545
Jekyll's built in webbrick server is handy, but if you're a [POW](http://pow.cx) user, you can set it up to work with Octopress like this.
4646

4747
cd ~/.pow
4848
ln -s /path/to/octopress
4949
cd -
5050

51-
Now you'll just run `rake watch` and load up `http://octopress.dev` instead.
51+
Now that you're setup with POW, you'll just run `rake watch` and load up `http://octopress.dev` instead.
5252

5353
## Writing A Post
5454

55-
While running `rake preview` or `rake watch`, open a new terminal session and start a Hello World post.
55+
Create your first post.
5656

5757
rake post['hello world']
5858

59-
This will create a new post named something like `2011-06-17-hello-world.markdown` in the `source/_posts` directory.
59+
This will put a new post in source/_posts with a name like like `2011-07-3-hello-world.markdown` in the `source/_posts` directory.
6060
Open that file in your favorite text editor and you'll see a block of [yaml front matter](https://github.com/mojombo/jekyll/wiki/yaml-front-matter)
6161
which tells Jekyll how to processes posts and pages.
6262

6363
---
6464
title: Hello World
65-
date: 2011-06-17 14:34
65+
date: 2011-07-03 5:59
6666
layout: post
6767
---
6868

69-
Now, go ahead and type up a sample post, or use some [inspired filler](http://baconipsum.com/). Save and refresh your browser, and you
69+
Now beneath the yaml block, go ahead and type up a sample post, or use some [inspired filler](http://baconipsum.com/). If you're running the watcher, save and refresh your browser and you
7070
should see the new post show up in your blog index.
7171

72-
Octopress does more than this though. Check out [Blogging with Octopress](#include_link) to learn about cool features which
73-
help make blogging easier and more beautiful.
72+
Octopress does more than this though. Check out [Blogging with Octopress](#include_link) to learn about all the different ways Octopress makes blogging easier.
7473

7574
## Configuring Octopress
7675

@@ -106,18 +105,18 @@ If you're using Github user or organization pages, clone the repository `git@git
106105

107106
# For Github project pages:
108107
git clone [email protected]:username/project.git _deploy
109-
rake init_deploy[gh-pages]
108+
rake config_deploy[gh-pages]
110109

111110
# For Github user/organization pages:
112111
git clone [email protected]:username/username.github.com _deploy
113-
rake init_deploy[master]
112+
rake config_deploy[master]
114113

115114
# Now to deploy, you'll run
116-
rake push
115+
rake deploy
117116

118-
The `init_deploy` rake task takes a branch name as an argument and creates a [new empty branch](http://book.git-scm.com/5_creating_new_empty_branches.html), adds an initial commit, and pushes it to the origin remote.
119-
This prepares your branch for easy deployment. The `rake push` task copies the generated blog from the `public` directory to the `_deploy` directory, adds new files, removes old files, sets a commit message, and pushes to Github.
120-
Then Github will queue your site for publishing (which usually occurs within minutes).
117+
The `config_deploy` rake task takes a branch name as an argument and creates a [new empty branch](http://book.git-scm.com/5_creating_new_empty_branches.html), and adds an initial commit.
118+
This prepares your branch for easy deployment. The `rake deploy` task copies the generated blog from the `public` directory to the `_deploy` directory, adds new files, removes old files, sets a commit message, and pushes to Github.
119+
Github will queue your site for publishing (which usually occurs instantly or within minutes if it's your first commit).
121120

122121
## License
123122
(The MIT License)

0 commit comments

Comments
 (0)