Restructuring wiki before update PDF instructions

[WillAdams]

I've now completed re-working the wiki and the PDF instructions. Next I'll see if I can puzzle out Github.

Once I do that, we'll need to:

- generate the main .pdf
- zip it up
- generate the individual page .pdfs
- re-work the links on the wiki

Anything I forgot?

I'd be obliged if people would read over the new text and other changes I made to the instructions on the wiki and let me know of any improvements / fixes which are made (or which should be made).

Is there a way to mark text in the wiki to be a comment? I've got some text on the .pdfs which I'd like to place in the wiki (using it as the master copy) which I don't want to appear on the wiki.

William

[WillAdams]

Okay, I've managed to:

- install git
- install a nice graphical client (SourceTree)
- set it up w/ my github credentials (such as they are, WillAdams is my username FWIW)
- clone a local copy of the ShapeOko repository
- copied my updated and new files into said repository
- I had ``Uncommitted changes'' in my graphical client, but clicked on the ``Commit'' button, selected all the changed files and added some comments and now have ``doc_update_v1j''

I tried to click ``Push'', but got an error message:

Code: Select all

git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags origin master:master 
Pushing to git://github.com/shapeoko/ShapeOko.git
fatal: remote error: 
  You can't push to git://github.com/shapeoko/ShapeOko.git
  Use https://github.com/shapeoko/ShapeOko.git
Completed with errors, see above

I believe there's one final step --- what is it?

William

[WillAdams]

The final step was to configure git to use https:

http://stackoverflow.com/questions/7548 ... -to-master

So I've got everything pushed up to:

https://github.com/WillAdams/ShapeOko

and sent a pull request (I think).

William

[WillAdams]

AFAICT, the pull request did go out --- how long until it's acted on?

Does anyone want to take a look at the files?

William

[WillAdams]

Pull request was merged by Edward.

Links on the wiki up-dated. One change is we're now linking to a .pdf rather than a .zip, and it doesn't have the cover --- will need to find an opensource tool (pdftk?) to merge the cover and page files, preserving the numbering.

[WillAdams]

Hmm, the command is straight-forward:

Code: Select all

pdftk Shapeoko_Build_Instructions_Cover_v1j.pdf Shapeoko_Build_Instructions_v1j.pdf cat output Shapeoko_Build_Instructions_v1j_cover.pdf

The problem is the concatenated pdf is numbered from page 1--14 (want i, then 1--13).

I suspect I'll have to join the files together using TeX....