From 164c1b896cb01eac1148e51cb18c882c860e8e15 Mon Sep 17 00:00:00 2001 From: Natalie Downe Date: Sat, 23 May 2009 15:29:03 +0100 Subject: minor modifications to styles, adding in a terminal / subversion cheat sheet and the pdf in the artifacts directory --- artifacts/pocketwiki_terminal-commands.pdf | Bin 0 -> 46654 bytes css/main.css | 33 ++++- css/print.css | 1 + pocketHelp.html | 202 +++++++++++++++++++++++++++++ 4 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 artifacts/pocketwiki_terminal-commands.pdf create mode 100644 pocketHelp.html diff --git a/artifacts/pocketwiki_terminal-commands.pdf b/artifacts/pocketwiki_terminal-commands.pdf new file mode 100644 index 0000000..f87f499 Binary files /dev/null and b/artifacts/pocketwiki_terminal-commands.pdf differ diff --git a/css/main.css b/css/main.css index d495545..425e70a 100644 --- a/css/main.css +++ b/css/main.css @@ -111,6 +111,13 @@ h1 { margin-top:0.1667em /* 6px */; margin-bottom:0.5833em /* 21px */; } +h1 span { + font-size: 0.5em; + line-height: 1; + color: #CCC; + display: block; + margin-bottom: 0.3em; +} h2, h3 { font-size:1.143em /* 16px */; margin-top:0; @@ -233,6 +240,11 @@ pre { padding: 0.5em 0; } +hr { + border: none; + background-color: black; + height: 1px; +} /* @end */ /* @end */ @@ -393,12 +405,21 @@ button.link { /* @end */ +.amp { + font-family: "Bell MT", "Adobe Caslon Pro", "Goudy Old Style"; + font-style: italic; + font-size: 1.3em; + line-height: 0.7; + margin: 0 0.2em 0 0.1em; +} + /* @end */ /* @group Page structure */ #book { margin: 10px; + overflow: hidden; } .page { width: 241px; @@ -407,10 +428,17 @@ button.link { outline: 1px solid #C7C7C7; float: left; margin: 10px; + position: relative; } .inner { margin: 15px; } +.footer { + position: absolute; + bottom: 15px; + left: 15px; + width: 211px; +} /* @end */ @@ -464,8 +492,11 @@ h3.micro, h4.micro, h5.micro, h6.micro, -p.micro { +p.micro, +span.micro { font-size: 0.7em; + line-height: 1.5em; + display: block; } /* @end */ diff --git a/css/print.css b/css/print.css index 216d62b..858331e 100644 --- a/css/print.css +++ b/css/print.css @@ -1,5 +1,6 @@ #book { position: relative; + overflow: visible; height: 969px; width: 743px; margin: 0; diff --git a/pocketHelp.html b/pocketHelp.html new file mode 100644 index 0000000..9cb84ed --- /dev/null +++ b/pocketHelp.html @@ -0,0 +1,202 @@ + + + + + + pocket wiki - Terminal commands + + + + + + + + + + + + +
+
+
+

pocket wikiTerminal commands

+ + +
+
+ +
+
+

navigate the file tree

+ +

changing directory to dirname + cd dirname +

+

move up a directory in the tree + cd .. + dont forget you can drag a folder in from the finder to get a path to that directory +

+

go back to the last directory I was in + cd - +

+

where am I? (present working directory) + pwd +

+

list what's in this directory + ls +

+

now give me more information in the listing + ls -lah +

+

ssh to server + ssh user@domain.com +

+
+
+ +
+
+

find & open

+

list all files recursively in subdomains + find . +

+

find all files with '.css' in the name + find . | grep .css +

+

find the string 'prose' in the contents of all the files in this directory + grep -r "prose" . +

+

open a file as if you had double clicked it in the finder (mac only) + open filename +

+

open the current directory in the finder + open . +

+

make a directory called dirname + mkdir dirname +

+

create a file called filename if it doesnt exist or update last modified date if it does + touch filename +

+
+
+ +
+
+

move, remove & copy

+

move or rename a file or directory + mv oldname newname +

+

remove a file + rm filename +

+

remove a directory and all its contents. BE VERY CAREFUL! you could easily delete everything! + rm -rf dirname +

+

copy a file + cp oldfilename newfilename +

+

copy a directory and everything in it + cp -r olddirname newdirname +

+

securely copy a file to / on a remote server + scp file user@domain.com: + you can also copy a directory using scp -r +

+ +
+
+ +
+
+

subversion

+

check out a repository to the current directory + svn co http://domain.com/svn/ . +

+

update local directory from repository + svn up +

+ +

are there new or modified files? + svn status +

+

add new files to the repository + svn add filename +

+

remove a file from subversion + svn remove filename +

+

mark a previously conflicted file as resolved + svn resolved filename +

+

who changed what line number of this file + svn blame filename +

+

commit all changes in this directory + svn commit -m "commit msg" +

+
+
+ +
+
+

subversion & download

+

is this directory checked out from svn? and where? + svn info +

+

show everything that has changed + svn diff +

+

show what has changed in one file + svn diff filename +

+ +

open text editor in order to specify which files to ignore from svn + svn propedit svn:ignore . +

+

download a file to the current directory + wget URL +

+

show the contents of a file in the terminal + curl URL +

+
+
+ +
+
+

help & information

+

run any command as root + sudo your-command-here +

+

get help for any command, eg svn + svn --help +

+

what is the uptime of this computer + uptime +

+

what is the size of the current directory and all the contents + du -h +

+

cancel the command you were currently typing + ctrl + c +

+

go to the beginning of the line in the terminal + ctrl + a +

+

go to the end of the line in the terminal + ctrl + e +

+
+
+ +
+
+
+ + + -- cgit v1.2.3