+[2015-02-02T00:47:56Z]jaybefehwalker, octopress 2 and octopress 3 are *completely* different things. 100%. +[2015-02-02T00:48:56Z]fehwalkeryep +[2015-02-05T04:59:55Z]compadreI had a question about updating octopress, I'm fairly new to Git and was wondering if I'm going about arranging everything in the ideal way. +[2015-02-05T05:01:38Z]compadrethe way it stands now I execute git pull origin master in the root directory rather than git pull octopress master +[2015-02-05T05:04:06Z]compadreI think I gathered that the origin master is different than my own master, when I push it goes to my master, but when I pull I specifically specific git pull origin master and I believe it's update but am unsure.
the way it stands now I execute git pull origin master in the root directory rather than git pull octopress master
+[2015-02-09T19:52:58Z]xcyclistI am looking through all the tutorials, and there doesn't seem to be a recommended specific on where to actually put your content files for the blog, nor what to call them. There is a config header, but ...sorry if I am wanting more specifics than is normal... +[2015-02-09T19:55:34Z]xcyclistSorry. I think I got it. +[2015-02-09T19:57:03Z]jaybejekyllrb.com +[2015-02-09T19:57:44Z]xcyclistNope. I still don't get it. I generated a file with configs between two lines that have --- on them only. I may be dumb, but it isn't markdown is it? Does my markdown go below the last ---, or in a separate file? +[2015-02-09T19:58:46Z]jaybethat link i just provided has full documentation